From 1ae6ee2693aa88a771f395e85f02dfe2e442d7f4 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 18 Oct 2010 18:49:01 +0530
Subject: [PATCH] [MOD]Point Of Sale : Usability Improvement
bzr revid: dbr@tinyerp.com-20101018131901-qz22a3kasedjp7g2
---
addons/point_of_sale/pos.py | 2 +-
.../report/report_cash_register_view.xml | 6 +++---
.../security/point_of_sale_security.xml | 2 +-
addons/point_of_sale/statement_view.xml | 14 +++++++-------
addons/point_of_sale/wizard/pos_box_entries.py | 2 +-
addons/point_of_sale/wizard/pos_box_out.py | 2 +-
addons/point_of_sale/wizard/pos_close_statement.py | 2 +-
.../point_of_sale/wizard/pos_close_statement.xml | 2 +-
addons/point_of_sale/wizard/pos_open_statement.py | 2 +-
addons/point_of_sale/wizard/pos_open_statement.xml | 2 +-
addons/point_of_sale/wizard/pos_payment.xml | 2 +-
11 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index a5bdf5ec0f87..97fe0e438a9f 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -271,7 +271,7 @@ class pos_order(osv.osv):
'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date', store=True),
'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date', store=True),
'date_validity': fields.date('Validity Date', required=True),
- 'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the register. It could be a reliever, a student or an interim employee."),
+ 'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the cash register. It could be a reliever, a student or an interim employee."),
'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True, help="User who is logged into the system."),
'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
'amount_tax': fields.function(_amount_all, method=True, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index 40e59e38f0b6..167851986cbe 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -67,9 +67,9 @@
<separator orientation="vertical"/>
<filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
- <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day from Creation date of register"/>
- <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month from Creation date of register"/>
- <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year from Creation date of register"/>
+ <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day from Creation date of cash register"/>
+ <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month from Creation date of cash register"/>
+ <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year from Creation date of cash register"/>
</group>
</search>
</field>
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 6163d65a36f0..ac9e5ae0b48d 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -10,7 +10,7 @@
</record>
<record model="ir.rule" id="pos_cash_statement_rule">
- <field name="name">Registers</field>
+ <field name="name">Cash Registers</field>
<field name="model_id" search="[('model','=','account.bank.statement')]" model="ir.model"/>
<field name="global" eval="True"/>
<field name="domain_force">[('user_id','!=',['base.user_root'])]</field>
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index d400bc35a4bd..435f0dcb3f29 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -120,7 +120,7 @@
</record>
<record id="action_new_bank_statement_all_tree" model="ir.actions.act_window">
- <field name="name">Registers</field>
+ <field name="name">Cash Registers</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.bank.statement</field>
<field name="view_type">form</field>
@@ -142,24 +142,24 @@
</record>
<menuitem
- name="Registers"
+ name="Cash Registers"
parent="menu_cash_register"
action="action_new_bank_statement_all_tree"
id="menu_all_menu_all_register"
sequence="4"
/>
- <menuitem name="Register management" parent="point_of_sale.menu_point_root"
+ <menuitem name="Cash register management" parent="point_of_sale.menu_point_root"
id="menu_point_open_config" sequence="1"/>
<menuitem
- name="Open Registers" parent="menu_point_open_config"
- string="Open Registers"
+ name="Open Cash Registers" parent="menu_point_open_config"
+ string="Open Cash Registers"
action="action_pos_open_statement"
id="menu_open_statement" sequence="1" />
<menuitem
- name="Close Registers" parent="menu_point_open_config"
- string="Close Registers"
+ name="Close Cash Registers" parent="menu_point_open_config"
+ string="Close Cash Registers"
action="action_pos_close_statement"
id="menu_close_statement" sequence="2" />
diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index 103e49be62d3..e86232874a18 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -74,7 +74,7 @@ class pos_box_entries(osv.osv_memory):
_columns = {
'name': fields.char('Description', size=32, required=True),
- 'journal_id': fields.selection(get_journal, "Register", required=True),
+ 'journal_id': fields.selection(get_journal, "Cash Register", required=True),
'product_id': fields.selection(_get_income_product, "Operation", required=True),
'amount': fields.float('Amount', digits=(16, 2)),
'ref': fields.char('Ref', size=32),
diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
index 92e7dded4322..d88019a9337a 100644
--- a/addons/point_of_sale/wizard/pos_box_out.py
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -50,7 +50,7 @@ class pos_box_out(osv.osv_memory):
_columns = {
'name': fields.char('Description', size=32, required=True),
- 'journal_id': fields.selection(pos_box_entries.get_journal, "Register", required=True),
+ 'journal_id': fields.selection(pos_box_entries.get_journal, "Cash Register", required=True),
'product_id': fields.selection(_get_expense_product, "Operation", required=True),
'amount': fields.float('Amount', digits=(16, 2)),
'ref': fields.char('Ref', size=32),
diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
index 82e47a2caa33..ec7137496998 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.py
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -45,7 +45,7 @@ class pos_close_statement(osv.osv_memory):
ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', journal_ids)])
for journal in journal_obj.browse(cr, uid, journal_ids):
if not ids:
- raise osv.except_osv(_('Message'), _('Registers are already closed.'))
+ raise osv.except_osv(_('Message'), _('Cash registers are already closed.'))
else:
if not journal.check_dtls:
statement_obj.button_confirm_cash(cr, uid, ids, context)
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index c1ee3dc13d49..7a9a5a0e23d9 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -32,7 +32,7 @@
<record id="action_pos_close_statement" model="ir.actions.act_window">
- <field name="name">Close Register</field>
+ <field name="name">Close Cash Register</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">pos.close.statement</field>
<field name="view_type">form</field>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 67c5b125768e..184395de1fe0 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -49,7 +49,7 @@ class pos_open_statement(osv.osv_memory):
for journal in journal_obj.browse(cr, uid, journal_ids):
ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)])
if len(ids):
- raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".\nPlease close its related Register.' %(journal.name)))
+ raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".\nPlease close its related cash register.' %(journal.name)))
number = ''
if journal.sequence_id:
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 2b275d36d324..870d8f71e47b 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -30,7 +30,7 @@
id="act_pos_open_statement"/>
<record id="action_pos_open_statement" model="ir.actions.act_window">
- <field name="name">Open Register</field>
+ <field name="name">Open Cash Register</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">pos.open.statement</field>
<field name="view_type">form</field>
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index f0536ae0ac89..a6757be6b78a 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -12,7 +12,7 @@
<form string="Add payment :">
<group colspan="6" col="6" >
<group colspan="3" >
- <separator string="The register must be opened to be able to execute a payment." />
+ <separator string="The cash register must be opened to be able to execute a payment." />
</group>
<newline/>
<group colspan="6">
--
GitLab