('paid', 'Paid Member'),
]
+
class pos_order(osv.osv):
_inherit = 'pos.order'
'user_id': order['user_id'] or False,
'session_id': order['pos_session_id'],
'lines': order['lines'],
- 'pos_reference':order['name'],
+ 'pos_reference': order['name'],
#-- BEGIN pos_membership
- 'partner_id':order['partner_id'],
+ 'partner_id': order['partner_id'],
#-- END pos_membership
}, context)
cash_journal = session.cash_journal_id
cash_statement = False
if not cash_journal:
- cash_journal_ids = filter(lambda st: st.journal_id.type=='cash', session.statement_ids)
+ cash_journal_ids = filter(lambda st: st.journal_id.type == 'cash', session.statement_ids)
if not len(cash_journal_ids):
- raise osv.except_osv( _('error!'),
- _("No cash statement found for this session. Unable to record returned cash."))
+ raise osv.except_osv(_('error!'),
+ _("No cash statement found for this session. Unable to record returned cash."))
cash_journal = cash_journal_ids[0].journal_id
self.add_payment(cr, uid, order_id, {
'amount': -order['amount_return'],
pos_order()
+
class membership_line(osv.osv):
'''Member line'''
_inherit = 'membership.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)
+ 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
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)
+ 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 = list_membership_line
print("DEV: [pos_membership] [membership_line] [_get_membership_lines_from_pos_order]: res=%s" % str(res))
return res
'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),
'state': fields.function(_state,
- string='Membership Status', type='selection',
- selection=STATE,
- store = {
- #'account.invoice': (_get_membership_lines_from_account_invoice, ['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.
- -Cancelled Member: A member who has cancelled his membership.
- -Old Member: A member whose membership date has expired.
- -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.
- -Invoiced Member: A member whose invoice has been created.
- -Paid Member: A member who has paid the membership amount."""),
+ string='Membership Status', type='selection',
+ selection=STATE,
+ store={
+ #'account.invoice': (_get_membership_lines_from_account_invoice, ['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.
+ -Cancelled Member: A member who has cancelled his membership.
+ -Old Member: A member whose membership date has expired.
+ -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.
+ -Invoiced Member: A member whose invoice has been created.
+ -Paid Member: A member who has paid the membership amount."""),
'company_id': fields.related('account_invoice_line', 'invoice_id', 'company_id', type="many2one", relation="res.company", string="Company", readonly=True, store=True)
# XXX: pos_order_line a aussi un company_id
}
membership_line()
+
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')
+ res_obj = self.pool.get('res.partner')
data_inv = member_line_obj.browse(cr, uid, ids, context=context)
list_partner = []
for data in data_inv:
if payment.invoice.type == 'out_refund':
s = 2
break
- elif istate == 'open' and s!=0:
+ elif istate == 'open' and s != 0:
s = 1
- elif istate == 'cancel' and s!=0 and s!=1:
+ elif istate == 'cancel' and s != 0 and s != 1:
s = 2
- elif (istate == 'draft' or istate == 'proforma') and s!=0 and s!=1:
+ elif (istate == 'draft' or istate == 'proforma') and s != 0 and s != 1:
s = 3
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:
+ if ostate == 'paid' and s != 0 and s != 1:
s = 3
if ostate == 'invoiced':
s = 1
# if payment.invoice.type == 'out_refund':
# s = 2
break
- elif ostate == '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 ostate == 'cancel' and s!=0 and s!=1:
+ elif ostate == 'cancel' and s != 0 and s != 1:
s = 2
- elif ostate == 'draft' and s!=0 and s!=1:
+ elif ostate == 'draft' and s != 0 and s != 1:
s = 3
- if s==4:
+ if s == 4:
for mline in partner_data.member_lines:
if mline.date_from < today and \
mline.date_to < today and \
mline.date_from <= mline.date_to and \
- ( (mline.account_invoice_line and mline.account_invoice_line.invoice_id.state) == 'paid' or \
- ( mline.pos_order_line and \
- ( mline.pos_order_line.order_id.state == 'paid' or \
+ ((mline.account_invoice_line and mline.account_invoice_line.invoice_id.state) == 'paid' or \
+ (mline.pos_order_line and \
+ (mline.pos_order_line.order_id.state == 'paid' or \
mline.pos_order_line.order_id.state == 'done' or \
mline.pos_order_line.order_id.state == 'invoiced' ))):
s = 5
else:
s = 6
- if s==0:
+ if s == 0:
res[id] = 'paid'
- elif s==1:
+ elif s == 1:
res[id] = 'invoiced'
- elif s==2:
+ elif s == 2:
res[id] = 'canceled'
- elif s==3:
+ elif s == 3:
res[id] = 'waiting'
- elif s==5:
+ elif s == 5:
res[id] = 'old'
- elif s==6:
+ elif s == 6:
res[id] = 'none'
- if partner_data.free_member and s!=0:
+ if partner_data.free_member and s != 0:
res[id] = 'free'
if partner_data.associate_member:
res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context=context)
dépôts / burette / pos_membership.git / commitdiff