Jan 8 [UPDT] : Updated 'product_volume'

product_volume/__manifest__.py

@@ -21,7 +21,7 @@
 ################################################################################
 {
     'name': 'Product Volume Calculation',
-    'version': '17.0.1.0.1',
+    'version': '17.0.1.1.0',
     'category': "Inventory",
     'summary': """This module will helps you to give dimensions of the product.""",
     'description': "Module helps you to manage the length, breadth and height "

product_volume/doc/RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 ## Module <product_volume>
-#### 21.12.2023
+
+#### 24.11.2023
 #### Version 17.0.1.0.0
 #### ADD
 - Initial Commit For Product Volume Calculation
+
+#### 22.12.2023
+#### Version 17.0.1.1.0
+#### UPDT
+- Added selecting UOM option

product_volume/models/__init__.py

@@ -19,5 +19,4 @@
 #    If not, see <http://www.gnu.org/licenses/>.
 #
 ################################################################################
-from . import product_product
 from . import product_template

product_volume/models/product_product.py

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-################################################################################
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#
-#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
-#    Author: Sabeel B (odoo@cybrosys.com)
-#
-#    You can modify it under the terms of the GNU AFFERO
-#    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details.
-#
-#    You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
-#    (AGPL v3) along with this program.
-#    If not, see <http://www.gnu.org/licenses/>.
-#
-################################################################################
-from odoo import api, models, fields
-
-
-class ProductProduct(models.Model):
-    """Inheriting product_template to add new fields"""
-    _inherit = 'product.product'
-
-    @api.onchange('length', 'breadth', 'height')
-    def _onchange_product_measures(self):
-        """Onchange function to calculate volume of the product"""
-        self.volume = (float(self.length if self.length else 0) *
-                       float(self.breadth if self.breadth else 0) * float(
-            self.height if self.height else 0))

product_volume/models/product_template.py

@@ -29,10 +29,47 @@ class ProductDimensionsVolume(models.Model):
     length = fields.Char(string="Length", help="Enter length of the product")
     breadth = fields.Char(string="Breadth", help="Enter breadth of the product")
     height = fields.Char(string="Height", help="Enter height of the product")
+    length_uom = fields.Selection(
+        selection=[('meters', 'Meters'), ('centimeters', 'Centimeters'),
+                   ('inches', 'Inches'), ('feet', 'Feet'), ('yards', 'Yards')],
+        string="UoM", default='meters', required=True,
+        help="Select the unit of measure for length and")
+    volume_uom = fields.Selection(
+        selection=[('cubic_meters', 'Cubic Meters'),
+                   ('cubic_inches', 'Cubic Inches'),
+                   ('cubic_feet', 'Cubic Feet'),
+                   ('cubic_yards', 'Cubic Yards')],
+        string="UoM of Volume", default='cubic_meters', required=True,
+        help="Select the unit of measure for volume")
 
-    @api.onchange('length', 'breadth', 'height')
+    @api.onchange('length', 'breadth', 'height', 'length_uom', 'volume_uom')
     def _onchange_product_measures(self):
         """Onchange function to calculate volume of the product"""
-        self.volume = (float(self.length if self.length else 0) *
-                       float(self.breadth if self.breadth else 0) * float(
-            self.height if self.height else 0))
+        volume = 0
+        if self.length_uom == "meters":
+            volume = (float(self.length if self.length else 0) *
+                      float(self.breadth if self.breadth else 0) * float(
+                        self.height if self.height else 0))
+        elif self.length_uom == "centimeters":
+            volume = ((float(self.length if self.length else 0) * float(
+                self.breadth if self.breadth else 0) * float(
+                self.height if self.height else 0)) / 1000000)
+        elif self.length_uom == "inches":
+            volume = ((float(self.length if self.length else 0) *
+                       float(self.breadth if self.breadth else 0) *
+                       float(self.height if self.height else 0)) / 61023.7)
+        elif self.length_uom == "feet":
+            volume = ((float(self.length if self.length else 0) *
+                       float(self.breadth if self.breadth else 0) *
+                       float(self.height if self.height else 0)) / 35.3147)
+        elif self.length_uom == "yards":
+            volume = ((float(self.length or 0) * float(
+                self.breadth or 0) * float(self.height or 0)) / 1.308)
+        if self.volume_uom == 'cubic_meters':
+            self.volume = volume
+        if self.volume_uom == 'cubic_inches':
+            self.volume = volume * 61023.7
+        if self.volume_uom == 'cubic_feet':
+            self.volume = volume * 35.3147
+        if self.volume_uom == 'cubic_yards':
+            self.volume = volume * 1.308

product_volume/static/description/index.html

@@ -71,7 +71,7 @@
                             <div>
                                 <p style="color: #1A202C;font-weight: 600; 
                                       font-size: 1.2rem; margin-bottom: 2px;">Seamless Adding of Properties.</p>
-                                <p class="m-0" style="color:#718096"> Length, Breadth and Height of the product in the product master page
+                                <p class="m-0" style="color:#718096">Length, Breadth and Height of the product in the product master page.
                                 </p>
                             </div>
                         </div>
@@ -87,13 +87,14 @@
                             </div>
                             <div>
                                 <p style="color: #1A202C;font-weight: 600; 
-                                      font-size: 1.2rem; margin-bottom: 2px;">Automatic Calculation</p>
-                                <p class="m-0" style="color:#718096">Automatic calculation of volume with the above details
+                                      font-size: 1.2rem; margin-bottom: 2px;">Automatic Calculation.</p>
+                                <p class="m-0" style="color:#718096">Automatic calculation of volume with the above details.
                                 </p>
                             </div>
                         </div>
                     </div>
-     
+                </div>
+            </div>
             <div class="container rounded" >
                 <ul class="nav nav-tabs d-flex" style="width: fit-content;margin: 0 auto;gap: 1rem;">
                     <li class="col text-center py-2 text-nowrap "
@@ -119,12 +120,25 @@
                             <div
                                 style="border: 1px solid #d8d6d6; border-radius: 4px; background: #fff; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);">
                                 <div class="row justify-content-center p-3 w-100 m-0">
-                                    <img src="assets/screenshots/scrnshot-1.png" class="img-responsive" width="100%" height="auto">
+                                    <img src="assets/screenshots/1.png" class="img-responsive" width="100%" height="auto">
+                                </div>
+                                <div class="px-3">
+                                    <h4 class="mt-2"
+                                        style=" font-weight:600 !important; color:#282F33 !important; font-size:1.3rem !important">
+                                       Provision for the product dimensions.</h4>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-lg-12 py-2" style="padding: 1rem 4rem !important;">
+                            <div
+                                style="border: 1px solid #d8d6d6; border-radius: 4px;  background: #fff; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);">
+                                <div class="row justify-content-center p-3 w-100 m-0">
+                                    <img src="assets/screenshots/2.png" class="img-responsive" width="100%" height="auto">
                                 </div>
                                 <div class="px-3">
                                     <h4 class="mt-2"
                                         style=" font-weight:600 !important; color:#282F33 !important; font-size:1.3rem !important">
-                                        Provision for the product dimensions.</h4>
+                                        Option to choose the unit of measures.</h4>
                                 </div>
                             </div>
                         </div>
@@ -132,18 +146,28 @@
                             <div
                                 style="border: 1px solid #d8d6d6; border-radius: 4px;  background: #fff; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);">
                                 <div class="row justify-content-center p-3 w-100 m-0">
-                                    <img src="assets/screenshots/scrnshot-2.png" class="img-responsive" width="100%" height="auto">
+                                    <img src="assets/screenshots/3.png" class="img-responsive" width="100%" height="auto">
                                 </div>
                                 <div class="px-3">
                                     <h4 class="mt-2"
                                         style=" font-weight:600 !important; color:#282F33 !important; font-size:1.3rem !important">
-                                       Automatic calculation of volume with the above details.</h4>
+                                        Automatic calculation of volume with the above details.</h4>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-lg-12 py-2" style="padding: 1rem 4rem !important;">
+                            <div
+                                style="border: 1px solid #d8d6d6; border-radius: 4px;  background: #fff; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);">
+                                <div class="row justify-content-center p-3 w-100 m-0">
+                                    <img src="assets/screenshots/4.png" class="img-responsive" width="100%" height="auto">
+                                </div>
+                                <div class="px-3">
+                                    <h4 class="mt-2"
+                                        style=" font-weight:600 !important; color:#282F33 !important; font-size:1.3rem !important">
+                                        Option to choose the unit of measure for volume.</h4>
                                 </div>
                             </div>
                         </div>
-                        
-                        
-                        
                     </div>
                     <div id="tab2" class="tab-pane fade">
                         <div class="col-mg-12" style="padding: 1rem 4rem;">
@@ -158,7 +182,6 @@
                                     <span style="margin-right: 12px;"><img src="assets/misc/star (1) 2.svg" alt=""
                                             width="16px"></span>Automatic Calculation.
                                 </li>
-
                             </ul>
                         </div>
                     </div>
@@ -168,7 +191,7 @@
                                 style="font-weight: 500;background-color: #fff; border-radius: 4px; padding: 1rem; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);">
                                 <div class="d-flex mb-3" style="font-size: 0.8rem; font-weight: 500;"><span>Version
                                         17.0.1.0.0</span><span class="px-2">|</span><span
-                                        style="color: #714B67;font-weight: 600;">Released on:13th November 2023</span>
+                                        style="color: #714B67;font-weight: 600;">Released on:21th December 2023</span>
                                 </div>
                                 <p class="m-0"
                                     style=" color:#718096!important; font-size:1rem !important;line-height: 28px;">

product_volume/views/product_template_views.xml

@@ -15,23 +15,24 @@
                     <label for="weight"/>
                     <div class="o_row" name="weight" style="width: 40px;">
                         <field name="weight"/>
-                            <field name="weight_uom_name"/>
+                        <span>kg</span>
                     </div>
                     <label for="volume"/>
                     <div name="volume">
                         <div class="o_row">
-                            <field name="length" style="width:65px;"
+                            <field name="length" style="width:55px;"
                                    placeholder="Length"/>
-                            <field name="breadth" style="width:65px;"
+                            <field name="breadth" style="width:55px;"
                                    placeholder="Breadth"/>
-                            <field name="height" style="width:65px;"
+                            <field name="height" style="width:55px;"
                                    placeholder="Height"/>
+                            <field name="length_uom" style="width:55px;"/>
                         </div>
                         <br/>
                         <div class="o_row">
                             <field name="volume" string="Volume"
                                    style="width: 40px;"/>
-                            <field name="volume_uom_name"/>
+                            <field name="volume_uom" style="width:25px;"/>
                         </div>
                     </div>
                 </group>