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

[IMP] pos session and cash register, Improved tooltip and layout. 

bzr revid: tta@openerp.com-20130405092419-jpa89isevfq6jw49
This commit is contained in:
Tejas Tank 2013-04-05 14:54:19 +05:30
parent 8e0f1cd1b9
commit 76b7a08275
5 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/account/account_cash_statement.py
View File

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

11
addons/account/account_view.xml
View File

@ -2350,17 +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'}"/>
<label for="total_entry_encoding" string="+ Transactions" class="oe_bold oe_account_opening_total"/>
<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="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'}"/>
<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."/>
</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'}"/>
<label for="difference" class="oe_force_bold oe_account_ening_total"/>
<field name="difference" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
<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'}"/>
</group>
</div>
</group>

11
addons/point_of_sale/point_of_sale.py
View File

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

5
addons/point_of_sale/point_of_sale_view.xml
View File

@ -925,7 +925,7 @@
<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'}"/>
<label for="cash_register_total_entry_encoding" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions" class="oe_bold oe_pos_opening_total"/>
<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"/>
<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'}"/>
@ -943,8 +943,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'}"/>
<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'}"/>
<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>

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

@ -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;
}
}
.openerp label.oe_pos_difference{
margin-right: -11px;
}