From ae0b3d93481baff67d3cac9857f4e073911d9840 Mon Sep 17 00:00:00 2001
From: "Tiffany Chang (tic)" <tic@odoo.com>
Date: Wed, 29 Dec 2021 08:33:42 +0000
Subject: [PATCH] [IMP] barcodes_gs1_nomenclature, uom: add more uom gs1 rules

Adding GS1 rules for UoMs in Odoo. Also adding 'yard' UoM since it
was not already part of standard UoMs but does have a GS1 rule.
Unfortunately not all standard Odoo UoMs have a GS1 rule so we add what
we can and will probably have to figure out how to handle these
unsupported UoMs when scanning GS1 barcodes. Note that 'lbs' rule is
needed not only to read in UoM quantity, but also to read SSCC (i.e.
package w/extra info) barcodes when their package contents' info is
included in the barcode.

Small update to GS1 rules sequences as well to make it easier to add
more rules in the future without having to worry about overlapping seq
numbers.

Part of task: 2494740

Part-of: odoo/odoo#82389
---
 .../data/barcodes_gs1_rules.xml               | 134 +++++++++++++++---
 addons/uom/data/uom_data.xml                  |   6 +
 2 files changed, 121 insertions(+), 19 deletions(-)

diff --git a/addons/barcodes_gs1_nomenclature/data/barcodes_gs1_rules.xml b/addons/barcodes_gs1_nomenclature/data/barcodes_gs1_rules.xml
index 89ff8826788..4142d3d4ed8 100644
--- a/addons/barcodes_gs1_nomenclature/data/barcodes_gs1_rules.xml
+++ b/addons/barcodes_gs1_nomenclature/data/barcodes_gs1_rules.xml
@@ -30,7 +30,7 @@
         <record id="barcode_rule_gs1_02" model="barcode.rule">
             <field name="name">GTIN of contained trade items</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">101</field>
+            <field name="sequence">102</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(02)(\d{14})</field>
             <field name="type">product</field>
@@ -40,7 +40,7 @@
         <record id="barcode_rule_gs1_410" model="barcode.rule">
             <field name="name">Ship to / Deliver to Global Location Number (GLN)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">102</field>
+            <field name="sequence">110</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(410)(\d{13})</field>
             <field name="type">location_dest</field>
@@ -50,7 +50,7 @@
         <record id="barcode_rule_gs1_413" model="barcode.rule">
             <field name="name">Ship for / Deliver for - Forward to Global Location Number (GLN)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">103</field>
+            <field name="sequence">113</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(413)(\d{13})</field>
             <field name="type">location_dest</field>
@@ -60,7 +60,7 @@
         <record id="barcode_rule_gs1_414" model="barcode.rule">
             <field name="name">Identification of a physical location - Global Location Number (GLN)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">104</field>
+            <field name="sequence">114</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(414)(\d{13})</field>
             <field name="type">location</field>
@@ -71,7 +71,7 @@
         <record id="barcode_rule_gs1_10" model="barcode.rule">
             <field name="name">Batch or lot number</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">105</field>
