Unifield Addons

Merge lp:~julie-w/unifield-addons/UTP-758 into lp:unifield-addons

  1. UTP-758
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4688
Proposed branch: lp:~julie-w/unifield-addons/UTP-758
Merge into: lp:unifield-addons
Diff against target: 44 lines (+2/-15)
2 files modified
account/company_view.xml (+1/-15)
report_webkit/company_view.xml (+1/-0)
To merge this branch: bzr merge lp:~julie-w/unifield-addons/UTP-758
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+285322@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/company_view.xml'
2--- account/company_view.xml 2011-01-14 00:11:01 +0000
3+++ account/company_view.xml 2016-02-08 10:53:17 +0000
4@@ -3,6 +3,7 @@
5 <data>
6 <record model="ir.ui.view" id="view_company_inherit_form">
7 <field name="name">res.company.form.inherit</field>
8+ <field name="priority" eval="6"/>
9 <field name="inherit_id" ref="base.view_company_form"/>
10 <field name="model">res.company</field>
11 <field name="type">form</field>
12@@ -16,20 +17,5 @@
13 </field>
14 </record>
15
16- <record model="ir.ui.view" id="view_company_inherit_1_form">
17- <field name="name">res.company.form.inherit</field>
18- <field name="inherit_id" ref="base.view_company_form"/>
19- <field name="model">res.company</field>
20- <field name="type">form</field>
21- <field name="arch" type="xml">
22- <page string="Configuration" position="inside">
23- <group col="2" colspan="2">
24- <separator string="Reserve And Profit/Loss Account" colspan="2"/>
25- <field name="property_reserve_and_surplus_account" colspan="2"/>
26- </group>
27- </page>
28- </field>
29- </record>
30-
31 </data>
32 </openerp>
33
34=== modified file 'report_webkit/company_view.xml'
35--- report_webkit/company_view.xml 2011-01-14 00:11:01 +0000
36+++ report_webkit/company_view.xml 2016-02-08 10:53:17 +0000
37@@ -3,6 +3,7 @@
38 <record model="ir.ui.view" id="currency_del_img">
39 <field name="name">res.company.form.inherit</field>
40 <field name="model">res.company</field>
41+ <field name="priority" eval="5"/>
42 <field name="inherit_id" ref="base.view_company_form"/>
43 <field name="type">form</field>
44 <field name="arch" type="xml">

Subscribers

People subscribed via source and target branches