diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 68d170fe290..94c9c010d7c 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -177,7 +177,7 @@ class account_cash_statement(osv.osv):
'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 closing balance and computed balance."),
+ 'difference' : fields.function(_compute_difference, method=True, string="Difference", type="float", help="Difference between the theoritical closing balance and the real closing 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 be60e82bb6b..4ed129f6fa5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2350,16 +2350,16 @@
diff --git a/addons/account/static/src/css/account_move_reconciliation.css b/addons/account/static/src/css/account_move_reconciliation.css
index ff6ec340787..b6baa122fe6 100644
--- a/addons/account/static/src/css/account_move_reconciliation.css
+++ b/addons/account/static/src/css/account_move_reconciliation.css
@@ -20,12 +20,24 @@
.openerp .oe_force_bold {
font-weight: bold !important;
}
-.openerp .oe_account_opening_total {
- margin-right: -14px;
+.openerp label.oe_open_balance{
+ margin-right: -18px;
}
-.openerp label.oe_account_ening_total {
- margin-right: -11px;
+.openerp label.oe_subtotal_footer_separator{
+ float:right;
+}
+.openerp label.oe_mini_subtotal_footer_separator{
+ margin-right: -14px;
}
.openerp .oe_account_total {
- margin-left: -2px;
+ margin-left: -2px;
}
+.openerp label.oe_real_closing_balance{
+ min-width: 184px !important;
+}
+.openerp label.oe_difference {
+ margin-right: -10px;
+ padding-left: 10px !important;
+ min-width: 195px !important;
+}
+
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index bf51fdfee1a..c735384c6ec 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -251,13 +251,13 @@ class pos_session(osv.osv):
'cash_register_balance_end' : fields.related('cash_register_id', 'balance_end',
type='float',
digits_compute=dp.get_precision('Account'),
- string="Computed Balance",
+ string="Theoritical Closing Balance",
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 balance and computed balance.",
+ help="Difference between the theoritical closing balance and the real closing 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 ae909a1e743..38bd0068864 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -927,7 +927,7 @@
-
+
@@ -942,7 +942,7 @@
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index c4a22600a0a..9d193af4ebd 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -1435,14 +1435,18 @@
font-weight: bold !important;
}
.openerp .oe_pos_opening_total{
- margin-right: -14px;
-}
-.openerp .oe_pos_ening_total{
- margin-right: -7px;
+ margin-right: 4px;
}
.openerp .oe_pos_total{
margin-left: -2px;
}
+.openerp label.oe_mini_subtotal_footer_separator{
+ margin-right: -14px;
+}
+.openerp label.oe_subtotal_footer_separator{
+ width: 184px !important;
+}
.openerp label.oe_pos_difference{
margin-right: -11px;
+ width: 195px !important;
}