Merge lp:~openerp-dev/openobject-addons/6.1-opw-574286-Vme into lp:openobject-addons/6.1

Proposed by Vidhin Mehta (OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6772
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-574286-Vme
Merge into: lp:openobject-addons/6.1
Diff against target: 16 lines (+2/-1)
1 file modified
stock/stock_view.xml (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-574286-Vme
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+103879@code.launchpad.net

Description of the change

Set correct condition for color in tree view.

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
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-574286-port-mma/+merge/132244 and 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

6772. By Vidhin Mehta (OpenERP)

[IMP]correct condtion.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock/stock_view.xml'
2--- stock/stock_view.xml 2012-03-02 15:26:24 +0000
3+++ stock/stock_view.xml 2012-04-27 13:47:21 +0000
4@@ -260,10 +260,11 @@
5 <field name="type">tree</field>
6 <field name="field_parent">child_ids</field>
7 <field name="arch" type="xml">
8- <tree colors="grey:not active" string="Packs">
9+ <tree colors="grey:active == False" string="Packs">
10 <field name="name" />
11 <field name="serial" />
12 <field name="date" />
13+ <field name="active" invisible="1"/>
14 </tree>
15 </field>
16 </record>