diff --git a/a.diff b/a.diff deleted file mode 100644 index d1e892a8780..00000000000 --- a/a.diff +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/sale_input_barcode/i18n/fr_FR.po b/sale_input_barcode/i18n/fr_FR.po -index ea78560..5de0920 100644 ---- a/sale_input_barcode/i18n/fr_FR.po -+++ b/sale_input_barcode/i18n/fr_FR.po -@@ -19,7 +19,7 @@ msgstr "" - #. module: sale_input_barcode - #: code:addons/sale_input_barcode/models/product_barcode_line_mixin.py:0 - #, python-format --msgid "Decoded barcode %s doesn't include a valid segment for GTIN" -+msgid "'Decoded barcode %s doesn't include a valid segment for GTIN' %barcode" - msgstr "Le code barre lu n'est pas au format GTIN" - - #. module: sale_input_barcode -@@ -56,7 +56,7 @@ msgstr "Date de la dernière modification" - #. module: sale_input_barcode - #: code:addons/sale_input_barcode/models/product_barcode_line_mixin.py:0 - #, python-format --msgid "No product found matching this barcode %s" -+msgid "'No product found matching this barcode %s' %barcode" - msgstr "Pas de produit trouvé pour ce code barre" - - #. module: sale_input_barcode -@@ -73,7 +73,7 @@ msgstr "Ligne de la commande de vente" - #: code:addons/sale_input_barcode/models/product_barcode_line_mixin.py:0 - #, python-format - msgid "" --"These products %s share the same barcode.\n" -+"'These products %s share the same barcode.\n' % [(x.display_name for x in product)]" - "Impossible to guess which one to choose." - msgstr "Ces produits ont le même code barre. Impossible d'en sélectionner un." - -diff --git a/sale_input_barcode/models/product_barcode_line_mixin.py b/sale_input_barcode/models/product_barcode_line_mixin.py -index 8bde51f..c4b717d 100644 ---- a/sale_input_barcode/models/product_barcode_line_mixin.py -+++ b/sale_input_barcode/models/product_barcode_line_mixin.py -@@ -23,10 +23,8 @@ def _process_barcode_on_product_line(self, barcode): - res = self.env["gs1_barcode"].decode(barcode) - if not res.get("01"): - raise UserError( -- _( -- "Decoded barcode %s doesn't include a valid segment for GTIN" -- % barcode -- ) -+ _("Decoded barcode %s doesn't include a valid segment for GTIN") -+ % (barcode) - ) - product = self.env["product.product"].search([("barcode", "=", res["01"])]) - if product: -@@ -35,11 +33,11 @@ def _process_barcode_on_product_line(self, barcode): - _( - "These products %s share the same barcode.\n" - "Impossible to guess which one to choose." -- % [(x.display_name for x in product)] - ) -+ % [(x.display_name for x in product)] - ) - else: -- raise UserError(_("No product found matching this barcode %s" % barcode)) -+ raise UserError(_("No product found matching this barcode %s") % (barcode)) - vals = {"product_id": product.id} - if res.get("10") and "lot_id" in self._fields: - # some module may add `lot_id` field