Merge pull request #29 from Gedeelde-Weelde/feat/GED-55-remove-uom-combo

feat: GED-55: Removed uom combo field from uom translation.
Gedeelde-Weelde · Dec 30, 2024 · 65e6652 · 65e6652
2 parents 495b0be + f7679af
commit 65e6652
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 10 deletions.
diff --git a/product_import_cwa/models/cwa_product_uom.py b/product_import_cwa/models/cwa_product_uom.py
@@ -12,7 +12,6 @@ class CwaProductUom(models.Model):
     uom_id = fields.Many2one("uom.uom", "Standard UoM", size=64, required=True)
     uom_po_id = fields.Many2one("uom.uom", "Purchase UoM", size=64, required=True)
     target_inhoud = fields.Float()
-    uos_combo = fields.Char("UoM/UoS Combo")
 
     @api.model
     def get_translated(self, source):

diff --git a/product_import_cwa/views/cwa_product_uom.xml b/product_import_cwa/views/cwa_product_uom.xml
@@ -9,7 +9,6 @@
                 <field name="inhoud" />
                 <field name="uom_id" />
                 <field name="uom_po_id" />
-                <field name="uos_combo" />
             </tree>
         </field>
     </record>
@@ -25,7 +24,6 @@
                         <field name="inhoud" />
                         <field name="uom_id" />
                         <field name="uom_po_id" />
-                        <field name="uos_combo" />
                     </group>
                 </sheet>
             </form>

diff --git a/product_import_cwa/wizard/cwa_locate_uom_wizard.py b/product_import_cwa/wizard/cwa_locate_uom_wizard.py
@@ -23,7 +23,6 @@ def _default_uom_ids(self):
                             "cwa_product_id": this.id,
                             "eenheid": this.eenheid,
                             "inhoud": this.inhoud,
-                            "uos_combo": combo,
                         },
                     )
                 )
@@ -55,7 +54,6 @@ class CwaProductImportWizard(models.TransientModel):
     uom_id = fields.Many2one("uom.uom", "Standard UoM", size=64)
     uom_po_id = fields.Many2one("uom.uom", "Purchase UoM", size=64)
     target_inhoud = fields.Float()
-    uos_combo = fields.Char("UoM/UoS Combo")
 
     # assume the purchase unit is same as uom, saves time!
     @api.onchange("uom_id")
@@ -72,6 +70,5 @@ def action_apply(self):
                     "inhoud": this.inhoud,
                     "uom_id": this.uom_id.id,
                     "uom_po_id": this.uom_po_id.id,
-                    "uos_combo": this.uos_combo,
                 }
                 self.env["cwa.product.uom"].create(values)
diff --git a/product_import_cwa/wizard/cwa_locate_uom_wizard.xml b/product_import_cwa/wizard/cwa_locate_uom_wizard.xml
@@ -14,7 +14,6 @@
                         <field name="target_inhoud" />
                         <field name="uom_id" />
                         <field name="uom_po_id" />
-                        <field name="uos_combo" readonly="0" />
                     </tree>
                 </field>
                 <footer>

diff --git a/product_import_cwa/wizard/cwa_uom_translation_wizard.py b/product_import_cwa/wizard/cwa_uom_translation_wizard.py
@@ -18,7 +18,6 @@ class CwaUomTranslationWizard(models.TransientModel):
     uom_id = fields.Many2one("uom.uom", "Standard UoM")
     uom_po_id = fields.Many2one("uom.uom", "Purchase UoM")
     target_inhoud = fields.Float()
-    uos_combo = fields.Char("UoM/UoS Combo")
 
     def action_translate_product_uom(self):
         for this in self:
@@ -29,6 +28,5 @@ def action_translate_product_uom(self):
                     "uom_id": this.uom_id.id,
                     "uom_po_id": this.uom_po_id.id,
                     "target_inhoud": this.target_inhoud,
-                    "uos_combo": this.uos_combo,
                 }
             )
diff --git a/product_import_cwa/wizard/cwa_uom_translation_wizard.xml b/product_import_cwa/wizard/cwa_uom_translation_wizard.xml
@@ -10,7 +10,6 @@
                     <field name="uom_id" required="1" />
                     <field name="uom_po_id" required="1" />
                     <field name="target_inhoud" />
-                    <field name="uos_combo" />
                 </group>
                 <footer>
                     <button