From a8b8dd5c849171c2a3583fa5d9069bb551cb4780 Mon Sep 17 00:00:00 2001 From: Ludovic CHEVALIER Date: Sun, 28 Oct 2012 21:30:02 +0100 Subject: [PATCH] [point of sale] partner required for order and auto invoice --- __openerp__.py | 3 ++- remembership.py | 21 ++++++++++++++++++--- view/point_of_sale.xml | 17 +++++++++++++++++ 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 view/point_of_sale.xml diff --git a/__openerp__.py b/__openerp__.py index eeb1df7..0adc843 100644 --- a/__openerp__.py +++ b/__openerp__.py @@ -30,11 +30,12 @@ """, 'author': 'L\'Heureux Cyclage - LHC', 'website': 'http://www.heureux-cyclage.org', - 'depends': ['membership'], + 'depends': ['membership', 'point_of_sale'], 'init_xml': [], 'data': [ 'data/membership_sequence.xml', 'view/partner.xml', + 'view/point_of_sale.xml', ], 'update_xml': [], 'demo_xml': [], diff --git a/remembership.py b/remembership.py index fa16f56..260e56e 100644 --- a/remembership.py +++ b/remembership.py @@ -38,15 +38,30 @@ class account_invoice_line(osv.osv): _inherit='account.invoice.line' def create(self, cr, uid, vals, context=None): - result = super(account_invoice_line, self).create(cr, uid, vals, context=context) - line = self.browse(cr, uid, result, context=context) + res = super(account_invoice_line, self).create(cr, uid, vals, context=context) + line = self.browse(cr, uid, res, context=context) if line.invoice_id.type == 'out_invoice': if line.product_id and line.product_id.membership and not line.invoice_id.partner_id.member_ident: mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident') self.pool.get('res.partner').write(cr, uid, line.invoice_id.partner_id.id, {'member_ident': mbr_id}) - return result + return res account_invoice_line() +class pos_make_payment(osv.osv_memory): + _inherit = 'pos.make.payment' + + def check(self, cr, uid, ids, context=None): + """ + Auto invoice orders. Temporarly solution before make partner members just with orders, without invoice. + """ + res = super(pos_make_payment, self).check(cr, uid, ids, context=context) + + order_obj = self.pool.get('pos.order') + order_obj.action_invoice(cr, uid, ids, context=context) + + return res + +pos_make_payment() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/view/point_of_sale.xml b/view/point_of_sale.xml new file mode 100644 index 0000000..5f7dea2 --- /dev/null +++ b/view/point_of_sale.xml @@ -0,0 +1,17 @@ + + + + pos.order.form - Remembership + pos.order + form + + + + + + + + + + + -- 2.20.1