[MERGE] forward port of branch 7.0 up to de07c64

[odoo/odoo.git] / addons / product / product_data.xml

diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 4e62e1e..6605011 100644 (file)
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -5,7 +5,7 @@
     Resource: product.uom.categ
     -->
         <record id="product_category_all" model="product.category">
-            <field name="name">All products</field>
+            <field name="name">All</field>
         </record>
         <record id="product_category_1" model="product.category">
             <field name="parent_id" ref="product_category_all"/>
@@ -150,6 +150,7 @@ parameter) will see those record just disappear.
         <record id="item0" model="product.pricelist.item">
             <field name="price_version_id" ref="ver0"/>
             <field name="base" ref="list_price"/>
+            <field name="sequence">1000</field>
             <field name="name">Default Public Pricelist Line</field>
         </record>
 
@@ -185,7 +186,7 @@ parameter) will see those record just disappear.
         <record forcecreate="True" id="decimal_product_uos" model="decimal.precision">
             <field name="name">Product UoS</field>
             <field name="digits" eval="3"/>
-        </record>        
+        </record>
 
         <!--
         Product
@@ -198,6 +199,12 @@ parameter) will see those record just disappear.
             <field name="name">Service</field>
             <field name="categ_id" ref="product.product_category_all"/>
             <field name="type">service</field>
+            <field name="sale_ok" eval="False"/>
+        </record>
+
+        <!-- Product Public Categories -->
+        <record id="categ_others" model="product.public.category">
+            <field name="name">Others</field>
         </record>
     </data>
 </openerp>