From 2a103948802e2f47033f447fd8606b17868bd7e8 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Mon, 8 Sep 2014 12:33:37 +0200 Subject: [PATCH] [FIX] point_of_sale: the self_checkout related fields are obsolete and should be removed, but we are too late in the release schedule to do so. Marking them as FIXME, to be removed for next major version --- addons/point_of_sale/account_bank_statement.py | 2 +- addons/point_of_sale/account_statement_view.xml | 2 +- addons/point_of_sale/point_of_sale.py | 2 +- addons/point_of_sale/static/src/js/models.js | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py index e698041f975..5d2804670a8 100644 --- a/addons/point_of_sale/account_bank_statement.py +++ b/addons/point_of_sale/account_bank_statement.py @@ -28,7 +28,7 @@ class account_journal(osv.osv): 'journal_user': fields.boolean('PoS Payment Method', help="Check this box if this journal define a payment method that can be used in point of sales."), 'amount_authorized_diff' : fields.float('Amount Authorized Difference', help="This field depicts the maximum difference allowed between the ending balance and the theorical cash when closing a session, for non-POS managers. If this maximum is reached, the user will have an error message at the closing of his session saying that he needs to contact his manager."), - 'self_checkout_payment_method' : fields.boolean('Self Checkout Payment Method'), + 'self_checkout_payment_method' : fields.boolean('Self Checkout Payment Method'), #FIXME : this field is obsolete } _defaults = { 'self_checkout_payment_method' : False, diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml index d9e9ac0d02c..2a62e4bd974 100644 --- a/addons/point_of_sale/account_statement_view.xml +++ b/addons/point_of_sale/account_statement_view.xml @@ -11,7 +11,7 @@ - + diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index b1ceac49412..67fdf5cf196 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -62,7 +62,7 @@ class pos_config(osv.osv): domain=[('type', '=', 'sale')], help="Accounting journal used to post sales entries."), 'currency_id' : fields.function(_get_currency, type="many2one", string="Currency", relation="res.currency"), - 'iface_self_checkout' : fields.boolean('Self Checkout Mode', + 'iface_self_checkout' : fields.boolean('Self Checkout Mode', # FIXME : this field is obsolete help="Check this if this point of sale should open by default in a self checkout mode. If unchecked, Odoo uses the normal cashier mode by default."), 'iface_cashdrawer' : fields.boolean('Cashdrawer', help="Automatically open the cashdrawer"), 'iface_payment_terminal' : fields.boolean('Payment Terminal', help="Enables Payment Terminal integration"), diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index f5b536b3c0e..2489f046c3e 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -273,7 +273,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal for(var j = 0, jlen = journals.length; j < jlen; j++){ if(bankstatements[i].journal_id[0] === journals[j].id){ bankstatements[i].journal = journals[j]; - bankstatements[i].self_checkout_payment_method = journals[j].self_checkout_payment_method; } } }