From a25777d0020d16395730756dc52d76d66ff45b31 Mon Sep 17 00:00:00 2001 From: Thibault Francois Date: Sun, 22 May 2016 15:39:03 +0200 Subject: [PATCH] [ADD] Code barre pour membre GA - nouveaux coop --- beesdoo_base/__openerp__.py | 1 + beesdoo_base/models/partner.py | 11 +++++++++-- beesdoo_base/security/groups.xml | 6 ++++++ beesdoo_base/wizard/new_member_card.py | 3 ++- beesdoo_base/wizard/views/new_member_card.xml | 3 +++ 5 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 beesdoo_base/security/groups.xml diff --git a/beesdoo_base/__openerp__.py b/beesdoo_base/__openerp__.py index a452a53..0c7cc21 100644 --- a/beesdoo_base/__openerp__.py +++ b/beesdoo_base/__openerp__.py @@ -18,6 +18,7 @@ 'depends': ['point_of_sale'], 'data': [ + 'security/groups.xml', 'security/ir.model.access.csv', 'views/partner.xml', 'wizard/views/new_member_card.xml', diff --git a/beesdoo_base/models/partner.py b/beesdoo_base/models/partner.py index dd2046a..a85abbe 100644 --- a/beesdoo_base/models/partner.py +++ b/beesdoo_base/models/partner.py @@ -57,8 +57,15 @@ class Partner(models.Model): card.end_date = fields.Date.today() @api.multi - def _new_card(self, reason, user_id): - self.env['member.card'].create({'partner_id' : self.id,'responsible_id' : user_id, 'comment' : reason}) + def _new_card(self, reason, user_id, barcode=False): + card_data = { + 'partner_id' : self.id, + 'responsible_id' : user_id, + 'comment' : reason, + } + if barcode: + card_data['barcode'] = barcode + self.env['member.card'].create(card_data) @api.noguess def _auto_init(self, cr, context=None): diff --git a/beesdoo_base/security/groups.xml b/beesdoo_base/security/groups.xml new file mode 100644 index 0000000..964655e --- /dev/null +++ b/beesdoo_base/security/groups.xml @@ -0,0 +1,6 @@ + + + + Bees Card Force Barcode + + \ No newline at end of file diff --git a/beesdoo_base/wizard/new_member_card.py b/beesdoo_base/wizard/new_member_card.py index 7a894c8..1a003da 100644 --- a/beesdoo_base/wizard/new_member_card.py +++ b/beesdoo_base/wizard/new_member_card.py @@ -14,9 +14,10 @@ class NewMemberCardWizard(models.TransientModel): new_comment = fields.Text('Reason', required=True) partner_id = fields.Many2one('res.partner', default=_get_default_partner) + force_barcode = fields.Char('Force Barcode', groups="beesdoo_base.group_force_barcode") @api.one def create_new_card(self): client = self.partner_id.sudo() client._deactivate_active_cards() - client._new_card(self.new_comment, self.env.uid) \ No newline at end of file + client._new_card(self.new_comment, self.env.uid, barcode=self.force_barcode) \ No newline at end of file diff --git a/beesdoo_base/wizard/views/new_member_card.xml b/beesdoo_base/wizard/views/new_member_card.xml index abe3f99..b7b24ee 100644 --- a/beesdoo_base/wizard/views/new_member_card.xml +++ b/beesdoo_base/wizard/views/new_member_card.xml @@ -6,6 +6,9 @@ membercard.new.wizard
+ + +