[FIX] barcodes_gs1_nomenclature: differentiate package and packaging
On Odoo, "package" and "packaging" do not represent the same thing. The current terms are quite confusing Part-of: odoo/odoo#82883
This commit is contained in:
@@ -90,12 +90,12 @@
|
||||
|
||||
<!-- Date Barcodes -->
|
||||
<record id="barcode_rule_gs1_13" model="barcode.rule">
|
||||
<field name="name">Packaging date (YYMMDD)</field>
|
||||
<field name="name">Pack date (YYMMDD)</field>
|
||||
<field name="barcode_nomenclature_id" ref="default_gs1_nomenclature"/>
|
||||
<field name="sequence">137</field>
|
||||
<field name="encoding">gs1-128</field>
|
||||
<field name="pattern">(13)(\d{6})</field>
|
||||
<field name="type">packaging_date</field>
|
||||
<field name="type">pack_date</field>
|
||||
<field name="gs1_content_type">date</field>
|
||||
</record>
|
||||
|
||||
|
||||
@@ -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([
|
||||
|
||||
@@ -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
|
||||
}, {
|
||||
|
||||
Reference in New Issue
Block a user