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

[Quentin THEURET @Amaris]

[lp:~unifield-team/unifield-addons/unifield-addons_1042]

4575. By Quentin THEURET @Amaris on 2013-04-10

Merge code from Pilot2.0

=== modified file 'product/product_demo.xml'
--- product/product_demo.xml	2012-06-06 09:17:31 +0000
+++ product/product_demo.xml	2013-04-10 07:12:20 +0000
@@ -170,7 +170,7 @@
             <field name="name">Customizable PC</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_pc"/>
-            <field name="state">end</field>
+            <field name="state" ref="product_attributes.status_5" />
         </record>
         <record id="product_product_mb1" model="product.product">
             <field name="default_code">MB1</field>
@@ -193,7 +193,7 @@
             <field name="name">Mainboard ASUStek A7V8X-X</field>
             <field name="type">product</field>
             <field name="categ_id" ref="product_category_10"/>
-            <field name="state">draft</field>
+            <field name="state" ref="product_attributes.status_1" />
         </record>
         <record id="product_product_cpu1" model="product.product">
             <field name="default_code">CPU1</field>