Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-opw-598926-dhr into lp:openobject-addons/7.0

  1. 7.0-opw-598926-dhr
  2. Merge into 7.0
Proposed by Olivier Laurent (Acsone)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-598926-dhr
Merge into: lp:openobject-addons/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
analytic/analytic_view.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-598926-dhr
Reviewer Review Type Date Requested Status
Olivier Laurent (Acsone) (community) cr + test Approve
Stéphane Bidoul (Acsone) (community) code review and test Approve
OpenERP Core Team Pending
Review via email: mp+192370@code.launchpad.net

Description of the change

This branch repairs the described issue.

To post a comment you must log in.
Revision history for this message
Stéphane Bidoul (Acsone) (sbi) :
review: Approve (code review and test)
Reply
Revision history for this message
Olivier Laurent (Acsone) (olivier-laurent) :
review: Approve (cr + test)
Reply

Unmerged revisions

9540. By Dharti Ratani(OpenERP)

[IMP]Made parent account visible for analytic accounts with type 'Contract or Project'

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'analytic/analytic_view.xml'
2--- analytic/analytic_view.xml 2012-11-29 22:26:45 +0000
3+++ analytic/analytic_view.xml 2013-10-23 17:30:16 +0000
4@@ -29,7 +29,7 @@
5 <field name="type" invisible="context.get('default_type', False)"/>
6 <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
7 <field name="code"/>
8- <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract'])]}"/>
9+ <field name="parent_id" on_change="on_change_parent(parent_id)"/>
10 <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
11 </group>
12 </group>