Merge lp:~openerp-dev/openobject-addons/trunk-product-variants-ref-chm into lp:openobject-addons

[Christophe Matthieu (OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-product-variants-ref-chm]

9368. By Christophe Matthieu (OpenERP) on 2014-04-29

[WIP]

9369. By Christophe Matthieu (OpenERP) on 2014-04-29

[MERGE] from trunk

9370. By Christophe Matthieu (OpenERP) on 2014-04-29

[IMP] product: remove group_product_variant and group_product_mono

9371. By Christophe Matthieu (OpenERP) on 2014-04-29

[WIP]

9372. By Christophe Matthieu (OpenERP) on 2014-04-29

[WIP] product: move membership to product template

9373. By Christophe Matthieu (OpenERP) on 2014-04-29

[IMP] product: merge variants and information vue

9374. By Christophe Matthieu (OpenERP) on 2014-04-29

[IMP] product: create funcion field to sum product variant qty and move field xml to product template

9375. By Christophe Matthieu (OpenERP) on 2014-04-29

[IMP] product: remove is_only_child field and add is_product_variant field; add related field

9376. By Christophe Matthieu (OpenERP) on 2014-04-29

[WIP]

9377. By Christophe Matthieu (OpenERP) on 2014-04-30

[FIX] product product_available

9378. By Christophe Matthieu (OpenERP) on 2014-05-07

[MERGE] from trunk

9379. By Christophe Matthieu (OpenERP) on 2014-05-07

[FIX] product views

9380. By Christophe Matthieu (OpenERP) on 2014-05-07

[FIX] views mode primary of inherit

9381. By Christophe Matthieu (OpenERP) on 2014-05-07

[FIX] views mode primary of inherit

9382. By Christophe Matthieu (OpenERP) on 2014-05-07

[IMP] stock: move valuation field from product.product to product template

9383. By Christophe Matthieu (OpenERP) on 2014-05-07

[IMP] purshase add purchase_count function field on product.template

9384. By Christophe Matthieu (OpenERP) on 2014-05-07

[FIX] product views

9385. By Christophe Matthieu (OpenERP) on 2014-05-07

[FIX] product views

9386. By Christophe Matthieu (OpenERP) on 2014-05-07

[FIX] product views

9387. By Christophe Matthieu (OpenERP) on 2014-05-07

[FIX] product views

9388. By Christophe Matthieu (OpenERP) on 2014-05-07

[FIX] product views

9389. By Christophe Matthieu (OpenERP) on 2014-05-07

[FIX] product views

9390. By Christophe Matthieu (OpenERP) on 2014-05-07

[FIX] product views

9391. By Christophe Matthieu (OpenERP) on 2014-05-16

[MERGE] from trunk

9392. By Christophe Matthieu (OpenERP) on 2014-05-16

[FIX] website_sale: variant searches and search bare

9393. By Christophe Matthieu (OpenERP) on 2014-05-16

[IMP] website_sale: search with default_code, description_sale

9394. By Christophe Matthieu (OpenERP) on 2014-05-16

[FIX] stock: product views

9395. By Christophe Matthieu (OpenERP) on 2014-05-16

[FIX] product_expiry: product view

9396. By Christophe Matthieu (OpenERP) on 2014-05-19

[FIX] mrp: product view

9397. By Christophe Matthieu (OpenERP) on 2014-05-19

[IMP] product: search product template function of attribute and product.product

9398. By Christophe Matthieu (OpenERP) on 2014-05-19

[FIX] product: views

9399. By Christophe Matthieu (OpenERP) on 2014-05-19

[IMP] product: button layout

9400. By Christophe Matthieu (OpenERP) on 2014-05-19

[IMP] stock: display qty on hand (sum of variants) on product template

9401. By Christophe Matthieu (OpenERP) on 2014-05-19

[IMP] product: display qty on product template

9402. By Christophe Matthieu (OpenERP) on 2014-05-19

[FIX] purchase: product view

9403. By Christophe Matthieu (OpenERP) on 2014-05-19

[FIX] purchase: remove wrong product view

9404. By Christophe Matthieu (OpenERP) on 2014-05-19

[IMP] stock: product view

9405. By Christophe Matthieu (OpenERP) on 2014-05-19

[FIX] product view

9406. By Christophe Matthieu (OpenERP) on 2014-05-19

[FIX] product view

9407. By Christophe Matthieu (OpenERP) on 2014-05-19

[IMP] product view

9408. By Christophe Matthieu (OpenERP) on 2014-05-19

[IMP] product view

9409. By Christophe Matthieu (OpenERP) on 2014-05-19

[IMP] product view

9410. By Christophe Matthieu (OpenERP) on 2014-05-19

[IMP] product view

9411. By Christophe Matthieu (OpenERP) on 2014-05-19

[IMP] product view

9412. By Christophe Matthieu (OpenERP) on 2014-05-20

[IMP] product: Creation of variants; Try to unlink with savepoint

9413. By Christophe Matthieu (OpenERP) on 2014-05-20

[FIX] product: _check_ean_key and add contition for call create_variant_ids

9414. By Christophe Matthieu (OpenERP) on 2014-05-20

[IMP] membership: membership field invisible if type is not service

9415. By Christophe Matthieu (OpenERP) on 2014-05-20

[IMP] product: move warranty to product template, imp view

9416. By Christophe Matthieu (OpenERP) on 2014-05-20

[IMP] product: move point of sale fields from product to template

9417. By Christophe Matthieu (OpenERP) on 2014-05-20

[IMP] product: move 'Can be Expensed' and 'Can constitute a landed cost' from product to template

9418. By Christophe Matthieu (OpenERP) on 2014-05-20

[IMP] stock: moves route_ids from product to template

9419. By Christophe Matthieu (OpenERP) on 2014-05-22

[WIP] mrp.bom: refactoring: split mrp.bom

9420. By Christophe Matthieu (OpenERP) on 2014-05-22

[WIP] mrp: mrp.bom refactoring

9421. By Christophe Matthieu (OpenERP) on 2014-05-22

[IMP] stock: move track fields from product to template

9422. By Christophe Matthieu (OpenERP) on 2014-05-22

[FIX] mrp: access right and demo

9423. By Christophe Matthieu (OpenERP) on 2014-05-22

[IMP] mrp: bom view

9424. By Christophe Matthieu (OpenERP) on 2014-05-22

[FIX] mrp: remove domains: bom_id = False

9425. By Christophe Matthieu (OpenERP) on 2014-05-22

[FIX] mrp: bom

9426. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] mrp: bom and test

9427. By Christophe Matthieu (OpenERP) on 2014-05-23

[IMP] product: title view

9428. By Christophe Matthieu (OpenERP) on 2014-05-23

[IMP] product view

9429. By Christophe Matthieu (OpenERP) on 2014-05-23

[IMP] mrp: re-active report mrp.bom

9430. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] sale_mrp: test cancelation_propagate: remove company_id and name

9431. By Christophe Matthieu (OpenERP) on 2014-05-23

[IMP] mrp: bom & bom.line views

9432. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] mrp: mrp.bom.line editable tree view

9433. By Christophe Matthieu (OpenERP) on 2014-05-23

[IMP] mrp: add a search view for mrp.bom.line

9434. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] mrp: bom default values and call to _bom_find

9435. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] mrp: default value for product_uom

9436. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] mrp: order uom by id for default values

9437. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] website_sale: filter by attributes

9438. By Christophe Matthieu (OpenERP) on 2014-05-23

[IMP] product: split public category into website and pos

9439. By Christophe Matthieu (OpenERP) on 2014-05-23

[IMP] website_sale: add a test to customize page and use the variant filter

9440. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] pos: pos.category

9441. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] website_sale: category search

9442. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] website_sale: tour

9443. By Christophe Matthieu (OpenERP) on 2014-05-23

[IMP] product: simplify product demo data

9444. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] website_sale: tour cycling because the 'Product Attribute's Filters' template is activate.

9445. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] mrp: view, move view_type, view_mode from view to action

9446. By Christophe Matthieu (OpenERP) on 2014-05-26

[IMP] product: price_extra is function of attributes value and product template

9447. By Christophe Matthieu (OpenERP) on 2014-05-26

[FIX] website_sale: display variant prices and text-muted

9448. By Christophe Matthieu (OpenERP) on 2014-05-26

[IMP] website_sale: add type of attributes

9449. By Christophe Matthieu (OpenERP) on 2014-05-26

[FIX] website_sale: bug to display attribute values on product detail

9450. By Christophe Matthieu (OpenERP) on 2014-05-26

[IMP] product view

9451. By Christophe Matthieu (OpenERP) on 2014-05-26

[MERGE] from trunk

Unmerged revisions

9451. By Christophe Matthieu (OpenERP) on 2014-05-26

[MERGE] from trunk

9450. By Christophe Matthieu (OpenERP) on 2014-05-26

[IMP] product view

9449. By Christophe Matthieu (OpenERP) on 2014-05-26

[FIX] website_sale: bug to display attribute values on product detail

9448. By Christophe Matthieu (OpenERP) on 2014-05-26

[IMP] website_sale: add type of attributes

9447. By Christophe Matthieu (OpenERP) on 2014-05-26

[FIX] website_sale: display variant prices and text-muted

9446. By Christophe Matthieu (OpenERP) on 2014-05-26

[IMP] product: price_extra is function of attributes value and product template

9445. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] mrp: view, move view_type, view_mode from view to action

9444. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] website_sale: tour cycling because the 'Product Attribute's Filters' template is activate.

9443. By Christophe Matthieu (OpenERP) on 2014-05-23

[IMP] product: simplify product demo data

9442. By Christophe Matthieu (OpenERP) on 2014-05-23

[FIX] website_sale: tour

=== modified file 'account/product_view.xml'
--- account/product_view.xml	2014-01-22 09:58:26 +0000
+++ account/product_view.xml	2014-05-26 16:10:21 +0000
@@ -1,57 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="product_normal_form_view" model="ir.ui.view">
-            <field name="name">product.normal.form.inherit</field>
-            <field name="model">product.product</field>
+        <record id="product_template_form_view" model="ir.ui.view">
+            <field name="name">product.template.form.inherit</field>
+            <field name="model">product.template</field>
             <field name="priority">5</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
+                <page string="Sales" position="after">
                     <page string="Accounting" groups="account.group_account_invoice">
+                        <group>
+                            <label for="categ_id" string="Internal Category"/>
+                            <div><field name="categ_id" colspan="3" nolabel="1"/></div>
+                        </group>
                         <group name="properties">
                             <group>
                                 <field name="property_account_income" domain="[('type','=','other')]" groups="account.group_account_user"
-                                    attrs="{'readonly': [('is_only_child', '=', False)]}"/>
+                                    attrs="{'readonly': [('is_product_variant', '=', True)]}"/>
                                 <field name="taxes_id" colspan="2" widget="many2many_tags"
-                                    attrs="{'readonly':[ '|', ('sale_ok','=',0), ('is_only_child', '=', False)]}"/>
+                                    attrs="{'readonly':[ '|', ('sale_ok','=',0), ('is_product_variant', '=', True)]}"/>
                             </group>
                             <group>
                                 <field name="property_account_expense" domain="[('type','=','other')]" groups="account.group_account_user"
-                                    attrs="{'readonly': [('is_only_child', '=', False)]}"/>
+                                    attrs="{'readonly': [('is_product_variant', '=', True)]}"/>
                                 <field name="supplier_taxes_id" colspan="2" widget="many2many_tags"
-                                    attrs="{'readonly': [('is_only_child', '=', False)]}"/>
+                                    attrs="{'readonly': [('is_product_variant', '=', True)]}"/>
                             </group>
                         </group>
                     </page>
-                </notebook>
+                </page>
             </field>
         </record>
 
-        <record id="product_template_form_view" model="ir.ui.view">
-            <field name="name">product.template.product.form.inherit</field>
+        <record id="product_template_search_view" model="ir.ui.view">
+            <field name="name">product.template.search</field>
             <field name="model">product.template</field>
-            <field name="inherit_id" ref="product.product_template_form_view"/>
+            <field name="mode">primary</field>
+            <field name="inherit_id" ref="product.product_template_search_view"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Accounting">
-                        <group name="properties">
-                            <group>
-                                <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                <field name="taxes_id" colspan="2" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                <field name="supplier_taxes_id" colspan="2" widget="many2many_tags"/>
-                            </group>
-                        </group>
-                    </page>
-                </notebook>
-             </field>
+                <field name="product_variant_ids" position="after">
+                    <field name="categ_id"/>
+                </field>
+                <xpath expr="//group[@string='Group by...']" position="inside">
+                    <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}"/>
+                </xpath>
+            </field>
         </record>
 
-
-
         <record id="view_category_property_form" model="ir.ui.view">
             <field name="name">product.category.property.form.inherit</field>
             <field name="model">product.category</field>

=== modified file 'account_anglo_saxon/product_view.xml'
--- account_anglo_saxon/product_view.xml	2013-11-22 05:48:50 +0000
+++ account_anglo_saxon/product_view.xml	2014-05-26 16:10:21 +0000
@@ -1,29 +1,18 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <record id="product_normal_form_view" model="ir.ui.view">
+        <record id="product_template_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit.stock</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="account.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <field name="property_account_expense" position="after">
-                    <label string="" colspan="2"/>
-                    <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
-                    <newline/>
-                </field>
-            </field>
-        </record>
-
-        <record id="product_template_form_view" model="ir.ui.view">
-            <field name="name">product.template.product.form.inherit</field>
             <field name="model">product.template</field>
             <field name="inherit_id" ref="account.product_template_form_view"/>
             <field name="arch" type="xml">
                 <field name="property_account_expense" position="after">
+                    <label string="" colspan="2"/>
+                    <field name="purchase_ok" invisible="1"/>
                     <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
                     <newline/>
                 </field>
-             </field>
+            </field>
         </record>
 
         <record id="view_category_property_form" model="ir.ui.view">

=== modified file 'event_sale/event_sale_view.xml'
--- event_sale/event_sale_view.xml	2014-05-12 05:01:53 +0000
+++ event_sale/event_sale_view.xml	2014-05-26 16:10:21 +0000
@@ -1,18 +1,19 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="event_sale_product_form">
-             <field name="model">product.product</field>
-             <field name="inherit_id" ref="product.product_normal_form_view" />
+
+        <record model="ir.ui.view" id="event_sale_product_template_form">
+             <field name="model">product.template</field>
+             <field name="inherit_id" ref="product.product_template_form_view" />
              <field name="arch" type="xml">
-                <div name="options" position="after">
-                    <field name="event_ok" on_change="onchange_event_ok(type, event_ok, context)"
-                           attrs="{'readonly': [('is_only_child', '=', False)]}"/>
-                    <label for="event_ok"/>
+                <div name="options" position="inside">
+                    <div>
+                        <field name="event_ok" on_change="onchange_event_ok(type, event_ok, context)"/>
+                        <label for="event_ok"/>
+                    </div>
                 </div>
                 <field name='type' position="after">
-                    <field name="event_type_id" attrs="{'invisible': [('event_ok', '=', False)],
-                                                        'readonly': [('is_only_child', '=', False)]}"/>
+                    <field name="event_type_id" attrs="{'invisible': [('event_ok', '=', False)]}"/>
                 </field>
              </field>
         </record>
@@ -50,20 +51,6 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="event_sale_product_template_form">
-             <field name="model">product.template</field>
-             <field name="inherit_id" ref="product.product_template_form_view" />
-             <field name="arch" type="xml">
-                <div name="options" position="inside">
-                    <field name="event_ok" on_change="onchange_event_ok(type, event_ok, context)"/>
-                    <label for="event_ok"/>
-                </div>
-                <field name='company_id' position="after">
-                    <field name="event_type_id" attrs="{'invisible': [('event_ok', '=', False)]}"/>
-                </field>
-             </field>
-        </record>
-
         <record model="ir.ui.view" id="event_order_line">
              <field name="name">event.sale.order</field>
              <field name="model">sale.order</field>

=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2014-03-10 14:36:00 +0000
+++ hr_expense/hr_expense.py	2014-05-26 16:10:21 +0000
@@ -392,8 +392,8 @@
         return result
 
 
-class product_product(osv.osv):
-    _inherit = "product.product"
+class product_template(osv.osv):
+    _inherit = "product.template"
     _columns = {
         'hr_expense_ok': fields.boolean('Can be Expensed', help="Specify if the product can be selected in an HR expense line."),
     }

=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml	2014-04-11 13:18:42 +0000
+++ hr_expense/hr_expense_view.xml	2014-05-26 16:10:21 +0000
@@ -191,13 +191,15 @@
 
 
         <record id="view_product_hr_expense_form" model="ir.ui.view">
-            <field name="name">product.product.expense.form</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="name">product.template.expense.form</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
                 <div name="options" position="inside">
-                    <field name="hr_expense_ok"/>
-                    <label for="hr_expense_ok"/>
+                    <div>
+                        <field name="hr_expense_ok"/>
+                        <label for="hr_expense_ok"/>
+                    </div>
                 </div>
             </field>
         </record>

=== modified file 'membership/membership.py'
--- membership/membership.py	2013-10-27 12:31:04 +0000
+++ membership/membership.py	2014-05-26 16:10:21 +0000
@@ -462,7 +462,7 @@
         return super(Product,self).fields_view_get(cr, user, view_id, view_type, context, toolbar, submenu)
 
     '''Product'''