+            <field name="sequence">125</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(10)([!"%-/0-9:-?A-Z_a-z]{0,20})</field>
             <field name="type">lot</field>
@@ -81,7 +81,7 @@
         <record id="barcode_rule_gs1_21" model="barcode.rule">
             <field name="name">Serial number</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">106</field>
+            <field name="sequence">126</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(21)([!"%-/0-9:-?A-Z_a-z]{0,20})</field>
             <field name="type">lot</field>
@@ -92,7 +92,7 @@
         <record id="barcode_rule_gs1_13" model="barcode.rule">
             <field name="name">Packaging date (YYMMDD)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">107</field>
+            <field name="sequence">137</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(13)(\d{6})</field>
             <field name="type">packaging_date</field>
@@ -102,7 +102,7 @@
         <record id="barcode_rule_gs1_15" model="barcode.rule">
             <field name="name">Best before date (YYMMDD)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">108</field>
+            <field name="sequence">138</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(15)(\d{6})</field>
             <field name="type">use_date</field>
@@ -112,7 +112,7 @@
         <record id="barcode_rule_gs1_17" model="barcode.rule">
             <field name="name">Expiration date (YYMMDD)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">109</field>
+            <field name="sequence">139</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(17)(\d{6})</field>
             <field name="type">expiration_date</field>
@@ -123,7 +123,7 @@
         <record id="barcode_rule_gs1_30" model="barcode.rule">
             <field name="name">Variable count of items (variable measure trade item)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">110</field>
+            <field name="sequence">300</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(30)(\d{0,8})</field>
             <field name="associated_uom_id" ref="uom.product_uom_unit"/>
@@ -135,7 +135,7 @@
         <record id="barcode_rule_gs1_37" model="barcode.rule">
             <field name="name">Count of trade items or trade item pieces contained in a logistic unit</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">111</field>
+            <field name="sequence">305</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(37)(\d{0,8})</field>
             <field name="associated_uom_id" ref="uom.product_uom_unit"/>
@@ -147,7 +147,7 @@
         <record id="barcode_rule_gs1_310y" model="barcode.rule">
             <field name="name">Net weight, kilograms (variable measure trade item)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">112</field>
+            <field name="sequence">310</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(310[0-5])(\d{6})</field>
             <field name="associated_uom_id" ref="uom.product_uom_kgm"/>
@@ -159,7 +159,7 @@
         <record id="barcode_rule_gs1_311y" model="barcode.rule">
             <field name="name">Length or first dimension, metres (variable measure trade item)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">113</field>
+            <field name="sequence">311</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(311[0-5])(\d{6})</field>
             <field name="associated_uom_id" ref="uom.product_uom_meter"/>
@@ -168,10 +168,22 @@
             <field name="gs1_decimal_usage">True</field>
         </record>
 
+        <record id="barcode_rule_gs1_314y" model="barcode.rule">
+            <field name="name">Area, square meters (variable measure trade item)</field>
+            <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
+            <field name="sequence">314</field>
+            <field name="encoding">gs1-128</field>
+            <field name="pattern">(314[0-5])(\d{6})</field>
+            <field name="associated_uom_id" ref="uom.uom_square_meter"/>
+            <field name="type">quantity</field>
+            <field name="gs1_content_type">measure</field>
+            <field name="gs1_decimal_usage">True</field>
+        </record>
+
         <record id="barcode_rule_gs1_315y" model="barcode.rule">
             <field name="name">Net volume, litres (variable measure trade item)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">114</field>
+            <field name="sequence">315</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(315[0-5])(\d{6})</field>
             <field name="associated_uom_id" ref="uom.product_uom_litre"/>
@@ -183,7 +195,7 @@
         <record id="barcode_rule_gs1_316y" model="barcode.rule">
             <field name="name">Net volume, cubic metres (variable measure trade item)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">115</field>
+            <field name="sequence">316</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(316[0-5])(\d{6})</field>
             <field name="associated_uom_id" ref="uom.product_uom_cubic_meter"/>
@@ -192,10 +204,22 @@
             <field name="gs1_decimal_usage">True</field>
         </record>
 
+        <record id="barcode_rule_gs1_320y" model="barcode.rule">
+            <field name="name">Net weight, pounds (variable measure trade item)</field>
+            <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
+            <field name="sequence">320</field>
+            <field name="encoding">gs1-128</field>
+            <field name="pattern">(320[0-5])(\d{6})</field>
+            <field name="associated_uom_id" ref="uom.product_uom_lb"/>
+            <field name="type">quantity</field>
+            <field name="gs1_content_type">measure</field>
+            <field name="gs1_decimal_usage">True</field>
+        </record>
+
         <record id="barcode_rule_gs1_321y" model="barcode.rule">
             <field name="name">Length or first dimension, inches (variable measure trade item)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">116</field>
+            <field name="sequence">321</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(321[0-5])(\d{6})</field>
             <field name="associated_uom_id" ref="uom.product_uom_inch"/>
@@ -204,10 +228,46 @@
             <field name="gs1_decimal_usage">True</field>
         </record>
 
+        <record id="barcode_rule_gs1_322y" model="barcode.rule">
+            <field name="name">Length or first dimension, feet (variable measure trade item)</field>
+            <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
+            <field name="sequence">322</field>
+            <field name="encoding">gs1-128</field>
+            <field name="pattern">(322[0-5])(\d{6})</field>
+            <field name="associated_uom_id" ref="uom.product_uom_foot"/>
+            <field name="type">quantity</field>
+            <field name="gs1_content_type">measure</field>
+            <field name="gs1_decimal_usage">True</field>
+        </record>
+
+        <record id="barcode_rule_gs1_323y" model="barcode.rule">
+            <field name="name">Length or first dimension, yards (variable measure trade item)</field>
+            <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
+            <field name="sequence">323</field>
+            <field name="encoding">gs1-128</field>
+            <field name="pattern">(322[0-5])(\d{6})</field>
+            <field name="associated_uom_id" ref="uom.product_uom_yard"/>
+            <field name="type">quantity</field>
+            <field name="gs1_content_type">measure</field>
+            <field name="gs1_decimal_usage">True</field>
+        </record>
+
+        <record id="barcode_rule_gs1_351y" model="barcode.rule">
+            <field name="name">Area, square feet (variable measure trade item)</field>
+            <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
+            <field name="sequence">351</field>
+            <field name="encoding">gs1-128</field>
+            <field name="pattern">(351[0-5])(\d{6})</field>
+            <field name="associated_uom_id" ref="uom.uom_square_foot"/>
+            <field name="type">quantity</field>
+            <field name="gs1_content_type">measure</field>
+            <field name="gs1_decimal_usage">True</field>
+        </record>
+
         <record id="barcode_rule_gs1_357y" model="barcode.rule">
             <field name="name">Net weight (or volume), ounces (variable measure trade item)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">117</field>
+            <field name="sequence">357</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(357[0-5])(\d{6})</field>
             <field name="associated_uom_id" ref="uom.product_uom_oz"/>
@@ -216,10 +276,46 @@
             <field name="gs1_decimal_usage">True</field>
         </record>
 
+        <record id="barcode_rule_gs1_360y" model="barcode.rule">
+            <field name="name">Net volume, quarts (variable measure trade item)</field>
+            <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
+            <field name="sequence">360</field>
+            <field name="encoding">gs1-128</field>
+            <field name="pattern">(360[0-5])(\d{6})</field>
+            <field name="associated_uom_id" ref="uom.product_uom_qt"/>
+            <field name="type">quantity</field>
+            <field name="gs1_content_type">measure</field>
+            <field name="gs1_decimal_usage">True</field>
+        </record>
+
+        <record id="barcode_rule_gs1_361y" model="barcode.rule">
+            <field name="name">Net volume, gallons U.S. (variable measure trade item)</field>
+            <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
+            <field name="sequence">361</field>
+            <field name="encoding">gs1-128</field>
+            <field name="pattern">(361[0-5])(\d{6})</field>
+            <field name="associated_uom_id" ref="uom.product_uom_gal"/>
+            <field name="type">quantity</field>
+            <field name="gs1_content_type">measure</field>
+            <field name="gs1_decimal_usage">True</field>
+        </record>
+
+        <record id="barcode_rule_gs1_364y" model="barcode.rule">
+            <field name="name">Net volume, cubic inches (variable measure trade item)</field>
+            <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
+            <field name="sequence">364</field>
+            <field name="encoding">gs1-128</field>
+            <field name="pattern">(364[0-5])(\d{6})</field>
+            <field name="associated_uom_id" ref="uom.product_uom_cubic_inch"/>
+            <field name="type">quantity</field>
+            <field name="gs1_content_type">measure</field>
+            <field name="gs1_decimal_usage">True</field>
+        </record>
+
         <record id="barcode_rule_gs1_365y" model="barcode.rule">
             <field name="name">Net volume, cubic feet (variable measure trade item)</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">118</field>
+            <field name="sequence">365</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(365[0-5])(\d{6})</field>
             <field name="associated_uom_id" ref="uom.product_uom_cubic_foot"/>
@@ -232,7 +328,7 @@
         <record id="barcode_rule_gs1_91" model="barcode.rule">
             <field name="name">Package type</field>
             <field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
-            <field name="sequence">200</field>
+            <field name="sequence">500</field>
             <field name="encoding">gs1-128</field>
             <field name="pattern">(91)([!"%-/0-9:-?A-Z_a-z]{0,90})</field>
             <field name="type">package_type</field>
diff --git a/addons/uom/data/uom_data.xml b/addons/uom/data/uom_data.xml
index 5a7d806b0d1..ae6068e83d9 100644
--- a/addons/uom/data/uom_data.xml
+++ b/addons/uom/data/uom_data.xml
@@ -149,6 +149,12 @@
         <field name="factor">3.28084</field>
         <field name="uom_type">smaller</field>
     </record>
+    <record id="product_uom_yard" model="uom.uom">
+        <field name="name">yd</field>
+        <field name="category_id" ref="uom_categ_length"/>
+        <field name="factor">1.09361</field>
+        <field name="uom_type">smaller</field>
+    </record>
     <record id="product_uom_mile" model="uom.uom">
         <field name="name">mi</field>
         <field name="category_id" ref="uom_categ_length"/>