Unifield Addons

Merge lp:~unifield-team/unifield-addons/unifield-addons_1042 into lp:unifield-addons

  1. unifield-addons_1042
  2. Merge into trunk
Proposed by Quentin THEURET @Amaris
Status: Merged
Merged at revision: 4592
Proposed branch: lp:~unifield-team/unifield-addons/unifield-addons_1042
Merge into: lp:unifield-addons
Diff against target: 21 lines (+2/-2)
1 file modified
product/product_demo.xml (+2/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/unifield-addons_1042
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+146845@code.launchpad.net
To post a comment you must log in.
lp:~unifield-team/unifield-addons/unifield-addons_1042 updated
4575. By Quentin THEURET @Amaris

Merge code from Pilot2.0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'product/product_demo.xml'
2--- product/product_demo.xml 2012-06-06 09:17:31 +0000
3+++ product/product_demo.xml 2013-04-10 07:12:20 +0000
4@@ -170,7 +170,7 @@
5 <field name="name">Customizable PC</field>
6 <field name="type">product</field>
7 <field name="categ_id" ref="product_category_pc"/>
8- <field name="state">end</field>
9+ <field name="state" ref="product_attributes.status_5" />
10 </record>
11 <record id="product_product_mb1" model="product.product">
12 <field name="default_code">MB1</field>
13@@ -193,7 +193,7 @@
14 <field name="name">Mainboard ASUStek A7V8X-X</field>
15 <field name="type">product</field>
16 <field name="categ_id" ref="product_category_10"/>
17- <field name="state">draft</field>
18+ <field name="state" ref="product_attributes.status_1" />
19 </record>
20 <record id="product_product_cpu1" model="product.product">
21 <field name="default_code">CPU1</field>

Subscribers

People subscribed via source and target branches

to all changes: