X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=pos_membership.py;h=fcfe106034b58de92e224385cad7d2aac33a1406;hb=5776b6c9b6ca30d4faf5d33ca3ffdbdaa3400a39;hp=396fad9df3e6429ff7366dc5d1eda0eda8d2270b;hpb=c7996cc7fc21a8167567557dd344d04dd7a61d99;p=burette%2Fpos_membership.git diff --git a/pos_membership.py b/pos_membership.py index 396fad9..fcfe106 100644 --- a/pos_membership.py +++ b/pos_membership.py @@ -11,7 +11,7 @@ # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# ReMembership is distributed in the hope that it will be useful, +# POS Membership is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -38,6 +38,31 @@ STATE = [ ('paid', 'Paid Member'), ] + +class pos_session(osv.osv): + _inherit = 'pos.session' + + def open_cb(self, cr, uid, ids, context=None): + """ + Avoid call the Point Of Sale interface and set the pos.session to 'opened' (in progress) + """ + if context is None: + context = dict() + + if isinstance(ids, (int, long)): + ids = [ids] + + this_record = self.browse(cr, uid, ids[0], context=context) + this_record._workflow_signal('open') + + context.update(active_id=this_record.id) + + return { + } +pos_session() + + + class pos_order(osv.osv): _inherit = 'pos.order' @@ -66,9 +91,9 @@ class pos_order(osv.osv): '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) @@ -87,10 +112,10 @@ class pos_order(osv.osv): 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'], @@ -105,6 +130,7 @@ class pos_order(osv.osv): pos_order() + class membership_line(osv.osv): '''Member line''' _inherit = 'membership.membership_line' @@ -114,7 +140,7 @@ class membership_line(osv.osv): 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 @@ -137,12 +163,12 @@ class membership_line(osv.osv): 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 @@ -294,26 +320,27 @@ class membership_line(osv.osv): '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' @@ -321,7 +348,7 @@ class Partner(osv.osv): 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: @@ -400,16 +427,16 @@ class Partner(osv.osv): 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 @@ -422,40 +449,40 @@ class Partner(osv.osv): # 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) @@ -535,7 +562,7 @@ class Partner(osv.osv): -Invoiced Member: A member whose invoice has been created. -Paying member: A member who has paid the membership fee."""), 'membership_start': fields.function( - _membership_date, multi = 'membeship_start', + _membership_date, multi = 'membership_start', string = 'Membership Start Date', type = 'date', store = { 'account.invoice': (_get_invoice_partner, ['state'], 10), @@ -619,8 +646,8 @@ class pos_order(osv.osv): inv_line['price_unit'] = line.price_unit inv_line['discount'] = line.discount inv_line['name'] = inv_name - inv_line['invoice_line_tax_id'] = ('invoice_line_tax_id' in inv_line)\ - and [(6, 0, inv_line['invoice_line_tax_id'])] or [] + inv_line['invoice_line_tax_id'] = [(6, 0, [x.id for x in line.product_id.taxes_id] )] + inv_line_ref.create(cr, uid, inv_line, context=context) #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) @@ -675,72 +702,70 @@ class pos_order_line(osv.osv): 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.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'] - and datetime.strptime(context['date_from'], "%Y-%m-%d") - or date.today()) - date_to = date_from + relativedelta(months = +12) # TODO: parameterize this delta? - date_from = date_from.strftime("%Y-%m-%d") - date_to = date_to .strftime("%Y-%m-%d") - 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.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') - , 'date_from': date_from - , 'date_to': date_to - , 'pos_order_line': line.id - } - , context=context) + if line.product_id and line.product_id.membership: + member_line_id = member_line_obj.search(cr, uid + , [('partner', '=', line.invoice_id.partner_id.id) + ,('pos_order_line', '=', line.id)] + , limit=1 + , context=context) + for member_line in member_line_obj.browse(cr, uid, member_line_id, context=context): + # NOTE: get member_line created in pos_membership.pos_order_line.create + date_from = member_line.date_from + date_to = member_line.date_to + if line.product_id.membership_date2date: + date_from = ('date_from' in context + and context.get('date_from') + and datetime.strptime(context('date_from'), "%Y-%m-%d") + or date.today()) + date_to = date_from + relativedelta(months = +12) # TODO: parameterize this delta? + date_from = date_from.strftime("%Y-%m-%d") + date_to = date_to .strftime("%Y-%m-%d") + print ("DEV: [pos_membership] [pos_order_line] [write] date_from: %s" % str(date_from)) + print ("DEV: [pos_membership] [pos_order_line] [write] date_to : %s" % str(date_to)) + member_line_obj.write(cr, uid, member_line.id + , {'date_from': date_from + ,'date_to' : date_to + } + , context=context) if line.product_id.membership_grouped: if line.order_id.partner_id.associate_members: associate_member_line_ids = member_line_obj.search(cr, uid - , [ ('pos_order_line', '=', line.id) - , ('partner', '!=', line.order_id.partner_id.id) - ] - , context=context) - for associate_member_line in member_line_obj.browse(cr, uid, associate_member_line_ids, context=context): - print ("DEV: [pos_membership] [write] [associate] date_from: %s" % str(date_from)) - print ("DEV: [pos_membership] [write] [associate] date_to : %s" % str(date_to)) - member_line_obj.write(cr, uid, associate_member_line.id - , {'date_from': date_from - ,'date_to' : date_to - } - , context=context) - else: - print("DEV: mettre une contrainte pour l'objet\ - membership.membership_line interdisant les\ - adhésions groupées reliées à des partenaires\ - sans membres associés") - else: - associate_member_line_ids = member_line_obj.search(cr, uid , [ ('pos_order_line', '=', line.id) - , ('partner', '!=', line.order_id.partner_id.id) + , ('partner', '!=', line.invoice_id.partner_id.id) ] , 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: - partners.extend(line.order_id.partner_id.associate_members) - for i in partners: - if not i.member_ident: - mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident') - self.pool.get('res.partner').write(cr, uid, i.id, {'member_ident': mbr_id}) - 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)) + for associate_member_line in member_line_obj.browse(cr, uid, associate_member_line_ids, context=context): + print ("DEV: [pos_membership] [pos_order_line] [write] [associate] date_from: %s" % str(date_from)) + print ("DEV: [pos_membership] [pos_order_line] [write] [associate] date_to : %s" % str(date_to)) + member_line_obj.write(cr, uid, associate_member_line.id + , {'date_from': date_from + ,'date_to' : date_to + } + , context=context) + else: + print("DEV: mettre une contrainte pour l'objet\ + membership.membership_line interdisant les\ + adhésions groupées reliées à des partenaires\ + sans membres associés") + else: + associate_member_line_ids = member_line_obj.search(cr, uid + , [ ('pos_order_line', '=', line.id) + , ('partner', '!=', line.order_id.partner_id.id) + ] + , 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: + partners.extend(line.order_id.partner_id.associate_members) + for i in partners: + if not i.member_ident: + mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident') + self.pool.get('res.partner').write(cr, uid, i.id, {'member_ident': mbr_id}) + 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] : return=%s" % str(res)) return res def unlink(self, cr, uid, ids, context=None):