Merge lp:~openerp-dev/openobject-addons/6.1-opw-381792-xal into lp:openobject-addons/6.1

Proposed by Xavier ALT
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6642
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-381792-xal
Merge into: lp:openobject-addons/6.1
Diff against target: 55 lines (+6/-6)
1 file modified
account_budget/account_budget_view.xml (+6/-6)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-381792-xal
Reviewer Review Type Date Requested Status
OpenERP R&D Team Pending
Review via email: mp+95545@code.launchpad.net

Description of the change

Hi,

This is a forward-port of v6.0 [OPW 381792].

Removing the groups on "analytic_account_id" as the field is required, and will prevent user from filling budget correctly.

Thanks,
Xavier

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-381792-port-mma/+merge/136573and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6642. By Rifakat Husen (OpenERP)

[FIX] account_budget: remove group from required field analytic_account_id

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml 2011-11-09 15:50:12 +0000
+++ account_budget/account_budget_view.xml 2012-03-02 12:17:18 +0000
@@ -66,13 +66,13 @@
66 <page string="Budget Lines">66 <page string="Budget Lines">
67 <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">67 <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">
68 <graph type="bar" string="Lines">68 <graph type="bar" string="Lines">
69 <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>69 <field name="analytic_account_id"/>
70 <field name="planned_amount" operator="+"/>70 <field name="planned_amount" operator="+"/>
71 <field group="True" name="general_budget_id"/>71 <field group="True" name="general_budget_id"/>
72 </graph>72 </graph>
73 <tree string="Budget Lines" editable="top">73 <tree string="Budget Lines" editable="top">
74 <field name="crossovered_budget_id"/>74 <field name="crossovered_budget_id"/>
75 <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>75 <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
76 <field name="date_from"/>76 <field name="date_from"/>
77 <field name="date_to"/>77 <field name="date_to"/>
78 <field name="paid_date"/>78 <field name="paid_date"/>
@@ -83,7 +83,7 @@
83 </tree>83 </tree>
84 <form string="Budget Lines">84 <form string="Budget Lines">
85 <field name="crossovered_budget_id"/>85 <field name="crossovered_budget_id"/>
86 <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />86 <field name="analytic_account_id" domain="[('parent_id','!=',False)]" />
87 <field name="date_from"/>87 <field name="date_from"/>
88 <field name="date_to"/>88 <field name="date_to"/>
89 <field name="paid_date"/>89 <field name="paid_date"/>
@@ -114,7 +114,7 @@
114 <field name="company_id" groups="base.group_multi_company" widget="selection"/>114 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
115 <field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">115 <field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
116 <tree string="Budget Lines">116 <tree string="Budget Lines">
117 <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>117 <field name="analytic_account_id"/>
118 <field name="general_budget_id"/>118 <field name="general_budget_id"/>
119 <field name="date_from"/>119 <field name="date_from"/>
120 <field name="date_to"/>120 <field name="date_to"/>
@@ -125,7 +125,7 @@
125 <field name="percentage"/>125 <field name="percentage"/>
126 </tree>126 </tree>
127 <form string="Budget Lines">127 <form string="Budget Lines">
128 <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>128 <field name="analytic_account_id" select="1"/>
129 <field name="general_budget_id" select="1"/>129 <field name="general_budget_id" select="1"/>
130 <field name="date_from"/>130 <field name="date_from"/>
131 <field name="date_to"/>131 <field name="date_to"/>
@@ -203,7 +203,7 @@
203 <field name="type">tree</field>203 <field name="type">tree</field>
204 <field name="arch" type="xml">204 <field name="arch" type="xml">
205 <tree string="Budget Lines">205 <tree string="Budget Lines">
206 <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>206 <field name="analytic_account_id"/>
207 <field name="crossovered_budget_id" invisible="1"/>207 <field name="crossovered_budget_id" invisible="1"/>
208 <field name="general_budget_id"/>208 <field name="general_budget_id"/>
209 <field name="date_from"/>209 <field name="date_from"/>