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
1=== modified file 'account_budget/account_budget_view.xml'
2--- account_budget/account_budget_view.xml 2011-11-09 15:50:12 +0000
3+++ account_budget/account_budget_view.xml 2012-03-02 12:17:18 +0000
4@@ -66,13 +66,13 @@
5 <page string="Budget Lines">
6 <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">
7 <graph type="bar" string="Lines">
8- <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
9+ <field name="analytic_account_id"/>
10 <field name="planned_amount" operator="+"/>
11 <field group="True" name="general_budget_id"/>
12 </graph>
13 <tree string="Budget Lines" editable="top">
14 <field name="crossovered_budget_id"/>
15- <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
16+ <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
17 <field name="date_from"/>
18 <field name="date_to"/>
19 <field name="paid_date"/>
20@@ -83,7 +83,7 @@
21 </tree>
22 <form string="Budget Lines">
23 <field name="crossovered_budget_id"/>
24- <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
25+ <field name="analytic_account_id" domain="[('parent_id','!=',False)]" />
26 <field name="date_from"/>
27 <field name="date_to"/>
28 <field name="paid_date"/>
29@@ -114,7 +114,7 @@
30 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
31 <field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
32 <tree string="Budget Lines">
33- <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
34+ <field name="analytic_account_id"/>
35 <field name="general_budget_id"/>
36 <field name="date_from"/>
37 <field name="date_to"/>
38@@ -125,7 +125,7 @@
39 <field name="percentage"/>
40 </tree>
41 <form string="Budget Lines">
42- <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
43+ <field name="analytic_account_id" select="1"/>
44 <field name="general_budget_id" select="1"/>
45 <field name="date_from"/>
46 <field name="date_to"/>
47@@ -203,7 +203,7 @@
48 <field name="type">tree</field>
49 <field name="arch" type="xml">
50 <tree string="Budget Lines">
51- <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
52+ <field name="analytic_account_id"/>
53 <field name="crossovered_budget_id" invisible="1"/>
54 <field name="general_budget_id"/>
55 <field name="date_from"/>