diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index 182180e8ac5..02b855f73fb 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -462,7 +462,7 @@ class product_pricelist_item(osv.osv): 'min_quantity': fields.integer('Min. Quantity', required=True, help="For the rule to apply, bought/sold quantity must be greater " "than or equal to the minimum quantity specified in this field.\n" - "Expressed in the default UoM of the product." + "Expressed in the default unit of measure of the product." ), 'sequence': fields.integer('Sequence', required=True, help="Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."), 'base': fields.selection(_price_field_get, 'Based on', required=True, diff --git a/addons/website_sale/data/demo.xml b/addons/website_sale/data/demo.xml index 9851aa2cb18..115356a469f 100644 --- a/addons/website_sale/data/demo.xml +++ b/addons/website_sale/data/demo.xml @@ -171,7 +171,7 @@ Capacity: 16GB Connectivity: Wifi Beautiful 7.9-inch display -Over 375,000 apps3 +Over 375,000 apps Ultrafast wireless iOS7 @@ -284,7 +284,7 @@ Impedance: 23 ohms Sensitivity: 109 dB SPL/mW Drivers: two-way balanced armature Cable length: 1065 mm -Weight: 0.4 ounce +Weight: 10.2 grams
@@ -339,7 +339,7 @@ Weight: 0.4 ounce 2.7GHz quad-core Intel Core i5 Turbo Boost up to 3.2GHz 8GB (two 4GB) memory - 1TB hard drive1 + 1TB hard drive Intel Iris Pro graphics @@ -437,10 +437,10 @@ Weight: 0.4 ounce - Height: 3.01 inches -Width: 1.56 inches -Depth: 0.21 inch -Weight: 1.1 ounces + Height: 76.5 mm +Width: 39.6 mm +Depth: 5.4 mm +Weight: 31 grams