Merge PR #171 into 12.0

Signed-off-by legalsylvain
grap · Dec 3, 2023 · c1190d3 · c1190d3
2 parents f765e6f + 4072fdd
commit c1190d3
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 33 deletions.
diff --git a/product_print_category/i18n/fr.po b/product_print_category/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-11 21:18+0000\n"
-"PO-Revision-Date: 2022-10-11 21:18+0000\n"
+"POT-Creation-Date: 2023-11-20 15:20+0000\n"
+"PO-Revision-Date: 2023-11-20 15:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -23,18 +23,13 @@ msgstr ""
 #. module: product_print_category
 #: model:ir.model.fields,field_description:product_print_category.field_product_print_category__active
 msgid "Active"
-msgstr "Actif"
+msgstr "Actif/ve"
 
 #. module: product_print_category
 #: model_terms:ir.ui.view,arch_db:product_print_category.view_product_print_wizard_form
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: product_print_category
-#: model_terms:ir.ui.view,arch_db:product_print_category.qweb_template_demo
-msgid "Code:"
-msgstr "Code :"
-
 #. module: product_print_category
 #: model:ir.model,name:product_print_category.model_res_company
 msgid "Companies"
@@ -43,7 +38,7 @@ msgstr "Sociétés"
 #. module: product_print_category
 #: model:ir.model.fields,field_description:product_print_category.field_product_print_category__company_id
 msgid "Company"
-msgstr "Société"
+msgstr ""
 
 #. module: product_print_category
 #: model:ir.model.fields,field_description:product_print_category.field_product_print_category__create_uid
@@ -65,17 +60,6 @@ msgstr "Créé le"
 msgid "Default Print Category"
 msgstr "Catégorie d'impression par défaut"
 
-#. module: product_print_category
-#: model:product.print.category,name:product_print_category.demo_category
-msgid "Demo Category"
-msgstr ""
-
-#. module: product_print_category
-#: model:product.product,name:product_print_category.demo_product
-#: model:product.template,name:product_print_category.demo_product_product_template
-msgid "Demo Product With Print category"
-msgstr ""
-
 #. module: product_print_category
 #: model:ir.model.fields,field_description:product_print_category.field_product_print_category__display_name
 #: model:ir.model.fields,field_description:product_print_category.field_product_print_category_mixin__display_name
@@ -90,6 +74,11 @@ msgstr "Nom affiché"
 msgid "Fields related to printing"
 msgstr "Champs déclenchant l'impression"
 
+#. module: product_print_category
+#: model_terms:ir.ui.view,arch_db:product_print_category.view_product_print_wizard_form
+msgid "For some small labels, codes will be prefered over barcode."
+msgstr "Pour certaines petites étiquettes, les codes écrits seront préférés à l'image du code-barre."
+
 #. module: product_print_category
 #: model:ir.model.fields,field_description:product_print_category.field_product_print_category__id
 #: model:ir.model.fields,field_description:product_print_category.field_product_print_category_mixin__id
@@ -208,6 +197,16 @@ msgstr "Imprimer les articles"
 msgid "Print barcode"
 msgstr "Imprimer les codes barres"
 
+#. module: product_print_category
+#: model:ir.model.fields,field_description:product_print_category.field_product_print_wizard__option_print_barcode_digits
+msgid "Print barcode digits"
+msgstr "Imprimer les chiffres du code-barre"
+
+#. module: product_print_category
+#: model:ir.model.fields,help:product_print_category.field_product_print_wizard__option_print_barcode_digits
+msgid "Print barcode digits if barcode exists"
+msgstr "Imprime les chiffres du code-barre s'il y en a un"
+
 #. module: product_print_category
 #: model:ir.model.fields,help:product_print_category.field_product_print_wizard__option_print_barcode
 msgid "Print barcode if it exists"
@@ -283,7 +282,7 @@ msgid "Report configuration"
 msgstr "Configuration du rapport"
 
 #. module: product_print_category
-#: code:addons/product_print_category/wizard/product_print_wizard.py:59
+#: code:addons/product_print_category/wizard/product_print_wizard.py:65
 #, python-format
 msgid "The following products has not print category defined. Please define one before.\n"
 " %s"
@@ -301,12 +300,6 @@ msgstr "À imprimer"
 msgid "To print"
 msgstr "À imprimer"
 
-#. module: product_print_category
-#: model:product.product,uom_name:product_print_category.demo_product
-#: model:product.template,uom_name:product_print_category.demo_product_product_template
-msgid "Unit(s)"
-msgstr "Unité(s)"
-
 #. module: product_print_category
 #: model:ir.model.fields,field_description:product_print_category.field_product_print_wizard_line__wizard_id
 msgid "Wizard"
@@ -322,12 +315,6 @@ msgstr ""
 msgid "Wizard line for printing products"
 msgstr ""
 
-#. module: product_print_category
-#: model:product.product,weight_uom_name:product_print_category.demo_product
-#: model:product.template,weight_uom_name:product_print_category.demo_product_product_template
-msgid "kg"
-msgstr ""
-
 #. module: product_print_category
 #: model_terms:ir.ui.view,arch_db:product_print_category.view_product_print_wizard_form
 msgid "🔧 Choose options"

diff --git a/product_print_category/wizard/product_print_wizard.py b/product_print_category/wizard/product_print_wizard.py
@@ -30,6 +30,12 @@ class ProductPrintWizard(models.TransientModel):
         default=True,
     )
 
+    option_print_barcode_digits = fields.Boolean(
+        string="Print barcode digits",
+        help="Print barcode digits if barcode exists",
+        default=False,
+    )
+
     @api.model
     def _default_line_ids(self):
         lines_vals = []
@@ -91,6 +97,7 @@ def _prepare_data(self):
             "line_data": [x.id for x in self.line_ids],
             "option_print_code": self.option_print_code,
             "option_print_barcode": self.option_print_barcode,
+            "option_print_barcode_digits": self.option_print_barcode_digits,
         }
 
     @api.multi

diff --git a/product_print_category/wizard/view_product_print_wizard.xml b/product_print_category/wizard/view_product_print_wizard.xml
@@ -15,7 +15,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                 <div class="wizard_options">
                   <h5>🔧 Choose options</h5><br/>
                   <label for="option_print_barcode"/><field name="option_print_barcode" widget="boolean_toggle"/><br/>
+                  <label for="option_print_barcode_digits"/><field name="option_print_barcode_digits" widget="boolean_toggle"/><br/>
                   <label for="option_print_code"/><field name="option_print_code" widget="boolean_toggle"/><br/>
+                  <p class="alert alert-info" role="alert" attrs="{'invisible': ['|', ('option_print_barcode', '=', False), '&amp;', ('option_print_barcode_digits', '=', False), ('option_print_code', '=', False)]}">
+                    For some small labels, codes will be prefered over barcode.
+                  </p>
                 </div>
                 <div class="wizard_instrutions">
                   <br/><h5>🖨️ Choose Products to print</h5>