X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=pos_membership.py;h=cb81c4c24ed3f7d9534c83628d292865b07bd24a;hb=997809cb039eb97366abcabb8324b8ecd37df79c;hp=6e75dd7e9d84aaf1c32fdca21f533a2e0bb2bb5b;hpb=3ca4ee1f0a4ab145da9e668e4c87c1c6618d507b;p=burette%2Fpos_membership.git diff --git a/pos_membership.py b/pos_membership.py index 6e75dd7..cb81c4c 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. @@ -27,7 +27,6 @@ import time from datetime import datetime, date from dateutil.relativedelta import relativedelta - STATE = [ ('none', 'Non Member'), ('canceled', 'Cancelled Member'), @@ -39,6 +38,30 @@ STATE = [ ] +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' @@ -233,7 +256,7 @@ class membership_line(osv.osv): res[line.id] = state else: cr.execute(''' - SELECT i.state, i.id, i.partner_id FROM + SELECT i.state, i.id FROM pos_order i WHERE i.id = ( @@ -250,13 +273,13 @@ class membership_line(osv.osv): if not fetched: res[line.id] = 'canceled' continue - partner_id = fetched[2] - self.write(cr, uid, line.id, {'partner': partner_id}) + print("DEV: [pos_membership] [membership_line] [_state]: line.partner.id=%s" % (str(line.partner.id))) + self.write(cr, uid, line.id, {'partner': line.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): + for partner in partner_obj.browse(cr, uid, [line.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}) @@ -280,7 +303,6 @@ class membership_line(osv.osv): 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 @@ -622,8 +644,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) @@ -666,6 +688,29 @@ class pos_order(osv.osv): print("DEV: [pos_membership] [pos_order] [create]: res=%s" % (str(res))) return res + def onchange_partner_id(self, cr, uid, ids, part=False, context=None): + if not part: + return {'value': {}} + res = super(pos_order, self).onchange_partner_id(cr, uid, ids, part=part, context=context) + membership_stop = self.pool.get('res.partner').browse(cr, uid, part, context=context).membership_stop + res['value']['membership_stop'] = membership_stop + return res + + def _get_membership_stop(self, cr, uid, ids, name, args, context=None): + """This function return the end date of the partner in pos order.""" + res = {} + for order in self.browse(cr, uid, ids): + res[order.id] = order.partner_id.membership_stop + return res + + _columns = { + 'membership_stop': fields.function( + _get_membership_stop, + string='Membership stop', + type='date', + help='The end date of the last membership of this partner.', + ), + } pos_order() class pos_order_line(osv.osv): @@ -678,72 +723,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.order_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, days=-1) # 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) ] , 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): @@ -773,9 +816,9 @@ class pos_order_line(osv.osv): and context.get('date_from') and datetime.strptime(context.get('date_from'), "%Y-%m-%d") or date.today()) - date_to = date_from + relativedelta(days = +364) # TODO: parameterize this delta? + date_to = date_from + relativedelta(months=+12, days=-1) # TODO: parameterize this delta? date_from = date_from.strftime("%Y-%m-%d") - date_to = date_to .strftime("%Y-%m-%d") + date_to = date_to.strftime("%Y-%m-%d") print ("DEV: [pos_membership] [pos_order_line] [create] date_from: %s" % str(date_from)) print ("DEV: [pos_membership] [pos_order_line] [create] date_to : %s" % str(date_to)) member_line_obj.create(cr, uid, {