diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index a380a69dc03..167d89ab2cb 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -135,7 +135,8 @@ for a particular financial year and for preparation of vouchers there is a modul ], 'css':[ 'static/src/css/account_move_reconciliation.css', - 'static/src/css/account_move_line_quickadd.css' + 'static/src/css/account_move_line_quickadd.css', + 'static/src/css/account_bank_and_cash.css', ], 'demo': [ 'demo/account_demo.xml', diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 99a89270c85..26aedd28947 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2346,8 +2346,12 @@
- - + + + + + +
diff --git a/addons/account/static/src/css/account_bank_and_cash.css b/addons/account/static/src/css/account_bank_and_cash.css new file mode 100644 index 00000000000..5b5643d0d8e --- /dev/null +++ b/addons/account/static/src/css/account_bank_and_cash.css @@ -0,0 +1,27 @@ +.openerp .oe_force_bold { + font-weight: bold !important; +} +.openerp label.oe_open_balance{ + margin-right: -18px; +} +.openerp label.oe_subtotal_footer_separator{ + float:right; + width: 184px !important; +} +.openerp label.oe_mini_subtotal_footer_separator{ + margin-right: -14px; +} +.openerp .oe_account_total, .openerp .oe_pos_total { + margin-left: -2px; +} +.openerp label.oe_real_closing_balance{ + min-width: 184px !important; +} +.openerp label.oe_difference, .openerp label.oe_pos_difference { + margin-right: -10px; + padding-left: 10px !important; + min-width: 195px !important; +} +.openerp .oe_opening_total{ + margin-right: 4px; +} diff --git a/addons/account/static/src/css/account_move_reconciliation.css b/addons/account/static/src/css/account_move_reconciliation.css index b6baa122fe6..a69c7a77c9c 100644 --- a/addons/account/static/src/css/account_move_reconciliation.css +++ b/addons/account/static/src/css/account_move_reconciliation.css @@ -17,27 +17,3 @@ display: table-cell; width: 50%: } -.openerp .oe_force_bold { - font-weight: bold !important; -} -.openerp label.oe_open_balance{ - margin-right: -18px; -} -.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; -} -.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_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 637bc0eb9bc..47927424c8c 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -920,7 +920,7 @@ - + @@ -929,9 +929,9 @@
-
@@ -943,14 +943,17 @@

- - - - - - +
+ + + + + + + + +
- diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 9d193af4ebd..d9a4d6d00a9 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -1431,22 +1431,3 @@ box-shadow: 0px 3px 38px rgba(0,0,0,0.3); border-radius: 3px; } -.openerp .oe_force_bold{ - font-weight: bold !important; -} -.openerp .oe_pos_opening_total{ - 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; -}