diff --git a/addons/barcodes_gs1_nomenclature/data/barcodes_gs1_rules.xml b/addons/barcodes_gs1_nomenclature/data/barcodes_gs1_rules.xml index 4142d3d4ed8..c06b14bfb60 100644 --- a/addons/barcodes_gs1_nomenclature/data/barcodes_gs1_rules.xml +++ b/addons/barcodes_gs1_nomenclature/data/barcodes_gs1_rules.xml @@ -90,12 +90,12 @@ - Packaging date (YYMMDD) + Pack date (YYMMDD) 137 gs1-128 (13)(\d{6}) - packaging_date + pack_date date diff --git a/addons/barcodes_gs1_nomenclature/models/barcode_rule.py b/addons/barcodes_gs1_nomenclature/models/barcode_rule.py index 590ba5e7623..bc1062fe135 100644 --- a/addons/barcodes_gs1_nomenclature/models/barcode_rule.py +++ b/addons/barcodes_gs1_nomenclature/models/barcode_rule.py @@ -22,8 +22,8 @@ class BarcodeRule(models.Model): ('package', 'Package'), ('use_date', 'Best before Date'), ('expiration_date', 'Expiration Date'), - ('package_type', 'Packaging Type'), - ('packaging_date', 'Packaging Date'), + ('package_type', 'Package Type'), + ('pack_date', 'Pack Date'), ], ondelete={ 'quantity': 'set default', 'location': 'set default', @@ -33,7 +33,7 @@ class BarcodeRule(models.Model): 'use_date': 'set default', 'expiration_date': 'set default', 'package_type': 'set default', - 'packaging_date': 'set default', + 'pack_date': 'set default', }) is_gs1_nomenclature = fields.Boolean(related="barcode_nomenclature_id.is_gs1_nomenclature") gs1_content_type = fields.Selection([ diff --git a/addons/barcodes_gs1_nomenclature/static/src/js/tests/barcode_parser_tests.js b/addons/barcodes_gs1_nomenclature/static/src/js/tests/barcode_parser_tests.js index 4e2d1b31d0d..5da8f68be94 100644 --- a/addons/barcodes_gs1_nomenclature/static/src/js/tests/barcode_parser_tests.js +++ b/addons/barcodes_gs1_nomenclature/static/src/js/tests/barcode_parser_tests.js @@ -75,12 +75,12 @@ QUnit.module('Barcode GS1 Parser', { gs1_decimal_usage: false }, { id: 6, - name: "Packaging date (YYMMDD)", + name: "Pack date (YYMMDD)", barcode_nomenclature_id: 2, sequence: 103, encoding: "gs1-128", pattern: "(13)(\\d{6})", - type: "packaging_date", + type: "pack_date", gs1_content_type: "date", gs1_decimal_usage: false }, {