Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-1100427-hip into lp:openobject-addons

  1. trunk-bug-1100427-hip
  2. Merge into trunk
Proposed by Hiral Patel (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1100427-hip
Merge into: lp:openobject-addons
Diff against target: 126 lines (+59/-57)
1 file modified
account/account_view.xml (+59/-57)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1100427-hip
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+143865@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

8508. By Hiral Patel (OpenERP)

[trunk][FIX] 'Default debit-credit account' fields on the journal form view are not visible without horizontal scrolling

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_view.xml'
2--- account/account_view.xml 2013-01-08 15:18:05 +0000
3+++ account/account_view.xml 2013-01-18 11:44:30 +0000
4@@ -384,63 +384,65 @@
5 <field name="model">account.journal</field>
6 <field name="arch" type="xml">
7 <form string="Account Journal" version="7.0">
8- <div class="oe_title">
9- <label for="name" class="oe_edit_only"/>
10- <h1><field name="name"/></h1>
11- </div>
12- <group>
13- <group>
14- <field name="code"/>
15- <field name="type"/>
16- </group>
17- <group>
18- <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
19- <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
20- <field name="currency" groups="base.group_multi_currency"/>
21- <field name="company_id" groups="base.group_multi_company"/>
22- </group>
23- </group>
24- <notebook>
25- <page string="Advanced Settings">
26- <group>
27- <group>
28- <field name="user_id"/>
29- <field name="sequence_id" required="0"/>
30- </group>
31- <group>
32- <field name="centralisation"/>
33- <field name="entry_posted"/>
34- <field name="allow_date"/>
35- <field name="group_invoice_lines"/>
36- </group>
37- </group>
38- </page>
39- <page string="Entry Controls">
40- <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
41- <field colspan="4" name="type_control_ids" nolabel="1"/>
42- <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
43- <field colspan="4" name="account_control_ids" nolabel="1"/>
44- </page>
45- <page string="Cash Registers">
46- <group>
47- <group string="Accounts">
48- <field name="profit_account_id" domain="[('type','!=','view')]"/>
49- <field name="loss_account_id" domain="[('type','!=','view')]"/>
50- <field name="internal_account_id"/>
51- </group>
52- <group string="Miscellaneous">
53- <field name="with_last_closing_balance"/>
54- <field name="cash_control"/>
55- </group>
56- </group>
57- <separator string="Available Coins" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)] }"/>
58- <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)]}">
59- <tree string="CashBox Lines" editable="bottom">
60- <field name="pieces" />
61- </tree>
62- </field>
63- </page>
64- </notebook>
65+ <sheet>
66+ <div class="oe_title">
67+ <label for="name" class="oe_edit_only"/>
68+ <h1><field name="name"/></h1>
69+ </div>
70+ <group>
71+ <group>
72+ <field name="code"/>
73+ <field name="type"/>
74+ </group>
75+ <group>
76+ <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
77+ <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
78+ <field name="currency" groups="base.group_multi_currency"/>
79+ <field name="company_id" groups="base.group_multi_company"/>
80+ </group>
81+ </group>
82+ <notebook>
83+ <page string="Advanced Settings">
84+ <group>
85+ <group>
86+ <field name="user_id"/>
87+ <field name="sequence_id" required="0"/>
88+ </group>
89+ <group>
90+ <field name="centralisation"/>
91+ <field name="entry_posted"/>
92+ <field name="allow_date"/>
93+ <field name="group_invoice_lines"/>
94+ </group>
95+ </group>
96+ </page>
97+ <page string="Entry Controls">
98+ <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
99+ <field colspan="4" name="type_control_ids" nolabel="1"/>
100+ <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
101+ <field colspan="4" name="account_control_ids" nolabel="1"/>
102+ </page>
103+ <page string="Cash Registers">
104+ <group>
105+ <group string="Accounts">
106+ <field name="profit_account_id" domain="[('type','!=','view')]"/>
107+ <field name="loss_account_id" domain="[('type','!=','view')]"/>
108+ <field name="internal_account_id"/>
109+ </group>
110+ <group string="Miscellaneous">
111+ <field name="with_last_closing_balance"/>
112+ <field name="cash_control"/>
113+ </group>
114+ </group>
115+ <separator string="Available Coins" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)] }"/>
116+ <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)]}">
117+ <tree string="CashBox Lines" editable="bottom">
118+ <field name="pieces" />
119+ </tree>
120+ </field>
121+ </page>
122+ </notebook>
123+ </sheet>
124 </form>
125 </field>
126 </record>

Subscribers

People subscribed via source and target branches

to all changes: