diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 82423598057..68d170fe290 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -170,13 +170,14 @@ class account_cash_statement(osv.osv):
store = {
'account.bank.statement': (lambda self, cr, uid, ids, context=None: ids, ['line_ids','move_line_ids'], 10),
'account.bank.statement.line': (_get_statement_from_line, ['amount'], 10),
- }),
+ },
+ help="Total of cash transaction lines."),
'closing_date': fields.datetime("Closed On"),
'details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='CashBox Lines'),
'opening_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Opening Cashbox Lines'),
'closing_details_ids' : fields.one2many('account.cashbox.line', 'bank_statement_id', string='Closing Cashbox Lines'),
'user_id': fields.many2one('res.users', 'Responsible', required=False),
- 'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the counted cash control at the closing and the closing balance."),
+ 'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the closing balance and computed balance."),
'last_closing_balance' : fields.function(_compute_last_closing_balance, method=True, string='Last Closing Balance', type='float'),
}
_defaults = {
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1af6460d858..be60e82bb6b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2350,17 +2350,16 @@
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 4e7e1d0ea84..bf51fdfee1a 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -236,27 +236,28 @@ class pos_session(osv.osv):
type='float',
digits_compute=dp.get_precision('Account'),
string="Ending Balance",
- help="Total of ending cash control line",
+ help="Total of closing cash control lines.",
readonly=True),
'cash_register_balance_start' : fields.related('cash_register_id', 'balance_start',
type='float',
digits_compute=dp.get_precision('Account'),
string="Starting Balance",
- help="Computed using the cash control at the opening.",
+ help="Total of opening cash control lines.",
readonly=True),
'cash_register_total_entry_encoding' : fields.related('cash_register_id', 'total_entry_encoding',
string='Total Cash Transaction',
- readonly=True),
+ readonly=True,
+ help="Total of all paid sale orders"),
'cash_register_balance_end' : fields.related('cash_register_id', 'balance_end',
type='float',
digits_compute=dp.get_precision('Account'),
string="Computed Balance",
- help="Sum of opening cash control total and the total of transactions.",
+ help="Sum of opening balance and transactions.",
readonly=True),
'cash_register_difference' : fields.related('cash_register_id', 'difference',
type='float',
string='Difference',
- help="Difference between the closing cash control and the theoretical balance.",
+ help="Difference between the closing balance and computed balance.",
readonly=True),
'journal_ids' : fields.related('config_id', 'journal_ids',
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index db113738620..ae909a1e743 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -925,7 +925,7 @@
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 847e4799e97..c4a22600a0a 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -1431,15 +1431,18 @@
box-shadow: 0px 3px 38px rgba(0,0,0,0.3);
border-radius: 3px;
}
-.openerp .oe_force_bold {
+.openerp .oe_force_bold{
font-weight: bold !important;
}
-.openerp .oe_pos_opening_total {
+.openerp .oe_pos_opening_total{
margin-right: -14px;
}
-.openerp .oe_pos_ening_total {
+.openerp .oe_pos_ening_total{
margin-right: -7px;
}
-.openerp .oe_pos_total {
+.openerp .oe_pos_total{
margin-left: -2px;
-}
\ No newline at end of file
+}
+.openerp label.oe_pos_difference{
+ margin-right: -11px;
+}