[MERGE] main branch

bzr revid: qdp-launchpad@openerp.com-20131205100702-14c4ob2v1i7psrul
This commit is contained in:
Quentin (OpenERP)
2013-12-05 11:07:02 +01:00
+2 -2
View File
@@ -23,7 +23,7 @@
order_line:
- product_id: product_average_icecream
product_qty: 10.0
product_uom: product.product_uom_categ_kgm
product_uom: product.product_uom_kgm
price_unit: 60.0
name: 'Average Ice Cream'
-
@@ -58,7 +58,7 @@
order_line:
- product_id: product_average_icecream
product_qty: 30.0
product_uom: product.product_uom_categ_kgm
product_uom: product.product_uom_kgm
price_unit: 80.0
name: 'Average Ice Cream'
-