class membership_line(osv.osv):
'''Member line'''
_inherit = 'membership.membership_line'
-
+
def _get_partners(self, cr, uid, ids, context=None):
list_membership_line = []
member_line_obj = self.pool.get('membership.membership_line')
for partner in self.pool.get('res.partner').browse(cr, uid, ids, context=context):
if partner.member_lines:
list_membership_line += member_line_obj.search(cr, uid, [('id', 'in', [ l.id for l in partner.member_lines])], context=context)
+ print("DEV: [pos_membership] [membership_line] [_get_partners]: ids=%s res=%s" % (str(ids), str(list_membership_line)))
return list_membership_line
-
+
#def _get_membership_lines_from_account_invoice(self, cr, uid, ids, context=None):
# list_membership_line = []
# member_line_obj = self.pool.get('membership.membership_line')
def _get_membership_lines_from_pos_order(self, cr, uid, ids, context=None):
list_membership_line = []
member_line_obj = self.pool.get('membership.membership_line')
+ print("DEV: [pos_membership] [membership_line] [_get_membership_lines_from_pos_order]: ids=%s context=%s" % (str(ids), str(context)))
for order in self.pool.get('pos.order').browse(cr, uid, ids, context=context):
if order.lines:
list_membership_line += member_line_obj.search(cr, uid, [('pos_order_line', 'in', [ l.id for l in order.lines])], context=context)
- res = \
- { 'class': 'pos.order'
- , 'ids': list_membership_line
- }
- #res= list_membership_line
+ #res = \
+ # { 'class': 'pos.order'
+ # , 'ids': list_membership_line
+ # }
+ res= list_membership_line
print("DEV: [pos_membership] [membership_line] [_get_membership_lines_from_pos_order]: res=%s" % str(res))
return res
-
+
def _check_membership_date(self, cr, uid, ids, context=None):
"""Check if membership product is not in the past
@param self: The object pointer
@param ids: List of Membership Line IDs
@param context: A standard dictionary for contextual values
"""
-
+
cr.execute('''
SELECT MIN(ml.date_to - ai.date_invoice)
FROM membership_membership_line ml
if r[0] and r[0] < 0:
return False
return True
-
- def _state(self, cr, uid, data, name, args, context=None):
+
+ def _state(self, cr, uid, ids, name, args, context=None):
"""Compute the state lines
@param self: The object pointer
@param cr: the current row, from the database cursor,
@param return: Dictionary of state Value
"""
res = {}
- print("DEV: [pos_membership] [membership_line] [_state]: name=%s data=%s args=%s context=%s" % (str(name), str(data), str(args), str(context)))
- if type(data) == type(list()) or data.get('class') == 'account.invoice':
- inv_obj = self.pool.get('account.invoice')
- if type(data) == type(list()):
- ids = data
- else:
- ids = data.get('ids')
- for line in self.browse(cr, uid, ids, context=context):
- cr.execute('''
- SELECT i.state, i.id FROM
- account_invoice i
- WHERE
- i.id = (
- SELECT l.invoice_id FROM
- account_invoice_line l WHERE
- l.id = (
- SELECT ml.account_invoice_line FROM
- membership_membership_line ml WHERE
- ml.id = %s
- )
+ print("DEV: [pos_membership] [membership_line] [_state]: name=%s ids=%s args=%s context=%s" % (str(name), str(ids), str(args), str(context)))
+ inv_obj = self.pool.get('account.invoice')
+ ord_obj = self.pool.get('pos.order')
+ for line in self.browse(cr, uid, ids, context=context):
+ cr.execute('''
+ SELECT i.state, i.id FROM
+ account_invoice i
+ WHERE
+ i.id = (
+ SELECT l.invoice_id FROM
+ account_invoice_line l WHERE
+ l.id = (
+ SELECT ml.account_invoice_line FROM
+ membership_membership_line ml WHERE
+ ml.id = %s
)
- ''', (line.id,))
- fetched = cr.fetchone()
- if not fetched:
- res[line.id] = 'canceled'
- continue
+ )
+ ''', (line.id,))
+ fetched = cr.fetchone()
+ if fetched:
istate = fetched[0]
state = 'none'
if (istate == 'draft') | (istate == 'proforma'):
elif istate == 'cancel':
state = 'canceled'
res[line.id] = state
- elif data.get('class') == 'pos.order':
- ord_obj = self.pool.get('pos.order')
- for line in self.browse(cr, uid, data.get('ids'), context=context):
+ else:
cr.execute('''
- SELECT i.state, i.id FROM
+ SELECT i.state, i.id, i.partner_id FROM
pos_order i
WHERE
i.id = (
if not fetched:
res[line.id] = 'canceled'
continue
+ partner_id = fetched[2]
+ self.write(cr, uid, line.id, {'partner': partner_id})
+ # NOTE: force une mise à jour du partner,
+ # car il n'y en a pas lors de la création du pos.order
+ # dans le PoS (pour le moment)
ostate = fetched[0]
state = 'none'
- if (ostate == 'draft'):
+ if (ostate == 'paid') | (ostate == 'draft'):
state = 'waiting'
- elif (ostate == 'paid') | (ostate == 'done') | (ostate == 'invoiced'):
+ elif (ostate == 'done') | (ostate == 'invoiced'):
state = 'paid'
# XXX: regarder l'équivalent de out_refund pour un pos.order
print("DEV: [pos_membership] [membership_line] [_state]: paid: TODO")
elif ostate == 'cancel':
state = 'canceled'
res[line.id] = state
+ print("DEV: [pos_membership] [membership_line] [_state]: return=%s" % (str(res)))
+ return res
+
+ def write(self, cr, uid, ids, vals, context=None):
+ print("DEV: [pos_membership] [membership_line] [write]: ids=%s vals=%s" % (str(ids), str(vals)))
+ member_line_obj = self.pool.get('membership.membership_line')
+ res = super(membership_line, self).write(cr, uid, ids, vals, context=context)
+ print("DEV: [pos_membership] [membership_line] [write]: res=%s" % str(res))
+ return res
+
+ def create(self, cr, uid, vals, context=None):
+ print("DEV: [pos_membership] [membership_line] [create]: vals=%s" % (str(vals)))
+ member_line_obj = self.pool.get('membership.membership_line')
+ res = super(membership_line, self).create(cr, uid, vals, context=context)
+ print("DEV: [pos_membership] [membership_line] [create]: res=%s" % (str(res)))
return res
-
+
_columns = {
'pos_order_line': fields.many2one('pos.order.line', 'POS Order line', readonly=True),
'pos_order_id': fields.related('pos_order_line', 'order_id', type='many2one', relation='pos.order', string='Order', readonly=True),
selection=STATE,
store = {
#'account.invoice': (_get_membership_lines_from_account_invoice, ['state'], 10),
- 'pos.order': (_get_membership_lines_from_pos_order, ['state'], 10),
+ # NOTE: déjà géré par membership.membership_line._get_membership_lines
+ 'pos.order': (_get_membership_lines_from_pos_order, ['state', 'partner_id'], 10),
'res.partner': (_get_partners, ['membership_state'], 12),
}, help="""It indicates the membership status.
-Non Member: A member who has not applied for any membership.
class Partner(osv.osv):
'''Partner'''
_inherit = 'res.partner'
-
+
def _get_partner_id(self, cr, uid, ids, context=None):
+ print("DEV: [pos_membership] [Partner] [_get_partner_id]: ids=%s context=%s" % (str(ids), str(context)))
member_line_obj = self.pool.get('membership.membership_line')
res_obj = self.pool.get('res.partner')
data_inv = member_line_obj.browse(cr, uid, ids, context=context)
while ids2:
ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
list_partner += ids2
+ print("DEV: [pos_membership] [Partner] [_get_partner_id]: res=%s" % (str(list_partner)))
return list_partner
-
+
def _get_invoice_partner(self, cr, uid, ids, context=None):
inv_obj = self.pool.get('account.invoice')
res_obj = self.pool.get('res.partner')
ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
list_partner += ids2
return list_partner
-
+
def _get_order_partner(self, cr, uid, ids, context=None):
ord_obj = self.pool.get('pos.order')
res_obj = self.pool.get('res.partner')
ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
list_partner += ids2
return list_partner
-
+
def _membership_state(self, cr, uid, ids, name, args, context=None):
"""This Function return Membership State For Given Partner.
@param self: The object pointer
@param return: Dictionary of Membership state Value
"""
res = {}
+ print("DEV: [pos_membership] [Partner] [_membership_state]: name=%s ids=%s args=%s context=%s" % (str(name), str(ids), str(args), str(context)))
for id in ids:
res[id] = 'none'
today = time.strftime('%Y-%m-%d')
for id in ids:
+ print("DEV: [pos_membership] [Partner] [_membership_state] id=%s" % (str(id)))
partner_data = self.browse(cr, uid, id, context=context)
if partner_data.membership_cancel and today > partner_data.membership_cancel:
res[id] = 'canceled'
res[id] = 'old'
continue
s = 4
+ print("DEV: [pos_membership] [Partner] [_membership_state] [partner_data] [member_lines] [test]")
if partner_data.member_lines:
+ print("DEV: [pos_membership] [Partner] [_membership_state] [partner_data] [member_lines]" % ())
for mline in partner_data.member_lines:
+ print("DEV: [pos_membership] [Partner] [_membership_state] [mline]: id=%s" % str(mline.id))
if mline.date_to >= today:
if mline.account_invoice_line and mline.account_invoice_line.invoice_id:
- mstate = mline.account_invoice_line.invoice_id.state
- if mstate == 'paid':
+ istate = mline.account_invoice_line.invoice_id.state
+ print("DEV: [pos_membership] [Partner] [_membership_state] [account_invoice_line]: id=%s istate=%s" % (str(mline.account_invoice_line.invoice_id.id), str(istate)))
+ if istate == 'paid':
s = 0
inv = mline.account_invoice_line.invoice_id
for payment in inv.payment_ids:
if payment.invoice.type == 'out_refund':
s = 2
break
- elif mstate == 'open' and s!=0:
+ elif istate == 'open' and s!=0:
s = 1
- elif mstate == 'cancel' and s!=0 and s!=1:
+ elif istate == 'cancel' and s!=0 and s!=1:
s = 2
- elif (mstate == 'draft' or mstate == 'proforma') and s!=0 and s!=1:
+ elif (istate == 'draft' or istate == 'proforma') and s!=0 and s!=1:
s = 3
- elif mline.order_pos_line and mline.order_pos_line.order_id:
- mstate = mline.pos_order_line.order_id.state
- if (mstate == 'paid') | (mstate == 'done') | (mstate == 'paid'):
+ elif mline.pos_order_line and mline.pos_order_line.order_id:
+ ostate = mline.pos_order_line.order_id.state
+ print("DEV: [pos_membership] [Partner] [_membership_state] [pos_order_line]: id=%s ostate=%s" % (str(mline.pos_order_line.order_id.id), str(ostate)))
+ if ostate == 'paid' and s!=0 and s!=1:
+ s = 3
+ if ostate == 'invoiced':
+ s = 1
+ if ostate == 'done':
s = 0
# XXX: regarder l'équivalent de out_refund pour un pos.order
print("DEV: [pos_membership] [partner] [_membership_state]: paid: TODO")
# if payment.invoice.type == 'out_refund':
# s = 2
break
- elif mstate == 'open' and s!=0:
+ elif ostate == 'open' and s!=0:
# XXX: 1 donne invoiced, c'est pitet pas bon
print("DEV: [pos_membership] [partner] [_membership_state]: invoiced: TODO")
s = 1
- elif mstate == 'cancel' and s!=0 and s!=1:
+ elif ostate == 'cancel' and s!=0 and s!=1:
s = 2
- elif mstate == 'draft' and s!=0 and s!=1:
+ elif ostate == 'draft' and s!=0 and s!=1:
s = 3
if s==4:
for mline in partner_data.member_lines:
if partner_data.associate_member:
res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context=context)
res[id] = res_state[partner_data.associate_member.id]
+ print("DEV: [pos_membership] [Partner] [_membership_state]: res=%s" % (str(res)))
return res
-
+
def _membership_date(self, cr, uid, ids, name, args, context=None):
"""Return date of membership"""
name = name[0]
res = {}
member_line_obj = self.pool.get('membership.membership_line')
+ print("DEV: [pos_membership] [Partner] [_membership_date]: ids=%s" % (str(ids)))
for partner in self.browse(cr, uid, ids, context=context):
if partner.associate_member:
partner_id = partner.associate_member.id
if line_id:
res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
['date_from'], context=context)['date_from']
-
+ print("DEV: [pos_membership] [Partner] [_membership_date] [membership_start]: ids=%s date=%s" % (str(ids), str(res[partner.id]['membership_start'])))
+
if name == 'membership_stop':
line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)],
limit=1, order='date_to desc', context=context)
if line_id1:
res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
['date_to'], context=context)['date_to']
-
+ print("DEV: [pos_membership] [Partner] [_membership_date] [membership_stop]: ids=%s date=%s" % (str(ids), str(res[partner.id]['membership_stop'])))
+
if name == 'membership_cancel':
if partner.membership_state == 'canceled':
line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)], limit=1, order='date_cancel', context=context)
if line_id2:
res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0], ['date_cancel'], context=context)['date_cancel']
+ print("DEV: [pos_membership] [Partner] [_membership_date] [membership_cancel]: ids=%s date=%s" % (str(ids), str(res[partner.id]['membership_cancel'])))
+ print("DEV: [pos_membership] [Partner] [_membership_date]: res=%s" % (str(res)))
return res
-
+
def _get_partners(self, cr, uid, ids, context=None):
ids2 = ids
while ids2:
ids2 = self.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
ids += ids2
return ids
-
+
def __get_membership_state(self, *args, **kwargs):
return self._membership_state(*args, **kwargs)
-
+
_columns = {
- 'associate_member': fields.many2one('res.partner', 'Associate Member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
- 'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
- 'free_member': fields.boolean('Free Member', help = "Select if you want to give free membership."),
- 'membership_amount': fields.float(
- 'Membership Amount', digits=(16, 2),
- help = 'The price negotiated by the partner'),
'membership_state': fields.function(
__get_membership_state,
string = 'Current Membership Status', type = 'selection',
selection = STATE,
store = {
- 'account.invoice': (_get_invoice_partner, ['state'], 10),
- 'pos.order': (_get_order_partner, ['state'], 10),
- 'membership.membership_line': (_get_partner_id, ['state'], 10),
- 'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 10)
+ # NOTE: il est important que la priorité soit plus grande
+ # que les membership_{start,stop,cancel}
+ # car _membership_state s'en sert et doit donc les trouver à jour.
+ 'account.invoice': (_get_invoice_partner, ['state'], 20),
+ 'pos.order': (_get_order_partner, ['state', 'partner_id'], 20),
+ 'membership.membership_line': (_get_partner_id, ['state'], 20),
+ 'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 20)
}, help="""It indicates the membership state.
-Non Member: A partner who has not applied for any membership.
-Cancelled Member: A member who has cancelled his membership.
string = 'Membership Start Date', type = 'date',
store = {
'account.invoice': (_get_invoice_partner, ['state'], 10),
- 'pos.order': (_get_order_partner, ['state'], 10),
- 'membership.membership_line': (_get_partner_id, ['state'], 10, ),
+ 'pos.order': (_get_order_partner, ['state', 'partner_id'], 10),
+ 'membership.membership_line': (_get_partner_id, ['state'], 10),
'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
}, help="Date from which membership becomes active."),
'membership_stop': fields.function(
string = 'Membership End Date', type='date', multi='membership_stop',
store = {
'account.invoice': (_get_invoice_partner, ['state'], 10),
- 'pos.order': (_get_order_partner, ['state'], 10),
+ 'pos.order': (_get_order_partner, ['state', 'partner_id'], 10),
'membership.membership_line': (_get_partner_id, ['state'], 10),
'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
}, help="Date until which membership remains active."),
string = 'Cancel Membership Date', type='date', multi='membership_cancel',
store = {
'account.invoice': (_get_invoice_partner, ['state'], 11),
- 'pos.order': (_get_order_partner, ['state'], 11),
+ 'pos.order': (_get_order_partner, ['state', 'partner_id'], 11),
'membership.membership_line': (_get_partner_id, ['state'], 10),
'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
}, help="Date on which membership has been cancelled"),
class pos_order(osv.osv):
_inherit = 'pos.order'
-
- def _check_membership_product(self, cr, uid, ids, context=None):
- #TODO : check condition and return boolean accordingly
- if not context is None:
- context = {}
- order_line_obj = self.pool.get('pos.order.line')
- data_order_line = order_line_obj.browse(cr, uid, ids, context=context)
- for data in data_order_line:
- print("DEV: [pos_membership] [_check_membership_product] [order_line]: data=%s product=%s" % (str(data.id), str(data.product_id)))
- return True
-
- _constraints = [
- (_check_membership_product, 'Error: Invalid Message', ['field_name']),
- ]
-
+
# XXX: copied from openerp/addons/point_of_sale/point_of_sale.py
def action_invoice(self, cr, uid, ids, context=None):
print ("DEV: [pos_membership] [pos_order] [action_invoice]")
inv_line_ref = self.pool.get('account.invoice.line')
product_obj = self.pool.get('product.product')
inv_ids = []
-
+
for order in self.pool.get('pos.order').browse(cr, uid, ids, context=context):
if order.invoice_id:
inv_ids.append(order.invoice_id.id)
continue
-
+
if not order.partner_id:
raise osv.except_osv(_('Error!'), _('Please provide a partner for the sale.'))
-
+
acc = order.partner_id.property_account_receivable.id
# XXX: copied from openerp/addons/point_of_sale/point_of_sale.py to fix account.invoice.line creation
inv = {
#inv_line_ref.create(cr, uid, inv_line, context=context)
inv['invoice_line'].append((0, 0, inv_line))
inv_id = inv_ref.create(cr, uid, inv, context=context)
-
+
self.write(cr, uid, [order.id], {'invoice_id': inv_id, 'state': 'invoiced'}, context=context)
inv_ref.confirm_paid(cr, uid, [inv_id], context=context)
inv_ids.append(inv_id)
inv_ref.button_reset_taxes(cr, uid, [inv_id], context=context)
wf_service.trg_validate(uid, 'pos.order', order.id, 'invoice', cr)
-
+
if not inv_ids: return {}
-
+
mod_obj = self.pool.get('ir.model.data')
res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
res_id = res and res[1] or False
'res_id': inv_ids and inv_ids[0] or False,
}
+ def write(self, cr, uid, ids, vals, context=None):
+ print("DEV: [pos_membership] [pos_order] [write]: ids=%s vals=%s" % (str(ids), str(vals)))
+ pos_order_obj = self.pool.get('pos.order')
+ res = super(pos_order, self).write(cr, uid, ids, vals, context=context)
+ print("DEV: [pos_membership] [pos_order] [write]: res=%s" % str(res))
+ return res
+
+ def create(self, cr, uid, vals, context=None):
+ print("DEV: [pos_membership] [pos_order] [create]: vals=%s" % (str(vals)))
+ pos_order_obj = self.pool.get('pos.order')
+ res = super(pos_order, self).create(cr, uid, vals, context=context)
+ print("DEV: [pos_membership] [pos_order] [create]: res=%s" % (str(res)))
+ return res
+
pos_order()
class pos_order_line(osv.osv):
_inherit = 'pos.order.line'
-
+
def write(self, cr, uid, ids, vals, context=None):
+ print("DEV: [pos_membership] [pos_order_line] [write]: ids=%s vals=%s context=%s" % (str(ids), str(vals), str(context)))
member_line_obj = self.pool.get('membership.membership_line')
res = super(pos_order_line, self).write(cr, uid, ids, vals, context=context)
+ print ("DEV: [pos_membership] [pos_order_line] [write] [super] : res=%s" % str(res))
for line in self.browse(cr, uid, ids, context=context):
ml_ids = member_line_obj.search(cr, uid, [('pos_order_line', '=', line.id)], context=context)
if line.product_id and line.product_id.membership and not ml_ids:
date_from = line.product_id.membership_date_from
date_to = line.product_id.membership_date_to
- if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
- date_from = line.invoice_id.date_invoice
-
+ if line.order_id.date_order > date_from and \
+ line.order_id.date_order < date_to:
+ date_from = line.order_id.date_order
if line.product_id.membership_date2date:
date_from = ('date_from' in context
and context['date_from']
print ("DEV: [pos_membership] [write] date_from: %s" % str(date_from))
print ("DEV: [pos_membership] [write] date_to : %s" % str(date_to))
member_line_obj.create(cr, uid
- , { 'partner': line.invoice_id.partner_id.id
+ , { 'partner': line.order_id.partner_id and line.order_id.partner_id.id or False
, 'membership_id': line.product_id.id
, 'member_price': line.price_unit
, 'date': time.strftime('%Y-%m-%d')
]
, context=context)
member_line_obj.unlink(cr, uid, associate_member_line_ids, context=context)
-
+
#Define member ident if it's necessary
partners = [line.order_id.partner_id]
if line.order_id.partner_id.associate_members:
if line.product_id and not line.product_id.membership and ml_ids:
# Product line has changed to a non membership product
member_line_obj.unlink(cr, uid, ml_ids, context=context)
+ print("DEV: [pos_membership] [pos_order_line] [write]: res=%s" % str(res))
return res
-
+
def unlink(self, cr, uid, ids, context=None):
"""Remove Membership Line Record for Account Invoice Line
"""
ml_ids = member_line_obj.search(cr, uid, [('pos_order_line', '=', id)], context=context)
member_line_obj.unlink(cr, uid, ml_ids, context=context)
return super(pos_order_line, self).unlink(cr, uid, ids, context=context)
-
+
def create(self, cr, uid, vals, context=None):
member_line_obj = self.pool.get('membership.membership_line')
+ print("DEV: [pos_membership] [pos_order_line] [create]: vals=%s context=%s" % (str(vals), str(context)))
res = super(pos_order_line, self).create(cr, uid, vals, context=context)
- print ("DEV: [pos_membership] [pos_order_line] [create] : begin res=%s" % str(res))
+ print ("DEV: [pos_membership] [pos_order_line] [create] [super] : res=%s" % str(res))
line = self.browse(cr, uid, res, context=context)
-
+
ml_ids = member_line_obj.search(cr, uid, [('pos_order_line', '=', line.id)], context=context)
if line.product_id and line.product_id.membership and not ml_ids:
date_from = line.product_id.membership_date_from
dépôts / burette / pos_membership.git / blobdiff