-    _inherit = 'product.product'
+    _inherit = 'product.template'
     _columns = {
         'membership': fields.boolean('Membership', help='Check if the product is eligible for membership.'),
         'membership_date_from': fields.date('Membership Start Date', help='Date from which membership becomes active.'),

=== modified file 'membership/membership_view.xml'
--- membership/membership_view.xml	2013-10-27 12:31:04 +0000
+++ membership/membership_view.xml	2014-05-26 16:10:21 +0000
@@ -8,7 +8,7 @@
 
         <record model="ir.ui.view" id="membership_product_search_form_view">
             <field name="name">membership.product.search.form</field>
-            <field name="model">product.product</field>
+            <field name="model">product.template</field>
             <field name="arch" type="xml">
                 <search string="Membership Products">
                     <field name="name" filter_domain="['|',('name','ilike',self),('code','ilike',self)]" string="Membership Product"/>
@@ -24,10 +24,9 @@
 
         <record model="ir.ui.view" id="membership_products_tree">
             <field name="name">Membership products</field>
-            <field name="model">product.product</field>
+            <field name="model">product.template</field>
             <field name="arch" type="xml">
                 <tree string="Membership products">
-                    <field name="code"/>
                     <field name="name"/>
                     <field name="membership_date_from"/>
                     <field name="membership_date_to"/>
@@ -41,7 +40,7 @@
 
         <record model="ir.ui.view" id="membership_products_form">
             <field name="name">Membership Products</field>
-            <field name="model">product.product</field>
+            <field name="model">product.template</field>
             <field name="arch" type="xml">
                 <form string="Membership products" version="7.0">
                     <sheet>
@@ -81,31 +80,27 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="product_normal_form_view">
+        <record model="ir.ui.view" id="product_template_form_view">
             <field name="name">Membership Products</field>
-            <field name="model">product.product</field>
+            <field name="model">product.template</field>
             <field name="priority">6</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                <page string="Accounting" position="after">
-                    <page string="Membership">
-                        <group col="1">
-                            <group>
-                                <field name="membership" readonly="0"/>
-                            </group>
-                            <group attrs="{'invisible':[('membership','=',False)]}">
-                                <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
-                                <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
-                            </group>
-                        </group>
-                    </page>
-                </page>
+                <field name="type" position="after">
+                    <field name="membership" readonly="0" attrs="{'invisible': [('type', '!=', 'service')]}"/>
+                </field>
+                <field name="description" position="before">
+                    <group attrs="{'invisible':[('membership','=',False)]}">
+                        <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                        <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                    </group>
+                </field>
             </field>
         </record>
 
         <record model="ir.actions.act_window" id="action_membership_products">
             <field name="name">Membership Products</field>
-            <field name="res_model">product.product</field>
+            <field name="res_model">product.template</field>
             <field name="domain">[('membership','=',True), ('type', '=', 'service')]</field>
             <field name="context">{'membership':True, 'type':'service', 'default_membership': True, 'default_type': 'service'}</field>
             <field name="search_view_id" ref="membership_product_search_form_view"/>

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2014-05-08 11:59:17 +0000
+++ mrp/mrp.py	2014-05-26 16:10:21 +0000
@@ -178,207 +178,266 @@
         bom_parent = bom_obj.browse(cr, uid, bom_id, context=context)
         for bom in self.browse(cr, uid, ids, context=context):
             if (bom_parent) or (bom.id == bom_id):
-                result[bom.id] = map(lambda x: x.id, bom.bom_lines)
+                result[bom.id] = map(lambda x: x.id, bom.bom_line_ids)
             else:
                 result[bom.id] = []
-            if bom.bom_lines:
+            if bom.bom_line_ids:
                 continue
             ok = ((name=='child_complete_ids'))
             if (bom.type=='phantom' or ok):
-                sids = bom_obj.search(cr, uid, [('bom_id','=',False),('product_id','=',bom.product_id.id)])
+                sids = bom_obj.search(cr, uid, [('product_tmpl_id','=',bom.product_tmpl_id.id)])
                 if sids:
                     bom2 = bom_obj.browse(cr, uid, sids[0], context=context)
-                    result[bom.id] += map(lambda x: x.id, bom2.bom_lines)
-
+                    result[bom.id] += map(lambda x: x.id, bom2.bom_line_ids)
         return result
 
     _columns = {
         'name': fields.char('Name', size=64),
         'code': fields.char('Reference', size=16),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the bills of material without removing it."),
-        'type': fields.selection([('normal', 'Normal BoM'), ('phantom', 'Sets / Phantom')], 'BoM Type', required=True,
-                                 help= "If a by-product is used in several products, it can be useful to create its own BoM. "\
-                                 "Though if you don't want separated production orders for this by-product, select Set/Phantom as BoM type. "\
-                                 "If a Phantom BoM is used for a root product, it will be sold and shipped as a set of components, instead of being produced."),
-        'date_start': fields.date('Valid From', help="Validity of this BoM or component. Keep empty if it's always valid."),
-        'date_stop': fields.date('Valid Until', help="Validity of this BoM or component. Keep empty if it's always valid."),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bills of material."),
+        'type': fields.selection([('normal', 'Normal'), ('phantom', 'Set')], 'BoM Type', required=True,
+                help= "Set: When processing a sales order for this product, the delivery order will contain the raw materials, instead of the finished product."),
         'position': fields.char('Internal Reference', size=64, help="Reference to a position in an external plan."),
-        'product_id': fields.many2one('product.product', 'Product', required=True),
-        'product_uos_qty': fields.float('Product UOS Qty'),
-        'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."),
+        'product_tmpl_id': fields.many2one('product.template', 'Product', required=True),
+        'product_id': fields.many2one('product.product', 'Product Variant',
+            domain="[('product_tmpl_id','=',product_tmpl_id)]",
+            help="If a product variant is defined the BOM is available only for this product."),
+        'bom_line_ids': fields.one2many('mrp.bom.line', 'bom_id', 'BoM Lines'),
+        
         'product_qty': fields.float('Product Quantity', required=True, digits_compute=dp.get_precision('Product Unit of Measure')),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control"),
+        'date_start': fields.date('Valid From', help="Validity of this BoM. Keep empty if it's always valid."),
+        'date_stop': fields.date('Valid Until', help="Validity of this BoM. Keep empty if it's always valid."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bills of material."),
+        'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of work centers) to produce the finished product. "\
+                "The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."),
         'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity."),
-        'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% within the production process."),
-        'bom_lines': fields.one2many('mrp.bom', 'bom_id', 'BoM Lines'),
-        'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True),
-        'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."),
-        'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id', 'property_id', 'Properties'),
+        'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% during the production process."),
+        'property_ids': fields.many2many('mrp.property', string='Properties'),
         'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', string="BoM Hierarchy", type='many2many'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
     }
+
+    def _get_uom_id(self, cr, uid, *args):
+        return self.pool["product.uom"].search(cr, uid, [], limit=1, order='id')[0]
     _defaults = {
         'active': lambda *a: 1,
+        'product_qty': lambda *a: 1.0,
         'product_efficiency': lambda *a: 1.0,
-        'product_qty': lambda *a: 1.0,
         'product_rounding': lambda *a: 0.0,
         'type': lambda *a: 'normal',
+        'product_uom': _get_uom_id,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.bom', context=c),
     }
     _order = "sequence"
-    _parent_name = "bom_id"
-    _sql_constraints = [
-        ('bom_qty_zero', 'CHECK (product_qty>0)', 'All product quantities must be greater than 0.\n' \
-            'You should install the mrp_byproduct module if you want to manage extra products on BoMs !'),
-    ]
-
-    def _check_recursion(self, cr, uid, ids, context=None):
-        level = 100
-        while len(ids):
-            cr.execute('select distinct bom_id from mrp_bom where id IN %s', (tuple(ids),))
-            ids = filter(None, map(lambda x: x[0], cr.fetchall()))
-            if not level:
-                return False
-            level -= 1
-        return True
-
-    def _check_product(self, cr, uid, ids, context=None):
-        all_prod = []
-        boms = self.browse(cr, uid, ids, context=context)
-        def check_bom(boms):
-            res = True
-            for bom in boms:
-                if bom.product_id.id in all_prod:
-                    res = res and False
-                all_prod.append(bom.product_id.id)
-                lines = bom.bom_lines
-                if lines:
-                    res = res and check_bom([bom_id for bom_id in lines if bom_id not in boms])
-            return res
-        return check_bom(boms)
-
-    _constraints = [
-        (_check_recursion, 'Error ! You cannot create recursive BoM.', ['parent_id']),
-        (_check_product, 'BoM line product should not be same as BoM product.', ['product_id']),
-    ]
-
-    def onchange_product_id(self, cr, uid, ids, product_id, name, product_qty=0, context=None):
-        """ Changes UoM and name if product_id changes.
-        @param name: Name of the field
-        @param product_id: Changed product_id
-        @return:  Dictionary of changed values
-        """
-        res = {}
-        if product_id:
-            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            res['value'] = {'name': prod.name, 'product_uom': prod.uom_id.id, 'product_uos_qty': 0, 'product_uos': False}
-            if prod.uos_id.id:
-                res['value']['product_uos_qty'] = product_qty * prod.uos_coeff
-                res['value']['product_uos'] = prod.uos_id.id
-        return res
-
-    def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
-        res = {'value': {}}
-        if not product_uom or not product_id:
-            return res
-        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-        uom = self.pool.get('product.uom').browse(cr, uid, product_uom, context=context)
-        if uom.category_id.id != product.uom_id.category_id.id:
-            res['warning'] = {'title': _('Warning'), 'message': _('The Product Unit of Measure you chose has a different category than in the product form.')}
-            res['value'].update({'product_uom': product.uom_id.id})
-        return res
-
-    def _bom_find(self, cr, uid, product_id, product_uom, properties=None):
+
+    def _bom_find(self, cr, uid, product_uom, product_tmpl_id=None, product_id=None, properties=None):
         """ Finds BoM for particular product and product uom.
-        @param product_id: Selected product.
+        @param product_tmpl_id: Selected product.
         @param product_uom: Unit of measure of a product.
         @param properties: List of related properties.
         @return: False or BoM id.
         """
         if properties is None:
             properties = []
-        domain = [('product_id', '=', product_id), ('bom_id', '=', False),
-            '|', ('date_start', '=', False), ('date_start', '<=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)),
-            '|', ('date_stop', '=', False), ('date_stop', '>=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT))]
+        domain = None
+        if product_id:
+            domain = ['|',('product_id', '=', product_id),('product_tmpl_id.product_variant_ids', '=', product_id)]
+        else:
+            domain = [('product_id', '=', False), ('product_tmpl_id', '=', product_tmpl_id)]
+        if product_uom:
+            domain +=  [('product_uom','=',product_uom)]
+        domain = domain + [ '|', ('date_start', '=', False), ('date_start', '<=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)),
+                            '|', ('date_stop', '=', False), ('date_stop', '>=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT))]
         ids = self.search(cr, uid, domain)
-        max_prop = 0
-        result = False
         for bom in self.pool.get('mrp.bom').browse(cr, uid, ids):
-            prop = 0
-            for prop_id in bom.property_ids:
-                if prop_id.id in properties:
-                    prop += 1
-            if (prop > max_prop) or ((max_prop == 0) and not result):
-                result = bom.id
-                max_prop = prop
-        return result
+            if not set(map(int,bom.property_ids or [])) - set(properties or []):
+                return bom.id
+        return False
 
-    def _bom_explode(self, cr, uid, bom, factor, properties=None, addthis=False, level=0, routing_id=False):
+    def _bom_explode(self, cr, uid, bom, product, factor, properties=None, level=0, routing_id=False, previous_products=None, master_bom=None):
         """ Finds Products and Work Centers for related BoM for manufacturing order.
-        @param bom: BoM of particular product.
+        @param bom: BoM of particular product template.
+        @param product: Select a particular variant of the BoM. If False use BoM without variants.
         @param factor: Factor of product UoM.
         @param properties: A List of properties Ids.
-        @param addthis: If BoM found then True else False.
         @param level: Depth level to find BoM lines starts from 10.
+        @param previous_products: List of product previously use by bom explore to avoid recursion
+        @param master_bom: When recursion, used to display the name of the master bom
         @return: result: List of dictionaries containing product details.
                  result2: List of dictionaries containing Work Center details.
         """
         routing_obj = self.pool.get('mrp.routing')
-        factor = factor / (bom.product_efficiency or 1.0)
-        factor = _common.ceiling(factor, bom.product_rounding)
-        if factor < bom.product_rounding:
-            factor = bom.product_rounding
+        all_prod = [] + (previous_products or [])
+        master_bom = master_bom or bom
+
+        def _factor(factor, product_efficiency, product_rounding):
+            factor = factor / (product_efficiency or 1.0)
+            factor = _common.ceiling(factor, product_rounding)
+            if factor < product_rounding:
+                factor = product_rounding
+            return factor
+
+        factor = _factor(factor, bom.product_efficiency, bom.product_rounding)
+
         result = []
         result2 = []
-        phantom = False
-        if bom.type == 'phantom' and not bom.bom_lines:
-            newbom = self._bom_find(cr, uid, bom.product_id.id, bom.product_uom.id, properties)
-
-            if newbom:
-                res = self._bom_explode(cr, uid, self.browse(cr, uid, [newbom])[0], factor * bom.product_qty, properties, addthis=True, level=level + 10)
-                result = result + res[0]
-                result2 = result2 + res[1]
-                phantom = True
-            else:
-                phantom = False
-        if not phantom:
-            if addthis and not bom.bom_lines:
+
+        routing = (routing_id and routing_obj.browse(cr, uid, routing_id)) or bom.routing_id or False
+        if routing:
+            for wc_use in routing.workcenter_lines:
+                wc = wc_use.workcenter_id
+                d, m = divmod(factor, wc_use.workcenter_id.capacity_per_cycle)
+                mult = (d + (m and 1.0 or 0.0))
+                cycle = mult * wc_use.cycle_nbr
+                result2.append({
+                    'name': tools.ustr(wc_use.name) + ' - ' + tools.ustr(bom.product_tmpl_id.name_get()[0][1]),
+                    'workcenter_id': wc.id,
+                    'sequence': level + (wc_use.sequence or 0),
+                    'cycle': cycle,
+                    'hour': float(wc_use.hour_nbr * mult + ((wc.time_start or 0.0) + (wc.time_stop or 0.0) + cycle * (wc.time_cycle or 0.0)) * (wc.time_efficiency or 1.0)),
+                })
+
+        for bom_line_id in bom.bom_line_ids:
+            if bom_line_id.date_start and bom_line_id.date_start > time.strftime(DEFAULT_SERVER_DATETIME_FORMAT) or \
+                bom_line_id.date_stop and bom_line_id.date_stop > time.strftime(DEFAULT_SERVER_DATETIME_FORMAT):
+                    continue
+            # check properties
+            if set(map(int,bom_line_id.property_ids or [])) - set(properties or []):
+                continue
+            # all bom_line_id variant values must be in the product
+            if bom_line_id.variants_ids:
+                if not product or (set(map(int,bom_line_id.variants_ids or [])) - set(map(int,product.variant_ids))):
+                    continue
+
+            if bom_line_id.product_id.id in all_prod:
+                raise osv.except_osv(_('Invalid Action!'), _('BoM "%s" contains a BoM line with a product recursion: "%s".') % (master_bom.name,bom_line_id.product_id.name_get()[0][1]))
+            all_prod.append(bom_line_id.product_id.id)
+            
+            if bom_line_id.type != "phantom":
                 result.append({
-                    'name': bom.product_id.name,
-                    'product_id': bom.product_id.id,
-                    'product_qty': bom.product_qty * factor,
-                    'product_uom': bom.product_uom.id,
-                    'product_uos_qty': bom.product_uos and bom.product_uos_qty * factor or False,
-                    'product_uos': bom.product_uos and bom.product_uos.id or False,
+                    'name': bom_line_id.product_id.name,
+                    'product_id': bom_line_id.product_id.id,
+                    'product_qty': _factor(bom_line_id.product_qty * factor, bom_line_id.product_efficiency, bom_line_id.product_rounding),
+                    'product_uom': bom_line_id.product_uom.id,
+                    'product_uos_qty': bom_line_id.product_uos and bom_line_id.product_uos_qty * factor or False,
+                    'product_uos': bom_line_id.product_uos and bom_line_id.product_uos.id or False,
                 })
-            routing = (routing_id and routing_obj.browse(cr, uid, routing_id)) or bom.routing_id or False
-            if routing:
-                for wc_use in routing.workcenter_lines:
-                    wc = wc_use.workcenter_id
-                    d, m = divmod(factor, wc_use.workcenter_id.capacity_per_cycle)
-                    mult = (d + (m and 1.0 or 0.0))
-                    cycle = mult * wc_use.cycle_nbr
-                    result2.append({
-                        'name': tools.ustr(wc_use.name) + ' - ' + tools.ustr(bom.product_id.name),
-                        'workcenter_id': wc.id,
-                        'sequence': level + (wc_use.sequence or 0),
-                        'cycle': cycle,
-                        'hour': float(wc_use.hour_nbr * mult + ((wc.time_start or 0.0) + (wc.time_stop or 0.0) + cycle * (wc.time_cycle or 0.0)) * (wc.time_efficiency or 1.0)),
-                    })
-            for bom2 in bom.bom_lines:
-                res = self._bom_explode(cr, uid, bom2, factor, properties, addthis=True, level=level + 10)
-                result = result + res[0]
-                result2 = result2 + res[1]
+            else:
+                bom_id = self._bom_find(cr, uid, bom_line_id.product_uom.id, product_id=bom_line_id.product_id.id, properties=properties)
+                bom2 = self.browse(cr, uid, bom_id)  
+                if bom2:
+                    res = self._bom_explode(cr, uid, bom2, bom_line_id.product_id, factor,
+                        properties=properties, level=level + 10, previous_products=all_prod, master_bom=master_bom)
+                    result = result + res[0]
+                    result2 = result2 + res[1]
+                else:
+                    raise osv.except_osv(_('Invalid Action!'), _('BoM "%s" contains a phantom BoM line but the product "%s" don\'t have any BoM defined.') % (master_bom.name,bom_line_id.product_id.name_get()[0][1]))
+
         return result, result2
 
     def copy_data(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
         bom_data = self.read(cr, uid, id, [], context=context)
-        default.update(name=_("%s (copy)") % (bom_data['name']), bom_id=False)
+        default.update(name=_("%s (copy)") % (bom_data['name']))
         return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context)
 
+    def onchange_uom(self, cr, uid, ids, product_tmpl_id, product_uom, context=None):
+        res = {'value': {}}
+        if not product_uom or not product_tmpl_id:
+            return res
+        product = self.pool.get('product.template').browse(cr, uid, product_tmpl_id, context=context)
+        uom = self.pool.get('product.uom').browse(cr, uid, product_uom, context=context)
+        if uom.category_id.id != product.uom_id.category_id.id:
+            res['warning'] = {'title': _('Warning'), 'message': _('The Product Unit of Measure you chose has a different category than in the product form.')}
+            res['value'].update({'product_uom': product.uom_id.id})
+        return res
+
+    def onchange_product_tmpl_id(self, cr, uid, ids, product_tmpl_id, product_qty=0, context=None):
+        """ Changes UoM and name if product_id changes.
+        @param product_id: Changed product_id
+        @return:  Dictionary of changed values
+        """
+        res = {}
+        if product_tmpl_id:
+            prod = self.pool.get('product.template').browse(cr, uid, product_tmpl_id, context=context)
+            res['value'] = {
+                'name': prod.name,
+                'product_uom': prod.uom_id.id,
+            }
+        return res
+
+class mrp_bom_line(osv.osv):
+    _name = 'mrp.bom.line'
+    _order = "sequence"
+
+    _columns = {
+        'type': fields.selection([('normal', 'Normal'), ('phantom', 'Phantom')], 'BoM Line Type', required=True,
+                help="Phantom: this product line will not appear in the raw materials of manufacturing orders,"
+                     "it will be directly replaced by the raw materials of its own BoM, without triggering"
+                     "an extra manufacturing order."),
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'product_uos_qty': fields.float('Product UOS Qty'),
+        'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."),
+        'product_qty': fields.float('Product Quantity', required=True, digits_compute=dp.get_precision('Product Unit of Measure')),
+        'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True,
+            help="Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control"),
+        
+        'date_start': fields.date('Valid From', help="Validity of component. Keep empty if it's always valid."),
+        'date_stop': fields.date('Valid Until', help="Validity of component. Keep empty if it's always valid."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying."),
+        'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."),
+        'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity."),
+        'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% within the production process."),
+        'property_ids': fields.many2many('mrp.property', string='Properties'),
+
+        'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True, required=True),
+        'variants_ids': fields.many2many('product.attribute.value', string='Variants', help="BOM Product Variants needed form apply this line."),
+    }
+
+    def _get_uom_id(self, cr, uid, *args):
+        return self.pool["product.uom"].search(cr, uid, [], limit=1, order='id')[0]
+    _defaults = {
+        'product_qty': lambda *a: 1.0,
+        'product_efficiency': lambda *a: 1.0,
+        'product_rounding': lambda *a: 0.0,
+        'type': lambda *a: 'normal',
+        'product_uom': _get_uom_id,
+    }
+    _sql_constraints = [
+        ('bom_qty_zero', 'CHECK (product_qty>0)', 'All product quantities must be greater than 0.\n' \
+            'You should install the mrp_byproduct module if you want to manage extra products on BoMs !'),
+    ]
+
+    def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
+        res = {'value': {}}
+        if not product_uom or not product_id:
+            return res
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        uom = self.pool.get('product.uom').browse(cr, uid, product_uom, context=context)
+        if uom.category_id.id != product.uom_id.category_id.id:
+            res['warning'] = {'title': _('Warning'), 'message': _('The Product Unit of Measure you chose has a different category than in the product form.')}
+            res['value'].update({'product_uom': product.uom_id.id})
+        return res
+
+    def onchange_product_id(self, cr, uid, ids, product_id, product_qty=0, context=None):
+        """ Changes UoM if product_id changes.
+        @param product_id: Changed product_id
+        @return:  Dictionary of changed values
+        """
+        res = {}
+        if product_id:
+            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            res['value'] = {
+                'product_uom': prod.uom_id.id,
+                'product_uos_qty': 0,
+                'product_uos': False
+            }
+            if prod.uos_id.id:
+                res['value']['product_uos_qty'] = product_qty * prod.uos_coeff
+                res['value']['product_uos'] = prod.uos_id.id
+        return res
 
 class mrp_production(osv.osv):
     """
@@ -475,7 +534,7 @@
         'date_planned': fields.datetime('Scheduled Date', required=True, select=1, readonly=True, states={'draft': [('readonly', False)]}),
         'date_start': fields.datetime('Start Date', select=True, readonly=True),
         'date_finished': fields.datetime('End Date', select=True, readonly=True),
-        'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id', '=', False)], readonly=True, states={'draft': [('readonly', False)]},
+        'bom_id': fields.many2one('mrp.bom', 'Bill of Material', readonly=True, states={'draft': [('readonly', False)]},
             help="Bill of Materials allow you to define the list of required raw materials to make a finished product."),
         'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft': [('readonly', False)]},
             help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
@@ -586,7 +645,7 @@
             }}
         bom_obj = self.pool.get('mrp.bom')
         product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-        bom_id = bom_obj._bom_find(cr, uid, product.id, product.uom_id and product.uom_id.id, [])
+        bom_id = bom_obj._bom_find(cr, uid, product.uom_id and product.uom_id.id, product_id=product.id, properties=[])
         routing_id = False
         if bom_id:
             bom_point = bom_obj.browse(cr, uid, bom_id, context=context)
@@ -635,7 +694,7 @@
             bom_point = production.bom_id
             bom_id = production.bom_id.id
             if not bom_point:
-                bom_id = bom_obj._bom_find(cr, uid, production.product_id.id, production.product_uom.id, properties)
+                bom_id = bom_obj._bom_find(cr, uid, production.product_uom.id, product_id=production.product_id.id, properties=properties)
                 if bom_id:
                     bom_point = bom_obj.browse(cr, uid, bom_id)
                     routing_id = bom_point.routing_id.id or False
@@ -646,9 +705,8 @@
 
             # get components and workcenter_lines from BoM structure
             factor = uom_obj._compute_qty(cr, uid, production.product_uom.id, production.product_qty, bom_point.product_uom.id)
-            res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties, routing_id=production.routing_id.id)
-            results = res[0]  # product_lines
-            results2 = res[1]  # workcenter_lines
+            # product_lines, workcenter_lines
+            results, results2 = bom_obj._bom_explode(cr, uid, bom_point, production.product_id, factor / bom_point.product_qty, properties, routing_id=production.routing_id.id)
             # reset product_lines in production order
             for line in results:
                 line['production_id'] = production.id
@@ -777,15 +835,18 @@
         dicts = {}
         # Find product qty to be consumed and consume it
         for scheduled in production.product_lines:
-            consumed_qty = consumed_data.get(scheduled.product_id.id, 0.0)
+            product_id = scheduled.product_id.id
+
+            consumed_qty = consumed_data.get(product_id, 0.0)
+            
             # qty available for consume and produce
             qty_avail = scheduled.product_qty - consumed_qty
             if qty_avail <= 0.0:
                 # there will be nothing to consume for this raw material
                 continue
 
-            if not dicts.get(scheduled.product_id.id):
-                dicts[scheduled.product_id.id] = {}
+            if not dicts.get(product_id):
+                dicts[product_id] = {}
 
             # total qty of consumed product we need after this consumption
             total_consume = ((product_qty + produced_qty) * scheduled.product_qty / production.product_qty)
@@ -795,9 +856,8 @@
             for move in production.move_lines:
                 if qty <= 0.0:
                     break
-                if move.product_id.id != scheduled.product_id.id:
+                if move.product_id.id != product_id:
                     continue
-                product_id = scheduled.product_id.id
 
                 q = min(move.product_qty, qty)
                 quants = quant_obj.quants_get_prefered_domain(cr, uid, move.location_id, scheduled.product_id, q, domain=[('qty', '>', 0.0)],
@@ -895,7 +955,8 @@
                     #consumed more in wizard than previously planned
                     product = self.pool.get('product.product').browse(cr, uid, consume['product_id'], context=context)
                     extra_move_id = self._make_consume_line_from_data(cr, uid, production, product, product.uom_id.id, remaining_qty, False, 0, context=context)
-                    stock_mov_obj.action_done(cr, uid, [extra_move_id], context=context)
+                    if extra_move_id:
+                        stock_mov_obj.action_done(cr, uid, [extra_move_id], context=context)
 
         self.message_post(cr, uid, production_id, body=_("%s produced") % self._description, context=context)
         self.signal_button_produce_done(cr, uid, [production_id])
@@ -1111,24 +1172,4 @@
         'production_id': fields.many2one('mrp.production', 'Production Order', select=True),
     }
 
-class product_product(osv.osv):
-    _inherit = "product.product"
-    def _bom_orders_count(self, cr, uid, ids, field_name, arg, context=None):
-        Bom = self.pool('mrp.bom')
-        Production = self.pool('mrp.production')
-        return {
-            product_id: {
-                'bom_count': Bom.search_count(cr, uid, [('product_id', '=', product_id), ('bom_id', '=', False)], context=context),
-                'mo_count': Production.search_count(cr,uid, [('product_id', '=', product_id)], context=context),
-                'bom_strct': Bom.search_count(cr, uid, [('product_id', '=', product_id), ('bom_id', '=', False)], context=context),
-            }
-            for product_id in ids
-        }
-    _columns = {
-        'bom_ids': fields.one2many('mrp.bom', 'product_id', 'Bill of Materials'),
-        'bom_count': fields.function(_bom_orders_count, string='# Bill of Material', type='integer', multi="_bom_order_count"),
-        'bom_strct': fields.function(_bom_orders_count, string='# Bill of Material Structure', type='integer', multi="_bom_order_count"),
-        'mo_count': fields.function(_bom_orders_count, string='# Manufacturing Orders', type='integer', multi="_bom_order_count"),
-    }
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'mrp/mrp_demo.xml'
--- mrp/mrp_demo.xml	2014-01-20 14:42:43 +0000
+++ mrp/mrp_demo.xml	2014-05-26 16:10:21 +0000
@@ -245,407 +245,366 @@
 
         <record id="mrp_bom_1" model="mrp.bom">
             <field name="name">HDD 500GB</field>
-            <field name="product_id" ref="product.product_product_18"/>
-            <field name="product_qty">1</field>
+            <field name="product_tmpl_id" ref="product.product_product_18_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
             <field name="routing_id" ref="mrp_routing_0"/>
             <field name="type">normal</field>
         </record>
 
+        <record id="mrp_bom_line_1" model="mrp.bom.line">
+            <field name="product_id" ref="product.product_product_17"/>
+            <field name="product_qty">2</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="sequence">5</field>            
+            <field name="type">normal</field>
+            <field name="bom_id" ref="mrp_bom_1"/>
+        </record>
+
         <record id="mrp_bom_2" model="mrp.bom">
-            <field name="name">320GB HDD</field>
-            <field name="product_id" ref="product.product_product_17"/>
-            <field name="product_qty">2</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">5</field>            
-            <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_1"/>
-        </record>
-
-        <record id="mrp_bom_3" model="mrp.bom">
             <field name="name">HDD 2TB on Demand</field>
-            <field name="product_id" ref="product.product_product_19"/>
-            <field name="product_qty">1</field>
+            <field name="product_tmpl_id" ref="product.product_product_19_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
             <field name="routing_id" ref="mrp_routing_1"/>
             <field name="type">normal</field>
         </record>
 
-        <record id="mrp_bom_4" model="mrp.bom">
-            <field name="name">HDD 500GB</field>
+        <record id="mrp_bom_line_2" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_18"/>
             <field name="product_qty">4</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
             <field name="type">normal</field>
+            <field name="bom_id" ref="mrp_bom_2"/>
+        </record>
+
+        <record id="mrp_bom_3" model="mrp.bom">
+            <field name="name">HDD on Demand</field>
+            <field name="product_tmpl_id" ref="product.product_product_19_product_template"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="sequence">10</field>            
+            <field name="type">normal</field>
+        </record>
+
+        <record id="mrp_bom_line_3" model="mrp.bom.line">
+            <field name="product_id" ref="product.product_product_17"/>
+            <field name="product_qty">1</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="sequence">5</field>            
+            <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_3"/>
         </record>
 
-        <record id="mrp_bom_5" model="mrp.bom">
-            <field name="name">HDD on Demand</field>
-            <field name="product_id" ref="product.product_product_19"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">10</field>            
-            <field name="type">normal</field>
-        </record>
-
-        <record id="mrp_bom_6" model="mrp.bom">
-            <field name="name">320GB HDD</field>
-            <field name="product_id" ref="product.product_product_17"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">5</field>            
-            <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_5"/>
-        </record>
-
-        <record id="mrp_bom_7" model="mrp.bom">
+        <record id="mrp_bom_4" model="mrp.bom">
             <field name="name">Laptop Customized</field>
-            <field name="product_id" ref="product.product_product_27"/>
-            <field name="product_qty">1</field>
+            <field name="product_tmpl_id" ref="product.product_product_27_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
             <field name="routing_id" ref="mrp_routing_1"/>
             <field name="type">normal</field>
         </record>
 
-        <record id="mrp_bom_8" model="mrp.bom">
-            <field name="name">Windows 7 Professional</field>
+        <record id="mrp_bom_line_4" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_40"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_7"/>
+            <field name="bom_id" ref="mrp_bom_4"/>
         </record>
 
-        <record id="mrp_bom_9" model="mrp.bom">
-            <field name="name">USB Keyboard, QWERTY</field>
+        <record id="mrp_bom_line_5" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_8"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_7"/>
+            <field name="bom_id" ref="mrp_bom_4"/>
         </record>
 
-        <record id="mrp_bom_10" model="mrp.bom">
-            <field name="name">Mouse, Wireless</field>
+        <record id="mrp_bom_line_6" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_12"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_7"/>
+            <field name="bom_id" ref="mrp_bom_4"/>
         </record>
 
-        <record id="mrp_bom_11" model="mrp.bom">
+        <record id="mrp_bom_5" model="mrp.bom">
             <field name="name">Laptop Customized + Azerty</field>
-            <field name="product_id" ref="product.product_product_27"/>
-            <field name="product_qty">1</field>
+            <field name="product_tmpl_id" ref="product.product_product_27_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
             <field name="type">normal</field>
         </record>
 
-        <record id="mrp_bom_12" model="mrp.bom">
-            <field name="name">Windows 7 Professional</field>
+        <record id="mrp_bom_line_7" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_40"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_11"/>
+            <field name="bom_id" ref="mrp_bom_5"/>
         </record>
 
-        <record id="mrp_bom_13" model="mrp.bom">
-            <field name="name">USB Keyboard, AZERTY</field>
+        <record id="mrp_bom_line_8" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_9"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_11"/>
+            <field name="bom_id" ref="mrp_bom_5"/>
         </record>
 
-        <record id="mrp_bom_14" model="mrp.bom">
-            <field name="name">Mouse, Laser</field>
+        <record id="mrp_bom_line_9" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_11"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_11"/>
+            <field name="bom_id" ref="mrp_bom_5"/>
         </record>
 
-        <record id="mrp_bom_15" model="mrp.bom">
+        <record id="mrp_bom_6" model="mrp.bom">
             <field name="name">Computer Case-1</field>
-            <field name="product_id" ref="product.product_product_16"/>
-            <field name="product_qty">1</field>
+            <field name="product_tmpl_id" ref="product.product_product_16_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
             <field name="type">normal</field>
         </record>
 
-        <record id="mrp_bom_16" model="mrp.bom">
-            <field name="name">Processesor AMD 8-Core</field>
+        <record id="mrp_bom_line_10" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_23"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_15"/>
+            <field name="bom_id" ref="mrp_bom_6"/>
         </record>
 
-        <record id="mrp_bom_17" model="mrp.bom">
-            <field name="name">Motherboard I9P57</field>
+        <record id="mrp_bom_line_11" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_20"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_15"/>
+            <field name="bom_id" ref="mrp_bom_6"/>
         </record>
 
-        <record id="mrp_bom_18" model="mrp.bom">
-            <field name="name">HDD 320GB</field>
+        <record id="mrp_bom_line_12" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_17"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">8</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_15"/>
+            <field name="bom_id" ref="mrp_bom_6"/>
         </record>
 
-        <record id="mrp_bom_19" model="mrp.bom">
+        <record id="mrp_bom_7" model="mrp.bom">
             <field name="name">Computer Case-2</field>
-            <field name="product_id" ref="product.product_product_16"/>
-            <field name="product_qty">1</field>
+            <field name="product_tmpl_id" ref="product.product_product_16_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
             <field name="type">normal</field>
         </record>
 
-        <record id="mrp_bom_20" model="mrp.bom">
-            <field name="name">Processor Core i5 2.70 Ghz</field>
+        <record id="mrp_bom_line_13" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_22"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_19"/>
+            <field name="bom_id" ref="mrp_bom_7"/>
         </record>
 
-        <record id="mrp_bom_21" model="mrp.bom">
-            <field name="name">Motherboard A20Z7</field>
+        <record id="mrp_bom_line_14" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_21"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_19"/>
+            <field name="bom_id" ref="mrp_bom_7"/>
         </record>
 
-        <record id="mrp_bom_22" model="mrp.bom">
-            <field name="name">HDD 500GB</field>
+        <record id="mrp_bom_line_15" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_18"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_19"/>
+            <field name="bom_id" ref="mrp_bom_7"/>
         </record>
 
-        <record id="mrp_bom_23" model="mrp.bom">
-            <field name="name">Graphics Card</field>
+        <record id="mrp_bom_line_16" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_24"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_19"/>
+            <field name="bom_id" ref="mrp_bom_7"/>
         </record>
 
-        <record id="mrp_bom_24" model="mrp.bom">
+        <record id="mrp_bom_8" model="mrp.bom">
             <field name="name">PC Assemble + 2GB RAM</field>
-            <field name="product_id" ref="product.product_product_4"/>
-            <field name="product_qty">1</field>
+            <field name="product_tmpl_id" ref="product.product_product_4_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
             <field name="type">phantom</field>
         </record>
 
-        <record id="mrp_bom_25" model="mrp.bom">
-            <field name="name">15" LCD Monitor </field>
+        <record id="mrp_bom_line_17" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_6"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_24"/>
+            <field name="bom_id" ref="mrp_bom_8"/>
         </record>
 
-        <record id="mrp_bom_26" model="mrp.bom">
-            <field name="name">Computer Case-1</field>
+        <record id="mrp_bom_line_18" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_16"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_24"/>
+            <field name="bom_id" ref="mrp_bom_8"/>
         </record>
 
-        <record id="mrp_bom_27" model="mrp.bom">
-            <field name="name">Mouse, Laser</field>
+        <record id="mrp_bom_line_19" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_11"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_24"/>
+            <field name="bom_id" ref="mrp_bom_8"/>
         </record>
 
-        <record id="mrp_bom_28" model="mrp.bom">
-            <field name="name">USB Keyboard, QWERTY</field>
+        <record id="mrp_bom_line_20" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_8"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">8</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_24"/>
+            <field name="bom_id" ref="mrp_bom_8"/>
         </record>
 
-        <record id="mrp_bom_29" model="mrp.bom">
-            <field name="name">RAM DDR2 1GB</field>
+        <record id="mrp_bom_line_21" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_15"/>
             <field name="product_qty">2</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_24"/>
+            <field name="bom_id" ref="mrp_bom_8"/>
         </record>
 
-        <record id="mrp_bom_30" model="mrp.bom">
+        <record id="mrp_bom_9" model="mrp.bom">
             <field name="name">PC Assemble + 512MB RAM</field>
-            <field name="product_id" ref="product.product_product_3"/>
-            <field name="product_qty">1</field>
+            <field name="product_tmpl_id" ref="product.product_product_3_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
             <field name="routing_id" ref="mrp_routing_2"/>
             <field name="type">phantom</field>
         </record>
 
-        <record id="mrp_bom_31" model="mrp.bom">
-            <field name="name">17" LCD Monitor</field>
+        <record id="mrp_bom_line_22" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_7"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_30"/>
+            <field name="bom_id" ref="mrp_bom_9"/>
         </record>
 
-        <record id="mrp_bom_32" model="mrp.bom">
-            <field name="name">Computer Case-2</field>
+        <record id="mrp_bom_line_23" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_16"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_30"/>
+            <field name="bom_id" ref="mrp_bom_9"/>
         </record>
 
-        <record id="mrp_bom_33" model="mrp.bom">
-            <field name="name">Mouse, Laser</field>
+        <record id="mrp_bom_line_24" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_11"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_30"/>
+            <field name="bom_id" ref="mrp_bom_9"/>
         </record>
 
-        <record id="mrp_bom_34" model="mrp.bom">
-            <field name="name">USB Keyboard, QWERTY</field>
+        <record id="mrp_bom_line_25" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_8"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">8</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_30"/>
+            <field name="bom_id" ref="mrp_bom_9"/>
         </record>
 
-        <record id="mrp_bom_35" model="mrp.bom">
-            <field name="name">RAM DDR 512MB</field>
+        <record id="mrp_bom_line_26" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_13"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_30"/>
+            <field name="bom_id" ref="mrp_bom_9"/>
         </record>
 
-        <record id="mrp_bom_36" model="mrp.bom">
+        <record id="mrp_bom_10" model="mrp.bom">
             <field name="name">PC Assemble + Custom RAM (PC on Demand)</field>
-            <field name="product_id" ref="product.product_product_5"/>
-            <field name="product_qty">1</field>
+            <field name="product_tmpl_id" ref="product.product_product_5_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
             <field name="routing_id" ref="mrp_routing_2"/>
             <field name="type">phantom</field>
         </record>
 
-        <record id="mrp_bom_37" model="mrp.bom">
-            <field name="name">15" LCD Monitor </field>
+        <record id="mrp_bom_line_27" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_6"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">2</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_36"/>
+            <field name="bom_id" ref="mrp_bom_10"/>
         </record>
 
-        <record id="mrp_bom_38" model="mrp.bom">
-            <field name="name">Computer Case-1</field>
+        <record id="mrp_bom_line_28" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_16"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">4</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_36"/>
+            <field name="bom_id" ref="mrp_bom_10"/>
         </record>
 
-        <record id="mrp_bom_39" model="mrp.bom">
-            <field name="name">RAM DDR 512MB</field>
+        <record id="mrp_bom_line_29" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_13"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">6</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_36"/>
+            <field name="bom_id" ref="mrp_bom_10"/>
         </record>
 
-        <record id="mrp_bom_40" model="mrp.bom">
-            <field name="name">Mouse, Laser</field>
+        <record id="mrp_bom_line_30" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_11"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">8</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_36"/>
+            <field name="bom_id" ref="mrp_bom_10"/>
         </record>
 
-        <record id="mrp_bom_41" model="mrp.bom">
-            <field name="name">USB Keyboard, QWERTY</field>
+        <record id="mrp_bom_line_31" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_8"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">10</field>            
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_36"/>
+            <field name="bom_id" ref="mrp_bom_10"/>
         </record>
 
     <record id="mrp_production_1" model="mrp.production">
@@ -654,7 +613,7 @@
         <field name="product_qty">3</field>
         <field name="location_src_id" ref="stock.stock_location_stock"/>
         <field name="location_dest_id" ref="stock.stock_location_output"/>
-        <field name="bom_id" ref="mrp_bom_24"/>
+        <field name="bom_id" ref="mrp_bom_8"/>
         <field name="routing_id" ref="mrp.mrp_routing_2"/>
     </record>
 
@@ -663,7 +622,7 @@
         <field name="product_uom" ref="product.product_uom_unit"/>
         <field name="location_src_id" ref="stock.stock_location_stock"/>
         <field name="location_dest_id" ref="stock.stock_location_output"/>
-        <field name="bom_id" ref="mrp.mrp_bom_7"/>
+        <field name="bom_id" ref="mrp.mrp_bom_4"/>
         <field name="routing_id" ref="mrp.mrp_routing_1"/>
     </record>
     <workflow action="button_confirm" model="mrp.production" ref="mrp_production_1"/>

=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2014-05-07 18:29:17 +0000
+++ mrp/mrp_view.xml	2014-05-26 16:10:21 +0000
@@ -347,22 +347,17 @@
                 <form string="Bill of Material" version="7.0">
                     <group>
                         <group>
-                            <field name="product_id" on_change="onchange_product_id(product_id, name, product_qty, context)" class="oe_inline"/>
+                            <field name="product_tmpl_id" on_change="onchange_product_tmpl_id(product_tmpl_id, product_qty, context)"/>
+                            <field name="product_id"/>
+                            <field name="product_uom" class="oe_inline" on_change="onchange_uom(product_tmpl_id, product_uom)" groups="product.group_uom"/>
                             <label for="product_qty" string="Quantity"/>
                             <div>
-                                <field name="product_qty" class="oe_inline" on_change="onchange_product_id(product_id, name, product_qty, context)"/>
-                                <field name="product_uom" class="oe_inline" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
-                            </div>
-                            <label for="product_uos_qty" groups="product.group_uos"/>
-                            <div groups="product.group_uos" >
-                                <field name="product_uos_qty"
-                                    class="oe_inline"/>
-                                <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
-                                <field name="product_uos" class="oe_inline"/>
+                                <field name="product_qty" class="oe_inline" on_change="onchange_product_tmpl_id(product_tmpl_id, product_qty, context)"/>
+                                <field name="product_uom" class="oe_inline" on_change="onchange_uom(product_tmpl_id, product_uom)" groups="product.group_uom"/>
                             </div>
                             <label for="routing_id" class="oe_inline" groups="mrp.group_mrp_routings"/>
                             <div groups="mrp.group_mrp_routings">
-                            	<field name="routing_id" class="oe_inline"/>
+                                <field name="routing_id" class="oe_inline"/>
                             </div>
                         </group>
                         <group>
@@ -378,14 +373,19 @@
                     </group>
                     <notebook>
                         <page string="Components">
-                            <field name="bom_lines" widget="one2many_list">
+                            <field name="bom_line_ids" widget="one2many_list">
                                 <tree string="Components" editable="bottom">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="product_id" on_change="onchange_product_id(product_id, product_qty)"/>
+                                    <field name="type"/>
                                     <field name="product_qty"/>
+                                    <field name="product_rounding"/>
+                                    <field name="product_efficiency"/>
                                     <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
-                                    <field name="name" invisible="1"/>
                                     <field name="date_start"/>
                                     <field name="date_stop"/>
+                                    <field name="routing_id"/>
+                                    <field name="variants_ids" widget="many2many_tags"/>
                                 </tree>
                             </field>
                         </page>
@@ -393,7 +393,6 @@
                             <group>
                                 <group>
                                     <field name="position"/>
-                                    <field name="bom_id"/>
                                     <field name="sequence"/>
                                     <field name="active"/>
                                 </group>
@@ -422,11 +421,11 @@
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
                     <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
-                    <field name="bom_lines" string="Components"/>
-                    <field name="product_id"/>
+                    <field name="bom_line_ids" string="Components"/>
+                    <field name="product_tmpl_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_tmpl_id'}"/>
                         <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}"/>
                         <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
                         <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}"/>
@@ -439,13 +438,13 @@
        <record id="mrp_bom_tree_view" model="ir.ui.view">
             <field name="name">mrp.bom.tree</field>
             <field name="model">mrp.bom</field>
-            <field name="field_parent">child_complete_ids</field>
+            <!--field name="field_parent">child_complete_ids</field-->
             <field name="arch" type="xml">
                 <tree string="Bill of Materials">
                     <field name="sequence" invisible="1"/>
                     <field name="name" invisible="1"/>
+                    <field name="product_tmpl_id"/>
                     <field name="product_id"/>
-                    <field name="product_qty"/>
                     <field name="product_uom" groups="product.group_uom"/>
                     <field name="code"/>
                     <field name="type"/>
@@ -455,32 +454,12 @@
                 </tree>
             </field>
         </record>
-       <record id="mrp_bom_component_tree_view" model="ir.ui.view">
-            <field name="name">mrp.bom.component.tree</field>
-            <field name="model">mrp.bom</field>
-            <field name="field_parent">child_complete_ids</field>
-            <field name="arch" type="xml">
-                <tree string="BoM Structure">
-                    <field name="sequence" invisible="1"/>
-                    <field name="name" groups="base.group_no_one"/>
-                    <field name="code"/>
-                    <field name="product_id"/>
-                    <field name="bom_id" groups="product.group_mrp_properties"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom" groups="product.group_uom"/>
-                    <field name="type"/>
-                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
-                    <field name="date_start" groups="product.group_mrp_properties"/>
-                    <field name="date_stop" groups="product.group_mrp_properties"/>
-                </tree>
-            </field>
-        </record>
+
         <record id="mrp_bom_form_action" model="ir.actions.act_window">
             <field name="name">Bill of Materials</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
-            <field name="domain">[('bom_id','=',False)]</field>
             <field name="search_view_id" ref="view_mrp_bom_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
@@ -495,13 +474,56 @@
               </p>
             </field>
         </record>
+
+       <record id="mrp_bom_component_tree_view" model="ir.ui.view">
+            <field name="name">mrp.bom.component.tree</field>
+            <field name="model">mrp.bom.line</field>
+            <field name="arch" type="xml">
+                <tree string="Components" editable="top">
+                    <field name="sequence" widget="handle"/>
+                    <field name="bom_id"/>
+                    <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                    <field name="type"/>
+                    <field name="product_qty"/>
+                    <field name="product_rounding"/>
+                    <field name="product_efficiency"/>
+                    <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
+                    <field name="product_uos_qty" groups="product.group_uos"/>
+                    <field name="product_uos" groups="product.group_uos"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                    <field name="routing_id"/>
+                    <field name="variants_ids" widget="many2many_tags"/>
+                    <field name="property_ids" widget="many2many_tags"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_mrp_bom_line_filter" model="ir.ui.view">
+            <field name="name">mrp.bom.line.select</field>
+            <field name="model">mrp.bom.line</field>
+            <field name="arch" type="xml">
+                <search string="Search Bill Of Material Components">
+                    <field name="bom_id"/>
+                    <field name="product_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Bill Of Material" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'bom_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}"/>
+                        <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
+                        <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}"/>
+                        <filter string=" Valid From Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Valid From Date by Month"/>
+                   </group>
+                </search>
+            </field>
+        </record>
+
         <record id="mrp_bom_form_action2" model="ir.actions.act_window">
             <field name="name">Bill of Material Components</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.bom</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="mrp_bom_component_tree_view"/>
-            <field name="domain">[]</field>
+            <field name="res_model">mrp.bom.line</field>
+            <field name="view_type">tree</field>
+            <field name="view_mode">tree</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to add a component to a bill of material.
@@ -512,47 +534,32 @@
               </p>
             </field>
         </record>
-        <record id="product_search_form_view_procurment" model="ir.ui.view">
-             <field name="name">product.search.bom</field>
-             <field name="model">product.product</field>
-             <field name="inherit_id" ref="product.product_search_form_view"/>
+
+        <record id="product_template_search_view_procurment" model="ir.ui.view">
+             <field name="name">product.template.search.bom</field>
+             <field name="model">product.template</field>
+             <field name="inherit_id" ref="product.product_template_search_view"/>
              <field name="arch" type="xml">
                  <xpath expr="//filter[@string='Consumable']" position="after">
                      <separator/>
-                    <filter string="Components" name="components" icon="terp-accessories-archiver" domain="[('bom_ids','not in',[]),('bom_ids.bom_id','!=',False)]"/>
+                    <filter string="Components" name="components" icon="terp-accessories-archiver" domain="[('bom_ids','not in',[])]"/>
                  </xpath>
              </field>
         </record>
         
         <record id="product_template_form_view_inherit" model="ir.ui.view">
-             <field name="name">product.template.form.view.inherited</field>
+             <field name="name">product.product.form.view.inherited</field>
              <field name="model">product.product</field>
-             <field name="inherit_id" ref="product.product_template_form_view"/>
+             <field name="inherit_id" ref="product.product_normal_form_view"/>
              <field name="arch" type="xml">
-                  <xpath expr="//field[@name='warranty']" position="before">
-                    <label for="produce_delay"/>
-                    <div>
+                <group name="sale_condition" position="inside">
+                    <label for="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                    <div attrs="{'invisible':[('type','=','service')]}">
                         <field name="produce_delay" class="oe_inline"/> days
                     </div>
-                </xpath>
+                </group>
              </field>
         </record>
-        
-        <record id="view_normal_procurement_locations_form_inherited" model="ir.ui.view">
-            <field name="name">product.normal.procurement.locations.inherited</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='procurement_uom']" position="after">
-                    <group name="delay" string="Delays" attrs="{'invisible':[('type','=','service')]}">
-                        <label for="produce_delay" />
-                        <div attrs="{'invisible':[('type','=','service')]}">
-                            <field name="produce_delay" class="oe_inline" style="vertical-align:baseline"/> days
-                        </div>                        
-                    </group>                
-                </xpath>
-            </field>
-        </record>
 
         <record id="view_mrp_product_form_inherited" model="ir.ui.view">
             <field name="name">product.form.mrp.inherited</field>
@@ -686,7 +693,7 @@
                     </div>
                     <group>
                         <group>
-                            <field name="product_id" on_change="product_id_change(product_id, product_qty)" domain="[('bom_ids','!=',False),('bom_ids.bom_id','=',False),('bom_ids.type','!=','phantom')]" class="oe_inline" context='{"default_type": "product"}'/>
+                            <field name="product_id" on_change="product_id_change(product_id, product_qty)" domain="[('bom_ids','!=',False),('bom_ids.type','!=','phantom')]" class="oe_inline" context='{"default_type": "product"}'/>
                             <label for="product_qty"/>
                             <div>
                                 <field name="product_qty" class="oe_inline" on_change="product_id_change(product_id, product_qty)"/>
@@ -980,7 +987,7 @@
             <field name="arch" type="xml">
             <data>
                 <xpath expr="//field[@name='origin']" position="before">
-                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
+                    <field name="bom_id" domain="[('product_id','=',product_id)]"/>
                     <field name="production_id" attrs="{'invisible': [('production_id','=',False)]}"/>
                 </xpath>
                 <xpath expr="//field[@name='origin']" position="after">
@@ -992,7 +999,6 @@
             </field>
         </record>
 
-
         <!-- Menu for Resource for MRP-->
 
         <record id="mrp_workcenter_action" model="ir.actions.act_window">
@@ -1029,14 +1035,13 @@
 
         <record id="act_product_mrp_bom_open" model="ir.actions.act_window">
             <field name="name">BoM Structure</field>
-            <field name="context">{'default_product_id': active_id}</field>
-            <field name="domain">[('product_id', 'in', active_ids),('bom_id','=',False)]</field>
+            <field name="context">{'default_product_tmpl_id': active_id}</field>
+            <field name="domain">[('product_tmpl_id', 'in', active_ids)]</field>
             <field name="res_model">mrp.bom</field>
         </record>
         <record model="ir.actions.act_window" id="product_open_bom">
-            <field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
+            <field name="context">{'default_product_tmpl_id': active_id, 'search_default_product_tmpl_id': active_id}</field>
             <field name="name">Bill of Materials</field>
-            <field name="domain">[('bom_id','=',False)]</field>
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
         </record>
@@ -1046,12 +1051,12 @@
             <field name="res_model">mrp.production</field>
             <field name="view_id" ref="mrp_production_tree_view"/>
         </record>
-        <record model="ir.ui.view" id="product_form_view_bom_button">
-            <field name="name">product.product.procurement</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+        <record model="ir.ui.view" id="product_template_form_view_bom_button">
+            <field name="name">product.template.procurement</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='buttons']" position="inside">
+                <div name="buttons" position="inside">
                     <button class="oe_inline oe_stat_button" name="%(product_open_bom)d" type="action" 
                         groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-flask">
                         <field string="Bill of Materials" name="bom_count" widget="statinfo" />
@@ -1064,7 +1069,7 @@
                         groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-list-alt">
                         <field string="Manufacturing" name="mo_count" widget="statinfo" />
                     </button>
-                </xpath>
+                </div>
             </field>
         </record>
         

=== modified file 'mrp/procurement.py'
--- mrp/procurement.py	2014-05-07 17:14:31 +0000
+++ mrp/procurement.py	2014-05-26 16:10:21 +0000
@@ -62,7 +62,8 @@
         """
         for procurement in self.browse(cr, uid, ids, context=context):
             properties = [x.id for x in procurement.property_ids]
-            bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
+            bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_uom.id,
+                product_id=procurement.product_id.id, properties=properties)
             if not bom_id:
                 return False
         return True
@@ -83,7 +84,8 @@
                     routing_id = procurement.bom_id.routing_id.id
                 else:
                     properties = [x.id for x in procurement.property_ids]
-                    bom_id = bom_obj._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
+                    bom_id = bom_obj._bom_find(cr, uid, procurement.product_uom.id,
+                        product_id=procurement.product_id.id, properties=properties)
                     bom = bom_obj.browse(cr, uid, bom_id, context=context)
                     routing_id = bom.routing_id.id
 

=== modified file 'mrp/product.py'
--- mrp/product.py	2014-01-07 10:39:15 +0000
+++ mrp/product.py	2014-05-26 16:10:21 +0000
@@ -20,27 +20,59 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
+
+
+class product_template(osv.osv):
+    _inherit = "product.template"
+    def _bom_orders_count(self, cr, uid, ids, field_name, arg, context=None):
+        Bom = self.pool('mrp.bom')
+        res = {}
+        for product_tmpl_id in ids:
+            nb = Bom.search_count(cr, uid, [('product_tmpl_id', '=', product_tmpl_id)], context=context)
+            res[product_tmpl_id] = {
+                'bom_count': nb,
+                'bom_strct': nb,
+            }
+        return res
+
+    def _bom_orders_count_mo(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for product_tmpl_id in self.browse(cr, uid, ids):
+            res[product_tmpl_id.id] = sum([p.mo_count for p in product_tmpl_id.product_variant_ids])
+        return res
+
+    _columns = {
+        "bom_ids": fields.one2many('mrp.bom', 'product_tmpl_id','Bill of Materials'),
+        'bom_count': fields.function(_bom_orders_count, string='# Bill of Material', type='integer', multi="_bom_order_count"),
+        'bom_strct': fields.function(_bom_orders_count, string='# Bill of Material Structure', type='integer', multi="_bom_order_count"),
+        'mo_count': fields.function(_bom_orders_count_mo, string='# Manufacturing Orders', type='integer'),
+    }
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({
+            'bom_ids': []
+        })
+        return super(product_template, self).copy(cr, uid, id, default, context=context)
 
 class product_product(osv.osv):
-    _inherit = "product.product"    
+    _inherit = "product.product"
+    def _bom_orders_count(self, cr, uid, ids, field_name, arg, context=None):
+        Production = self.pool('mrp.production')
+        res = {}
+        for product_id in ids:
+            res[product_id] = Production.search_count(cr,uid, [('product_id', '=', product_id)], context=context)
+        return res
+
     _columns = {
-        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials', domain=[('bom_id','=',False)]),
         "produce_delay": fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."),
         'track_production': fields.boolean('Track Manufacturing Lots', help="Forces to specify a Serial Number for all moves containing this product and generated by a Manufacturing Order"),
+        'mo_count': fields.function(_bom_orders_count, string='# Manufacturing Orders', type='integer'),
     }
     
     _defaults = {
         "produce_delay": 1,
     }
-    def copy(self, cr, uid, id, default=None, context=None):
-        if not default:
-            default = {}
-        default.update({
-            'bom_ids': []
-        })
-        return super(product_product, self).copy(cr, uid, id, default, context=context)
 
 
 

=== modified file 'mrp/report/price.py'
--- mrp/report/price.py	2014-01-06 13:57:00 +0000
+++ mrp/report/price.py	2014-05-26 16:10:21 +0000
@@ -144,7 +144,7 @@
 
         for product in product_pool.browse(cr, uid, ids, context=context):
             product_uom_name = to_xml(product.uom_id.name)
-            bom_id = bom_pool._bom_find(cr, uid, product.id, product.uom_id.id)
+            bom_id = bom_pool._bom_find(cr, uid, product.uom_id.id, product_id=product.id)
             title = "<title>%s</title>" %(_("Cost Structure"))
             title += "<title>%s</title>" % (to_xml(product.name))
             xml += "<lines style='header'>" + title + prod_header + "</lines>"
@@ -168,7 +168,7 @@
             else:
                 bom = bom_pool.browse(cr, uid, bom_id, context=context)
                 factor = number * product.uom_id.factor / bom.product_uom.factor
-                sub_boms = bom_pool._bom_explode(cr, uid, bom, factor / bom.product_qty)
+                sub_boms = bom_pool._bom_explode(cr, uid, bom, product, factor / bom.product_qty)
                 total = 0
                 total_strd = 0
                 parent_bom = {

=== modified file 'mrp/security/ir.model.access.csv'
--- mrp/security/ir.model.access.csv	2014-05-02 13:03:52 +0000
+++ mrp/security/ir.model.access.csv	2014-05-26 16:10:21 +0000
@@ -4,6 +4,7 @@
 access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
 access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
 access_mrp_bom,mrp.bom,model_mrp_bom,group_mrp_user,1,0,0,0
+access_mrp_bom_line,mrp.bom.line,model_mrp_bom_line,group_mrp_user,1,0,0,0
 access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
 access_mrp_production_salesman,mrp.production salesman,model_mrp_production,base.group_sale_salesman,1,1,1,0
 access_mrp_production_product_line_salesman,mrp.production.product.line salesman,model_mrp_production_product_line,base.group_sale_salesman,1,0,1,0
@@ -14,6 +15,7 @@
 access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_manager,1,1,1,1
 access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_manager,1,1,1,1
 access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_manager,1,1,1,1
+access_mrp_bom_line_manager,mrp.bom.line.manager,model_mrp_bom_line,mrp.group_mrp_manager,1,1,1,1
 access_stock_location_mrp_worker,stock.location mrp_worker,stock.model_stock_location,mrp.group_mrp_user,1,0,0,0
 access_stock_move_mrp_worker,stock.move mrp_worker,stock.model_stock_move,mrp.group_mrp_user,1,1,1,0
 access_stock_picking_mrp_worker,stock.picking mrp_worker,stock.model_stock_picking,mrp.group_mrp_user,1,1,1,1
@@ -55,6 +57,8 @@
 access_report_workcenter_load_user,report.workcenter.load.user,model_report_workcenter_load,mrp.group_mrp_user,1,0,0,0
 access_mrp_bom_salesman,mrp.bom,model_mrp_bom,base.group_sale_salesman,1,0,0,0
 access_mrp_bom_stockuser,mrp.bom,model_mrp_bom,stock.group_stock_user,1,0,0,0
+access_mrp_bom_line_salesman,mrp.bom.line,model_mrp_bom_line,base.group_sale_salesman,1,0,0,0
+access_mrp_bom_line_stockuser,mrp.bom.line,model_mrp_bom_line,stock.group_stock_user,1,0,0,0
 access_product_uom_categ_mrp_manager,product.uom.categ mrp_manager,product.model_product_uom_categ,mrp.group_mrp_manager,1,1,1,1
 access_product_uom_mrp_manager,product.uom mrp_manager,product.model_product_uom,mrp.group_mrp_manager,1,1,1,1
 access_product_ul_mrp_manager,product.ul mrp_manager,product.model_product_ul,mrp.group_mrp_manager,1,1,1,1

=== modified file 'mrp/stock.py'
--- mrp/stock.py	2014-05-07 17:24:46 +0000
+++ mrp/stock.py	2014-05-26 16:10:21 +0000
@@ -55,13 +55,14 @@
         user_company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         #doing the search as SUPERUSER because a user with the permission to write on a stock move should be able to explode it
         #without giving him the right to read the boms.
-        return self.pool.get('mrp.bom').search(cr, SUPERUSER_ID, [
-            ('product_id', '=', move.product_id.id),
-            ('bom_id', '=', False),
+        domain = [
+            '|', ('product_id', '=', move.product_id.id),
+            '&', ('product_id', '=', False), ('product_tmpl_id.product_variant_ids', '=', move.product_id.id),
             ('type', '=', 'phantom'),
             '|', ('date_start', '=', False), ('date_start', '<=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)),
             '|', ('date_stop', '=', False), ('date_stop', '>=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)),
-            ('company_id', '=', user_company)], context=context)
+            ('company_id', '=', user_company)]
+        return self.pool.get('mrp.bom').search(cr, SUPERUSER_ID, domain, context=context)
 
     def _action_explode(self, cr, uid, move, context=None):
         """ Explodes pickings.
@@ -76,7 +77,7 @@
         if bis:
             factor = move.product_qty
             bom_point = bom_obj.browse(cr, SUPERUSER_ID, bis[0], context=context)
-            res = bom_obj._bom_explode(cr, SUPERUSER_ID, bom_point, factor, [])
+            res = bom_obj._bom_explode(cr, SUPERUSER_ID, bom_point, move.product_id, factor, [])
             state = 'confirmed'
             if move.state == 'assigned':
                 state = 'assigned'

=== modified file 'mrp/test/bom_with_service_type_product.yml'
--- mrp/test/bom_with_service_type_product.yml	2014-02-05 09:34:11 +0000
+++ mrp/test/bom_with_service_type_product.yml	2014-05-26 16:10:21 +0000
@@ -4,17 +4,17 @@
   !record {model: mrp.bom, id: mrp_bom_test1}:
     company_id: base.main_company
     name: PC Assemble SC234
+    product_tmpl_id: product.product_product_3_product_template
     product_id: product.product_product_3
+    product_uom: product.product_uom_unit
     product_qty: 1.0
     type: normal
-    bom_lines:
-      - company_id: base.main_company
-        name: On Site Assistance
-        product_id: product.product_product_2
+    bom_line_ids:
+      - product_id: product.product_product_2
+        product_uom: product.product_uom_unit
         product_qty: 1.0
-      - company_id: base.main_company
-        name: GrapWorks Software
-        product_id: product.product_product_44
+      - product_id: product.product_product_44
+        product_uom: product.product_uom_unit
         product_qty: 1.0
 -
   I make the production order using BoM having one service type product and one consumable product.

=== modified file 'mrp/test/order_demo.yml'
--- mrp/test/order_demo.yml	2014-04-04 16:17:13 +0000
+++ mrp/test/order_demo.yml	2014-05-26 16:10:21 +0000
@@ -7,11 +7,11 @@
   I create Production Order of PC Assemble SC349 to produce 5.0 Unit.
 -
   !record {model: mrp.production, id: mrp_production_test1}:
-    product_id: product.product_product_4
+    product_id: product.product_product_3
     product_qty: 5.0
     location_src_id: stock.stock_location_14
     location_dest_id: stock.stock_location_output
-    bom_id: mrp_bom_24
+    bom_id: mrp_bom_9
     routing_id: mrp.mrp_routing_1
     
     

=== modified file 'mrp/views/report_mrpbomstructure.xml'
--- mrp/views/report_mrpbomstructure.xml	2014-02-24 10:34:53 +0000
+++ mrp/views/report_mrpbomstructure.xml	2014-05-26 16:10:21 +0000
@@ -27,10 +27,9 @@
                                 </td>
                                 <td><span t-field="o.code"/></td>
                             </tr>
-                            <tr t-foreach="get_children(o.bom_lines)" t-as="l">
+                            <tr t-foreach="get_children(o.bom_line_ids)" t-as="l">
                                 <td>
                                     <span style="color: white;" t-esc="'... '*(l['level'])"/>
-                                    - <span t-esc="l['name']"/>
                                 </td>
                                  <td>
                                         [ <span t-esc="l['pcode']"/> ]

=== modified file 'mrp/wizard/change_production_qty.py'
--- mrp/wizard/change_production_qty.py	2013-11-29 16:56:44 +0000
+++ mrp/wizard/change_production_qty.py	2014-05-26 16:10:21 +0000
@@ -78,7 +78,7 @@
                 bom_point = prod.bom_id
                 bom_id = prod.bom_id.id
                 if not bom_point:
-                    bom_id = bom_obj._bom_find(cr, uid, prod.product_id.id, prod.product_uom.id)
+                    bom_id = bom_obj._bom_find(cr, uid, prod.product_uom.id, product_id=prod.product_id.id)
                     if not bom_id:
                         raise osv.except_osv(_('Error!'), _("Cannot find bill of material for this product."))
                     prod_obj.write(cr, uid, [prod.id], {'bom_id': bom_id})
@@ -89,7 +89,7 @@
 
                 factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
                 product_details, workcenter_details = \
-                    bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
+                    bom_obj._bom_explode(cr, uid, bom_point, prod.product_id, factor / bom_point.product_qty, [])
                 for r in product_details:
                     if r['product_id'] == move.product_id.id:
                         move_obj.write(cr, uid, [move.id], {'product_uom_qty': r['product_qty']})

=== modified file 'mrp_byproduct/test/mrp_byproduct.yml'
--- mrp_byproduct/test/mrp_byproduct.yml	2014-01-22 12:52:11 +0000
+++ mrp_byproduct/test/mrp_byproduct.yml	2014-05-26 16:10:21 +0000
@@ -4,7 +4,7 @@
 -
   I add a sub product in Bill of material for product External Hard Disk.
 -
-  !record {model: mrp.bom, id: mrp.mrp_bom_24}:
+  !record {model: mrp.bom, id: mrp.mrp_bom_9}:
     product_id: product.product_product_28
     name: External Hard Disk + Subproduct
     product_uom: product.product_uom_unit
@@ -20,7 +20,7 @@
     product_id: product.product_product_28
     product_qty: 2.0
     product_uom: product.product_uom_unit
-    bom_id: mrp.mrp_bom_24
+    bom_id: mrp.mrp_bom_9
     location_src_id: stock.stock_location_stock
 -
   I compute the data of production order.

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2014-05-08 14:39:40 +0000
+++ point_of_sale/point_of_sale.py	2014-05-26 16:10:21 +0000
@@ -1318,30 +1318,80 @@
             self.pool[m].write(cr,uid,[m_id],{'ean13':ean13})
         return { 'type' : 'ir.actions.act_window_close' }
 
-class product_product(osv.osv):
-    _inherit = 'product.product'
-
-
-    #def _get_small_image(self, cr, uid, ids, prop, unknow_none, context=None):
-    #    result = {}
-    #    for obj in self.browse(cr, uid, ids, context=context):
-    #        if not obj.product_image:
-    #            result[obj.id] = False
-    #            continue
-
-    #        image_stream = io.BytesIO(obj.product_image.decode('base64'))
-    #        img = Image.open(image_stream)
-    #        img.thumbnail((120, 100), Image.ANTIALIAS)
-    #        img_stream = StringIO.StringIO()
-    #        img.save(img_stream, "JPEG")
-    #        result[obj.id] = img_stream.getvalue().encode('base64')
-    #    return result
+class pos_category(osv.osv):
+    _name = "pos.category"
+    _description = "Public Category"
+    _order = "sequence, name"
+
+    _constraints = [
+        (osv.osv._check_recursion, 'Error ! You cannot create recursive categories.', ['parent_id'])
+    ]
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['parent_id']:
+                name = record['parent_id'][1]+' / '+name
+            res.append((record['id'], name))
+        return res
+
+    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = self.name_get(cr, uid, ids, context=context)
+        return dict(res)
+
+    def _get_image(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = tools.image_get_resized_images(obj.image)
+        return result
+    
+    def _set_image(self, cr, uid, id, name, value, args, context=None):
+        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
+
+    _columns = {
+        'name': fields.char('Name', required=True, translate=True),
+        'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
+        'parent_id': fields.many2one('product.public.category','Parent Category', select=True),
+        'child_id': fields.one2many('product.public.category', 'parent_id', string='Children Categories'),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
+        
+        # NOTE: there is no 'default image', because by default we don't show thumbnails for categories. However if we have a thumbnail
+        # for at least one category, then we display a default image on the other, so that the buttons have consistent styling.
+        # In this case, the default image is set by the js code.
+        # NOTE2: image: all image fields are base64 encoded and PIL-supported
+        'image': fields.binary("Image",
+            help="This field holds the image used as image for the cateogry, limited to 1024x1024px."),
+        'image_medium': fields.function(_get_image, fnct_inv=_set_image,
+            string="Medium-sized image", type="binary", multi="_get_image",
+            store={
+                'product.public.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+            },
+            help="Medium-sized image of the category. It is automatically "\
+                 "resized as a 128x128px image, with aspect ratio preserved. "\
+                 "Use this field in form views or some kanban views."),
+        'image_small': fields.function(_get_image, fnct_inv=_set_image,
+            string="Smal-sized image", type="binary", multi="_get_image",
+            store={
+                'product.public.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+            },
+            help="Small-sized image of the category. It is automatically "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
+                 "Use this field anywhere a small image is required."),
+    }
+
+class product_template(osv.osv):
+    _inherit = 'product.template'
 
     _columns = {
         'income_pdt': fields.boolean('Point of Sale Cash In', help="Check if, this is a product you can use to put cash into a statement for the point of sale backend."),
         'expense_pdt': fields.boolean('Point of Sale Cash Out', help="Check if, this is a product you can use to take cash from a statement for the point of sale backend, example: money lost, transfer to bank, etc."),
         'available_in_pos': fields.boolean('Available in the Point of Sale', help='Check if you want this product to appear in the Point of Sale'), 
         'to_weight' : fields.boolean('To Weigh', help="Check if the product should be weighted (mainly used with self check-out interface)."),
+        'pos_categ_id': fields.many2one('pos.category','Point of Sale Category', help="Those categories are used to group similar products for point of sale."),
     }
 
     _defaults = {

=== modified file 'point_of_sale/point_of_sale_demo.xml'
--- point_of_sale/point_of_sale_demo.xml	2014-01-27 17:21:21 +0000
+++ point_of_sale/point_of_sale_demo.xml	2014-05-26 16:10:21 +0000
@@ -39,145 +39,146 @@
             <field name="journal_ids" eval="[(6, 0, [ref('account.cash_journal'), ref('account.bank_journal'), ref('account.check_journal')])]" />
         </record>
 
-        <!-- Resource: product.public.category -->
+        <!-- Resource: pos.category -->
 
-        <record id="product.computers" model="product.public.category">
+        <record id="computers" model="pos.category">
+          <field name="name">Computers</field>
           <field name="image" type="base64" file="point_of_sale/static/img/computer.png"/>
         </record>
 
-        <record id="beverage" model="product.public.category">
+        <record id="beverage" model="pos.category">
           <field name="name">Beverages</field>
           <field name="image" type="base64" file="point_of_sale/static/img/beverage-image.jpg"/>
         </record>
 
-        <record id="water" model="product.public.category">
+        <record id="water" model="pos.category">
           <field name="parent_id" ref="beverage"/>
           <field name="name">Water</field>
           <field name="image" type="base64" file="point_of_sale/static/img/water-image.jpg"/>
         </record>
-        <record id="plain_water" model="product.public.category">
+        <record id="plain_water" model="pos.category">
           <field name="parent_id" ref="water"/>
           <field name="name">Plain Water</field>
           <field name="image" type="base64" file="point_of_sale/static/img/plain_water-image.jpg"/>
         </record>
-        <record id="sparkling_water" model="product.public.category">
+        <record id="sparkling_water" model="pos.category">
           <field name="parent_id" ref="water"/>
           <field name="name">Sparkling Water</field>
           <field name="image" type="base64" file="point_of_sale/static/img/sparkling_water-image.jpg"/>
         </record>
-        <record id="soda" model="product.public.category">
+        <record id="soda" model="pos.category">
           <field name="parent_id" ref="beverage"/>
           <field name="name">Soda</field>
           <field name="image" type="base64" file="point_of_sale/static/img/soda-image.jpg"/>
         </record>
-        <record id="coke" model="product.public.category">
+        <record id="coke" model="pos.category">
             <field name="parent_id" ref="soda"/>
             <field name="name">Coke</field>
             <field name="image" type="base64" file="point_of_sale/static/img/coke-image.jpg"/>
         </record>
-        <record id="soda_orange" model="product.public.category">
+        <record id="soda_orange" model="pos.category">
             <field name="parent_id" ref="soda"/>
             <field name="name">Orange</field>
             <field name="image" type="base64" file="point_of_sale/static/img/soda_orange-image.jpg"/>
         </record>
-        <record id="beers" model="product.public.category">
+        <record id="beers" model="pos.category">
           <field name="parent_id" ref="beverage"/>
           <field name="name">Beers</field>
           <field name="image" type="base64" file="point_of_sale/static/img/beers-image.jpg"/>
         </record>
-        <record id="pils" model="product.public.category">
+        <record id="pils" model="pos.category">
             <field name="parent_id" ref="beers"/>
             <field name="name">Pils</field>
             <field name="image" type="base64" file="point_of_sale/static/img/pils-image.jpg"/>
         </record>
-        <record id="fruity_beers" model="product.public.category">
+        <record id="fruity_beers" model="pos.category">
             <field name="parent_id" ref="beers"/>
             <field name="name">Fruity Beers</field>
             <field name="image" type="base64" file="point_of_sale/static/img/fruity_beers-image.jpg"/>
         </record>
-        <record id="special_beers" model="product.public.category">
+        <record id="special_beers" model="pos.category">
             <field name="parent_id" ref="beers"/>
             <field name="name">Special Beers</field>
             <field name="image" type="base64" file="point_of_sale/static/img/special_beers-image.jpg"/>
         </record>
-        <record id="food" model="product.public.category">
+        <record id="food" model="pos.category">
           <field name="name">Food</field>
           <field name="image" type="base64" file="point_of_sale/static/img/food-image.jpg"/>
         </record>
-        <record id="pizza" model="product.public.category">
+        <record id="pizza" model="pos.category">
           <field name="parent_id" ref="food"/>
           <field name="name">Pizza</field>
           <field name="image" type="base64" file="point_of_sale/static/img/pizza-image.jpg"/>
         </record>
-        <record id="ice_cream" model="product.public.category">
+        <record id="ice_cream" model="pos.category">
           <field name="parent_id" ref="food"/>
           <field name="name">Ice Cream</field>
           <field name="image" type="base64" file="point_of_sale/static/img/ice_cream-image.jpg"/>
         </record>
-        <record id="chips" model="product.public.category">
+        <record id="chips" model="pos.category">
           <field name="parent_id" ref="food"/>
           <field name="name">Chips</field>
           <field name="image" type="base64" file="point_of_sale/static/img/chips-image.jpg"/>
         </record>
-        <record id="fruits" model="product.public.category">
+        <record id="fruits" model="pos.category">
           <field name="name">Fresh Fruits</field>
           <field name="image" type="base64" file="point_of_sale/static/img/fruits-image.jpg"/>
         </record>
-        <record id="oranges" model="product.public.category">
+        <record id="oranges" model="pos.category">
           <field name="parent_id" ref="fruits"/>
           <field name="name">Oranges</field>
           <field name="image" type="base64" file="point_of_sale/static/img/oranges-image.jpg"/>
         </record>
-        <record id="pomme" model="product.public.category">
+        <record id="pomme" model="pos.category">
           <field name="parent_id" ref="fruits"/>
           <field name="name">Apples</field>
           <field name="image" type="base64" file="point_of_sale/static/img/pomme-image.jpg"/>
         </record>
-        <record id="autres_agrumes" model="product.public.category">
+        <record id="autres_agrumes" model="pos.category">
           <field name="parent_id" ref="fruits"/>
           <field name="name">Other Citrus</field>
           <field name="image" type="base64" file="point_of_sale/static/img/autres_agrumes-image.jpg"/>
         </record>
-        <record id="poire" model="product.public.category">
+        <record id="poire" model="pos.category">
           <field name="parent_id" ref="fruits"/>
           <field name="name">Pears</field>
           <field name="image" type="base64" file="point_of_sale/static/img/poire-image.jpg"/>
         </record>
-        <record id="rouges_noyau_fruits" model="product.public.category">
+        <record id="rouges_noyau_fruits" model="pos.category">
           <field name="parent_id" ref="fruits"/>
           <field name="name">Berries</field>
           <field name="image" type="base64" file="point_of_sale/static/img/rouges_noyau_fruits-image.jpg"/>
         </record>
-        <record id="raisins" model="product.public.category">
+        <record id="raisins" model="pos.category">
           <field name="parent_id" ref="fruits"/>
           <field name="name">Grapes</field>
           <field name="image" type="base64" file="point_of_sale/static/img/raisins-image.jpg"/>
         </record>
-        <record id="legumes" model="product.public.category">
+        <record id="legumes" model="pos.category">
           <field name="name">Fresh vegetables</field>
           <field name="image" type="base64" file="point_of_sale/static/img/legumes-image.jpg"/>
         </record>
-        <record id="pommes_de_terre" model="product.public.category">
+        <record id="pommes_de_terre" model="pos.category">
           <field name="parent_id" ref="legumes"/>
           <field name="name">Potatoes</field>
           <field name="image" type="base64" file="point_of_sale/static/img/pommes_de_terre-image.jpg"/>
         </record>
-        <record id="legumes_racine" model="product.public.category">
+        <record id="legumes_racine" model="pos.category">
           <field name="parent_id" ref="legumes"/>
           <field name="name">Root vegetables</field>
           <field name="image" type="base64" file="point_of_sale/static/img/legumes_racine-image.jpg"/>
         </record>
-        <record id="tomates" model="product.public.category">
+        <record id="tomates" model="pos.category">
           <field name="parent_id" ref="legumes"/>
           <field name="name">Tomatos</field>
           <field name="image" type="base64" file="point_of_sale/static/img/tomates-image.jpg"/>
         </record>
-        <record id="oignons_ail_echalotes" model="product.public.category">
+        <record id="oignons_ail_echalotes" model="pos.category">
           <field name="parent_id" ref="legumes"/>
           <field name="name">Onions / Garlic / Shallots</field>
           <field name="image" type="base64" file="point_of_sale/static/img/oignons_ail_echalotes-image.jpg"/>
         </record>
-        <record id="autres_legumes_frais" model="product.public.category">
+        <record id="autres_legumes_frais" model="pos.category">
           <field name="parent_id" ref="legumes"/>
           <field name="name">Other fresh vegetables</field>
           <field name="image" type="base64" file="point_of_sale/static/img/autres_legumes_frais-image.jpg"/>
@@ -191,7 +192,7 @@
           <field name="name">Boni Oranges</field>
           <field name="to_weight">True</field>
           <field name="ean13">2100002000003</field>
-          <field name="public_categ_id" ref="oranges"/>
+          <field name="pos_categ_id" ref="oranges"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/boni_orange-image.jpg"/>
@@ -200,7 +201,7 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">2.83</field>
           <field name="name">Orange Butterfly</field>
-          <field name="public_categ_id" ref="oranges"/>
+          <field name="pos_categ_id" ref="oranges"/>
           <field name="to_weight">True</field>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
@@ -213,7 +214,7 @@
           <field name="name">Lemon</field>
           <field name="ean13">2301000000006</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="autres_agrumes"/>
+          <field name="pos_categ_id" ref="autres_agrumes"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/citron-image.jpg"/>
@@ -223,7 +224,7 @@
           <field name="list_price">3.19</field>
           <field name="name">Stringers</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="autres_agrumes"/>
+          <field name="pos_categ_id" ref="autres_agrumes"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/limon-image.jpg"/>
@@ -233,7 +234,7 @@
           <field name="list_price">1.98</field>
           <field name="name">Red grapefruit</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="autres_agrumes"/>
+          <field name="pos_categ_id" ref="autres_agrumes"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/pamplemousse_rouge_pamplemousse-image.jpg"/>
@@ -244,7 +245,7 @@
           <field name="list_price">2.09</field>
           <field name="name">Granny Smith apples</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="pomme"/>
+          <field name="pos_categ_id" ref="pomme"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/pomme_granny_smith-image.jpg"/>
@@ -254,7 +255,7 @@
           <field name="list_price">1.10</field>
           <field name="name">Jonagold apples</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="pomme"/>
+          <field name="pos_categ_id" ref="pomme"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/pomme_jonagold-image.jpg"/>
@@ -264,7 +265,7 @@
           <field name="list_price">1.69</field>
           <field name="name">Golden Apples Perlim</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="pomme"/>
+          <field name="pos_categ_id" ref="pomme"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/pomme_golden_perlim-image.jpg"/>
@@ -275,7 +276,7 @@
           <field name="list_price">1.70</field>
           <field name="name">Conference pears</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="poire"/>
+          <field name="pos_categ_id" ref="poire"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/poire_conference-image.jpg"/>
@@ -286,7 +287,7 @@
           <field name="list_price">5.70</field>
           <field name="name">Peach</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="rouges_noyau_fruits"/>
+          <field name="pos_categ_id" ref="rouges_noyau_fruits"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/nectarine-image.jpg"/>
@@ -297,7 +298,7 @@
           <field name="name">Peaches</field>
           <field name="to_weight">True</field>
           <field name="ean13">2300001000008</field>
-          <field name="public_categ_id" ref="rouges_noyau_fruits"/>
+          <field name="pos_categ_id" ref="rouges_noyau_fruits"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/peche-image.jpg"/>
@@ -308,7 +309,7 @@
           <field name="list_price">4.80</field>
           <field name="name">Black Grapes</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="raisins"/>
+          <field name="pos_categ_id" ref="raisins"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/raisins_noir-image.jpg"/>
@@ -319,7 +320,7 @@
           <field name="list_price">1.39</field>
           <field name="name">Potatoes</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="pommes_de_terre"/>
+          <field name="pos_categ_id" ref="pommes_de_terre"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/pomme_de_terre-image.jpg"/>
@@ -330,7 +331,7 @@
           <field name="list_price">2.20</field>
           <field name="name">Extra Flandria chicory</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="legumes_racine"/>
+          <field name="pos_categ_id" ref="legumes_racine"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/chicon_flandria_extra-image.jpg"/>
@@ -340,7 +341,7 @@
           <field name="list_price">0.90</field>
           <field name="name">Carrots</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="legumes_racine"/>
+          <field name="pos_categ_id" ref="legumes_racine"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/carotte-image.jpg"/>
@@ -350,7 +351,7 @@
           <field name="list_price">2.10</field>
           <field name="name">Fennel</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="legumes_racine"/>
+          <field name="pos_categ_id" ref="legumes_racine"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/fenouil_fenouil-image.jpg"/>
@@ -361,7 +362,7 @@
           <field name="list_price">1.90</field>
           <field name="name">In Cluster Tomatoes</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="tomates"/>
+          <field name="pos_categ_id" ref="tomates"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/tomate_en_grappe-image.jpg"/>
@@ -373,7 +374,7 @@
           <field name="name">Onions</field>
           <field name="to_weight">True</field>
           <field name="ean13">2100001000004</field>
-          <field name="public_categ_id" ref="oignons_ail_echalotes"/>
+          <field name="pos_categ_id" ref="oignons_ail_echalotes"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/Onions-image.jpg"/>
@@ -384,7 +385,7 @@
           <field name="list_price">3.10</field>
           <field name="name">Red Pepper</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="autres_legumes_frais"/>
+          <field name="pos_categ_id" ref="autres_legumes_frais"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/poivron_rouges-image.jpg"/>
@@ -394,7 +395,7 @@
           <field name="list_price">3.00</field>
           <field name="name">Green Peppers</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="autres_legumes_frais"/>
+          <field name="pos_categ_id" ref="autres_legumes_frais"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/poivron_verts-image.jpg"/>
@@ -404,7 +405,7 @@
           <field name="list_price">2.70</field>
           <field name="name">Yellow Peppers</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="autres_legumes_frais"/>
+          <field name="pos_categ_id" ref="autres_legumes_frais"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/poivron_jaunes-image.jpg"/>
@@ -414,7 +415,7 @@
           <field name="list_price">2.29</field>
           <field name="name">Leeks</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="autres_legumes_frais"/>
+          <field name="pos_categ_id" ref="autres_legumes_frais"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/poireaux_poireaux-image.jpg"/>
@@ -424,7 +425,7 @@
           <field name="list_price">1.20</field>
           <field name="name">Zucchini</field>
           <field name="to_weight">True</field>
-          <field name="public_categ_id" ref="autres_legumes_frais"/>
+          <field name="pos_categ_id" ref="autres_legumes_frais"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/courgette-image.jpg"/>
@@ -435,21 +436,21 @@
           <field name="list_price">1.49</field>
           <field name="name">Coca-Cola Regular 1L</field>
           <field name="ean13">5449000054227</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_regular_1l-image.jpg"/>
         </record>
         <record id="coca_regular_2l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.38</field>
           <field name="name">Coca-Cola Regular 2L</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_regular_2l-image.jpg"/>
         </record>
         <record id="coca_regular_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.97</field>
           <field name="name">Coca-Cola Regular 50cl</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_regular_50cl-image.jpg"/>
         </record>
         <record id="coca_regular_33cl" model="product.product">
@@ -457,7 +458,7 @@
           <field name="list_price">0.51</field>
           <field name="name">Coca-Cola Regular 33cl</field>
           <field name="ean13">5449000000996</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_regular_33cl-image.jpg"/>
         </record>
 
@@ -465,35 +466,35 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">1.49</field>
           <field name="name">Coca-Cola Light 1L</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_light_1l-image.jpg"/>
         </record>
         <record id="coca_light_2l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.38</field>
           <field name="name">Coca-Cola Light 2L</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_light_2l-image.jpg"/>
         </record>
         <record id="coca_light_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.97</field>
           <field name="name">Coca-Cola Light 50cl</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_light_50cl-image.jpg"/>
         </record>
         <record id="coca_light_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.51</field>
           <field name="name">Coca-Cola Light 33cl</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_light_33cl-image.jpg"/>
         </record>
         <record id="coca_light_decaf_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.53</field>
           <field name="name">Coca-Cola Light 33cl Decaf</field> 
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_light_decaf_33cl-image.jpg"/>
         </record>
 
@@ -501,35 +502,35 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">1.49</field>
           <field name="name">Coca-Cola Zero 1L</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_zero_1l-image.jpg"/>
         </record>
         <record id="coca_zero_2l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.38</field>
           <field name="name">Coca-Cola Zero 2L</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_zero_2l-image.jpg"/>
         </record>
         <record id="coca_zero_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.97</field>
           <field name="name">Coca-Cola Zero 50cl</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_zero_50cl-image.jpg"/>
         </record>
         <record id="coca_zero_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.51</field>
           <field name="name">Coca-Cola Zero 33cl</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_zero_33cl-image.jpg"/>
         </record>
         <record id="coca_zero_decaf_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.67</field>
           <field name="name">Coca-Cola Zero Decaf 33cl</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_zero_decaf_33cl-image.jpg"/>
         </record>
 
@@ -537,21 +538,21 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">2.83</field>
           <field name="name">Coca-Cola Light Lemon 2L</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_light_lemon_2l-image.jpg"/>
         </record>
         <record id="coca_light_lemon_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.16</field>
           <field name="name">Coca-Cola Light Lemon 50cl</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_light_lemon_50cl-image.jpg"/>
         </record>
         <record id="coca_light_lemon_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.53</field>
           <field name="name">Coca-Cola Light Lemon 33cl</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_light_lemon_33cl-image.jpg"/>
         </record>
 
@@ -559,42 +560,42 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">1.70</field>
           <field name="name">Pepsi 2L</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/pepsi_2l-image.jpg"/>
         </record>
         <record id="pepsi_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.43</field>
           <field name="name">Pepsi 33cl</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/pepsi_33cl-image.jpg"/>
         </record>
         <record id="pepsi_max_2l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.71</field>
           <field name="name">Pepsi Max 2L</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/pepsi_max_2l-image.jpg"/>
         </record>
         <record id="pepsi_max_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.40</field>
           <field name="name">Pepsi Max 33cl</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/pepsi_max_33cl-image.jpg"/>
         </record>
         <record id="pepsi_max_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.61</field>
           <field name="name">Pepsi Max 50cl</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/pepsi_max_50cl-image.jpg"/>
         </record>
         <record id="pepsi_max_lemon_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.40</field>
           <field name="name">Pepsi Max Cool Lemon 33cl</field>
-          <field name="public_categ_id" ref="coke"/>
+          <field name="pos_categ_id" ref="coke"/>
           <field name="image" type="base64" file="point_of_sale/static/img/pepsi_max_lemon_33cl-image.jpg"/>
         </record>
 
@@ -602,63 +603,63 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">0.75</field>
           <field name="name">Spa Fruit and Orange 50cl</field>
-          <field name="public_categ_id" ref="soda_orange"/>
+          <field name="pos_categ_id" ref="soda_orange"/>
           <field name="image" type="base64" file="point_of_sale/static/img/spa_et_fruit_50cl-image.jpg"/>
         </record>
         <record id="orangina_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.72</field>
           <field name="name">Orangina 33cl</field>
-          <field name="public_categ_id" ref="soda_orange"/>
+          <field name="pos_categ_id" ref="soda_orange"/>
           <field name="image" type="base64" file="point_of_sale/static/img/orangina_33cl-image.jpg"/>
         </record>
         <record id="orangina_1,5l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.42</field>
           <field name="name">Orangina 1.5L</field>
-          <field name="public_categ_id" ref="soda_orange"/>
+          <field name="pos_categ_id" ref="soda_orange"/>
           <field name="image" type="base64" file="point_of_sale/static/img/orangina_1,5l-image.jpg"/>
         </record>
         <record id="fanta_orange_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.98</field>
           <field name="name">Fanta Orange 50cl</field>
-          <field name="public_categ_id" ref="soda_orange"/>
+          <field name="pos_categ_id" ref="soda_orange"/>
           <field name="image" type="base64" file="point_of_sale/static/img/fanta_orange_50cl-image.jpg"/>
         </record>
         <record id="fanta_orange_2l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.28</field>
           <field name="name">Fanta Orange 2L</field>
-          <field name="public_categ_id" ref="soda_orange"/>
+          <field name="pos_categ_id" ref="soda_orange"/>
           <field name="image" type="base64" file="point_of_sale/static/img/fanta_orange_2l-image.jpg"/>
         </record>
         <record id="fanta_orange_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.51</field>
           <field name="name">Fanta Orange 33cl</field>
-          <field name="public_categ_id" ref="soda_orange"/>
+          <field name="pos_categ_id" ref="soda_orange"/>
           <field name="image" type="base64" file="point_of_sale/static/img/fanta_orange_33cl-image.jpg"/>
         </record>
         <record id="fanta_orange_25cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.84</field>
           <field name="name">Fanta Orange 25cl</field>
-          <field name="public_categ_id" ref="soda_orange"/>
+          <field name="pos_categ_id" ref="soda_orange"/>
           <field name="image" type="base64" file="point_of_sale/static/img/fanta_orange_25cl-image.jpg"/>
         </record>
         <record id="fanta_zero_orange_1,5l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.08</field>
           <field name="name">Fanta Orange Zero 1.5L</field>
-          <field name="public_categ_id" ref="soda_orange"/>
+          <field name="pos_categ_id" ref="soda_orange"/>
           <field name="image" type="base64" file="point_of_sale/static/img/fanta_zero_orange_1,5l-image.jpg"/>
         </record>
         <record id="fanta_zero_orange_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.53</field>
           <field name="name">Fanta Zero Orange 33cl</field>
-          <field name="public_categ_id" ref="soda_orange"/>
+          <field name="pos_categ_id" ref="soda_orange"/>
           <field name="image" type="base64" file="point_of_sale/static/img/fanta_zero_orange_33cl-image.jpg"/>
         </record>
 
@@ -666,56 +667,56 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">0.52</field>
           <field name="name">Evian 50cl</field>
-          <field name="public_categ_id" ref="plain_water"/>
+          <field name="pos_categ_id" ref="plain_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/evian_50cl-image.jpg"/>
         </record>
         <record id="evian_1l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.70</field>
           <field name="name">Evian 1L</field>
-          <field name="public_categ_id" ref="plain_water"/>
+          <field name="pos_categ_id" ref="plain_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/evian_1l-image.jpg"/>
         </record>
         <record id="evian_2l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.26</field>
           <field name="name">2L Evian</field>
-          <field name="public_categ_id" ref="plain_water"/>
+          <field name="pos_categ_id" ref="plain_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/evian_2l-image.jpg"/>
         </record>
         <record id="spa_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.40</field>
           <field name="name">Spa Reine 33cl</field>
-          <field name="public_categ_id" ref="plain_water"/>
+          <field name="pos_categ_id" ref="plain_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/spa_33cl-image.jpg"/>
         </record>
         <record id="spa_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.46</field>
           <field name="name">Spa Reine 50cl</field>
-          <field name="public_categ_id" ref="plain_water"/>
+          <field name="pos_categ_id" ref="plain_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/spa_50cl-image.jpg"/>
         </record>
         <record id="spa_1l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.65</field>
           <field name="name">Spa Reine 1L</field>
-          <field name="public_categ_id" ref="plain_water"/>
+          <field name="pos_categ_id" ref="plain_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/spa_1l-image.jpg"/>
         </record>
         <record id="spa_2l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.30</field>
           <field name="name">Spa Reine 2L</field>
-          <field name="public_categ_id" ref="plain_water"/>
+          <field name="pos_categ_id" ref="plain_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/spa_2l-image.jpg"/>
         </record>
         <record id="chaudfontaine_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.34</field>
           <field name="name">Chaudfontaine 33cl</field>
-          <field name="public_categ_id" ref="plain_water"/>
+          <field name="pos_categ_id" ref="plain_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_33cl-image.jpg"/>
         </record>
         <record id="chaudfontaine_50cl" model="product.product">
@@ -723,14 +724,14 @@
           <field name="list_price">0.44</field>
           <field name="ean13">5449000111715</field>
           <field name="name">Chaudfontaine 50cl</field>
-          <field name="public_categ_id" ref="plain_water"/>
+          <field name="pos_categ_id" ref="plain_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_50cl-image.jpg"/>
         </record>
         <record id="chaudfontaine_1,5l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.86</field>
           <field name="name">Chaudfontaine 1.5l</field>
-          <field name="public_categ_id" ref="plain_water"/>
+          <field name="pos_categ_id" ref="plain_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_1,5l-image.jpg"/>
         </record>
 
@@ -738,63 +739,63 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">0.38</field>
           <field name="name">Spa Barisart 33cl</field>
-          <field name="public_categ_id" ref="sparkling_water"/>
+          <field name="pos_categ_id" ref="sparkling_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/spa_gazeuse_33cl-image.jpg"/>
         </record>
         <record id="spa_gazeuse_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.49</field>
           <field name="name">Spa Barisart 50cl</field>
-          <field name="public_categ_id" ref="sparkling_water"/>
+          <field name="pos_categ_id" ref="sparkling_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/spa_gazeuse_50cl-image.jpg"/>
         </record>
         <record id="spa_gazeuse_1,5l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.00</field>
           <field name="name">Spa Barisart 1.5l</field>
-          <field name="public_categ_id" ref="sparkling_water"/>
+          <field name="pos_categ_id" ref="sparkling_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/spa_gazeuse_1,5l-image.jpg"/>
         </record>
         <record id="chaudfontaine_petillante_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.41</field>
           <field name="name">Chaudfontaine Petillante 33cl</field>
-          <field name="public_categ_id" ref="sparkling_water"/>
+          <field name="pos_categ_id" ref="sparkling_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_petillante_33cl-image.jpg"/>
         </record>
         <record id="chaudfontaine_petillante_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.57</field>
           <field name="name">Chaudfontaine Petillante 50cl</field>
-          <field name="public_categ_id" ref="sparkling_water"/>
+          <field name="pos_categ_id" ref="sparkling_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_petillante_50cl-image.jpg"/>
         </record>
         <record id="chaudfontaine_petillante_1,5l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.98</field>
           <field name="name">Chaudfontaine Petillante 1.5l</field>
-          <field name="public_categ_id" ref="sparkling_water"/>
+          <field name="pos_categ_id" ref="sparkling_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_petillante_1,5l-image.jpg"/>
         </record>
         <record id="perrier_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.71</field>
           <field name="name">50cl Perrier</field>
-          <field name="public_categ_id" ref="sparkling_water"/>
+          <field name="pos_categ_id" ref="sparkling_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/perrier_50cl-image.jpg"/>
         </record>
         <record id="perrier_1l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.96</field>
           <field name="name">Perrier 1L</field>
-          <field name="public_categ_id" ref="sparkling_water"/>
+          <field name="pos_categ_id" ref="sparkling_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/perrier_1l-image.jpg"/>
         </record>
         <record id="san_pellegrino_1l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.98</field>
           <field name="name">San Pellegrino 1L</field>
-          <field name="public_categ_id" ref="sparkling_water"/>
+          <field name="pos_categ_id" ref="sparkling_water"/>
           <field name="image" type="base64" file="point_of_sale/static/img/san_pellegrino_1l-image.jpg"/>
         </record>
 
@@ -802,35 +803,35 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">1.19</field>
           <field name="name">Stella Artois 50cl</field>
-          <field name="public_categ_id" ref="pils"/>
+          <field name="pos_categ_id" ref="pils"/>
           <field name="image" type="base64" file="point_of_sale/static/img/stella_50cl-image.jpg"/>
         </record>
         <record id="stella_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.82</field>
           <field name="name">Stella Artois 33cl</field>
-          <field name="public_categ_id" ref="pils"/>
+          <field name="pos_categ_id" ref="pils"/>
           <field name="image" type="base64" file="point_of_sale/static/img/stella_33cl-image.jpg"/>
         </record>
         <record id="maes_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.95</field>
           <field name="name">Maes 50cl</field>
-          <field name="public_categ_id" ref="pils"/>
+          <field name="pos_categ_id" ref="pils"/>
           <field name="image" type="base64" file="point_of_sale/static/img/maes_50cl-image.jpg"/>
         </record>
         <record id="maes_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.77</field>
           <field name="name">Maes 33cl</field>
-          <field name="public_categ_id" ref="pils"/>
+          <field name="pos_categ_id" ref="pils"/>
           <field name="image" type="base64" file="point_of_sale/static/img/maes_33cl-image.jpg"/>
         </record>
         <record id="jupiler_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.97</field>
           <field name="name">Jupiler 50cl</field>
-          <field name="public_categ_id" ref="pils"/>
+          <field name="pos_categ_id" ref="pils"/>
           <field name="image" type="base64" file="point_of_sale/static/img/jupiler_50cl-image.jpg"/>
         </record>
         <record id="jupiler_33cl" model="product.product">
@@ -838,7 +839,7 @@
           <field name="list_price">0.77</field>
           <field name="ean13">5410228142027</field>
           <field name="name">Jupiler 33cl</field>
-          <field name="public_categ_id" ref="pils"/>
+          <field name="pos_categ_id" ref="pils"/>
           <field name="image" type="base64" file="point_of_sale/static/img/jupiler_33cl-image.jpg"/>
         </record>
 
@@ -846,49 +847,49 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">2.53</field>
           <field name="name">Boon Framboise 37.5cl</field>
-          <field name="public_categ_id" ref="fruity_beers"/>
+          <field name="pos_categ_id" ref="fruity_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/boon_framboise_37,5cl-image.jpg"/>
         </record>
         <record id="timmermans_geuze_37,5cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.54</field>
           <field name="name">Timmermans Geuze 37.5cl</field>
-          <field name="public_categ_id" ref="fruity_beers"/>
+          <field name="pos_categ_id" ref="fruity_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/timmermans_geuze_37,5cl-image.jpg"/>
         </record>
         <record id="timmermans_kriek_37,5cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.7</field>
           <field name="name">Timmermans Kriek 37.5cl</field>
-          <field name="public_categ_id" ref="fruity_beers"/>
+          <field name="pos_categ_id" ref="fruity_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/timmermans_kriek_37,5cl-image.jpg"/>
         </record>
         <record id="timmermans_faro_37,5cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.56</field>
           <field name="name">Timmermans Faro 37.5cl</field>
-          <field name="public_categ_id" ref="fruity_beers"/>
+          <field name="pos_categ_id" ref="fruity_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/timmermans_faro_37,5cl-image.jpg"/>
         </record>
         <record id="lindemans_pecheresse_37,,5cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.94</field>
           <field name="name">Lindemans sinful 37.5cl</field>
-          <field name="public_categ_id" ref="fruity_beers"/>
+          <field name="pos_categ_id" ref="fruity_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lindemans_pecheresse_37,,5cl-image.jpg"/>
         </record>
         <record id="lindemans_kriek_37,5cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.51</field>
           <field name="name">Lindemans Kriek 37.5cl</field>
-          <field name="public_categ_id" ref="fruity_beers"/>
+          <field name="pos_categ_id" ref="fruity_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lindemans_kriek_37,5cl-image.jpg"/>
         </record>
         <record id="grisette_cerise_25cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.04</field>
           <field name="name">Grisette Cherry 25cl</field>
-          <field name="public_categ_id" ref="fruity_beers"/>
+          <field name="pos_categ_id" ref="fruity_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/grisette_cerise_25cl-image.jpg"/>
         </record>
         <record id="belle_vue_kriek_25cl" model="product.product">
@@ -896,7 +897,7 @@
           <field name="list_price">0.83</field>
           <field name="name">Belle-Vue Kriek 25cl</field>
           <field name='ean13'>5410228193449</field>
-          <field name="public_categ_id" ref="fruity_beers"/>
+          <field name="pos_categ_id" ref="fruity_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/belle_vue_kriek_25cl-image.jpg"/>
         </record>
 
@@ -905,7 +906,7 @@
           <field name="list_price">1.00</field>
           <field name="name">Leffe Brune 33cl</field>
           <field name='ean13'>5410228142164</field>
-          <field name="public_categ_id" ref="special_beers"/>
+          <field name="pos_categ_id" ref="special_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/leffe_brune_33cl-image.jpg"/>
         </record>
         <record id="leffe_blonde_33cl" model="product.product">
@@ -913,49 +914,49 @@
           <field name="list_price">1.00</field>
           <field name="name">Leffe Blonde 33cl</field>
           <field name='ean13'>5410228142218</field>
-          <field name="public_categ_id" ref="special_beers"/>
+          <field name="pos_categ_id" ref="special_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/leffe_blonde_33cl-image.jpg"/>
         </record>
         <record id="leffe_9_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.16</field>
           <field name="name">Leffe Brune "9" 33cl</field>
-          <field name="public_categ_id" ref="special_beers"/>
+          <field name="pos_categ_id" ref="special_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/leffe_9_33cl-image.jpg"/>
         </record>
         <record id="orval_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.59</field>
           <field name="name">Orval 33cl</field>
-          <field name="public_categ_id" ref="special_beers"/>
+          <field name="pos_categ_id" ref="special_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/orval_33cl-image.jpg"/>
         </record>
         <record id="rochefort_8_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.75</field>
           <field name="name">Rochefort "8" 33cl</field>
-          <field name="public_categ_id" ref="special_beers"/>
+          <field name="pos_categ_id" ref="special_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/rochefort_8_33cl-image.jpg"/>
         </record>
         <record id="chimay_bleu_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.46</field>
           <field name="name">Chimay Bleu 33cl</field>
-          <field name="public_categ_id" ref="special_beers"/>
+          <field name="pos_categ_id" ref="special_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/chimay_bleu_33cl-image.jpg"/>
         </record>
         <record id="chimay_bleu_75cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">3.57</field>
           <field name="name">Chimay Bleu 75cl</field>
-          <field name="public_categ_id" ref="special_beers"/>
+          <field name="pos_categ_id" ref="special_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/chimay_bleu_75cl-image.jpg"/>
         </record>
         <record id="chimay_rouge_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.02</field>
           <field name="name">Chimay Red 33cl</field>
-          <field name="public_categ_id" ref="special_beers"/>
+          <field name="pos_categ_id" ref="special_beers"/>
           <field name="image" type="base64" file="point_of_sale/static/img/chimay_rouge_33cl-image.jpg"/>
         </record>
 
@@ -963,84 +964,84 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">2.86</field>
           <field name="name">Dr. Oetker Ristorante Mozzarella</field>
-          <field name="public_categ_id" ref="pizza"/>
+          <field name="pos_categ_id" ref="pizza"/>
           <field name="image" type="base64" file="point_of_sale/static/img/oetker_mozzarella-image.jpg"/>
         </record>
         <record id="oetker_bolognese" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.86</field>
           <field name="name">Dr. Oetker Ristorante Bolognese</field>
-          <field name="public_categ_id" ref="pizza"/>
+          <field name="pos_categ_id" ref="pizza"/>
           <field name="image" type="base64" file="point_of_sale/static/img/oetker_bolognese-image.jpg"/>
         </record>
         <record id="oetker_funghi" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.86</field>
           <field name="name">Dr. Oetker Ristorante Funghi</field>
-          <field name="public_categ_id" ref="pizza"/>
+          <field name="pos_categ_id" ref="pizza"/>
           <field name="image" type="base64" file="point_of_sale/static/img/oetker_funghi-image.jpg"/>
         </record>
         <record id="oetker_hawaii" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.86</field>
           <field name="name">Dr. Oetker Ristorante Hawaii</field>
-          <field name="public_categ_id" ref="pizza"/>
+          <field name="pos_categ_id" ref="pizza"/>
           <field name="image" type="base64" file="point_of_sale/static/img/oetker_hawaii-image.jpg"/>
         </record>
         <record id="oetker_pollo" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.86</field>
           <field name="name">Dr. Oetker Ristorante Pollo</field>
-          <field name="public_categ_id" ref="pizza"/>
+          <field name="pos_categ_id" ref="pizza"/>
           <field name="image" type="base64" file="point_of_sale/static/img/oetker_pollo-image.jpg"/>
         </record>
         <record id="oetker_prosciutto" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.86</field>
           <field name="name">Dr. Oetker Ristorante Prosciutto</field>
-          <field name="public_categ_id" ref="pizza"/>
+          <field name="pos_categ_id" ref="pizza"/>
           <field name="image" type="base64" file="point_of_sale/static/img/oetker_prosciutto-image.jpg"/>
         </record>
         <record id="oetker_4formaggi" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.86</field>
           <field name="name">Dr. Oetker Ristorante Quattro Formaggi</field>
-          <field name="public_categ_id" ref="pizza"/>
+          <field name="pos_categ_id" ref="pizza"/>
           <field name="image" type="base64" file="point_of_sale/static/img/oetker_4formaggi-image.jpg"/>
         </record>
         <record id="oetker_speciale" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.86</field>
           <field name="name">Dr. Oetker Ristorante Speciale</field>
-          <field name="public_categ_id" ref="pizza"/>
+          <field name="pos_categ_id" ref="pizza"/>
           <field name="image" type="base64" file="point_of_sale/static/img/oetker_speciale-image.jpg"/>
         </record>
         <record id="oetker_spinaci" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.86</field>
           <field name="name">Dr. Oetker Ristorante Spinaci</field>
-          <field name="public_categ_id" ref="pizza"/>
+          <field name="pos_categ_id" ref="pizza"/>
           <field name="image" type="base64" file="point_of_sale/static/img/oetker_spinaci-image.jpg"/>
         </record>
         <record id="oetker_tonno" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.86</field>
           <field name="name">Dr. Oetker Ristorante Tonno</field>
-          <field name="public_categ_id" ref="pizza"/>
+          <field name="pos_categ_id" ref="pizza"/>
           <field name="image" type="base64" file="point_of_sale/static/img/oetker_tonno-image.jpg"/>
         </record>
         <record id="oetker_vegetale" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.86</field>
           <field name="name">Dr. Oetker Ristorante Vegetable</field>
-          <field name="public_categ_id" ref="pizza"/>
+          <field name="pos_categ_id" ref="pizza"/>
           <field name="image" type="base64" file="point_of_sale/static/img/oetker_vegetale-image.jpg"/>
         </record>
         <record id="oetker_margherita" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.67</field>
           <field name="name">Dr. Oetker La Margherita</field>
-          <field name="public_categ_id" ref="pizza"/>
+          <field name="pos_categ_id" ref="pizza"/>
           <field name="image" type="base64" file="point_of_sale/static/img/oetker_margherita-image.jpg"/>
         </record>
 
@@ -1048,42 +1049,42 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">0.33</field>
           <field name="name">Croky Paprika 45g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/croky_paprika_45g-image.jpg"/>
         </record>
         <record id="croky_naturel_45g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.39</field>
           <field name="name">Croky Natural 45g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/croky_naturel_45g-image.jpg"/>
         </record>
         <record id="croky_bolognaise_250g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.78</field>
           <field name="name">Croky Bolognese 250g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/croky_bolognaise_250g-image.jpg"/>
         </record>
         <record id="lays_pickles_250g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.48</field>
           <field name="name">250g Lays Pickels</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_pickles_250g-image.jpg"/>
         </record>
         <record id="lays_ketchup_250g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.48</field>
           <field name="name">Lays Ketchup 250g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_ketchup_250g-image.jpg"/>
         </record>
         <record id="lays_poivre_sel_oven_150g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.58</field>
           <field name="name">Lays Salt and Pepper Oven Baked 150g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_poivre_sel_oven_150g-image.jpg"/>
         </record>
 
@@ -1091,35 +1092,35 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">1.54</field>
           <field name="name">Oven Baked Lays Paprika 150g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_paprika_oven_150g-image.jpg"/>
         </record>
         <record id="lays_paprika_300g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.55</field>
           <field name="name">Lays Paprika XXL 300g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_paprika_300g-image.jpg"/>
         </record>
         <record id="lays_paprika_170g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.48</field>
           <field name="name">Lays Light Paprika 170g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_paprika_170g-image.jpg"/>
         </record>
         <record id="lays_light_paprika_170g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.48</field>
           <field name="name">Lays Light Paprika 170g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_light_paprika_170g-image.jpg"/>
         </record>
         <record id="lays_paprika_45g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.39</field>
           <field name="name">Lays Paprika 45g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_paprika_45g-image.jpg"/>
         </record>
 
@@ -1127,35 +1128,35 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">1.54</field>
           <field name="name">Oven Baked Lays Natural 150g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_naturel_oven_150g-image.jpg"/>
         </record>
         <record id="lays_naturel_300g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.55</field>
           <field name="name">Lays Natural XXL 300g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_naturel_300g-image.jpg"/>
         </record>
         <record id="lays_naturel_170g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.48</field>
           <field name="name">Lays Natural Light 170g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_naturel_170g-image.jpg"/>
         </record>
         <record id="lays_light_naturel_170g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.48</field>
           <field name="name">Lays Natural Light 170g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_light_naturel_170g-image.jpg"/>
         </record>
         <record id="lays_naturel_45g" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.39</field>
           <field name="name">Lays Natural 45g</field>
-          <field name="public_categ_id" ref="chips"/>
+          <field name="pos_categ_id" ref="chips"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lays_naturel_45g-image.jpg"/>
         </record>
 
@@ -1163,35 +1164,35 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">7.60</field>
           <field name="name">IJsboerke Chocolat 2.5L</field>
-          <field name="public_categ_id" ref="ice_cream"/>
+          <field name="pos_categ_id" ref="ice_cream"/>
           <field name="image" type="base64" file="point_of_sale/static/img/ijsboerke_chocolat_2,5l-image.jpg"/>
         </record>
         <record id="ijsboerke_moka_2,5l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">7.60</field>
           <field name="name">IJsboerke Mocha 2.5L</field>
-          <field name="public_categ_id" ref="ice_cream"/>
+          <field name="pos_categ_id" ref="ice_cream"/>
           <field name="image" type="base64" file="point_of_sale/static/img/ijsboerke_moka_2,5l-image.jpg"/>
         </record>
         <record id="ijsboerke_vanille_2,5l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">7.40</field>
           <field name="name">IJsboerke Vanilla 2.5L</field>
-          <field name="public_categ_id" ref="ice_cream"/>
+          <field name="pos_categ_id" ref="ice_cream"/>
           <field name="image" type="base64" file="point_of_sale/static/img/ijsboerke_vanille_2,5l-image.jpg"/>
         </record>
         <record id="ijsboerke_stracciatella_2,5l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">8.40</field>
           <field name="name">IJsboerke Stracciatella 2.5L</field>
-          <field name="public_categ_id" ref="ice_cream"/>
+          <field name="pos_categ_id" ref="ice_cream"/>
           <field name="image" type="base64" file="point_of_sale/static/img/ijsboerke_stracciatella_2,5l-image.jpg"/>
         </record>
         <record id="ijsboerke_dame_blanche_2,5l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">7.60</field>
           <field name="name">IJsboerke 2.5L White Lady</field>
-          <field name="public_categ_id" ref="ice_cream"/>
+          <field name="pos_categ_id" ref="ice_cream"/>
           <field name="image" type="base64" file="point_of_sale/static/img/ijsboerke_dame_blanche_2,5l-image.jpg"/>
         </record>
         

=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml	2014-05-07 18:29:17 +0000
+++ point_of_sale/point_of_sale_view.xml	2014-05-26 16:10:21 +0000
@@ -477,13 +477,68 @@
 
 
 
-        <record id="product_normal_form_view" model="ir.ui.view">
-            <field name="name">product.normal.form.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
-            <field name="arch" type="xml">
-                <group name="sale" position="inside">
+        <!-- Product Public Categories -->
+        <record id="product_pos_category_form_view" model="ir.ui.view">
+            <field name="name">pos.category.form</field>
+            <field name="model">pos.category</field>
+            <field name="arch" type="xml">
+                <form string="Pos Categories" version="7.0">
+                    <sheet>
+                        <field name="image_medium" widget='image' class="oe_avatar oe_right"/>
+                        <div class="oe_left">
+                            <group>
+                                <field name="name"/>
+                                <field name="parent_id"/>
+                                <field name="sequence"/>
+                            </group>
+                        </div>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        <record id="product_pos_category_tree_view" model="ir.ui.view">
+            <field name="name">pos.category.tree</field>
+            <field name="model">pos.category</field>
+            <field name="field_parent" eval="False"/>
+            <field name="arch" type="xml">
+                <tree string="Product Product Categories">
+                    <field name="sequence" invisible="1"/>
+                    <field name="complete_name"/>
+                </tree>
+            </field>
+        </record>
+        <record id="product_pos_category_action" model="ir.actions.act_window">
+            <field name="name">Pos Product Categories</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.category</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="False"/>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to define a new category.
+              </p><p>
+                Categories are used to browse your products through the
+                touchscreen interface.
+              </p><p>
+                If you put a photo on the category, the layout of the
+                touchscreen interface will automatically. We suggest not to put
+                a photo on categories for small (1024x768) screens.
+              </p>
+            </field>
+        </record>
+        <menuitem action="product_pos_category_action" id="menu_product_pos_category" parent="menu_point_of_sale_product" sequence="0" />
+        <!-- END -->
+
+
+        <record id="product_template_form_view" model="ir.ui.view">
+            <field name="name">product.template.form.inherit</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_form_view"/>
+            <field name="arch" type="xml">
+                <group name="website_and_pos" position="inside">
                     <group name="pos" string="Point of Sale">
+                        <field name="pos_categ_id"/>
                         <field name="available_in_pos"/>
                         <field name="to_weight" />
                         <field name="income_pdt"/>
@@ -495,9 +550,6 @@
                 </field>
             </field>
         </record>
-
-        <!-- Categories tree view -->
-        <menuitem action="product.product_public_category_action" id="menu_product_public_category" parent="menu_point_of_sale_product" sequence="0" />
         <!-- END -->
 
         <menuitem name="Configuration" parent="menu_point_root"

=== modified file 'point_of_sale/security/ir.model.access.csv'
--- point_of_sale/security/ir.model.access.csv	2014-02-03 17:30:00 +0000
+++ point_of_sale/security/ir.model.access.csv	2014-05-26 16:10:21 +0000
@@ -57,5 +57,5 @@
 access_pos_session_user,pos.session user,model_pos_session,group_pos_user,1,1,1,0
 access_pos_config_user,pos.config user,model_pos_config,group_pos_user,1,1,1,0
 access_ir_sequence_manager,ir.sequence manager,base.model_ir_sequence,group_pos_manager,1,1,1,1
-access_product_category_pos_manager,product.public.category manager,product.model_product_public_category,group_pos_manager,1,1,1,1
-access_product_category_pos_user,product.public.category user,product.model_product_public_category,group_pos_user,1,0,0,0
+access_product_category_pos_manager,pos.category manager,model_pos_category,group_pos_manager,1,1,1,1
+access_product_category_pos_user,pos.category user,model_pos_category,group_pos_user,1,0,0,0

=== modified file 'point_of_sale/static/src/js/db.js'
--- point_of_sale/static/src/js/db.js	2014-01-27 16:10:05 +0000
+++ point_of_sale/static/src/js/db.js	2014-05-26 16:10:21 +0000
@@ -145,7 +145,7 @@
             for(var i = 0, len = products.length; i < len; i++){
                 var product = products[i];
                 var search_string = this._product_search_string(product);
-                var categ_id = product.public_categ_id ? product.public_categ_id[0] : this.root_category_id;
+                var categ_id = product.pos_categ_id ? product.pos_categ_id[0] : this.root_category_id;
                 if(!stored_categories[categ_id]){
                     stored_categories[categ_id] = [];
                 }

=== modified file 'point_of_sale/static/src/js/models.js'
--- point_of_sale/static/src/js/models.js	2014-03-28 14:57:10 +0000
+++ point_of_sale/static/src/js/models.js	2014-05-26 16:10:21 +0000
@@ -208,13 +208,13 @@
                 }).then(function(packagings){
                     self.db.add_packagings(packagings);
 
-                    return self.fetch('product.public.category', ['id','name','parent_id','child_id','image'])
+                    return self.fetch('pos.category', ['id','name','parent_id','child_id','image'])
                 }).then(function(categories){
                     self.db.add_categories(categories);
 
                     return self.fetch(
                         'product.product', 
-                        ['name', 'list_price','price','public_categ_id', 'taxes_id', 'ean13', 'default_code',
+                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code',
                          'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
                         [['sale_ok','=',true],['available_in_pos','=',true]],
                         {pricelist: self.pricelist.id} // context for price

=== modified file 'point_of_sale/static/src/js/widgets.js'
--- point_of_sale/static/src/js/widgets.js	2014-04-25 12:22:20 +0000
+++ point_of_sale/static/src/js/widgets.js	2014-05-26 16:10:21 +0000
@@ -436,7 +436,7 @@
         },
 
         get_image_url: function(category){
-            return window.location.origin + '/web/binary/image?model=product.public.category&field=image_medium&id='+category.id;
+            return window.location.origin + '/web/binary/image?model=pos.category&field=image_medium&id='+category.id;
         },
 
         render_category: function( category, with_image ){

=== modified file 'product/pricelist.py'
--- product/pricelist.py	2014-03-17 12:01:26 +0000
+++ product/pricelist.py	2014-05-26 16:10:21 +0000
@@ -188,10 +188,13 @@
 
         products = map(lambda x: x[0], products_by_qty_by_partner)
         currency_obj = self.pool.get('res.currency')
-        product_obj = self.pool.get('product.product')
+        product_obj = self.pool.get('product.template')
         product_uom_obj = self.pool.get('product.uom')
         price_type_obj = self.pool.get('product.price.type')
 
+        if not products:
+            return {}
+
         version = False
         for v in pricelist.version_id:
             if ((v.date_start is False) or (v.date_start <= date)) and ((v.date_end is False) or (v.date_end >= date)):
@@ -207,8 +210,13 @@
                 categ = categ.parent_id
         categ_ids = categ_ids.keys()
 
-        prod_ids = [x.id for x in products]
-        prod_tmpl_ids = [x.product_tmpl_id.id for x in products]
+        is_product_template = products[0]._name == "product.template"
+        if is_product_template:
+            prod_tmpl_ids = [tmpl.id for tmpl in products]
+            prod_ids = [product.id for product in tmpl.product_variant_ids for tmpl in products]
+        else:
+            prod_ids = [product.id for product in products]
+            prod_tmpl_ids = [product.product_tmpl_id.id for product in products]
 
         # Load all rules
         cr.execute(
@@ -234,10 +242,17 @@
             for rule in items:
                 if rule.min_quantity and qty<rule.min_quantity:
                     continue
-                if rule.product_tmpl_id and product.product_tmpl_id.id<>rule.product_tmpl_id.id:
-                    continue
-                if rule.product_id and product.id<>rule.product_id.id:
-                    continue
+                if is_product_template:
+                    if rule.product_tmpl_id and product.id<>rule.product_tmpl_id.id:
+                        continue
+                    if rule.product_id:
+                        continue
+                else:
+                    if rule.product_tmpl_id and product.product_tmpl_id.id<>rule.product_tmpl_id.id:
+                        continue
+                    if rule.product_id and product.id<>rule.product_id.id:
+                        continue
+
                 if rule.categ_id:
                     cat = product.categ_id
                     while cat:

=== modified file 'product/product.py'
--- product/product.py	2014-05-09 07:33:15 +0000
+++ product/product.py	2014-05-26 16:10:21 +0000
@@ -29,6 +29,7 @@
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+import psycopg2
 
 import openerp.addons.decimal_precision as dp
 
@@ -316,69 +317,78 @@
     }
 
 
-class product_public_category(osv.osv):
-    _name = "product.public.category"
-    _description = "Public Category"
-    _order = "sequence, name"
-
-    _constraints = [
-        (osv.osv._check_recursion, 'Error ! You cannot create recursive categories.', ['parent_id'])
-    ]
-
-    def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
-            return []
-        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
-        res = []
-        for record in reads:
-            name = record['name']
-            if record['parent_id']:
-                name = record['parent_id'][1]+' / '+name
-            res.append((record['id'], name))
-        return res
-
-    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
-        res = self.name_get(cr, uid, ids, context=context)
-        return dict(res)
-
-    def _get_image(self, cr, uid, ids, name, args, context=None):
-        result = dict.fromkeys(ids, False)
+#----------------------------------------------------------
+# Attributes / Variants
+#----------------------------------------------------------
+class product_attribute(osv.osv):
+    _name = "product.attribute"
+    _description = "Product Attribute"
+    _columns = {
+        'name': fields.char('Name', translate=True, required=True),
+        'value_ids': fields.one2many('product.attribute.value', 'attribute_id', 'Values'),
+    }
+
+class product_attribute_value(osv.osv):
+    _name = "product.attribute.value"
+    _order = 'sequence'
+    def _get_price_extra(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, 0)
+        if not context.get('active_id'):
+            return result
+
         for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = tools.image_get_resized_images(obj.image)
+            for price_id in obj.price_ids:
+                if price_id.product_tmpl_id.id == context.get('active_id'):
+                    result[obj.id] = price_id.price_extra
+                    break
         return result
-    
-    def _set_image(self, cr, uid, id, name, value, args, context=None):
-        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
-
-    _columns = {
-        'name': fields.char('Name', required=True, translate=True),
-        'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
-        'parent_id': fields.many2one('product.public.category','Parent Category', select=True),
-        'child_id': fields.one2many('product.public.category', 'parent_id', string='Children Categories'),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
-        
-        # NOTE: there is no 'default image', because by default we don't show thumbnails for categories. However if we have a thumbnail
-        # for at least one category, then we display a default image on the other, so that the buttons have consistent styling.
-        # In this case, the default image is set by the js code.
-        # NOTE2: image: all image fields are base64 encoded and PIL-supported
-        'image': fields.binary("Image",
-            help="This field holds the image used as image for the cateogry, limited to 1024x1024px."),
-        'image_medium': fields.function(_get_image, fnct_inv=_set_image,
-            string="Medium-sized image", type="binary", multi="_get_image",
-            store={
-                'product.public.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
-            },
-            help="Medium-sized image of the category. It is automatically "\
-                 "resized as a 128x128px image, with aspect ratio preserved. "\
-                 "Use this field in form views or some kanban views."),
-        'image_small': fields.function(_get_image, fnct_inv=_set_image,
-            string="Smal-sized image", type="binary", multi="_get_image",
-            store={
-                'product.public.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
-            },
-            help="Small-sized image of the category. It is automatically "\
-                 "resized as a 64x64px image, with aspect ratio preserved. "\
-                 "Use this field anywhere a small image is required."),
+
+    def _set_price_extra(self, cr, uid, id, name, value, args, context=None):
+        if 'active_id' not in context:
+            return None
+        p_obj = self.pool['product.attribute.price']
+        p_ids = p_obj.search(cr, uid, [('value_id', '=', id), ('product_tmpl_id', '=', context['active_id'])], context=context)
+        if p_ids:
+            p_obj.write(cr, uid, p_ids, {'price_extra': value}, context=context)
+        else:
+            p_obj.create(cr, uid, p_ids, {
+                    'product_tmpl_id': context['active_id'],
+                    'value_id': id,
+                    'price_extra': value,
+                }, context=context)
+
+    _columns = {
+        'sequence': fields.integer('Sequence', help="Determine the display order"),
+        'name': fields.char('Value', translate=True, required=True),
+        'attribute_id': fields.many2one('product.attribute', 'Attribute', required=True),
+        'product_ids': fields.many2many('product.product', id1='att_id', id2='prod_id', string='Variants', readonly=True),
+        'price_extra': fields.function(_get_price_extra, type='float', string='Variant Price Extra',
+            fnct_inv=_set_price_extra,
+            digits_compute=dp.get_precision('Product Price'),
+            help="Price Extra: Extra price for the variant with this attribute value on sale price. eg. 200 price extra, 1000 + 200 = 1200."),
+        'price_ids': fields.one2many('product.attribute.price', 'value_id', string='Variant Prices', readonly=True),
+    }
+    _sql_constraints = [
+        ('value_company_uniq', 'unique (name,attribute_id)', 'This attribute value already exists !')
+    ]
+    _defaults = {
+        'price_extra': lambda *a: 0.0,
+    }
+
+class product_attribute_price(osv.osv):
+    _name = "product.attribute.price"
+    _columns = {
+        'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True),
+        'value_id': fields.many2one('product.attribute.value', 'Product Attribute Value', required=True),
+        'price_extra': fields.float('Price Extra', digits_compute=dp.get_precision('Product Price')),
+    }
+
+class product_attribute_line(osv.osv):
+    _name = "product.attribute.line"
+    _columns = {
+        'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True),
+        'attribute_id': fields.many2one('product.attribute', 'Attribute', required=True),
+        'value_ids': fields.many2many('product.attribute.value', id1='line_id', id2='val_id', string='Product Attribute Value'),
     }
 
 
@@ -399,6 +409,38 @@
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
 
+    def _is_product_variant(self, cr, uid, ids, name, arg, context=None):
+        prod = self.pool.get('product.product')
+        res = dict.fromkeys(ids, False)
+        ctx = dict(context, active_test=True)
+        for product in self.browse(cr, uid, ids, context=context):
+            res[product.id] = prod.search(cr, uid, [('product_tmpl_id','=',product.id)], context=ctx, count=True) == 1
+        return res
+
+    def _product_template_price(self, cr, uid, ids, name, arg, context=None):
+        plobj = self.pool.get('product.pricelist')
+        res = {}
+        quantity = context.get('quantity') or 1.0
+        pricelist = context.get('pricelist', False)
+        partner = context.get('partner', False)
+        if pricelist:
+            # Support context pricelists specified as display_name or ID for compatibility
+            if isinstance(pricelist, basestring):
+                pricelist_ids = plobj.name_search(
+                    cr, uid, pricelist, operator='=', context=context, limit=1)
+                pricelist = pricelist_ids[0][0] if pricelist_ids else pricelist
+
+            if isinstance(pricelist, (int, long)):
+                products = self.browse(cr, uid, ids, context=context)
+                qtys = map(lambda x: (x, quantity, partner), products)
+                pl = plobj.browse(cr, uid, pricelist, context=context)
+                price = plobj._price_get_multi(cr,uid, pl, qtys, context=context)
+                for id in ids:
+                    res[id] = price.get(id, 0.0)
+        for id in ids:
+            res.setdefault(id, 0.0)
+        return res
+
     def get_history_price(self, cr, uid, product_tmpl, company_id, date=None, context=None):
         if context is None:
             context = {}
@@ -421,6 +463,12 @@
             'company_id': company_id,
         }, context=context)
 
+    def _get_product_variant_count(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for product in self.browse(cr, uid, ids):
+            res[product.id] = len(product.product_variant_ids)
+        return res
+
     _columns = {
         'name': fields.char('Name', required=True, translate=True, select=True),
         'product_manager': fields.many2one('res.users','Product Manager'),
@@ -434,9 +482,10 @@
                  "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"),
         'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),        
         'rental': fields.boolean('Can be Rent'),
-        'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
-        'public_categ_id': fields.many2one('product.public.category','Public Category', help="Those categories are used to group similar products for public sales (eg.: point of sale, e-commerce)."),
+        'categ_id': fields.many2one('product.category','Internal Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
+        'price': fields.function(_product_template_price, type='float', string='Price', digits_compute=dp.get_precision('Product Price')),
         'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price to compute the customer price. Sometimes called the catalog price."),
+        'lst_price' : fields.related('list_price', type="float", string='Public Price', digits_compute=dp.get_precision('Product Price')),
         'standard_price': fields.property(type = 'float', digits_compute=dp.get_precision('Product Price'), 
                                           help="Cost price of the product template used for standard stock valuation in accounting and used as a base price on purchase orders.", 
                                           groups="base.group_user", string="Cost Price"),
@@ -445,6 +494,7 @@
         'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
         'warranty': fields.float('Warranty'),
         'sale_ok': fields.boolean('Can be Sold', help="Specify if the product can be selected in a sales order line."),
+        'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
         'state': fields.selection([('',''),
             ('draft', 'In Development'),
             ('sellable','Normal'),
@@ -458,13 +508,12 @@
             help='Coefficient to convert default Unit of Measure to Unit of Sale\n'
             ' uos = uom * coeff'),
         'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type'),
-        'seller_ids': fields.one2many('product.supplierinfo', 'product_tmpl_id', 'Supplier'),
         'company_id': fields.many2one('res.company', 'Company', select=1),
         # image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Image",
             help="This field holds the image used as image for the product, limited to 1024x1024px."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
-            string="Medium-sized image", type="binary", multi="_get_image",
+            string="Medium-sized image", type="binary", multi="_get_image", 
             store={
                 'product.template': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
@@ -479,13 +528,64 @@
             help="Small-sized image of the product. It is automatically "\
                  "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
-        'product_variant_ids': fields.one2many('product.product', 'product_tmpl_id', 'Product Variants', required=True),
+
+        'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units',
+            help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
+        
+        'seller_ids': fields.one2many('product.supplierinfo', 'product_tmpl_id', 'Supplier'),
+        'seller_delay': fields.related('seller_ids','delay', type='integer', string='Supplier Lead Time',
+            help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
+        'seller_qty': fields.related('seller_ids','qty', type='float', string='Supplier Quantity',
+            help="This is minimum quantity to purchase from Main Supplier."),
+        'seller_id': fields.related('seller_ids','name', type='many2one', relation='res.partner', string='Main Supplier',
+            help="Main Supplier who has highest priority in Supplier List."),
+
+        'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the product without removing it."),
+        'color': fields.integer('Color Index'),
+        'is_product_variant': fields.function( _is_product_variant, type='boolean', string='Only one product variant'),
+
+        'variant_ids': fields.one2many('product.attribute.line', 'product_tmpl_id', 'Product Variants'),
+        'product_variant_ids': fields.one2many('product.product', 'product_tmpl_id', 'Products', required=True),
+        'product_variant_count': fields.function( _get_product_variant_count, type='integer', string='Product Variant Number'),
+
+        # related to display product product information if is_product_variant
+        'ean13': fields.related('product_variant_ids', 'ean13', type='char', string='EAN13 Barcode'),
+        'default_code': fields.related('product_variant_ids', 'default_code', type='char', string='Internal Reference'),
     }
 
+    def _price_get_list_price(self, product):
+        return 0.0
+
+    def _price_get(self, cr, uid, products, ptype='list_price', context=None):
+        if context is None:
+            context = {}
+
+        if 'currency_id' in context:
+            pricetype_obj = self.pool.get('product.price.type')
+            price_type_id = pricetype_obj.search(cr, uid, [('field','=',ptype)])[0]
+            price_type_currency_id = pricetype_obj.browse(cr,uid,price_type_id).currency_id.id
+
+        res = {}
+        product_uom_obj = self.pool.get('product.uom')
+        for product in products:
+            res[product.id] = product[ptype] or 0.0
+            if ptype == 'list_price':
+                res[product.id] += product._name == "product.product" and product.price_extra or 0.0
+            if 'uom' in context:
+                uom = product.uom_id or product.uos_id
+                res[product.id] = product_uom_obj._compute_price(cr, uid,
+                        uom.id, res[product.id], context['uom'])
+            # Convert from price_type currency to asked one
+            if 'currency_id' in context:
+                # Take the price_type currency from the product field
+                # This is right cause a field cannot be in more than one currency
+                res[product.id] = self.pool.get('res.currency').compute(cr, uid, price_type_currency_id,
+                    context['currency_id'], res[product.id],context=context)
+
+        return res
+
     def _get_uom_id(self, cr, uid, *args):
-        cr.execute('select id from product_uom order by id limit 1')
-        res = cr.fetchone()
-        return res and res[0] or False
+        return self.pool["product.uom"].search(cr, uid, [], limit=1, order='id')[0]
 
     def _default_category(self, cr, uid, context=None):
         if context is None:
@@ -505,9 +605,65 @@
             return {'value': {'uom_po_id': uom_id}}
         return {}
 
+    def create_variant_ids(self, cr, uid, ids, context=None):
+        product_obj = self.pool.get("product.product")
+        ctx = context and context.copy() or {}
+
+        if ctx.get("create_product_variant"):
+            return None
+
+        ctx.update(active_test=False, create_product_variant=True)
+
+        tmpl_ids = self.browse(cr, uid, ids, context=ctx)
+        for tmpl_id in tmpl_ids:
+
+            # list of values combination
+            all_variants = [[]]
+            for variant_id in tmpl_id.variant_ids:
+                if len(variant_id.value_ids) > 1:
+                    temp_variants = []
+                    for value_id in variant_id.value_ids:
+                        for variant in all_variants:
+                            temp_variants.append(variant + [int(value_id)])
+                    all_variants = temp_variants
+
+            # check product
+            variants_active_ids = []
+            variants_inactive = []
+            for product_id in tmpl_id.product_variant_ids:
+                variants = map(int,product_id.variant_ids)
+                if variants in all_variants:
+                    variants_active_ids.append(product_id.id)
+                    all_variants.pop(all_variants.index(variants))
+                    # TODO all write in same time
+                    if product_id.active:
+                        product_id.write({'active': True}, context=ctx)
+                else:
+                    variants_inactive.append(product_id)
+
+            # create new product
+            for variant_ids in all_variants:
+                values = {
+                    'product_tmpl_id': tmpl_id.id,
+                    'variant_ids': [(6, 0, variant_ids)]
+                }
+                id = product_obj.create(cr, uid, values, context=ctx)
+                variants_active_ids.append(id)
+
+            # unlink or inactive product
+            for variant_id in map(int,variants_inactive):
+                try:
+                    with cr.savepoint():
+                        product_obj.unlink(cr, uid, [variant_id], context=ctx)
+                except (psycopg2.Error, osv.except_osv):
+                    product_obj.write(cr, uid, [variant_id], {'active': False}, context=ctx)
+                    pass
+        return True
+
     def create(self, cr, uid, vals, context=None):
         ''' Store the initial standard price in order to be able to retrieve the cost of a product template for a given date'''
         product_template_id = super(product_template, self).create(cr, uid, vals, context=context)
+        self.create_variant_ids(cr, uid, [product_template_id], context=context)
         self._set_standard_price(cr, uid, product_template_id, vals.get('standard_price', 0.0), context=context)
         return product_template_id
 
@@ -524,7 +680,15 @@
         if 'standard_price' in vals:
             for prod_template_id in ids:
                 self._set_standard_price(cr, uid, prod_template_id, vals['standard_price'], context=context)
-        return super(product_template, self).write(cr, uid, ids, vals, context=context)
+        if 'active' in vals:
+            product_ids = []
+            for product in self.browse(cr, uid, ids, context=context):
+                product_ids = map(int, product.product_variant_ids)
+            self.write(cr, uid, product_ids, {'active': vals.get('active')}, context=context)
+        res = super(product_template, self).write(cr, uid, ids, vals, context=context)
+        if 'variant_ids' in vals:
+            self.create_variant_ids(cr, uid, ids, context=context)
+        return res
 
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
@@ -544,6 +708,7 @@
         'mes_type': 'fixed',
         'categ_id' : _default_category,
         'type' : 'consu',
+        'active': lambda *a: 1,
     }
 
     def _check_uom(self, cursor, user, ids, context=None):
@@ -579,6 +744,32 @@
     _inherit = ['mail.thread']
     _order = 'default_code,name_template'
 
+    def _product_price(self, cr, uid, ids, name, arg, context=None):
+        plobj = self.pool.get('product.pricelist')
+        res = {}
+        if context is None:
+            context = {}
+        quantity = context.get('quantity') or 1.0
+        pricelist = context.get('pricelist', False)
+        partner = context.get('partner', False)
+        if pricelist:
+            # Support context pricelists specified as display_name or ID for compatibility
+            if isinstance(pricelist, basestring):
+                pricelist_ids = plobj.name_search(
+                    cr, uid, pricelist, operator='=', context=context, limit=1)
+                pricelist = pricelist_ids[0][0] if pricelist_ids else pricelist
+
+            if isinstance(pricelist, (int, long)):
+                products = self.browse(cr, uid, ids, context=context)
+                qtys = map(lambda x: (x, quantity, partner), products)
+                pl = plobj.browse(cr, uid, pricelist, context=context)
+                price = plobj._price_get_multi(cr,uid, pl, qtys, context=context)
+                for id in ids:
+                    res[id] = price.get(id, 0.0)
+        for id in ids:
+            res.setdefault(id, 0.0)
+        return res
+
     def view_header_get(self, cr, uid, view_id, view_type, context=None):
         if context is None:
             context = {}
@@ -587,37 +778,11 @@
             return _('Products: ') + self.pool.get('product.category').browse(cr, uid, context['categ_id'], context=context).name
         return res
 
-    def _product_price(self, cr, uid, ids, name, arg, context=None):
-        plobj = self.pool.get('product.pricelist')
-        res = {}
-        if context is None:
-            context = {}
-        quantity = context.get('quantity') or 1.0
-        pricelist = context.get('pricelist', False)
-        partner = context.get('partner', False)
-        if pricelist:
-            # Support context pricelists specified as display_name or ID for compatibility
-            if isinstance(pricelist, basestring):
-                pricelist_ids = plobj.name_search(
-                    cr, uid, pricelist, operator='=', context=context, limit=1)
-                pricelist = pricelist_ids[0][0] if pricelist_ids else pricelist
-
-            if isinstance(pricelist, (int, long)):
-                products = self.browse(cr, uid, ids, context=context)
-                qtys = map(lambda x: (x, quantity, partner), products)
-                pl = plobj.browse(cr, uid, pricelist, context=context)
-                price = plobj._price_get_multi(cr,uid, pl, qtys, context=context)
-                for id in ids:
-                    res[id] = price.get(id, 0.0)
-        for id in ids:
-            res.setdefault(id, 0.0)
-        return res
-
     def _product_lst_price(self, cr, uid, ids, name, arg, context=None):
         res = {}
         product_uom_obj = self.pool.get('product.uom')
-        for id in ids:
-            res.setdefault(id, 0.0)
+        res = dict.fromkeys(ids, 0.0)
+
         for product in self.browse(cr, uid, ids, context=context):
             if 'uom' in context:
                 uom = product.uos_id or product.uom_id
@@ -625,20 +790,17 @@
                         uom.id, product.list_price, context['uom'])
             else:
                 res[product.id] = product.list_price
-            res[product.id] =  (res[product.id] or 0.0) * (product.price_margin or 1.0) + product.price_extra
+            price_extra = 0.0
+            for variant_id in product.variant_ids:
+                price_extra += variant_id.price_extra
+            res[product.id] =  (res[product.id] or 0.0) + price_extra
         return res
 
-    def _save_product_lst_price(self, cr, uid, product_id, field_name, field_value, arg, context=None):
-        field_value = field_value or 0.0
-        product = self.browse(cr, uid, product_id, context=context)
-        list_price = (field_value - product.price_extra) / (product.price_margin or 1.0)
-        return self.write(cr, uid, [product_id], {'list_price': list_price}, context=context)
-
     def _get_partner_code_name(self, cr, uid, ids, product, partner_id, context=None):
         for supinfo in product.seller_ids:
             if supinfo.name.id == partner_id:
-                return {'code': supinfo.product_code or product.default_code, 'name': supinfo.product_name or product.name, 'variants': ''}
-        res = {'code': product.default_code, 'name': product.name, 'variants': product.variants}
+                return {'code': supinfo.product_code or product.default_code, 'name': supinfo.product_name or product.name}
+        res = {'code': product.default_code, 'name': product.name}
         return res
 
     def _product_code(self, cr, uid, ids, name, arg, context=None):
@@ -655,48 +817,15 @@
             context = {}
         for p in self.browse(cr, uid, ids, context=context):
             data = self._get_partner_code_name(cr, uid, [], p, context.get('partner_id', None), context=context)
-            if not data['variants']:
-                data['variants'] = p.variants
             if not data['code']:
                 data['code'] = p.code
             if not data['name']:
                 data['name'] = p.name
-            res[p.id] = (data['code'] and ('['+data['code']+'] ') or '') + \
-                    (data['name'] or '') + (data['variants'] and (' - '+data['variants']) or '')
-        return res
-
-    def _is_only_child(self, cr, uid, ids, name, arg, context=None):
-        res = dict.fromkeys(ids, True)
-        for product in self.browse(cr, uid, ids, context=context):
-            if product.product_tmpl_id and len(product.product_tmpl_id.product_variant_ids) > 1:
-                res[product.id] = False
-        return res
-
-    def _get_main_product_supplier(self, cr, uid, product, context=None):
-        """Determines the main (best) product supplier for ``product``,
-        returning the corresponding ``supplierinfo`` record, or False
-        if none were found. The default strategy is to select the
-        supplier with the highest priority (i.e. smallest sequence).
-
-        :param browse_record product: product to supply
-        :rtype: product.supplierinfo browse_record or False
-        """
-        sellers = [(seller_info.sequence, seller_info)
-                       for seller_info in product.seller_ids or []
-                       if seller_info and isinstance(seller_info.sequence, (int, long))]
-        return sellers and sellers[0][1] or False
-
-    def _calc_seller(self, cr, uid, ids, fields, arg, context=None):
-        result = {}
-        for product in self.browse(cr, uid, ids, context=context):
-            main_supplier = self._get_main_product_supplier(cr, uid, product, context=context)
-            result[product.id] = {
-                'seller_info_id': main_supplier and main_supplier.id or False,
-                'seller_delay': main_supplier.delay if main_supplier else 1,
-                'seller_qty': main_supplier and main_supplier.qty or 0.0,
-                'seller_id': main_supplier and main_supplier.name.id or False
-            }
-        return result
+            res[p.id] = (data['code'] and ('['+data['code']+'] ') or '') + (data['name'] or '')
+        return res
+
+    def _is_product_variant(self, cr, uid, ids, name, arg, context=None):
+        return dict.fromkeys(ids, True)
 
     def _get_name_template_ids(self, cr, uid, ids, context=None):
         result = set()
@@ -705,39 +834,69 @@
             result.add(el)
         return list(result)
 
+    def _get_image_variant(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = obj.image_variant or getattr(obj.product_tmpl_id, name)
+        return result
+
+    def _set_image_variant(self, cr, uid, id, name, value, args, context=None):
+        image = tools.image_resize_image_big(value)
+        res = self.write(cr, uid, [id], {'image_variant': image}, context=context)
+        product = self.browse(cr, uid, id, context=context)
+        if not product.product_tmpl_id.image:
+            product.write({'image_variant': None}, context=context)
+            product.product_tmpl_id.write({'image': image}, context=context)
+        return res
+
+    def _get_price_extra(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for product in self.browse(cr, uid, ids, context=context):
+            price_extra = 0.0
+            for variant_id in product.variant_ids:
+                for price_id in variant_id.price_ids:
+                    if price_id.product_tmpl_id.id == product.product_tmpl_id.id:
+                        price_extra += price_id.price_extra
+            result[product.id] = price_extra
+        return result
+
     _columns = {
-        'price': fields.function(_product_price, fnct_inv=_save_product_lst_price, type='float', string='Price', digits_compute=dp.get_precision('Product Price')),
-        'lst_price' : fields.function(_product_lst_price, fnct_inv=_save_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')),
+        'price': fields.function(_product_price, type='float', string='Price', digits_compute=dp.get_precision('Product Price')),
+        'price_extra': fields.function(_get_price_extra, type='float', string='Sum of Variant Price Extra'),
+        'lst_price': fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')),
         'code': fields.function(_product_code, type='char', string='Internal Reference'),
         'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
         'default_code' : fields.char('Internal Reference', select=True),
         'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the product without removing it."),
-        'variants': fields.char('Variants', translate=True),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade", select=True),
-        'is_only_child': fields.function(
-            _is_only_child, type='boolean', string='Sole child of the parent template'),
         'ean13': fields.char('EAN13 Barcode', size=13, help="International Article Number used for product identification."),
+        'is_product_variant': fields.function( _is_product_variant, type='boolean', string='Only one product variant'),
         'packaging': fields.one2many('product.packaging', 'product_id', 'Packaging', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
-        'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price'), help="Price Extra: Extra price for the variant on sale price. eg. 200 price extra, 1000 + 200 = 1200."),
-        'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price'), help="Price Margin: Margin in percentage amount on sale price for the variant. eg. 10 price margin, 1000 * 1.1 = 1100."),
-        'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
         'name_template': fields.related('product_tmpl_id', 'name', string="Template Name", type='char', store={
             'product.template': (_get_name_template_ids, ['name'], 10),
             'product.product': (lambda self, cr, uid, ids, c=None: ids, [], 10),
         }, select=True),
-        'color': fields.integer('Color Index'),
-        'seller_info_id': fields.function(_calc_seller, type='many2one', relation="product.supplierinfo", string="Supplier Info", multi="seller_info"),
-        'seller_delay': fields.function(_calc_seller, type='integer', string='Supplier Lead Time', multi="seller_info", help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
-        'seller_qty': fields.function(_calc_seller, type='float', string='Supplier Quantity', multi="seller_info", help="This is minimum quantity to purchase from Main Supplier."),
-        'seller_id': fields.function(_calc_seller, type='many2one', relation="res.partner", string='Main Supplier', help="Main Supplier who has highest priority in Supplier List.", multi="seller_info"),
+        'variant_ids': fields.many2many('product.attribute.value',  id1='prod_id', id2='att_id', string='Variants', readonly=True),
+
+        # image: all image fields are base64 encoded and PIL-supported
+        'image_variant': fields.binary("Variant Image",
+            help="This field holds the image used as image for the product variant, limited to 1024x1024px."),
+
+        'image': fields.function(_get_image_variant, fnct_inv=_set_image_variant,
+            string="Big-sized image", type="binary",
+            help="Image of the product variant (Big-sized image of product template if false). It is automatically "\
+                 "resized as a 1024x1024px image, with aspect ratio preserved."),
+        'image_small': fields.function(_get_image_variant, fnct_inv=_set_image_variant,
+            string="Small-sized image", type="binary",
+            help="Image of the product variant (Small-sized image of product template if false)."),
+        'image_medium': fields.function(_get_image_variant, fnct_inv=_set_image_variant,
+            string="Medium-sized image", type="binary",
+            help="Image of the product variant (Medium-sized image of product template if false)."),
     }
 
     _defaults = {
         'active': lambda *a: 1,
-        'price_extra': lambda *a: 0.0,
-        'price_margin': lambda *a: 1.0,
         'color': 0,
-        'is_only_child': True,
     }
 
     def unlink(self, cr, uid, ids, context=None):
@@ -767,8 +926,9 @@
 
     def _check_ean_key(self, cr, uid, ids, context=None):
         for product in self.read(cr, uid, ids, ['ean13'], context=context):
-            res = check_ean(product['ean13'])
-        return res
+            if not check_ean(product['ean13']):
+                return False
+        return True
 
     _constraints = [(_check_ean_key, 'You provided an invalid "EAN13 Barcode" reference. You may use the "Internal Reference" field instead.', ['ean13'])]
 
@@ -782,13 +942,12 @@
             ids = [ids]
         if not len(ids):
             return []
+
         def _name_get(d):
             name = d.get('name','')
             code = d.get('default_code',False)
             if code:
                 name = '[%s] %s' % (code,name)
-            if d.get('variants'):
-                name = name + ' - %s' % (d['variants'],)
             return (d['id'], name)
 
         partner_id = context.get('partner_id', False)
@@ -800,6 +959,8 @@
 
         result = []
         for product in self.browse(cr, SUPERUSER_ID, ids, context=context):
+            variant = ", ".join([v.name for v in product.variant_ids])
+            name = variant and "%s (%s)" % (product.name, variant) or product.name
             sellers = []
             if partner_id:
                 sellers = filter(lambda x: x.name.id == partner_id, product.seller_ids)
@@ -807,17 +968,15 @@
                 for s in sellers:
                     mydict = {
                               'id': product.id,
-                              'name': s.product_name or product.name,
+                              'name': s.product_name or name,
                               'default_code': s.product_code or product.default_code,
-                              'variants': product.variants
                               }
                     result.append(_name_get(mydict))
             else:
                 mydict = {
                           'id': product.id,
-                          'name': product.name,
+                          'name': name,
                           'default_code': product.default_code,
-                          'variants': product.variants
                           }
                 result.append(_name_get(mydict))
         return result
@@ -855,44 +1014,7 @@
     #
     def price_get(self, cr, uid, ids, ptype='list_price', context=None):
         products = self.browse(cr, uid, ids, context=context)
-        return self._price_get(cr, uid, products, ptype=ptype, context=context)
-
-    def _price_get(self, cr, uid, products, ptype='list_price', context=None):
-        if context is None:
-            context = {}
-
-        if 'currency_id' in context:
-            pricetype_obj = self.pool.get('product.price.type')
-            price_type_id = pricetype_obj.search(cr, uid, [('field','=',ptype)])[0]
-            price_type_currency_id = pricetype_obj.browse(cr,uid,price_type_id).currency_id.id
-
-        res = {}
-        # standard_price field can only be seen by users in base.group_user
-        # Thus, in order to compute the sale price from the cost price for users not in this group
-        # We fetch the standard price as the superuser
-        for product in products:
-            if ptype != 'standard_price':
-                res[product.id] = product[ptype] or 0.0
-            else: 
-                res[product.id] = self.read(cr, SUPERUSER_ID, product.id, [ptype], context=context)[ptype] or 0.0
-
-        product_uom_obj = self.pool.get('product.uom')
-        for product in products:
-            if ptype == 'list_price':
-                res[product.id] = (res[product.id] * (product.price_margin or 1.0)) + \
-                        product.price_extra
-            if 'uom' in context:
-                uom = product.uom_id or product.uos_id
-                res[product.id] = product_uom_obj._compute_price(cr, uid,
-                        uom.id, res[product.id], context['uom'])
-            # Convert from price_type currency to asked one
-            if 'currency_id' in context:
-                # Take the price_type currency from the product field
-                # This is right cause a field cannot be in more than one currency
-                res[product.id] = self.pool.get('res.currency').compute(cr, uid, price_type_currency_id,
-                    context['currency_id'], res[product.id],context=context)
-
-        return res
+        return self.pool.get("product.template")._price_get(cr, uid, products, ptype=ptype, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
         context = context or {}
@@ -952,8 +1074,9 @@
 
     def _check_ean_key(self, cr, uid, ids, context=None):
         for pack in self.browse(cr, uid, ids, context=context):
-            res = check_ean(pack.ean)
-        return res
+            if not check_ean(pack.ean):
+                return False
+        return True
 
     _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean'])]
 

=== modified file 'product/product_data.xml'
--- product/product_data.xml	2014-05-02 13:03:52 +0000
+++ product/product_data.xml	2014-05-26 16:10:21 +0000
@@ -255,10 +255,5 @@
             <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>

=== modified file 'product/product_demo.xml'
--- product/product_demo.xml	2014-01-28 12:53:40 +0000
+++ product/product_demo.xml	2014-05-26 16:10:21 +0000
@@ -56,127 +56,6 @@
             <field name="type">box</field>
         </record>
 
-
-    <!-- product.public.category -->
-
-        <record id="computers" model="product.public.category">
-          <field name="name">Computers</field>
-        </record>
-        
-        <record id="Components" model="product.public.category">
-          <field name="parent_id" ref="computers"/>
-          <field name="name">Components</field>
-        </record>
-
-        <record id="case" model="product.public.category">
-          <field name="parent_id" ref="Components"/>
-          <field name="name">Case</field>
-        </record>
-        <record id="HDD" model="product.public.category">
-          <field name="parent_id" ref="Components"/>
-          <field name="name">Hard Drive</field>
-        </record>
-        <record id="motherboard" model="product.public.category">
-          <field name="parent_id" ref="Components"/>
-          <field name="name">Motherboard</field>
-        </record>
-        <record id="graphics_card" model="product.public.category">
-          <field name="parent_id" ref="Components"/>
-          <field name="name">Graphics Card</field>
-        </record>
-        <record id="Memory" model="product.public.category">
-          <field name="parent_id" ref="Components"/>
-          <field name="name">Memory</field>
-        </record>
-        <record id="processor" model="product.public.category">
-          <field name="parent_id" ref="Components"/>
-          <field name="name">Processor</field>
-        </record>
-        <record id="video_acquisition" model="product.public.category">
-          <field name="parent_id" ref="Components"/>
-          <field name="name">Video Acquisition</field>
-        </record>
-
-        <record id="devices" model="product.public.category">
-          <field name="parent_id" ref="computers"/>
-          <field name="name">Devices</field>
-        </record>
-
-        <record id="Screen" model="product.public.category">
-          <field name="parent_id" ref="devices"/>
-          <field name="name">Screen</field>
-        </record>
-        <record id="Pen_Drive" model="product.public.category">
-          <field name="parent_id" ref="devices"/>
-          <field name="name">Pen Drive</field>
-        </record>
-        <record id="External_Hard_Drive" model="product.public.category">
-          <field name="parent_id" ref="devices"/>
-          <field name="name">External Hard Drive</field>
-        </record>
-        <record id="Keyboard_Mouse" model="product.public.category">
-          <field name="parent_id" ref="devices"/>
-          <field name="name">Keyboard / Mouse</field>
-        </record>
-        <record id="printer" model="product.public.category">
-          <field name="parent_id" ref="devices"/>
-          <field name="name">Printer</field>
-        </record>
-        <record id="Speakers" model="product.public.category">
-          <field name="parent_id" ref="devices"/>
-          <field name="name">Speakers</field>
-        </record>
-        <record id="Headset" model="product.public.category">
-          <field name="parent_id" ref="devices"/>
-          <field name="name">Headset</field>
-        </record>
-        <record id="Software" model="product.public.category">
-          <field name="parent_id" ref="devices"/>
-          <field name="name">Software</field>
-        </record>
-
-        <record id="laptops" model="product.public.category">
-          <field name="parent_id" ref="computers"/>
-          <field name="name">Laptops</field>
-        </record>
-
-        <record id="sub_computers" model="product.public.category">
-          <field name="parent_id" ref="computers"/>
-          <field name="name">Computers</field>
-        </record>
-
-        <record id="Computer_all_in_one" model="product.public.category">
-          <field name="parent_id" ref="sub_computers"/>
-          <field name="name">Computer all-in-one</field>
-        </record>
-        <record id="server" model="product.public.category">
-          <field name="parent_id" ref="sub_computers"/>
-          <field name="name">Server</field>
-        </record>
-
-        <record id="network" model="product.public.category">
-          <field name="parent_id" ref="computers"/>
-          <field name="name">Network</field>
-        </record>
-
-        <record id="Switch" model="product.public.category">
-          <field name="parent_id" ref="network"/>
-          <field name="name">Switch</field>
-        </record>
-        <record id="Modem_Router" model="product.public.category">
-          <field name="parent_id" ref="network"/>
-          <field name="name">Modem &amp; Router</field>
-        </record>
-        <record id="Switch" model="product.public.category">
-          <field name="parent_id" ref="network"/>
-          <field name="name">Switch</field>
-        </record>
-        
-        <record id="services" model="product.public.category">
-          <field name="parent_id" ref="computers"/>
-          <field name="name">Services</field>
-        </record>
-
     <!-- Apple Products -->
     <record id="apple" model="product.category">
           <field name="name">Apple Products</field>
@@ -210,10 +89,9 @@
             <field name="sale_ok" eval="True"/>
         </record>
 
-        <record id="product_template_1" model="product.template">
+        <record id="product_product_1" model="product.product">
             <field name="name">On Site Monitoring</field>
             <field name="categ_id" ref="product_category_5"/>
-            <field name="public_categ_id" ref="services"/>
             <field name="standard_price">20.5</field>
             <field name="list_price">30.75</field>
             <field name="type">service</field>
@@ -222,15 +100,11 @@
             <field name="description">This type of service include basic monitoring of products.</field>
             <field name="description_sale">This type of service include basic monitoring of products.</field>
         </record>
-        <record id="product_product_1" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_1"/>
-        </record>
-
-
-        <record id="product_template_2" model="product.template">
+
+
+        <record id="product_product_2" model="product.product">
             <field name="name">On Site Assistance</field>
             <field name="categ_id" ref="product_category_5"/>
-            <field name="public_categ_id" ref="services"/>
             <field name="standard_price">25.5</field>
             <field name="list_price">38.25</field>
             <field name="type">service</field>
@@ -238,15 +112,11 @@
             <field name="uom_po_id" ref="product_uom_hour"/>
             <field name="description">This type of service include assistance for security questions, system configuration requirements, implementation or special needs.</field>
         </record>
-        <record id="product_product_2" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_2"/>
-        </record>
-
-
-        <record id="product_template_3" model="product.template">
+
+
+        <record id="product_product_3" model="product.product">
             <field name="name">PC Assemble SC234</field>
             <field name="categ_id" ref="product_category_4"/>
-            <field name="public_categ_id" ref="Computer_all_in_one"/>
             <field name="list_price">450.0</field>
             <field name="standard_price">300.0</field>
             <field name="type">consu</field>
@@ -256,17 +126,13 @@
 Processor AMD 8-Core
 512MB RAM
 HDD SH-1</field>
-        </record>
-        <record id="product_product_3" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_3"/>
             <field name="default_code">PCSC234</field>
         </record>
 
 
-        <record id="product_template_4" model="product.template">
+        <record id="product_product_4" model="product.product">
             <field name="name">iPad Retina Display</field>
             <field name="categ_id" ref="ipad"/>
-            <field name="public_categ_id" ref="Computer_all_in_one"/>
             <field name="standard_price">500.0</field>
             <field name="list_price">750.0</field>
             <field name="type">consu</field>
@@ -275,17 +141,13 @@
             <field name="description_sale">7.9‑inch (diagonal) LED-backlit, 128Gb
 Dual-core A5 with quad-core graphics
 FaceTime HD Camera, 1.2 MP Photos</field>
-        </record>
-        <record id="product_product_4" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_4"/>
             <field name="default_code">A2323</field>
         </record>
 
 
-        <record id="product_template_5" model="product.template">
+        <record id="product_product_5" model="product.product">
             <field name="name">Bose Mini Bluetooth Speaker</field>
             <field name="categ_id" ref="accessories"/>
-            <field name="public_categ_id" ref="Speakers"/>
             <field name="standard_price">600.0</field>
             <field name="list_price">147.0</field>
             <field name="type">consu</field>
@@ -293,44 +155,33 @@
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Custom computer assembled on order based on customer's requirement.</field>
             <field name="description_sale">Bose's smallest portable Bluetooth speaker</field>
-        </record>
-        <record id="product_product_5" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_5"/>
             <field name="default_code">B3423</field>
         </record>
 
 
-        <record id="product_template_6" model="product.template">
+        <record id="product_product_6" model="product.product">
             <field name="name">iPad Mini</field>
             <field name="categ_id" ref="ipad"/>
-            <field name="public_categ_id" ref="Screen"/>
             <field name="standard_price">800.0</field>
             <field name="list_price">320.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_6" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_6"/>
             <field name="default_code">A1232</field>
         </record>
 
-        <record id="product_template_7" model="product.template">
+        <record id="product_product_7" model="product.product">
             <field name="name">Apple In-Ear Headphones</field>
             <field name="categ_id" ref="accessories"/>
-            <field name="public_categ_id" ref="Screen"/>
             <field name="standard_price">70.0</field>
             <field name="list_price">79.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_7" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_7"/>
             <field name="default_code">A8767</field>
         </record>
 
-        <record id="product_template_8" model="product.template">
+        <record id="product_product_8" model="product.product">
             <field name="name">iMac</field>
             <field name="categ_id" ref="imac"/>
             <field name="standard_price">1299.0</field>
@@ -338,272 +189,227 @@
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_8" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_8"/>
             <field name="default_code">A1090</field>
         </record>
 
-        <record id="product_template_9" model="product.template">
+        <record id="product_product_9" model="product.product">
             <field name="name">Apple Wireless Keyboard</field>
             <field name="categ_id" ref="accessories"/>
-            <field name="public_categ_id" ref="Keyboard_Mouse"/>
             <field name="standard_price">10.0</field>
             <field name="list_price">47.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_9" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_9"/>
             <field name="default_code">AK789</field>
         </record>
 
-        <record id="product_template_10" model="product.template">
+        <record id="product_product_10" model="product.product">
             <field name="name">Mouse, Optical</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="Keyboard_Mouse"/>
             <field name="standard_price">12.50</field>
             <field name="list_price">14</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_10" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_10"/>
             <field name="default_code">M-Opt</field>
         </record>
 
-        <record id="product_template_11" model="product.template">
-            <field name="name">iPod</field>
-            <field name="categ_id" ref="ipod"/>
-            <field name="public_categ_id" ref="Keyboard_Mouse"/>
-            <field name="standard_price">14</field>
-            <field name="list_price">16.50</field>
-            <field name="type">consu</field>
-            <field name="uom_id" ref="product_uom_unit"/>
-            <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
+        <!-- -->
+
+        <record id="product_attribute_1" model="product.attribute">
+            <field name="name">Memory</field>
+        </record>
+        <record id="product_attribute_value_1" model="product.attribute.value">
+            <field name="name">16 Go</field>
+            <field name="attribute_id" ref="product_attribute_1"/>
+        </record>
+        <record id="product_attribute_value_2" model="product.attribute.value">
+            <field name="name">32 Go</field>
+            <field name="attribute_id" ref="product_attribute_1"/>
+        </record>
+
         <record id="product_product_11" model="product.product">
             <field name="name">iPod</field>
-            <field name="variants">16 Gb</field>
-            <field name="default_code">A6678</field>
             <field name="categ_id" ref="ipod"/>
-            <field name="public_categ_id" ref="Keyboard_Mouse"/>
             <field name="standard_price">14</field>
             <field name="list_price">16.50</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="product_tmpl_id" ref="product_template_11"/>
             <field name="default_code">A6678</field>
-        </record>
-        <record id="product_product_11_b" model="product.product">
-            <field name="variants">32 Gb</field>
-            <field name="price_extra">12</field>
-            <field name="product_tmpl_id" ref="product_template_11"/>
-        </record>
-
-        <record id="product_template_12" model="product.template">
+            <field name="variant_ids" eval="[(6,0,[ref('product.product_attribute_value_1')])]"/>
+        </record>
+        <record id="product_product_11b" model="product.product">
+            <field name="default_code">A6679</field>
+            <field name="product_tmpl_id" ref="product_product_11_product_template"/>
+            <field name="variant_ids" eval="[(6,0,[ref('product.product_attribute_value_2')])]"/>
+        </record>
+
+        <record id="product_attribute_line_1" model="product.attribute.line">
+            <field name="product_tmpl_id" ref="product_product_11_product_template"/>
+            <field name="attribute_id" ref="product_attribute_1"/>
+            <field name="value_ids" eval="[(6,0,[ref('product.product_attribute_value_1'), ref('product.product_attribute_value_2')])]"/>
+        </record>
+
+        <record id="product_product_11_product_template" model="product.template">
+            <field name="variant_ids" eval="[(6,0,[ref('product.product_attribute_line_1')])]"/>
+        </record>
+        
+        <record id="product_attribute_price_1" model="product.attribute.price">
+            <field name="product_tmpl_id" ref="product_product_11_product_template"/>
+            <field name="value_id" ref="product_attribute_value_2"/>
+            <field name="price_extra">6.40</field>
+        </record>
+
+        <!-- -->
+
+        <record id="product_product_12" model="product.product">
             <field name="name">Mouse, Wireless</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="Keyboard_Mouse"/>
             <field name="standard_price">18</field>
             <field name="list_price">12.50</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_12" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_12"/>
             <field name="default_code">M-Wir</field>
         </record>
 
-        <record id="product_template_13" model="product.template">
+        <record id="product_product_13" model="product.product">
             <field name="name">RAM SR5</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="Memory"/>
             <field name="standard_price">78.0</field>
             <field name="list_price">85.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_13" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_13"/>
             <field name="default_code">RAM-SR5</field>
         </record>
 
-        <record id="product_template_14" model="product.template">
+        <record id="product_product_14" model="product.product">
             <field name="name">RAM SR2</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="Memory"/>
             <field name="standard_price">87.0</field>
             <field name="list_price">95.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_14" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_14"/>
             <field name="default_code">RAM-SR2</field>
         </record>
 
-        <record id="product_template_15" model="product.template">
+        <record id="product_product_15" model="product.product">
             <field name="name">RAM SR3</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="Memory"/>
             <field name="standard_price">80.0</field>
             <field name="list_price">85.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_15" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_15"/>
             <field name="default_code">RAM-SR3</field>
         </record>
 
-        <record id="product_template_16" model="product.template">
+        <record id="product_product_16" model="product.product">
             <field name="name">Computer Case</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="case"/>
             <field name="standard_price">20.0</field>
             <field name="list_price">25.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_16" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_16"/>
             <field name="default_code">C-Case</field>
         </record>
 
-        <record id="product_template_17" model="product.template">
+        <record id="product_product_17" model="product.product">
             <field name="name">HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="HDD"/>
             <field name="standard_price">860.0</field>
             <field name="list_price">975.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_17" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_17"/>
             <field name="default_code">HDD-SH1</field>
         </record>
 
-        <record id="product_template_18" model="product.template">
+        <record id="product_product_18" model="product.product">
             <field name="name">HDD SH-2</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="HDD"/>
             <field name="standard_price">1020.0</field>
             <field name="list_price">1150.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_18" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_18"/>
             <field name="default_code">HDD-SH2</field>
         </record>
 
-        <record id="product_template_19" model="product.template">
+        <record id="product_product_19" model="product.product">
             <field name="name">HDD on Demand</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="HDD"/>
             <field name="standard_price">1100.0</field>
             <field name="list_price">1250.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">On demand hard-disk having capacity based on requirement.</field>
-        </record>
-        <record id="product_product_19" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_19"/>
             <field name="default_code">HDD-DEM</field>
         </record>
 
-        <record id="product_template_20" model="product.template">
+        <record id="product_product_20" model="product.product">
             <field name="name">Motherboard I9P57</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="motherboard"/>
             <field name="standard_price">1700.0</field>
             <field name="list_price">1950.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_20" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_20"/>
             <field name="default_code">MBi9</field>
         </record>
 
-        <record id="product_template_21" model="product.template">
+        <record id="product_product_21" model="product.product">
             <field name="name">Motherboard A20Z7</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="motherboard"/>
             <field name="standard_price">1790.0</field>
             <field name="list_price">2000.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_21" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_21"/>
             <field name="default_code">MBa20</field>
         </record>
 
-        <record id="product_template_22" model="product.template">
+        <record id="product_product_22" model="product.product">
             <field name="name">Processor Core i5 2.70 Ghz</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="processor"/>
             <field name="standard_price">2010.0</field>
             <field name="list_price">2100.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_22" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_22"/>
             <field name="default_code">CPUi5</field>
         </record>
 
-        <record id="product_template_23" model="product.template">
+        <record id="product_product_23" model="product.product">
             <field name="name">Processor AMD 8-Core</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="processor"/>
             <field name="standard_price">1910.0</field>
             <field name="list_price">1980.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_23" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_23"/>
             <field name="default_code">CPUa8</field>
         </record>
 
-        <record id="product_template_24" model="product.template">
+        <record id="product_product_24" model="product.product">
             <field name="name">Graphics Card</field>
             <field name="categ_id" ref="product_category_8"/>
-            <field name="public_categ_id" ref="graphics_card"/>
             <field name="standard_price">876.0</field>
             <field name="list_price">885.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_24" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_24"/>
             <field name="default_code">CARD</field>
         </record>
 
-        <record id="product_template_25" model="product.template">
+        <record id="product_product_25" model="product.product">
             <field name="name">Laptop E5023</field>
             <field name="categ_id" ref="product_category_4"/>
-            <field name="public_categ_id" ref="laptops"/>
             <field name="standard_price">2870.0</field>
             <field name="list_price">2950.0</field>
             <field name="type">consu</field>
@@ -613,16 +419,12 @@
 4GB RAM
 Standard-1294P Processor
 QWERTY keyboard</field>
-        </record>
-        <record id="product_product_25" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_25"/>
             <field name="default_code">LAP-E5</field>
         </record>
 
-        <record id="product_template_26" model="product.template">
+        <record id="product_product_26" model="product.product">
             <field name="name">Laptop S3450</field>
             <field name="categ_id" ref="product_category_4"/>
-            <field name="public_categ_id" ref="laptops"/>
             <field name="standard_price">3000.0</field>
             <field name="list_price">3245.0</field>
             <field name="type">consu</field>
@@ -632,141 +434,106 @@
 6GB RAM
 Hi-Speed 234Q Processor
 QWERTY keyboard</field>
-        </record>
-        <record id="product_product_26" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_26"/>
             <field name="default_code">LAP-S3</field>
         </record>
 
-        <record id="product_template_27" model="product.template">
+        <record id="product_product_27" model="product.product">
             <field name="name">Laptop Customized</field>
             <field name="categ_id" ref="product_category_4"/>
-            <field name="public_categ_id" ref="laptops"/>
             <field name="standard_price">3300.0</field>
             <field name="list_price">3645.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Custom Laptop based on customer's requirement.</field>
-        </record>
-        <record id="product_product_27" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_27"/>
             <field name="default_code">LAP-CUS</field>
         </record>
 
-        <record id="product_template_28" model="product.template">
+        <record id="product_product_28" model="product.product">
             <field name="name">External Hard disk</field>
             <field name="categ_id" ref="product_category_6"/>
-            <field name="public_categ_id" ref="External_Hard_Drive"/>
             <field name="standard_price">390.0</field>
             <field name="list_price">405.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_28" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_28"/>
             <field name="default_code">EXT-HDD</field>
         </record>
 
 
-        <record id="product_template_29" model="product.template">
+        <record id="product_product_29" model="product.product">
             <field name="name">Pen drive, SP-2</field>
             <field name="categ_id" ref="product_category_7"/>
-            <field name="public_categ_id" ref="Pen_Drive"/>
             <field name="standard_price">90.0</field>
             <field name="list_price">100.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_29" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_29"/>
             <field name="default_code">PD-SP2</field>
         </record>
 
 
-        <record id="product_template_30" model="product.template">
+        <record id="product_product_30" model="product.product">
             <field name="name">Pen drive, SP-4</field>
             <field name="categ_id" ref="product_category_7"/>
-            <field name="public_categ_id" ref="Pen_Drive"/>
             <field name="standard_price">126.0</field>
             <field name="list_price">145.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-        </record>
-        <record id="product_product_30" model="product.product">
-            <field name="product_tmpl_id" ref="product_template_30"/>
             <field name="default_code">PD-SP4</field>
         </record>
 
-        <record id="product_template_31" model="product.template">
+        <record id="product_product_31" model="product.product">
             <field name="name">Multimedia Speakers</field>
             <field name="categ_id" ref="product_category_7"/>
-            <field name="public_categ_id" ref="Speakers"/>