From b1007263127162ddd37b275bb8715d8113417398 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 9 Jan 2014 16:26:21 +0100
Subject: [PATCH] [FIX] product: remove data demo of product in multi_company
 module; fix product images storage

bzr revid: chm@openerp.com-20140109152621-vduwsnm2hbm9nwop
---
 addons/multi_company/multi_company_demo.xml | 81 ---------------------
 addons/product/product.py                   |  4 +-
 2 files changed, 2 insertions(+), 83 deletions(-)

diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 0c7b200a867..44a021c1434 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -94,87 +94,6 @@
     Resource: product.product
     -->
 
-        <record id="product.product_product_2" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_1" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_3" model="product.product">
-            <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_4" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_5" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_6" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_7" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_6" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_9" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_10" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_11" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_12" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_13" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_14" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_15" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_16" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_17" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_18" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_19" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_27" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_20" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_21" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_22" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_23" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_24" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_25" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
-        <record id="product.product_product_26" model="product.product">
-        <field name="company_id" ref="res_company_oerp_editor"/>
-        </record>
         <record id="Odoo1" model="product.category">
             <field name="parent_id" ref="product.product_category_all"/>
             <field name="name">Odoo Offers</field>
diff --git a/addons/product/product.py b/addons/product/product.py
index 4e158e8e7f6..163785459b4 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -420,7 +420,7 @@ class product_template(osv.osv):
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized image", type="binary", multi="_get_image",
             store={
-                'product.product': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+                'product.template': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the product. It is automatically "\
                  "resized as a 128x128px image, with aspect ratio preserved, "\
@@ -428,7 +428,7 @@ class product_template(osv.osv):
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Small-sized image", type="binary", multi="_get_image",
             store={
-                'product.product': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+                'product.template': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the product. It is automatically "\
                  "resized as a 64x64px image, with aspect ratio preserved. "\