Merge lp:~unifield-team/unifield-addons/OEB-16 into lp:unifield-addons

Proposed by Matthieu Dietrich @ camptocamp
Status: Merged
Merged at revision: 4475
Proposed branch: lp:~unifield-team/unifield-addons/OEB-16
Merge into: lp:unifield-addons
Diff against target: 12 lines (+1/-1)
1 file modified
stock/stock_view.xml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/OEB-16
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+65202@code.launchpad.net
To post a comment you must log in.

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 2011-04-04 10:05:21 +0000
3+++ stock/stock_view.xml 2011-06-20 14:09:28 +0000
4@@ -523,7 +523,7 @@
5 <group col="2" colspan="2" groups="base.group_extended">
6 <separator string="Chained Locations" colspan="2"/>
7 <field name="chained_location_type"/>
8- <field name="chained_location_id" attrs="{'required':[('chained_location_type','=','fixed')]}"/>
9+ <field name="chained_location_id" attrs="{'required':[('chained_location_type','=','fixed')], 'invisible':[('chained_location_type','!=','fixed')]}" string="Chained Location"/>
10 <field name="chained_auto_packing"/>
11 <field name="chained_delay"/>
12 <field name="chained_journal_id"/>

Subscribers

People subscribed via source and target branches

to all changes: