diff --git a/addons/product/product.py b/addons/product/product.py
index 35d0bb4182e..06343eda249 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -271,8 +271,9 @@ class product_template(osv.osv):
         'loc_rack': fields.char('Rack', size=16),
         'loc_row': fields.char('Row', size=16),
         'loc_case': fields.char('Case', size=16),
+        'company_id': fields.many2one('res.company', 'Company'),
     }
-
+    
     def _get_uom_id(self, cr, uid, *args):
         cr.execute('select id from product_uom order by id limit 1')
         res = cr.fetchone()
@@ -284,6 +285,9 @@ class product_template(osv.osv):
         return False
 
     _defaults = {
+        'company_id': lambda self, cr, uid, context: \
+                self.pool.get('res.users').browse(cr, uid, uid,
+                    context=context).company_id.id,
         'type': lambda *a: 'product',
         'list_price': lambda *a: 1,
         'cost_method': lambda *a: 'standard',
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index fa9ff515aef..1aacaa39691 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -101,6 +101,7 @@
                             <group colspan="2" col="2" name="misc">
                                 <separator string="Miscelleanous" colspan="2"/>
                                 <field name="active" select="2"/>
+                                <field name="company_id" select="2" groups="base.group_extended"/>
                             </group>
 
                         </page>
diff --git a/addons/product/report/product_label.xml b/addons/product/report/product_label.xml
index ba7d202cb81..beb8d22d6e2 100644
--- a/addons/product/report/product_label.xml
+++ b/addons/product/report/product_label.xml
@@ -6,5 +6,6 @@
         <variant type="field" name="variants"/>
         <price type="field" name="list_price"/>
         <ean13 type="field" name="ean13"/>
+        <currency type="field" name="company_id.currency_id.name"/>
     </lot-line>
 </lots>
diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl
index 2df7e8d3e2c..f76cea07e94 100644
--- a/addons/product/report/product_label.xsl
+++ b/addons/product/report/product_label.xsl
@@ -66,7 +66,7 @@
 				<td>
 					<para style="nospace"><xsl:value-of select="code"/></para>
 				</td><td>
-					<para style="nospace" t="1"><xsl:value-of select="price"/> EUR</para>
+					<para style="nospace" t="1"><xsl:value-of select="price"/> <xsl:value-of select="currency"/></para>
 				</td>
 			</tr><tr>
 				<td>