odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] pos,cash-register: Corrected tooltips and layout. 

bzr revid: tta@openerp.com-20130409044724-1jhnyjhp0ka1ckf6
This commit is contained in:
Tejas Tank 2013-04-09 10:17:24 +05:30
parent 8ed830928f
commit b062573df4
6 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_cash_statement.py
View File

@ -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 = {

12
addons/account/account_view.xml
View File

@ -2350,16 +2350,16 @@
</notebook>
<group>
<group class="oe_subtotal_footer oe_right">
<field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
<label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_account_opening_total"/>
<field name="balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator oe_open_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
<label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_mini_subtotal_footer_separator"/>
<field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
<label for="balance_end" string="= Computed Balance" class="oe_force_bold oe_account_opening_total"/>
<field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}" help="Sum of opening balance and transactions."/>
<label for="balance_end" string="= Theoritical Closing Balance" class="oe_force_bold oe_mini_subtotal_footer_separator" help="Sum of opening balance and transactions."/>
<field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
</group>
<div>
<group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'draft')]}">
<field name="balance_end_real" readonly="1" string="Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
<field name="difference" class="oe_subtotal_footer_separator oe_account_ening_total oe_account_total oe_right" widget="monetary" options="{'currency_field': 'currency'}"/>
<field name="balance_end_real" readonly="1" string="Real Closing Balance" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
<field name="difference" class="oe_subtotal_footer_separator oe_difference" widget="monetary" options="{'currency_field': 'currency'}"/>
</group>
</div>
</group>

22
addons/account/static/src/css/account_move_reconciliation.css
View File

@ -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;
}

4
addons/point_of_sale/point_of_sale.py
View File

@ -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',

4
addons/point_of_sale/point_of_sale_view.xml
View File

@ -927,7 +927,7 @@
<field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
<label for="cash_register_total_entry_encoding" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" class="oe_force_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"/>
<label for="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theoritical Closing 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"/>
@ -942,7 +942,7 @@
<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_balance_end_real" string="Real Closing Balance" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
<field name="cash_register_difference" class="oe_subtotal_footer_separator oe_right oe_pos_total oe_pos_difference" widget="monetary" options="{'currency_field': 'currency_id'}"/>
</group>
</group>

12
addons/point_of_sale/static/src/css/pos.css
View File

@ -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;
}