pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] POS: made changes to have POS total well aligned

Browse Source 
bzr revid: cha@tinyerp.com-20130318095952-wynm8qf0nmuq7uc5
This commit is contained in:
Ajay Chauhan (OpenERP)
2013-03-18 15:29:52 +05:30
parent 3c9a40ff84
commit cbc2fc05c8
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/point_of_sale_view.xml
+6 -3
View File
@@ -925,8 +925,10 @@
<div attrs="{'invisible' : [('cash_control', '=', False)]}">
<group class="oe_subtotal_footer oe_right">
<field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
<field name="cash_register_total_entry_encoding" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" widget="monetary" options="{'currency_field': 'currency_id'}"/>
<field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Computed Balance" widget="monetary" options="{'currency_field': 'currency_id'}"/>
<label for="cash_register_total_entry_encoding" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" class="oe_bold oe_pos_opening_total"/>
<field name="cash_register_total_entry_encoding" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
<label for="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Computed Balance" class="oe_force_bold oe_pos_opening_total"/>
<field name="cash_register_balance_end" nolabel="1" attrs="{'invisible' : [('state', '=', 'opening_control')]}" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
</group>
<div class="oe_clear"/>
<div attrs="{'invisible' : ['|', ('cash_journal_id', '=', False), ('state', '!=', 'opening_control')]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
@@ -941,7 +943,8 @@
<group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'opening_control')]}">
<field name="cash_register_balance_end_real" string="Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
<field name="cash_register_difference" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
<label for="cash_register_difference" class="oe_force_bold oe_pos_ening_total"/>
<field name="cash_register_difference" nolabel="1" class="oe_bold oe_pos_total" widget="monetary" options="{'currency_field': 'currency_id'}"/>
</group>
</group>
addons/point_of_sale/static/src/css/pos.css
+12
View File
@@ -1431,3 +1431,15 @@
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: -14px;
}
.openerp .oe_pos_ening_total {
margin-right: -7px;
}
.openerp .oe_pos_total {
margin-left: -2px;
}