Merge PR #491 into 10.0

Signed-off-by pedrobaeza

README.md

@@ -20,6 +20,7 @@ addon | version | summary
 [product_code_unique](product_code_unique/) | 10.0.1.0.0 | Set Product Internal Reference as Unique
 [product_custom_info](product_custom_info/) | 10.0.1.0.0 | Add custom field in products
 [product_default_image](product_default_image/) | 10.0.1.0.0 | Apply default images to new and existing products.
+[product_dimension](product_dimension/) | 10.0.1.0.0 | Product Dimension
 [product_manufacturer](product_manufacturer/) | 10.0.1.0.0 | Product Manufacturers
 [product_multi_category](product_multi_category/) | 10.0.1.0.0 | Product - Many Categories
 [product_multi_image](product_multi_image/) | 10.0.1.0.0 | Multiple Images in Products
@@ -46,7 +47,6 @@ addon | version | summary
 [product_categ_attributes](product_categ_attributes/) | 0.1 (unported) | product_categ_attributes
 [product_custom_attributes](product_custom_attributes/) | 0.2.1 (unported) | product_custom_attributes
 [product_customer_code](product_customer_code/) | 1.0 (unported) | Add many Customers' Codes in product
-[product_dimension](product_dimension/) | 9.0.1.1.0 (unported) | Product Dimension
 [product_electronic](product_electronic/) | 1.0 (unported) | Products Attributes & Manufacturers
 [product_gift](product_gift/) | 0.1 (unported) | product_gift
 [product_gtin](product_gtin/) | 8.0.1.1.0 (unported) | Product GTIN EAN8 EAN13 UPC JPC Support

product_dimension/__manifest__.py

@@ -4,12 +4,11 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     'name': 'Product Dimension',
-    'version': '9.0.1.1.0',
+    'version': '10.0.1.0.0',
     'category': 'Product',
     'author': 'ADHOC SA, Camptocamp, Odoo Community Association (OCA)',
     'license': 'AGPL-3',
     'depends': ['product'],
     'data': ['views/product_view.xml'],
-    'installable': False,
-    'images': [],
+    'installable': True,
 }

product_dimension/i18n/product_dimension.pot

@@ -0,0 +1,60 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* product_dimension
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: product_dimension
+#: model:ir.model.fields,field_description:product_dimension.field_product_product_dimensional_uom_id
+#: model:ir.model.fields,field_description:product_dimension.field_product_template_dimensional_uom_id
+msgid "Dimensional UoM"
+msgstr ""
+
+#. module: product_dimension
+#: model:ir.ui.view,arch_db:product_dimension.product_template_form_view
+msgid "Dimensions"
+msgstr ""
+
+#. module: product_dimension
+#: model:ir.model.fields,field_description:product_dimension.field_product_product_height
+#: model:ir.model.fields,field_description:product_dimension.field_product_template_height
+msgid "Height"
+msgstr ""
+
+#. module: product_dimension
+#: model:ir.model.fields,field_description:product_dimension.field_product_product_length
+#: model:ir.model.fields,field_description:product_dimension.field_product_template_length
+msgid "Length"
+msgstr ""
+
+#. module: product_dimension
+#: model:ir.model,name:product_dimension.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: product_dimension
+#: model:ir.model,name:product_dimension.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: product_dimension
+#: model:ir.model.fields,help:product_dimension.field_product_product_dimensional_uom_id
+#: model:ir.model.fields,help:product_dimension.field_product_template_dimensional_uom_id
+msgid "UoM for length, height, width"
+msgstr ""
+
+#. module: product_dimension
+#: model:ir.model.fields,field_description:product_dimension.field_product_product_width
+#: model:ir.model.fields,field_description:product_dimension.field_product_template_width
+msgid "Width"
+msgstr ""
+

product_dimension/models/product.py

@@ -4,11 +4,10 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 
-from openerp import models, fields
-from openerp import api
+from odoo import models, fields, api
 
 
-class Product(models.Model):
+class ProductProduct(models.Model):
     _inherit = 'product.product'
 
     @api.onchange('length', 'height', 'width', 'dimensional_uom_id')
@@ -23,14 +22,8 @@ def onchange_calculate_volume(self):
         self.volume = length_m * height_m * width_m
 
     def convert_to_meters(self, measure, dimensional_uom):
-        uom_meters = self.env['product.uom'].search([('name', '=', 'm')])
-
-        return self.env['product.uom']._compute_qty_obj(
-            from_unit=dimensional_uom,
-            qty=measure,
-            to_unit=uom_meters,
-            round=False,
-            )
+        uom_meters = self.env.ref('product.product_uom_meter')
+        return dimensional_uom._compute_quantity(measure, uom_meters)
 
     @api.model
     def _get_dimension_uom_domain(self):
