('paid', 'Paid Member'),
]
+class pos_order(osv.osv):
+ _inherit = 'pos.order'
+
+ def create_partner_from_ui(self, cr, uid, partners, context=None):
+ print ("DEV: [pos_membership] [create_partner_from_ui] partners=%s" % str(partners))
+ partner_ids = []
+ partner_obj = self.pool.get('res.partner')
+ for tmp_partner in partners:
+ partner = tmp_partner['data']
+ partner_id = partner_obj.create(cr, uid, {
+ 'name': partner['name'],
+ }, context)
+ partner_ids.append(partner_id)
+ #self.signal_paid(cr, uid, [partner_id])
+ return partner_ids
+
+ def create_from_ui(self, cr, uid, orders, context=None):
+ # NOTE: copied from openerp/addons/point_of_sale/point_of_sale.py
+ #_logger.info("orders: %r", orders)
+ print ("DEV: [pos_membership] [create_from_ui] order=", str(orders))
+ order_ids = []
+ for tmp_order in orders:
+ order = tmp_order['data']
+ order_id = self.create(cr, uid, {
+ 'name': order['name'],
+ 'user_id': order['user_id'] or False,
+ 'session_id': order['pos_session_id'],
+ 'lines': order['lines'],
+ 'pos_reference':order['name'],
+ #-- BEGIN pos_membership
+ 'partner_id':order['partner_id'],
+ #-- END pos_membership
+ }, context)
+
+ for payments in order['statement_ids']:
+ payment = payments[2]
+ self.add_payment(cr, uid, order_id, {
+ 'amount': payment['amount'] or 0.0,
+ 'payment_date': payment['name'],
+ 'statement_id': payment['statement_id'],
+ 'payment_name': payment.get('note', False),
+ 'journal': payment['journal_id']
+ }, context=context)
+
+ if order['amount_return']:
+ session = self.pool.get('pos.session').browse(cr, uid, order['pos_session_id'], context=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)
+ if not len(cash_journal_ids):
+ 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'],
+ 'payment_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'payment_name': _('return'),
+ 'journal': cash_journal.id,
+ }, context=context)
+ order_ids.append(order_id)
+ wf_service = netsvc.LocalService("workflow")
+ wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr)
+ return order_ids
+
+pos_order()
+
class membership_line(osv.osv):
'''Member line'''
_inherit = '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)
if not fetched:
res[line.id] = 'canceled'
continue
- self.write(cr, uid, line.id, {'partner': fetched[2]})
- # NOTE: force un mise à jour du partner,
+ 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)
+ partner_obj = self.pool.get('res.partner')
+ for partner in partner_obj.browse(cr, uid, [partner_id], context=context):
+ if not partner.member_ident:
+ mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident')
+ partner_obj.write(cr, uid, partner.id, {'member_ident': mbr_id})
ostate = fetched[0]
state = 'none'
if (ostate == 'paid') | (ostate == 'draft'):
_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):
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:
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)],
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):
string = 'Current Membership Status', type = 'selection',
selection = STATE,
store = {
- 'account.invoice': (_get_invoice_partner, ['state'], 10),
- 'pos.order': (_get_order_partner, ['state', 'partner_id'], 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"),
dépôts / burette / pos_membership.git / blobdiff