Hiral Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-1100427-hip into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #1100427 in OpenERP Addons: ""Default debit / credit account" fields on
the journal form view are not visible without horizontal scrolling"
https://bugs.launchpad.net/openobject-addons/+bug/1100427
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1100427-hip/+merge/143865
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1100427-hip/+merge/143865
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-1100427-hip.
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2013-01-08 15:18:05 +0000
+++ account/account_view.xml 2013-01-18 11:44:30 +0000
@@ -384,63 +384,65 @@
<field name="model">account.journal</field>
<field name="arch" type="xml">
<form string="Account Journal" version="7.0">
- <div class="oe_title">
- <label for="name" class="oe_edit_only"/>
- <h1><field name="name"/></h1>
- </div>
- <group>
- <group>
- <field name="code"/>
- <field name="type"/>
- </group>
- <group>
- <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <field name="currency" groups="base.group_multi_currency"/>
- <field name="company_id" groups="base.group_multi_company"/>
- </group>
- </group>
- <notebook>
- <page string="Advanced Settings">
- <group>
- <group>
- <field name="user_id"/>
- <field name="sequence_id" required="0"/>
- </group>
- <group>
- <field name="centralisation"/>
- <field name="entry_posted"/>
- <field name="allow_date"/>
- <field name="group_invoice_lines"/>
- </group>
- </group>
- </page>
- <page string="Entry Controls">
- <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
- <field colspan="4" name="type_control_ids" nolabel="1"/>
- <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
- <field colspan="4" name="account_control_ids" nolabel="1"/>
- </page>
- <page string="Cash Registers">
- <group>
- <group string="Accounts">
- <field name="profit_account_id" domain="[('type','!=','view')]"/>
- <field name="loss_account_id" domain="[('type','!=','view')]"/>
- <field name="internal_account_id"/>
- </group>
- <group string="Miscellaneous">
- <field name="with_last_closing_balance"/>
- <field name="cash_control"/>
- </group>
- </group>
- <separator string="Available Coins" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)] }"/>
- <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)]}">
- <tree string="CashBox Lines" editable="bottom">
- <field name="pieces" />
- </tree>
- </field>
- </page>
- </notebook>
+ <sheet>
+ <div class="oe_title">
+ <label for="name" class="oe_edit_only"/>
+ <h1><field name="name"/></h1>
+ </div>
+ <group>
+ <group>
+ <field name="code"/>
+ <field name="type"/>
+ </group>
+ <group>
+ <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="currency" groups="base.group_multi_currency"/>
+ <field name="company_id" groups="base.group_multi_company"/>
+ </group>
+ </group>
+ <notebook>
+ <page string="Advanced Settings">
+ <group>
+ <group>
+ <field name="user_id"/>
+ <field name="sequence_id" required="0"/>
+ </group>
+ <group>
+ <field name="centralisation"/>
+ <field name="entry_posted"/>
+ <field name="allow_date"/>
+ <field name="group_invoice_lines"/>
+ </group>
+ </group>
+ </page>
+ <page string="Entry Controls">
+ <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
+ <field colspan="4" name="type_control_ids" nolabel="1"/>
+ <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
+ <field colspan="4" name="account_control_ids" nolabel="1"/>
+ </page>
+ <page string="Cash Registers">
+ <group>
+ <group string="Accounts">
+ <field name="profit_account_id" domain="[('type','!=','view')]"/>
+ <field name="loss_account_id" domain="[('type','!=','view')]"/>
+ <field name="internal_account_id"/>
+ </group>
+ <group string="Miscellaneous">
+ <field name="with_last_closing_balance"/>
+ <field name="cash_control"/>
+ </group>
+ </group>
+ <separator string="Available Coins" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)] }"/>
+ <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)]}">
+ <tree string="CashBox Lines" editable="bottom">
+ <field name="pieces" />
+ </tree>
+ </field>
+ </page>
+ </notebook>
+ </sheet>
</form>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