@@ -64,14 +57,8 @@ def onchange_calculate_volume(self):
         self.volume = length_m * height_m * width_m
 
     def convert_to_meters(self, measure, dimensional_uom):
-        uom_meters = self.env['product.uom'].search([('name', '=', 'm')])
-
-        return self.env['product.uom']._compute_qty_obj(
-            from_unit=dimensional_uom,
-            qty=measure,
-            to_unit=uom_meters,
-            round=False,
-            )
+        uom_meters = self.env.ref('product.product_uom_meter')
+        return dimensional_uom._compute_quantity(measure, uom_meters)
 
     length = fields.Float(related='product_variant_ids.length')
     height = fields.Float(related='product_variant_ids.height')

product_dimension/views/product_view.xml

@@ -1,36 +1,24 @@
 <?xml version="1.0"?>
 <odoo>
 
-    <record model="ir.ui.view" id="product_normal_form_view">
-      <field name="name">product_normal_form_view</field>
-      <field name="model">product.product</field>
-      <field name="inherit_id" ref="product.product_normal_form_view"/>
-      <field name="arch" type="xml">
-        <xpath expr="//page/group[@name='inventory']" position="inside">
-          <group name="dimensions">
-            <field name="dimensional_uom_id"/>
-            <field name="length" attrs="{'readonly':[('type','=','service')]}"/>
-            <field name="height" attrs="{'readonly':[('type','=','service')]}"/>
-            <field name="width" attrs="{'readonly':[('type','=','service')]}"/>
-          </group>
-        </xpath>
-      </field>
-    </record>
-
-    <record model="ir.ui.view" id="product_template_only_form_view">
-      <field name="name">product_template_form_view</field>
-      <field name="model">product.template</field>
-      <field name="inherit_id" ref="product.product_template_only_form_view"/>
-      <field name="arch" type="xml">
-        <xpath expr="//page/group[@name='inventory']" position="inside">
-          <group name="dimensions" attrs="{'invisible': [('product_variant_count', '&gt;', 1)]}">
-            <field name="dimensional_uom_id" attrs="{'invisible': [('product_variant_count', '&gt;', 1)]}"/>
-            <field name="length" attrs="{'readonly':[('type','=','service')],'invisible': [('product_variant_count', '&gt;', 1)]}"/>
-            <field name="height" attrs="{'readonly':[('type','=','service')],'invisible': [('product_variant_count', '&gt;', 1)]}"/>
-            <field name="width" attrs="{'readonly':[('type','=','service')],'invisible': [('product_variant_count', '&gt;', 1)]}"/>
-          </group>
-        </xpath>
-      </field>
+    <record model="ir.ui.view" id="product_template_form_view">
+        <field name="name">product.template with properties and dimensions</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//notebook" position="inside">
+                <page string="Dimensions" name="dimensions">
+                    <group>
+                        <group>
+                            <field name="length" attrs="{'readonly':[('type','=','service')],'invisible': [('product_variant_count', '&gt;', 1)]}"/>
+                            <field name="width" attrs="{'readonly':[('type','=','service')],'invisible': [('product_variant_count', '&gt;', 1)]}"/>
+                            <field name="height" attrs="{'readonly':[('type','=','service')],'invisible': [('product_variant_count', '&gt;', 1)]}"/>
+                            <field name="dimensional_uom_id" attrs="{'invisible': [('product_variant_count', '&gt;', 1)]}"/>
+                        </group>
+                    </group>
+                </page>
+            </xpath>
+        </field>
     </record>
 
 </odoo>

setup/_metapackage/VERSION.txt

@@ -1 +1 @@
-10.0.20190710.1
+10.0.20190715.0

setup/_metapackage/setup.py

@@ -15,6 +15,7 @@
         'odoo10-addon-product_code_unique',
         'odoo10-addon-product_custom_info',
         'odoo10-addon-product_default_image',
+        'odoo10-addon-product_dimension',
         'odoo10-addon-product_manufacturer',
         'odoo10-addon-product_multi_category',
         'odoo10-addon-product_multi_image',

setup/product_dimension/odoo/__init__.py

@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)

setup/product_dimension/odoo/addons/__init__.py

@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)

setup/product_dimension/odoo/addons/product_dimension

@@ -0,0 +1 @@
+../../../../product_dimension

setup/product_dimension/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)