From c850875ca386d81c69f02aa6614bb290b4264cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Tue, 2 Oct 2012 12:04:20 +0200 Subject: [PATCH 1/8] [FIX] point_of_sale: Number.isNaN is not supported on older but supported browsers bzr revid: fva@openerp.com-20121002100420-pcvbn7qqxyp62bzw --- addons/point_of_sale/static/src/js/widgets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 47a527a010d..72e7c5c1612 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -712,7 +712,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }); this.$('.button.set_weight').click(function(){ var kg = Number(self.$('input.weight').val()); - if(!Number.isNaN(kg)){ + if(!isNaN(kg)){ self.pos.proxy.debug_set_weight(kg); } }); From 0fa7da31685d353e1d397f0f078629447ec9660e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Tue, 2 Oct 2012 12:13:53 +0200 Subject: [PATCH 2/8] [WIP FIX] point_of_sale: investigating a bug with codebar scanning in subcategories bzr revid: fva@openerp.com-20121002101353-imjbqe1vxtdjbqu7 --- addons/point_of_sale/static/src/js/devices.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js index 142d35bd340..f998ed334df 100644 --- a/addons/point_of_sale/static/src/js/devices.js +++ b/addons/point_of_sale/static/src/js/devices.js @@ -432,13 +432,13 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal // The barcode readers acts as a keyboard, we catch all keyup events and try to find a // barcode sequence in the typed keys, then act accordingly. $('body').delegate('','keyup', function (e){ - + console.log('keyup:'+String.fromCharCode(e.keyCode)+' '+e.keyCode,e); //We only care about numbers - if (!isNaN(Number(String.fromCharCode(e.keyCode)))) { + if (e.keyCode >= 48 && e.keyCode < 58){ // The barcode reader sends keystrokes with a specific interval. // We look if the typed keys fit in the interval. - if (codeNumbers.length==0) { + if (codeNumbers.length === 0) { timeStamp = new Date().getTime(); } else { if (lastTimeStamp + 30 < new Date().getTime()) { @@ -449,7 +449,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal } codeNumbers.push(e.keyCode - 48); lastTimeStamp = new Date().getTime(); - if (codeNumbers.length == 13) { + if (codeNumbers.length === 13) { //We have found what seems to be a valid codebar self.on_ean(codeNumbers.join('')); codeNumbers = []; From 58ec91eb79b873db6f38ff2c770c1b63f1cb887a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 14 Nov 2012 16:55:40 +0100 Subject: [PATCH 3/8] [FIX] point_of_sale: bad indentation bzr revid: fva@openerp.com-20121114155540-dvkat6on42koims3 --- addons/point_of_sale/static/src/js/widgets.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 5669bfe101b..bc5f29601a8 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -202,9 +202,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.currentOrderLines.bind('remove', this.renderElement, this); }, update_numpad: function() { - this.selected_line = this.pos.get('selectedOrder').getSelectedLine(); - if (this.numpadState) - this.numpadState.reset(); + this.selected_line = this.pos.get('selectedOrder').getSelectedLine(); + if (this.numpadState) + this.numpadState.reset(); }, renderElement: function() { var self = this; From 107e579ecdfb0ab8d20fb2e532a17967fc51350b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 14 Nov 2012 17:50:43 +0100 Subject: [PATCH 4/8] [IMP] point_of_sale: auto focus on paymentlines bzr revid: fva@openerp.com-20121114165043-vbfj1r93ww3es9qt --- addons/point_of_sale/static/src/js/screens.js | 3 ++- addons/point_of_sale/static/src/js/widgets.js | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 0b8ab70a9c0..d8e53066c1e 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -899,7 +899,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa }); this.updatePaymentSummary(); - this.$('.paymentline-amout input').last().focus(); }, close: function(){ this._super(); @@ -946,6 +945,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa self.deleteLine(r); }); x.appendTo(this.$('#paymentlines')); + this.$('.paymentline-amount input:last').focus(); }, renderElement: function() { this._super(); @@ -975,6 +975,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa if(this.pos_widget.action_bar){ this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0); } + this.$('.paymentline-amount input:last').focus(); }, set_numpad_state: function(numpadState) { if (this.numpadState) { diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index bc5f29601a8..94d6a5dc57e 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -298,8 +298,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.payment_line.bind('change', this.changedAmount, this); }, changeAmount: function(event) { - var newAmount; - newAmount = event.currentTarget.value; + var newAmount = event.currentTarget.value; if (newAmount && !isNaN(newAmount)) { this.amount = parseFloat(newAmount); this.payment_line.set_amount(this.amount); From 8c820330a5e4985b622fcfaf10af45d1c6ef2379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 14 Nov 2012 18:00:06 +0100 Subject: [PATCH 5/8] [FIX] point_of_sale: removed the gif loader, replaced it by niv's js one bzr revid: fva@openerp.com-20121114170006-gkx6ezikiw86po7u --- addons/point_of_sale/static/src/css/pos.css | 5 ----- addons/point_of_sale/static/src/img/loader.gif | Bin 3208 -> 0 bytes addons/point_of_sale/static/src/js/widgets.js | 8 +++++--- addons/point_of_sale/static/src/xml/pos.xml | 1 - 4 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 addons/point_of_sale/static/src/img/loader.gif diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 675b77345e7..9b286be250e 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -62,11 +62,6 @@ z-index: 999; text-align: center; } -.point-of-sale .loader img{ - position:absolute; - top:50%; - left:50%; -} /* ********* Generic element styling ********* */ diff --git a/addons/point_of_sale/static/src/img/loader.gif b/addons/point_of_sale/static/src/img/loader.gif deleted file mode 100644 index 967288f55af9a3c9f27985da9559516e2d343aba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3208 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 diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 94d6a5dc57e..4ab6ee4f5ee 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -791,7 +791,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa template: 'PosWidget', init: function() { this._super(arguments[0],{}); - + + instance.web.blockUI(); + this.pos = new module.PosModel(this.session); this.pos_widget = this; //So that pos_widget's childs have pos_widget set automatically @@ -841,11 +843,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa self.screen_selector.show_popup('error', 'Sorry, we could not find any PoS Configuration for this session'); } + instance.web.unblockUI(); self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').hide();}); - self.$('.loader img').hide(); }).fail(function(){ // error when loading models data from the backend - self.$('.loader img').hide(); + instance.web.unblockUI(); return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_session_opening']], ['res_id']) .pipe( _.bind(function(res){ return instance.session.rpc('/web/action/load', {'action_id': res[0]['res_id']}) diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 986921af1c5..cb4d90f1671 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -31,7 +31,6 @@
-
From 1af48858a5d7870e096c95246730fe7fe298b98a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Mon, 19 Nov 2012 17:09:00 +0100 Subject: [PATCH 6/8] [IMP] prompt for cashier intervention when negative or zero price in self-checkout bzr revid: fva@openerp.com-20121119160900-ks6a0bfuswlipyvu --- addons/point_of_sale/static/src/js/screens.js | 12 ++++++++++-- addons/point_of_sale/static/src/js/widgets.js | 4 ++++ addons/point_of_sale/static/src/xml/pos.xml | 8 ++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index d8e53066c1e..61c6d1cc2b8 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -430,6 +430,10 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa template:'ErrorSessionPopupWidget', }); + module.ErrorNegativePricePopupWidget = module.ErrorPopupWidget.extend({ + template:'ErrorNegativePricePopupWidget', + }); + module.ScaleInviteScreenWidget = module.ScreenWidget.extend({ template:'ScaleInviteScreenWidget', @@ -684,8 +688,12 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa console.log("CANCEL_END"); return (new $.Deferred()).resolve(); } - - this.queue.schedule(this.start); + + if(this.pos.get('selectedOrder').getDueLeft() <= 0){ + this.pos_widget.screen_selector.show_popup('error-negative-price'); + }else{ + this.queue.schedule(this.start); + } this.add_action_button({ label: 'back', diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 4984ee5dda9..6038a74b35e 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -904,6 +904,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.choose_receipt_popup = new module.ChooseReceiptPopupWidget(this, {}); this.choose_receipt_popup.appendTo($('.point-of-sale')); + this.error_negative_price_popup = new module.ErrorNegativePricePopupWidget(this, {}); + this.error_negative_price_popup.appendTo($('.point-of-sale')); + // -------- Misc --------- this.notification = new module.SynchNotificationWidget(this,{}); @@ -963,6 +966,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa 'error': this.error_popup, 'error-product': this.error_product_popup, 'error-session': this.error_session_popup, + 'error-negative-price': this.error_negative_price_popup, 'choose-receipt': this.choose_receipt_popup, }, default_client_screen: 'welcome', diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index cb4d90f1671..6171869cbb4 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -351,6 +351,14 @@ + +
+
+

Your order has to be validated by a cashier.

+
+
+ +
From 87550820ac1fe1daf65ce4a01a28f643815b4dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 21 Nov 2012 12:26:44 +0100 Subject: [PATCH 7/8] changed the clients to be partners instead of users, fixed receipt print css bzr revid: fva@openerp.com-20121121112644-xqj6n0yvy0sahwev --- addons/point_of_sale/__init__.py | 1 + addons/point_of_sale/__openerp__.py | 1 + addons/point_of_sale/point_of_sale_data.xml | 26 ++++++++++++++++++- addons/point_of_sale/static/src/css/pos.css | 13 ++++++++++ addons/point_of_sale/static/src/js/models.js | 10 +++++++ addons/point_of_sale/static/src/js/screens.js | 8 +++--- addons/point_of_sale/static/src/js/widgets.js | 13 +++++----- addons/point_of_sale/static/src/xml/pos.xml | 2 +- 8 files changed, 62 insertions(+), 12 deletions(-) diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py index bf0b86a0e9d..7a786ebb5f1 100644 --- a/addons/point_of_sale/__init__.py +++ b/addons/point_of_sale/__init__.py @@ -22,6 +22,7 @@ import point_of_sale import account_bank_statement import res_users +import res_partner import wizard import report diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index e9dd628243b..0823a573ab6 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -74,6 +74,7 @@ Main Features 'account_statement_view.xml', 'account_statement_report.xml', 'res_users_view.xml', + 'res_partner_view.xml', ], 'demo': [ 'point_of_sale_demo.xml', diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml index 01d8dd9ff60..2e9cf84ff39 100644 --- a/addons/point_of_sale/point_of_sale_data.xml +++ b/addons/point_of_sale/point_of_sale_data.xml @@ -1,6 +1,30 @@ - + + + + 0420100000005 + 0420200000004 + 0420300000003 + 0420400000002 + 0420500000001 + 0420600000000 + 0420700000009 + 0420800000008 + 0420900000007 + 0421000000003 + 0421100000002 + 0421200000001 + 0421300000000 + 0421400000009 + 0421500000008 + 0421600000007 + 0421700000006 + 0421800000005 + 0421900000004 + 0422000000000 + 0422100000009 + Open POS Menu diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 9b286be250e..a8cb56dd7f8 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -800,12 +800,25 @@ #receipt-screen { text-align: left; } + .pos-actionbar { + display: none !important; + } .pos-sale-ticket { margin: 0; } .debug-widget{ display: none !important; } + .point-of-sale *{ + text-shadow: none !important; + box-shadow: none !important; + background: transparent !important; + } + .point-of-sale .pos-sale-ticket{ + margin-left: auto !important; + margin-right: auto !important; + border: solid 1px black !important; + } } /* d) The Scale screen */ diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index f1462424f1e..9a96df7e221 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -36,6 +36,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal 'company': null, 'user': null, // the user that loaded the pos 'user_list': null, // list of all users + 'partner_list': null, // list of all partners with an ean 'cashier': null, // the logged cashier, if different from user 'orders': new module.OrderCollection(), @@ -121,6 +122,11 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal }).then(function(users){ self.set('user_list',users); + return self.fetch('res.partner', ['name','ean13'], [['ean13', '!=', false]]); + }).then(function(partners){ + self.set('partner_list',partners); + console.log('Loaded partners:',partners); + return self.fetch('account.tax', ['amount', 'price_include', 'type']); }).then(function(taxes){ self.set('taxes', taxes); @@ -657,6 +663,10 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal get_client: function(){ return this.get('client'); }, + get_client_name: function(){ + var client = this.get('client'); + return client ? client.name : ""; + }, // the order also stores the screen status, as the PoS supports // different active screens per order. This method is used to // store the screen status. diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 61c6d1cc2b8..b783b170f9e 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -198,10 +198,10 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa // - if there's a user with a matching ean, put it as the active 'client' and return true // - else : return false. barcode_client_action: function(ean){ - var users = this.pos.get('user_list'); - for(var i = 0, len = users.length; i < len; i++){ - if(users[i].ean13 === ean.ean){ - this.pos.get('selectedOrder').set_client(users[i]); + var partners = this.pos.get('partner_list'); + for(var i = 0, len = partners.length; i < len; i++){ + if(partners[i].ean13 === ean.ean){ + this.pos.get('selectedOrder').set_client(partners[i]); this.pos_widget.username.refresh(); this.pos.proxy.scan_item_success(ean); return true; diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 6038a74b35e..c983b87168e 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -323,10 +323,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa template:'OrderButtonWidget', init: function(parent, options) { this._super(parent,options); + var self = this; + this.order = options.order; - this.order.bind('destroy', _.bind( function() { - this.destroy(); - }, this)); + this.order.bind('destroy',function(){ self.destroy(); }); + this.order.bind('change', function(){ self.renderElement(); }); this.pos.bind('change:selectedOrder', _.bind( function(pos) { var selectedOrder; selectedOrder = pos.get('selectedOrder'); @@ -337,8 +338,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }, renderElement:function(){ this._super(); - this.$('button.select-order').click(_.bind(this.selectOrder, this)); - this.$('button.close-order').click(_.bind(this.closeOrder, this)); + this.$('button.select-order').off('click').click(_.bind(this.selectOrder, this)); + this.$('button.close-order').off('click').click(_.bind(this.closeOrder, this)); }, selectOrder: function(event) { this.pos.set({ @@ -667,7 +668,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa template: "DebugWidget", eans:{ admin_badge: '0410100000006', - client_badge: '0420100000005', + client_badge: '0420200000004', invalid_ean: '1232456', soda_33cl: '5449000000996', oranges_kg: '2100002031410', diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 6171869cbb4..e43c0d39bbb 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -536,7 +536,7 @@
  • - +
    • From b5ce5ee91b32479d2f938e4eb041ad4ea528ce3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 21 Nov 2012 17:58:23 +0100 Subject: [PATCH 8/8] [IMP] point_of_sale: forgot views and decls for partner's ean13. Demo data where at the wrong place also bzr revid: fva@openerp.com-20121121165823-awkqy7wp0mq4zkhm --- addons/point_of_sale/point_of_sale_data.xml | 24 +------------- addons/point_of_sale/point_of_sale_demo.xml | 31 +++++++++++++----- addons/point_of_sale/res_partner.py | 35 +++++++++++++++++++++ addons/point_of_sale/res_partner_view.xml | 22 +++++++++++++ addons/point_of_sale/static/src/css/pos.css | 5 +-- 5 files changed, 84 insertions(+), 33 deletions(-) create mode 100644 addons/point_of_sale/res_partner.py create mode 100644 addons/point_of_sale/res_partner_view.xml diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml index 2e9cf84ff39..2164ddc1cb1 100644 --- a/addons/point_of_sale/point_of_sale_data.xml +++ b/addons/point_of_sale/point_of_sale_data.xml @@ -1,29 +1,7 @@ - + - - 0420100000005 - 0420200000004 - 0420300000003 - 0420400000002 - 0420500000001 - 0420600000000 - 0420700000009 - 0420800000008 - 0420900000007 - 0421000000003 - 0421100000002 - 0421200000001 - 0421300000000 - 0421400000009 - 0421500000008 - 0421600000007 - 0421700000006 - 0421800000005 - 0421900000004 - 0422000000000 - 0422100000009 diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml index faa3927a9c4..d49805656f3 100644 --- a/addons/point_of_sale/point_of_sale_demo.xml +++ b/addons/point_of_sale/point_of_sale_demo.xml @@ -1,13 +1,32 @@ + + 0420100000005 + 0420200000004 + 0420300000003 + 0420400000002 + 0420500000001 + 0420600000000 + 0420700000009 + 0420800000008 + 0420900000007 + 0421000000003 + 0421100000002 + 0421200000001 + 0421300000000 + 0421400000009 + 0421500000008 + 0421600000007 + 0421700000006 + 0421800000005 + 0421900000004 + 0422000000000 + 0422100000009 + 0410100000006 - - - 0420100000005 - @@ -15,10 +34,6 @@ 0410100000006 - - 0420100000005 - - diff --git a/addons/point_of_sale/res_partner.py b/addons/point_of_sale/res_partner.py new file mode 100644 index 00000000000..61462b8e0de --- /dev/null +++ b/addons/point_of_sale/res_partner.py @@ -0,0 +1,35 @@ + +#!/usr/bin/env python +from osv import osv, fields +import math +import openerp.addons.product.product + + +class res_users(osv.osv): + _inherit = 'res.partner' + _columns = { + 'ean13' : fields.char('EAN13', size=13, help="BarCode"), + } + + def _check_ean(self, cr, uid, ids, context=None): + return all( + openerp.addons.product.product.check_ean(user.ean13) == True + for user in self.browse(cr, uid, ids, context=context) + ) + + def edit_ean(self, cr, uid, ids, context): + return { + 'name': "Edit Ean", + 'type': 'ir.actions.act_window', + 'view_type': 'form', + 'view_mode': 'form', + 'res_model': 'pos.ean_wizard', + 'target' : 'new', + 'view_id': False, + 'context':context, + } + + _constraints = [ + (_check_ean, "Error: Invalid ean code", ['ean13'],), + ] + diff --git a/addons/point_of_sale/res_partner_view.xml b/addons/point_of_sale/res_partner_view.xml new file mode 100644 index 00000000000..4bd433adf28 --- /dev/null +++ b/addons/point_of_sale/res_partner_view.xml @@ -0,0 +1,22 @@ + + + + + + res.partner.product.property.form.inherit + res.partner + + + + + + +