Merge PR #651 into 16.0

Signed-off-by legalsylvain

barcodes_generator_abstract/models/barcode_generate_mixin.py

@@ -37,10 +37,8 @@ def create(self, vals_list):
         for rec in records:
             rule = rec.barcode_rule_id
             if rule and rule.generate_automate and rule.generate_type == "sequence":
-                if not rec.barcode_base:
-                    rec.generate_base()
-                if not rec.barcode:
-                    rec.generate_barcode()
+                rec.generate_base()
+                rec.generate_barcode()
         return records
 
     def write(self, vals):
@@ -51,15 +49,17 @@ def write(self, vals):
             rule = self.env["barcode.rule"].browse(vals["barcode_rule_id"])
             if rule.generate_automate and rule.generate_type == "sequence":
                 for rec in self:
-                    if not rec.barcode_base:
-                        rec.generate_base()
-                    if not rec.barcode:
-                        rec.generate_barcode()
+                    rec.generate_base()
+                    rec.generate_barcode()
         return res
 
     # View Section
     def generate_base(self):
-        for item in self:
+        """Generate a base barcode, based on sequence, if the item
+        has no barcode defined.
+        Raise an exception if the generate_type of the barcode rule
+        is not set to 'sequence'."""
+        for item in self.filtered(lambda x: not x.barcode_base):
             if item.generate_type != "sequence":
                 raise exceptions.UserError(
                     _(

barcodes_generator_abstract/tests/test_barcodes_generator_abstract.py

@@ -82,6 +82,7 @@ def test_generate_sequence_sequence(self):
         self.user_fake.generate_barcode()
         self.assertEqual(self.user_fake.barcode, "2000001000007")
 
+        self.user_fake.barcode_base = False
         self.user_fake.generate_base()
         self.assertEqual(self.user_fake.barcode_base, 2)
         self.user_fake.generate_barcode()