Merge lp:~openerp-dev/openobject-addons/6.1-opw-575212-nep into lp:openobject-addons/6.1

Proposed by Nehal Panchal (OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6817
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-575212-nep
Merge into: lp:openobject-addons/6.1
Diff against target: 14 lines (+2/-2)
1 file modified
sale_layout/sale_layout_view.xml (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-575212-nep
Reviewer Review Type Date Requested Status
Michael (OpenERP) (community) Approve
Naresh(OpenERP) (community) Approve
Xavier ALT Pending
Review via email: mp+107717@code.launchpad.net

Description of the change

Hello,

With sale_layout installed, in a sale order line when set a non-product type of line, the fields "Quantity (UoS)" and "product_uos"(hidden label) are still displayed, unlike other fields which are made invisible accordingly.

This fixes the issue.

Thanks

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

Hello,

This bug was qualified as Not Relevant on Trunk (means that architecture on trunk has changed and so this bug has no meaning anymore). 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

6817. By Nehal Panchal (OpenERP)

[FIX] sale_layout : when set a non-product type of line, the fields 'Quantity (UoS)' and 'product_uos' are still displayed, unlike other fields which are made invisible accordingly

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale_layout/sale_layout_view.xml'
2--- sale_layout/sale_layout_view.xml 2011-12-21 13:10:28 +0000
3+++ sale_layout/sale_layout_view.xml 2012-05-29 06:45:27 +0000
4@@ -43,8 +43,8 @@
5 <field name="price_unit"
6 attrs="{'invisible':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
7
8- <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
9- <field groups="product.group_uos" name="product_uos" nolabel="1"/>
10+ <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)" attrs="{'invisible':[('layout_type','!=','article')]}"/>
11+ <field groups="product.group_uos" name="product_uos" nolabel="1" attrs="{'invisible':[('layout_type','!=','article')]}"/>
12 <newline/>
13
14 <field