odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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

This commit is contained in:
Frederic van der Essen 2014-09-08 12:33:37 +02:00
parent 53cde4f7f4
commit 2a10394880
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/point_of_sale/account_bank_statement.py
View File

@ -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,

2
addons/point_of_sale/account_statement_view.xml
View File

@ -11,7 +11,7 @@
<group col="4" colspan="4">
<field name="journal_user"/>
<field name="amount_authorized_diff"/>
<field name="self_checkout_payment_method" />
<field name="self_checkout_payment_method" /> <!-- FIXME : this field is obsolete -->
</group>
</page>
</xpath>

2
addons/point_of_sale/point_of_sale.py
View File

@ -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"),

1
addons/point_of_sale/static/src/js/models.js
View File

@ -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;
}
}
}