Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-cash_registers-nco
into lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-cash_registers-nco/+merge/112110
Hello sir,
I have improve the view of cash registers as per the specification.
Thanks,
NCO.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-cash_registers-nco/+merge/112110
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-06-22 10:29:59 +0000
+++ account/account_view.xml 2012-06-26 13:31:40 +0000
@@ -2550,15 +2550,24 @@
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
</header>
<sheet string="Statement">
- <group col="4">
- <field name="name"/>
- <field name='company_id' widget="selection" groups="base.group_multi_company" />
- <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
- <field name="user_id" readonly="1"/>
- <field name="period_id"/>
- <field name="currency" invisible="1"/>
- </group>
-
+ <label for="name" class="oe_edit_only"/>
+ <h1><field name="name" class="oe_inline"/>-<field name="period_id" class="oe_inline"/></h1>
+ <label for="journal_id" class="oe_edit_only"/>
+ <h2>
+ <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
+ </h2>
+ <group col="4">
+ <group>
+ <field name="user_id" readonly="1"/>
+ <field name="total_entry_encoding"/>
+ <field name='company_id' widget="selection" groups="base.group_multi_company" />
+ </group>
+ <group>
+ <field name="date" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_date(date, company_id)"/>
+ <field name="closing_date" readonly="1"/>
+ <field name="currency" invisible="1"/>
+ </group>
+ </group>
<notebook>
<page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
<field name="line_ids" context="{'date':date}">
@@ -2591,51 +2600,52 @@
</field>
</page>
<page string="CashBox">
- <group>
- <field name="starting_details_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1">
- <tree string = "Opening Balance" editable="bottom">
- <field name="pieces"/>
- <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
- <field name="subtotal" sum="Total"/>
- </tree>
- <form string = "Opening Balance" version="7.0">
- <field name="pieces"/>
- <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
- <field name="subtotal"/>
- </form>
- </field>
- <field name="ending_details_ids" attrs="{'readonly':[('state','!=','open')]}" nolabel="1">
- <tree string = "Closing Balance" editable="bottom">
- <field name="pieces"/>
- <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
- <field name="subtotal" sum="Total"/>
- </tree>
- <form string = "Closing Balance" version="7.0">
- <field name="pieces"/>
- <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
- <field name="subtotal"/>
- </form>
- </field>
+ <group col="4">
+ <group>
+ <label for="starting_details_ids" string="Opening Operations"/><newline/>
+ <field name="starting_details_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1">
+ <tree string = "Opening Balance" editable="bottom">
+ <field name="pieces"/>
+ <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+ <field name="subtotal" sum="Total"/>
+ </tree>
+ <form string = "Opening Balance" version="7.0">
+ <field name="pieces"/>
+ <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+ <field name="subtotal"/>
+ </form>
+ </field>
+ <newline/>
+ <group class="oe_subtotal_footer oe_right">
+ <field name="balance_start" readonly="1" string="Total"/>
+ </group>
+ </group>
+ <group>
+ <label for="ending_details_ids" string="Closing Operations"/><newline/>
+ <field name="ending_details_ids" attrs="{'readonly':[('state','!=','open')]}" nolabel="1">
+ <tree string = "Closing Balance" editable="bottom">
+ <field name="pieces"/>
+ <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+ <field name="subtotal" sum="Total"/>
+ </tree>
+ <form string = "Closing Balance" version="7.0">
+ <field name="pieces"/>
+ <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+ <field name="subtotal"/>
+ </form>
+ </field>
+ <newline/>
+ <group class="oe_subtotal_footer oe_right">
+ <field name="balance_end_cash" invisible="1" string="Total"/>
+ <field name="balance_end" string="Total"/>
+ </group>
+ </group>
</group>
</page>
<page string="Journal Entries" attrs="{'invisible': [('state','!=','confirm')]}">
<field name="move_line_ids" string="Journal Entries"/>
</page>
</notebook>
- <group col="3">
- <group string="Dates">
- <field name="date" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_date(date, company_id)"/>
- <field name="closing_date" readonly="1"/>
- </group>
- <group string="Opening Balance">
- <field name="balance_start" readonly="1" string="Opening Balance"/>
- <field name="total_entry_encoding"/>
- </group>
- <group string="Closing Balance">
- <field name="balance_end"/>
- <field name="balance_end_cash"/>
- </group>
- </group>
</sheet>
</form>
</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
