diff --git a/grap_change_views_product/i18n/fr.po b/grap_change_views_product/i18n/fr.po
index 4f3238db..b256ef1d 100644
--- a/grap_change_views_product/i18n/fr.po
+++ b/grap_change_views_product/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-11-03 22:14+0000\n"
-"PO-Revision-Date: 2022-11-03 22:14+0000\n"
+"POT-Creation-Date: 2023-11-21 11:20+0000\n"
+"PO-Revision-Date: 2023-11-21 11:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -30,11 +30,6 @@ msgstr "<span class=\"o_stat_text\">Prévisions</span>"
 msgid "<span class=\"o_stat_text\">On Hand</span>"
 msgstr "<span class=\"o_stat_text\">Disponible</span>"
 
-#. module: grap_change_views_product
-#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
-msgid "<span class=\"unity_for_time_to_produce\"> minutes</span>"
-msgstr ""
-
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
 msgid "Accounting Fields"
@@ -61,6 +56,7 @@ msgid "Allergens"
 msgstr "Allergènes"
 
 #. module: grap_change_views_product
+#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_mrp
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_price
 msgid "Apply Margin"
 msgstr "Appliquer la marge"
@@ -80,17 +76,17 @@ msgstr "Catégorie"
 msgid "Category in POS"
 msgstr "Catégorie de PdV"
 
-#. module: grap_change_views_product
-#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
-msgid "Changing this value will change all BoM containing this product."
-msgstr "Changer cette valeur entraînera le changement de toutes les fiches techniques contenant ce produit."
-
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_supplierinfo_tree
 msgid "Code"
 msgstr ""
 
+#. module: grap_change_views_product
+#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__standard_price
+msgid "Cost"
+msgstr "Coût"
+
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree
 msgid "Cost P."
@@ -106,6 +102,21 @@ msgstr "Coût HT"
 msgid "Cost Price (VAT Incl.)"
 msgstr "Coût TTC"
 
+#. module: grap_change_views_product
+#: model:ir.model.fields,help:grap_change_views_product.field_product_product__standard_price
+msgid "Cost used for stock valuation in standard price and as a first price to set in average/fifo. Also used as a base price for pricelists. Expressed in the default unit of measure of the product."
+msgstr "Également utilisé comme prix de base pour les listes. Exprimé dans l'unité de mesure par défaut du produit."
+
+#. module: grap_change_views_product
+#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__country_id
+msgid "Country (Ingredients)"
+msgstr "Pays (ingrédients)"
+
+#. module: grap_change_views_product
+#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__country_group_id
+msgid "Country Group (Ingredients)"
+msgstr "Groupe de pays (ingrédients)"
+
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
 msgid "Create an automatic trigram. Change its BoM references with this trigram."
@@ -113,10 +124,22 @@ msgstr "Générer un trigramme automatiquement. Cela change les codes référenc
 
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
+#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_mrp
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_price
 msgid "Decrease the Sale Price down to Theoretical Price"
 msgstr "Baisser le prix de vente pour atteindre le prix théorique"
 
+#. module: grap_change_views_product
+#: model:ir.model.fields,help:grap_change_views_product.field_product_product__seller_ids
+#: model:ir.model.fields,help:grap_change_views_product.field_product_template__seller_ids
+msgid "Define vendor pricelists."
+msgstr "Définissez les listes de prix des fournisseurs."
+
+#. module: grap_change_views_product
+#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__department_id
+msgid "Department (Ingredients)"
+msgstr "Département (ingrédients)"
+
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
 msgid "Description"
@@ -163,6 +186,18 @@ msgstr "Informations complémentaires"
 msgid "Fields only configurable for raw materials."
 msgstr "Champs modifiables seulement pour les articles de matières premières"
 
+#. module: grap_change_views_product
+#: model:ir.model.fields,help:grap_change_views_product.field_product_product__country_group_id
+#: model:ir.model.fields,help:grap_change_views_product.field_product_product__country_id
+#: model:ir.model.fields,help:grap_change_views_product.field_product_product__department_id
+#: model:ir.model.fields,help:grap_change_views_product.field_product_product__state_id
+msgid "Fill in the origin of the ingredients. \n"
+" If it has several ingredients, take the widest denominator of origin. Example 1 for crunchy: EU / non-EU because the chocolate comes from South America. Example 2 coelslaw with local products: choose the Puy-de-dôme department. \n"
+" Mandatory for Fruits & Vegetables, and meat."
+msgstr "Remplir l'origine des ingrédients. \n"
+" S'il a plusieurs ingrédients, prendre le dénominateur d'origine le plus large. Exemple 1 pour du crunchy : UE / non UE car le chocolat vient d'Amérique du sud. Exemple 2 coelslaw avec des produits locaux : choisir le département du Puy-de-dôme. \n"
+" Obligatoire pour les Fruits & Légumes et la viande."
+
 #. module: grap_change_views_product
 #: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_mrp_handle_prices_standard_prices_3a_finished
 msgid "Finished Products"
@@ -207,6 +242,7 @@ msgstr "TI - Article chez l'acti"
 
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
+#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_mrp
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_price
 msgid "Increase the Sale Price up to Theoretical Price"
 msgstr "Augmenter le prix de vente pour atteindre le prix théorique"
@@ -349,6 +385,11 @@ msgstr "Prix"
 msgid "Price History"
 msgstr "Historique des coûts"
 
+#. module: grap_change_views_product
+#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
+msgid "Price Supp UoM"
+msgstr "Prix brut UdM Frs"
+
 #. module: grap_change_views_product
 #: model:ir.model.fields,help:grap_change_views_product.field_product_product__list_price
 #: model:ir.model.fields,help:grap_change_views_product.field_product_template__list_price
@@ -372,6 +413,7 @@ msgstr "Impression des étiquettes"
 
 #. module: grap_change_views_product
 #: model:ir.model,name:grap_change_views_product.model_product_product
+#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_mrp
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_supplierinfo_tree
 msgid "Product"
 msgstr "Article"
@@ -431,18 +473,18 @@ msgstr "Articles (Catégories)"
 msgid "Products (Food)"
 msgstr "Articles (Alimentaire)"
 
+#. module: grap_change_views_product
+#: model:ir.actions.act_window,name:grap_change_views_product.action_product_product_origin
+#: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_origin
+msgid "Products (Ingredients origin)"
+msgstr "Articles (origine ingrédients)"
+
 #. module: grap_change_views_product
 #: model:ir.actions.act_window,name:grap_change_views_product.action_product_product_joint_buying
 #: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_joint_buying
 msgid "Products (Joint Buying)"
 msgstr "Articles (Commandes groupées)"
 
-#. module: grap_change_views_product
-#: model:ir.actions.act_window,name:grap_change_views_product.action_product_product_origin
-#: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_origin
-msgid "Products (Origin)"
-msgstr "Articles (Origine)"
-
 #. module: grap_change_views_product
 #: model:ir.actions.act_window,name:grap_change_views_product.action_product_product_pos
 #: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_pos
@@ -479,11 +521,6 @@ msgstr "Articles (eBoutique)"
 msgid "Products - Update Margin and Sale Price"
 msgstr "Articles - Mettre à jour les prix de vente et marges 💶"
 
-#. module: grap_change_views_product
-#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_supplierinfo_tree
-msgid "Product price"
-msgstr "Prix de l'article"
-
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
 msgid "Purchase Invoicing Fields"
@@ -510,6 +547,11 @@ msgstr "Matières premières 🥕"
 msgid "Ref"
 msgstr "Réf"
 
+#. module: grap_change_views_product
+#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_mrp
+msgid "Ref."
+msgstr "Réf."
+
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
 msgid "Replenish"
@@ -566,6 +608,11 @@ msgstr "Voir les marges par liste de prix"
 msgid "Standard Price"
 msgstr "Coût"
 
+#. module: grap_change_views_product
+#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__state_id
+msgid "State (Ingredients)"
+msgstr "Région (Ingrédients)"
+
 #. module: grap_change_views_product
 #: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_stock
 msgid "Stock Situation"
@@ -595,12 +642,12 @@ msgstr "Nom chez frs."
 #. module: grap_change_views_product
 #: model:ir.ui.menu,name:grap_change_views_product.menu_grap_mrp_handle_prices_1b_supplierinfos
 msgid "Suppliers Informations"
-msgstr "Prix fournisseur·es"
+msgstr "Prix fournisseur·e·s"
 
 #. module: grap_change_views_product
 #: model:ir.actions.act_window,name:grap_change_views_product.action_product_supplierinfo_tree
 msgid "Suppliers informations"
-msgstr "Prix fournisseur·es"
+msgstr "Prix fournisseur·e·s"
 
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_supplierinfo_tree
@@ -688,13 +735,13 @@ msgstr "Mettre à jour le stock disponible"
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_supplierinfo_tree
 msgid "Use this price for product standard price"
-msgstr "Utiliser ce prix pour le coût de l'article"
+msgstr "Utiliser ce montant pour le coût de l'article"
 
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_supplierinfo_tree
 msgid "Use this price 🎯"
-msgstr "Utiliser ce prix 🎯"
+msgstr "Utiliser ce coût 🎯"
 
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
@@ -712,6 +759,8 @@ msgid "Valuation of Virtual Quantity"
 msgstr "Valorisation du stock virtuel"
 
 #. module: grap_change_views_product
+#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__seller_ids
+#: model:ir.model.fields,field_description:grap_change_views_product.field_product_template__seller_ids
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
 msgid "Vendors"
 msgstr "Fournisseurs"
@@ -736,11 +785,6 @@ msgstr "⇒ Générer trigramme"
 msgid "⇒ Increase Price"
 msgstr "⇒ Augmenter le prix"
 
-#. module: grap_change_views_product
-#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
-msgid "⌛ Handling time"
-msgstr "⌛ Gestion du temps"
-
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
 msgid "✅ Notations"
@@ -748,23 +792,23 @@ msgstr ""
 
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
-msgid "🌱 Organic informations"
-msgstr "🌱 Informations bio"
+msgid "🌱 Organic informations - Labels"
+msgstr "🌱 Infos réglementaires bio - labels"
 
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
-msgid "🍴 Alimentary informations"
-msgstr "🍴 Informations alimentaire"
+msgid "🌱 Organic informations - Ingredients origin"
+msgstr "🌱 Infos réglementaires bio - origine des ingrédients"
 
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
-msgid "📜 Market price list"
-msgstr "📜 Mercuriale"
+msgid "🍴 Alimentary and production informations 🚩"
+msgstr "🍴 Infos alimentaires et de production 🚩"
 
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
-msgid "🚩 Production place"
-msgstr "🚩 Lieu de production"
+msgid "📜 Market price list"
+msgstr "📜 Mercuriale"
 
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
diff --git a/grap_change_views_product/models/product_product.py b/grap_change_views_product/models/product_product.py
index 5c16e210..7ead46c0 100644
--- a/grap_change_views_product/models/product_product.py
+++ b/grap_change_views_product/models/product_product.py
@@ -26,6 +26,38 @@ class ProductProduct(models.Model):
 
     # Overload Column Section
     standard_price = fields.Float(copy=True)
+    country_group_id = fields.Many2one(
+        string="Country Group (Ingredients)",
+        help="Fill in the origin of the ingredients. \n If it has several ingredients, "
+        "take the widest denominator of origin. Example 1 for crunchy: EU / non-EU because"
+        " the chocolate comes from South America. Example 2 coelslaw"
+        " with local products: choose the Puy-de-dôme department. \n"
+        " Mandatory for Fruits & Vegetables, and meat.",
+    )
+    country_id = fields.Many2one(
+        string="Country (Ingredients)",
+        help="Fill in the origin of the ingredients. \n If it has several ingredients, "
+        "take the widest denominator of origin. Example 1 for crunchy: EU / non-EU because"
+        " the chocolate comes from South America. Example 2 coelslaw"
+        " with local products: choose the Puy-de-dôme department. \n"
+        " Mandatory for Fruits & Vegetables, and meat.",
+    )
+    state_id = fields.Many2one(
+        string="State (Ingredients)",
+        help="Fill in the origin of the ingredients. \n If it has several ingredients, "
+        "take the widest denominator of origin. Example 1 for crunchy: EU / non-EU because"
+        " the chocolate comes from South America. Example 2 coelslaw"
+        " with local products: choose the Puy-de-dôme department. \n"
+        " Mandatory for Fruits & Vegetables, and meat.",
+    )
+    department_id = fields.Many2one(
+        string="Department (Ingredients)",
+        help="Fill in the origin of the ingredients. \n If it has several ingredients, "
+        "take the widest denominator of origin. Example 1 for crunchy: EU / non-EU because"
+        " the chocolate comes from South America. Example 2 coelslaw"
+        " with local products: choose the Puy-de-dôme department. \n"
+        " Mandatory for Fruits & Vegetables, and meat.",
+    )
 
     # Compute Section
     @api.multi
diff --git a/grap_change_views_product/views/view_product_product_form.xml b/grap_change_views_product/views/view_product_product_form.xml
index ce3b65db..aa5098b5 100644
--- a/grap_change_views_product/views/view_product_product_form.xml
+++ b/grap_change_views_product/views/view_product_product_form.xml
@@ -228,7 +228,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                                                 attrs="{'readonly': [('is_intercompany_trade', '=', True)]}"/>
                                             <field name="multiplier_qty" string="Multiplier Qty"/>
                                             <field name="min_qty" string="Min Qty"/>
-                                            <field name="price" widget="monetary" options="{'field_digits': True}"/>
+                                            <field name="price" string="Price Supp UoM" widget="monetary" options="{'field_digits': True}"/>
                                             <field name="product_uom" string="UoM"/>
                                             <field name="discount" string="Disc. 1 %"/>
                                             <field name="discount2"  string="Disc. 2 %"/>
@@ -281,22 +281,24 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                             </group>
                         </page>
                         <page string="Extra Informations">
-                                <group>
-                                <group string="🚩 Production place">
-                                    <field name="maker_description"/>
-                                    <field name="department_id"/>
-                                    <field name="state_id"/>
-                                    <field name="country_id"/>
-                                    <field name="origin_description"/>
+                            <group>
+                                <group string="🌱 Organic informations - Labels">
+                                  <field name="is_uncertifiable" attrs="{'invisible': [('is_alimentary', '=', False)]}"/>
+                                  <field name="label_ids" widget="many2many_tags"/>
+                                  <field name="organic_type"/>
                                 </group>
-                                <group string="🌱 Organic informations">
+                                <group string="🌱 Organic informations - Ingredients origin">
                                     <field name="country_group_id"/>
-                                    <field name="label_ids" widget="many2many_tags"/>
-                                    <field name="is_uncertifiable" attrs="{'invisible': [('is_alimentary', '=', False)]}"/>
-                                    <field name="organic_type"/>
+                                    <field name="country_id"/>
+                                    <field name="state_id"/>
+                                    <field name="department_id"/>
+                                    <field name="origin_description"/>
                                     <field name="pricetag_origin"/>
+                                    <br/>
                                 </group>
-                                <group string="🍴 Alimentary informations">
+                                <group string="🍴 Alimentary and production informations 🚩">
+                                    <field name="maker_description"/>
+                                    <br/>
                                     <field name="is_vegan"/>
                                     <field name="is_alcohol" attrs="{'invisible': [('is_alimentary', '=', False)]}"/>
                                     <field name="best_before_date_day" attrs="{'invisible': [('is_alimentary', '=', False)]}"/>
diff --git a/grap_change_views_product/views/view_product_product_tree.xml b/grap_change_views_product/views/view_product_product_tree.xml
index 1dd8d66c..94ab54b5 100644
--- a/grap_change_views_product/views/view_product_product_tree.xml
+++ b/grap_change_views_product/views/view_product_product_tree.xml
@@ -144,18 +144,19 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                 <field name="default_code" readonly="1"/>
                 <button name="see_current_product" type="object" string="↗️"/>
                 <field name="name" readonly="1"/>
+                <field name="country_group_id"/>
                 <field name="country_id"/>
                 <field name="state_id"/>
                 <field name="department_id"/>
-                <field name="maker_description"/>
                 <field name="origin_description"/>
+                <field name="maker_description"/>
                 <field name="company_id" groups="base.group_multi_company" readonly="1"/>
             </tree>
         </field>
     </record>
 
     <record id="action_product_product_origin" model="ir.actions.act_window">
-        <field name="name">Products (Origin)</field>
+        <field name="name">Products (Ingredients origin)</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">product.product</field>
         <field name="view_type">form</field>
@@ -164,7 +165,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
     </record>
 
    <menuitem id="menu_product_product_origin"
-        name="Products (Origin)"
+        name="Products (Ingredients origin)"
         action="action_product_product_origin"
         parent="menu_product_product_editable_view" sequence="3"/>
 
diff --git a/grap_qweb_report/i18n/fr.po b/grap_qweb_report/i18n/fr.po
index 3ef49ad8..45f9a084 100644
--- a/grap_qweb_report/i18n/fr.po
+++ b/grap_qweb_report/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:14+0000\n"
-"PO-Revision-Date: 2022-10-11 21:14+0000\n"
+"POT-Creation-Date: 2023-11-20 13:58+0000\n"
+"PO-Revision-Date: 2023-11-20 13:58+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 #. module: grap_qweb_report
 #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_square_large
 msgid "- Code:"
-msgstr "- Code :"
+msgstr "- Code : "
 
 #. module: grap_qweb_report
 #: model_terms:ir.ui.view,arch_db:grap_qweb_report.grap_external_layout
@@ -32,8 +32,8 @@ msgstr ""
 
 #. module: grap_qweb_report
 #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_square_large
-msgid "<b>Origine : </b>"
-msgstr "<b>Lieu de prod. : </b>"
+msgid "Origine : "
+msgstr ""
 
 #. module: grap_qweb_report
 #: model_terms:ir.ui.view,arch_db:grap_qweb_report.grap_external_layout
@@ -52,9 +52,19 @@ msgid "<br/>\n"
 "                            est une activité de <br/>"
 msgstr ""
 
+#. module: grap_qweb_report
+#: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_small
+msgid "<br/>Origin:"
+msgstr "<br/>Origine : "
+
+#. module: grap_qweb_report
+#: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_large
+msgid "<br/>Origine :"
+msgstr ""
+
 #. module: grap_qweb_report
 #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_square_large
-msgid "<span class=\"empty_field\"><b>Ingrédients</b></span><br/>"
+msgid "<span class=\"empty_field\">Ingrédients</span><br/>"
 msgstr ""
 
 #. module: grap_qweb_report
@@ -146,6 +156,11 @@ msgstr "Montant (avec ou sans taxes)"
 msgid "Anonymous"
 msgstr "Anonyme"
 
+#. module: grap_qweb_report
+#: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_square_large
+msgid "Barcode:"
+msgstr "Code barre :"
+
 #. module: grap_qweb_report
 #. openerp-web
 #: code:addons/grap_qweb_report/static/src/xml/pos.xml:90
@@ -181,7 +196,7 @@ msgstr "Sociétés"
 #. module: grap_qweb_report
 #: model:ir.model.fields,field_description:grap_qweb_report.field_report_custom_message__company_id
 msgid "Company"
-msgstr "Société"
+msgstr ""
 
 #. module: grap_qweb_report
 #: model:ir.model.fields,field_description:grap_qweb_report.field_report_custom_message__create_uid
@@ -275,6 +290,11 @@ msgstr "Afficher sur"
 msgid "Document Template"
 msgstr "Modèle de document"
 
+#. module: grap_qweb_report
+#: model_terms:ir.ui.view,arch_db:grap_qweb_report.template_account_invoice
+msgid "Document d'origine"
+msgstr ""
+
 #. module: grap_qweb_report
 #: code:addons/grap_qweb_report/models/account_invoice.py:18
 #, python-format
@@ -329,8 +349,8 @@ msgstr ""
 #. module: grap_qweb_report
 #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_large
 #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_small
-msgid "Internal code:"
-msgstr "Code :"
+msgid "Internal code: ["
+msgstr "Code : ["
 
 #. module: grap_qweb_report
 #: model:ir.model,name:grap_qweb_report.model_account_invoice
@@ -392,17 +412,6 @@ msgstr ""
 msgid "Normal (small) - 76x33mm"
 msgstr ""
 
-#. module: grap_qweb_report
-#: model_terms:ir.ui.view,arch_db:grap_qweb_report.template_account_invoice
-msgid "Document d'origine"
-msgstr ""
-
-#. module: grap_qweb_report
-#: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_large
-#: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_small
-msgid "Origine :"
-msgstr "Lieu de prod. :"
-
 #. module: grap_qweb_report
 #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_large
 #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_small
@@ -563,7 +572,7 @@ msgstr ""
 #. module: grap_qweb_report
 #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_large
 #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_small
-msgid "kg"
+msgid "kg<br/>"
 msgstr ""
 
 #. module: grap_qweb_report
diff --git a/grap_qweb_report/report/qweb_pricetag_normal_large.xml b/grap_qweb_report/report/qweb_pricetag_normal_large.xml
index 207f66cd..dea30223 100644
--- a/grap_qweb_report/report/qweb_pricetag_normal_large.xml
+++ b/grap_qweb_report/report/qweb_pricetag_normal_large.xml
@@ -12,6 +12,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <xpath expr="." position="inside">
             <!-- pricetag_base.scss et pricetag_normal_base.scss sont importés dans product_print_category_food_report -->
             <link href="/grap_qweb_report/static/css/pricetag_normal_large.scss" rel="stylesheet" type="text/scss"/>
+            <link href="/product_print_category_food_report/static/css/font.less" rel="stylesheet" type="text/less"/>
         </xpath>
     </template>
 
@@ -20,7 +21,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
             <t t-foreach="category_data['lines']" t-as="line">
                 <t t-foreach="line.quantity" t-as="q">
                     <!-- NORMAL PRICETAG LARGE -->
-                    <div class="normal_pricetag normal_pricetag_large floating_box">
+                    <div class="normal_pricetag normal_pricetag_large floating_box pricetag-font">
                         <div class="pricetag_left floating_box">
                             <div class="write_date">
                                 <t t-if="line.product_id.write_date">
@@ -31,10 +32,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                                 <t t-esc="line.product_id.name"/>
                             </div>
                             <div class="product_informations" t-attf-style="background-color: {{ line.product_id.pricetag_type_id.color }};">
-                                <t t-if="line.product_id.default_code and option_print_code">Internal code: <t t-esc="line.product_id.default_code"/><br/></t>
-                                <t t-if="line.product_id.pricetag_origin">Origine : <b><t t-esc="line.product_id.pricetag_origin"/></b><br/></t>
+                                <t t-if="line.product_id.default_code and option_print_code">Internal code: [<t t-esc="line.product_id.default_code"/>]</t>
+                                <t t-if="line.product_id.barcode and option_print_barcode_digits"> <t t-esc="line.product_id.barcode"/></t>
+                                <t t-if="line.product_id.pricetag_origin"><br/>Origine : <t t-esc="line.product_id.pricetag_origin"/><br/></t>
                                 <t t-else=""><br/></t>
-                                <t t-if="line.product_id.maker_description">Producteur·rice : <b><t t-esc="line.product_id.maker_description"/></b><br/></t>
+                                <t t-if="line.product_id.maker_description">Producteur·rice : <t t-esc="line.product_id.maker_description"/><br/></t>
                                 <t t-else=""><br/></t>
                             </div>
                             <div class="product_labels">
@@ -62,7 +64,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                         <div class="pricetag_right floating_box">
                             <t t-if="not line.product_id.pricetag_special_quantity_price">
                                 <div class="product_price">
-                                    <t t-esc="'%0.2f' % (line.product_id.list_price)"/> €
+                                    <t t-esc="'%0.2f' % (line.product_id.list_price)"/>€
                                 </div>
                                 <!-- Le kilo // La pièce -->
                                 <t t-if="line.product_id.uom_id.category_id.measure_type == 'weight'"><div class="product_sell_by_weight">le kilo</div></t>
@@ -70,14 +72,14 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                                 <!-- Poids (Kg) ou Volume (L) du produit -->
                                 <t t-if="line.product_id.pricetag_is_second_price">
                                     <div class="product_price_per_uom_qty floating_box">
-                                        <t t-if="line.product_id.volume">Volume<br/><b><t t-esc="line.product_id.volume"/> L</b><br/></t>
-                                        <t t-elif="line.product_id.net_weight">Poids net<br/><b><t t-esc="line.product_id.net_weight"/> kg</b><br/></t>
+                                        <t t-if="line.product_id.volume">Volume<br/><t t-esc="line.product_id.volume"/> L<br/></t>
+                                        <t t-elif="line.product_id.net_weight">Poids net<br/><t t-esc="line.product_id.net_weight"/> kg<br/></t>
                                     </div>
                                     <!-- Prix au kilo ou au L -->
                                     <div class="product_price_per_uom_price floating_box">
                                         <t t-if="line.product_id.pricetag_is_second_price">
                                             <t t-esc="line.product_id.pricetag_second_price_uom_text"/><br/>
-                                            <b><t t-esc="'%0.2f' % (line.product_id.pricetag_second_price)"/> €</b>
+                                            <t t-esc="'%0.2f' % (line.product_id.pricetag_second_price)"/> €
                                         </t>
                                     </div>
                                 </t>
diff --git a/grap_qweb_report/report/qweb_pricetag_normal_small.xml b/grap_qweb_report/report/qweb_pricetag_normal_small.xml
index 6713db7c..72d907cc 100644
--- a/grap_qweb_report/report/qweb_pricetag_normal_small.xml
+++ b/grap_qweb_report/report/qweb_pricetag_normal_small.xml
@@ -12,6 +12,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <xpath expr="." position="inside">
             <!-- pricetag_base.scss et pricetag_normal_base.scss sont importés dans product_print_category_food_report -->
             <link href="/grap_qweb_report/static/css/pricetag_normal_small.scss" rel="stylesheet" type="text/scss"/>
+            <link href="/product_print_category_food_report/static/css/font.less" rel="stylesheet" type="text/less"/>
         </xpath>
     </template>
 
@@ -20,7 +21,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
             <t t-foreach="category_data['lines']" t-as="line">
                 <t t-foreach="line.quantity" t-as="q">
                     <!-- NORMAL PRICETAG SMALL -->
-                    <div class="normal_pricetag normal_pricetag_small floating_box">
+                    <div class="normal_pricetag normal_pricetag_small floating_box pricetag-font">
                         <div class="pricetag_left floating_box">
                             <div class="write_date">
                                 <t t-if="line.product_id.write_date">
@@ -31,10 +32,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                                 <t t-esc="line.product_id.name"/>
                             </div>
                             <div class="product_informations" t-attf-style="background-color: {{ line.product_id.pricetag_type_id.color }};">
-                                <t t-if="line.product_id.default_code and option_print_code">Internal code: <t t-esc="line.product_id.default_code"/><br/></t>
-                                <t t-if="line.product_id.pricetag_origin">Origine : <b><t t-esc="line.product_id.pricetag_origin"/></b><br/></t>
+                                <t t-if="line.product_id.default_code and option_print_code">Internal code: [<t t-esc="line.product_id.default_code"/>]</t>
+                                <t t-if="line.product_id.barcode and option_print_barcode_digits"> <t t-esc="line.product_id.barcode"/></t>
+                                <t t-if="line.product_id.pricetag_origin"><br/>Origin: <t t-esc="line.product_id.pricetag_origin"/><br/></t>
                                 <t t-else=""><br/></t>
-                                <t t-if="line.product_id.maker_description">Producteur·rice : <b><t t-esc="line.product_id.maker_description"/></b><br/></t>
+                                <t t-if="line.product_id.maker_description">Producteur·rice : <t t-esc="line.product_id.maker_description"/><br/></t>
                                 <t t-else=""><br/></t>
                             </div>
                             <!-- Product Label -->
@@ -76,14 +78,14 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                                 <!-- Poids (Kg) ou Volume (L) du produit -->
                                 <t t-if="line.product_id.pricetag_is_second_price">
                                     <div class="product_price_per_uom_qty floating_box">
-                                        <t t-if="line.product_id.volume">Volume<br/><b><t t-esc="line.product_id.volume"/> L</b><br/></t>
-                                        <t t-elif="line.product_id.net_weight">Poids net<br/><b><t t-esc="line.product_id.net_weight"/> kg</b><br/></t>
+                                        <t t-if="line.product_id.volume">Volume<br/><t t-esc="line.product_id.volume"/> L<br/></t>
+                                        <t t-elif="line.product_id.net_weight">Poids net<br/><t t-esc="line.product_id.net_weight"/> kg<br/></t>
                                     </div>
                                     <!-- Prix au Kg ou au L -->
                                     <div class="product_price_per_uom_price floating_box">
                                         <t t-if="line.product_id.pricetag_is_second_price">
                                             <t t-esc="line.product_id.pricetag_second_price_uom_text"/><br/>
-                                            <b><t t-esc="'%0.2f' % (line.product_id.pricetag_second_price)"/> €</b>
+                                            <t t-esc="'%0.2f' % (line.product_id.pricetag_second_price)"/> €
                                         </t>
                                     </div>
                                 </t>
diff --git a/grap_qweb_report/report/qweb_pricetag_square_large.xml b/grap_qweb_report/report/qweb_pricetag_square_large.xml
index 73a1d13b..80022c9a 100644
--- a/grap_qweb_report/report/qweb_pricetag_square_large.xml
+++ b/grap_qweb_report/report/qweb_pricetag_square_large.xml
@@ -12,6 +12,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <xpath expr="." position="inside">
             <!-- pricetag_base.scss et pricetag_square.scss sont importés dans product_print_category_food_report -->
             <link href="/grap_qweb_report/static/css/pricetag_square_large.scss" rel="stylesheet" type="text/scss"/>
+            <link href="/product_print_category_food_report/static/css/font.less" rel="stylesheet" type="text/less"/>
         </xpath>
     </template>
 
@@ -19,7 +20,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <t t-call="web.basic_layout">
             <t t-foreach="category_data['lines']" t-as="line">
                 <t t-foreach="line.quantity" t-as="q">
-                    <div class="square_pricetag_large floating_box">
+                    <div class="square_pricetag_large floating_box pricetag-font">
                         <!-- Label bottom -->
                         <div class="label_left floating_box">
                             <div class="div_company_logo" style="background-color:white;">
@@ -41,7 +42,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                                     Printed <span t-esc="line.product_id.write_date.strftime('%d/%m/%Y - %H:%M')"/>
                                 </t>
                                 <t t-if="line.product_id.default_code and option_print_code">
-                                  <span class="span_code">- Code: <b><t t-esc="line.product_id.default_code"/></b></span>
+                                  <span class="span_code">- Code: <t t-esc="line.product_id.default_code"/></span>
+                                </t>
+                                <t t-if="line.product_id.barcode and option_print_barcode_digits">
+                                  <br/>
+                                  <span class="barcode_digits">Barcode: <t t-esc="line.product_id.barcode"/></span>
                                 </t>
                             </div>
                             <div class="wrap_barcode_image floating_box">
@@ -52,14 +57,14 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                                 </t>
                             </div>
                         </div>
-                        <div class="label_right">
+                        <div class="label_right pricetag-font">
                             <div class="product_name" t-attf-style="background-color: {{ line.product_id.pricetag_type_id.color }};">
                                 <t t-esc="line.product_id.name.replace('(RV)', '')"/>
                             </div>
                             <t t-if="not line.product_id.pricetag_special_quantity_price">
                                 <div class="product_price_per_uom_price_big">
                                     <span class="product_price_big">
-                                        <b><t t-esc="'%0.2f' % (line.product_id.list_price)"/> €</b><!--
+                                        <t t-esc="'%0.2f' % (line.product_id.list_price)"/> €<!--
                                          --><t t-if="line.product_id.uom_id.category_id.measure_type == 'volume'"><!--
                                              --><span class="product_uom">le litre</span><br/>
                                         </t>
@@ -74,7 +79,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                                         <span class="product_price_per_uom_price_beside floating_box">
                                             <t t-if="line.product_id.pricetag_is_second_price">
                                                 <t t-esc="line.product_id.pricetag_second_price_uom_text"/> :
-                                                <b><t t-esc="'%0.2f' % (line.product_id.pricetag_second_price)"/>&#160;€</b>
+                                                <t t-esc="'%0.2f' % (line.product_id.pricetag_second_price)"/>&#160;€
                                             </t>
                                         </span>
                                     </t>
@@ -83,7 +88,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                             <t t-if="line.product_id.pricetag_special_quantity_price">
                                 <div class="product_price_per_uom_price_big">
                                     <div class="product_price_big">
-                                        <b><t t-esc="'%0.2f' % (line.product_id.pricetag_second_price)"/> €</b><!--
+                                        <t t-esc="'%0.2f' % (line.product_id.pricetag_second_price)"/> €<!--
                                          --><span class="product_uom_special"><t t-esc="line.product_id.pricetag_second_price_uom_text"/></span>
                                     </div>
                                 </div>
@@ -97,11 +102,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                                 </div>
                             </t>
                             <div class="label_origin">
-                                <t t-if="line.product_id.pricetag_origin"><b>Origine : </b><t t-esc="line.product_id.pricetag_origin"/><br/></t>
+                                <t t-if="line.product_id.pricetag_origin"><span class="info_underline">Origine : </span><t t-esc="line.product_id.pricetag_origin"/><br/></t>
                             </div>
                             <div class="label_ingredients">
                                 <t t-if="not line.product_id.ingredients == '&lt;p>&lt;br>&lt;/p>'"><t t-raw="line.product_id.ingredients"/></t>
-                                <t t-else=""><span class="empty_field"><b>Ingrédients</b></span><br/></t>
+                                <t t-else=""><span class="empty_field">Ingrédients</span><br/></t>
                             </div>
                             <div class="label_allergens">
                                 <t t-if="line.product_id.allergens"><t t-raw="line.product_id.allergens"/></t>
diff --git a/grap_qweb_report/report/qweb_pricetag_square_small.xml b/grap_qweb_report/report/qweb_pricetag_square_small.xml
index 42be46ed..daf1fac6 100644
--- a/grap_qweb_report/report/qweb_pricetag_square_small.xml
+++ b/grap_qweb_report/report/qweb_pricetag_square_small.xml
@@ -12,6 +12,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <xpath expr="." position="inside">
             <!-- pricetag_base.scss et pricetag_square.scss sont importés dans product_print_category_food_report -->
             <link href="/grap_qweb_report/static/css/pricetag_square_small.scss" rel="stylesheet" type="text/scss"/>
+            <link href="/product_print_category_food_report/static/css/font.less" rel="stylesheet" type="text/less"/>
         </xpath>
     </template>
 
@@ -19,7 +20,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <t t-call="web.basic_layout">
         <t t-foreach="category_data['lines']" t-as="line">
             <t t-foreach="line.quantity" t-as="q">
-                <div class="square_pricetag_small floating_box">
+                <div class="square_pricetag_small floating_box pricetag-font">
                         <!-- Write date -->
                         <div class="write_date">
                             <t t-if="line.product_id.write_date">
@@ -59,32 +60,40 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                                     <t t-esc="'%0.2f' % (line.product_id.list_price)"/> €
                                 </div>
                                 <!-- Le kilo // La pièce -->
-                                <t t-if="line.product_id.uom_id.category_id.measure_type == 'weight'"><div class="product_sell_by_weight">le kilo</div></t>
-                                <t t-else=""><div class="product_sell_by_weight">la pièce</div></t>
+                                <div class="product_sell_by_weight">
+                                  <t t-if="line.product_id.uom_id.category_id.measure_type == 'weight'">le kilo</t>
+                                  <t t-else="">la pièce</t>
+                                </div>
                                 <!-- Prix au Kg ou au L -->
-                                <t t-if="line.product_id.pricetag_is_second_price">
-                                    <div class="product_price_per_uom_price">
-                                        <t t-if="line.product_id.pricetag_is_second_price">
-                                            <t t-esc="line.product_id.pricetag_second_price_uom_text"/>:
-                                            <b><t t-esc="'%0.2f' % (line.product_id.pricetag_second_price)"/> €</b>
-                                        </t>
-                                    </div>
-                                </t>
-                                <t t-else="">
-                                    <div class="product_price_per_uom_price"></div>
-                                </t>
+                                <div class="product_price_per_uom_price">
+                                  <t t-if="line.product_id.pricetag_is_second_price">
+                                          <t t-if="line.product_id.pricetag_is_second_price">
+                                              <t t-esc="line.product_id.pricetag_second_price_uom_text"/> :
+                                              <t t-esc="'%0.2f' % (line.product_id.pricetag_second_price)"/> €
+                                          </t>
+                                  </t>
+                              </div>
                             </t>
                         </div>
                         <!-- BARCODE Image -->
                         <div>
-                            <div class="option_print_code" t-if="option_print_code"><t t-esc="line.product_id.default_code"/></div>
-                            <div class="wrap_barcode_image floating_box and option_print_barcode">
-                                <t t-if="line.product_id.barcode">
-                                    <img t-if="len(line.product_id.barcode) == 13" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;' % ('EAN13', line.product_id.barcode)"/>
-                                    <img t-elif="len(line.product_id.barcode) == 8" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;' % ('EAN8', line.product_id.barcode)"/>
-                                    <img t-else="" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;' % ('Code128', line.product_id.barcode)"/>
-                                </t>
+                            <div class="option_print_codes">
+                              <t t-if="option_print_code">
+                                [<t t-esc="line.product_id.default_code"/>]
+                              </t>
+                              <t t-if="line.product_id.barcode and option_print_barcode_digits">
+                                <span class="barcode_digits"> <t t-esc="line.product_id.barcode"/></span>
+                              </t>
                             </div>
+                            <t t-if="option_print_barcode and (not option_print_code and not option_print_barcode_digits)">
+                              <div class="wrap_barcode_image floating_box">
+                                  <t t-if="line.product_id.barcode and option_print_barcode">
+                                      <img t-if="len(line.product_id.barcode) == 13" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;' % ('EAN13', line.product_id.barcode)"/>
+                                      <img t-elif="len(line.product_id.barcode) == 8" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;' % ('EAN8', line.product_id.barcode)"/>
+                                      <img t-else="" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;' % ('Code128', line.product_id.barcode)"/>
+                                  </t>
+                              </div>
+                            </t>
                         </div>
                 </div>
             </t>
diff --git a/grap_qweb_report/static/css/pricetag_normal_large.scss b/grap_qweb_report/static/css/pricetag_normal_large.scss
index 09f27d6a..68ae7c94 100644
--- a/grap_qweb_report/static/css/pricetag_normal_large.scss
+++ b/grap_qweb_report/static/css/pricetag_normal_large.scss
@@ -3,10 +3,10 @@
     padding: 0.8cm 5px;
 
     .pricetag_left {
-        width : 5.8cm;
+        width : 5.5cm;
     }
     .pricetag_right {
-        width : 3.05cm;
+        width : 3.1cm;
         height: 3.6cm;
         padding-top: 30px;
     }
@@ -20,7 +20,7 @@
         font-size: 13px;
     }
     .product_price {
-        font-size: 30px;
+        font-size: 29px;
         height: 1cm; line-height: 1cm;
         white-space: nowrap;
     }
diff --git a/grap_qweb_report/static/css/pricetag_square_large.scss b/grap_qweb_report/static/css/pricetag_square_large.scss
index 3accd530..67b77d6f 100644
--- a/grap_qweb_report/static/css/pricetag_square_large.scss
+++ b/grap_qweb_report/static/css/pricetag_square_large.scss
@@ -38,6 +38,9 @@
         padding-top: 0.2cm;
         font-size: 12px;
     }
+    .info_underline {
+      text-decoration: underline;
+    }
     .product_price {
         position: relative;
         text-align: center;
@@ -57,7 +60,6 @@
         word-wrap: normal;
     }
     .product_price_big {
-        font-family: Open Sans;
         font-weight: lighter;
         font-size: 38px;
         margin: 0.1cm 0;
diff --git a/grap_qweb_report/static/css/pricetag_square_small.scss b/grap_qweb_report/static/css/pricetag_square_small.scss
index 4e09bcb3..71766863 100644
--- a/grap_qweb_report/static/css/pricetag_square_small.scss
+++ b/grap_qweb_report/static/css/pricetag_square_small.scss
@@ -11,68 +11,77 @@
     }
     .product_labels{
         float:left;
-        width: 0.88cm; max-height: 1cm;
-        padding-top: 0.25cm;
+        width: 0.88cm;
+        min-width: 0.55cm;
+        min-height: 1px; // to have width and height even if empty
+        max-height: 1cm;
     }
     img.product_label{
         width:0.5cm; height:0.5cm;
-    }
-    .price_area {
-        display: initial;
         position: relative;
-        bottom: 0.2cm;
-        width: 2.7cm;
+        bottom: 0.15cm;
     }
     .product_name{
-        font-size:12px; font-weight:bold;
-        padding-bottom : 6px; padding-top : 5px;
+        font-size:12px;
+        padding-bottom : 6px; padding-top : 3px;
         margin-top: 0.1cm;
         overflow: hidden; height: 1.1cm;
         text-align: center;
     }
+    // ========== Price
+    .price_area {
+      text-align: center;
+      position: relative;
+      right:0.28cm;
+      width:3.8cm; height:1.9cm;
+    }
+    // 1. With special quantity price
     .pricetag_second_product_price {
-        font-size: 25px; font-weight: bold;
+        font-size: 25px;
         text-align: center;
         overflow: hidden;
+        position: relative; right: 0.28cm;
     }
     .pricetag_second_price_uom_text {
-        font-size: 13px; font-weight: bold;
+        font-size: 13px;
         text-align: center; line-height: 0.5em;
     }
+    .product_price_per_uom_price_only {
+      font-size: 9px; line-height: 3em;
+      width: 100%; text-align: center;
+    }
+    // 2. With normal quantity
     .product_price {
-        font-size: 23px; font-weight: bold;
+        font-size: 23px;
         line-height: 1cm;
         overflow: hidden;
         white-space: nowrap;
     }
+    // 2.a Sell by weight or unit
+    .product_sell_by_weight {
+      font-size: 11px;
+      text-align: center;
+      position: relative;
+      bottom: 0.7em;
+      left: 0.2cm;
+    }
+    // 2.b Uom price
     .product_price_per_uom_price {
         text-align: center;
         font-size:9px;
-        height: 0.8cm;
         display: inline;
-        position : relative; left: 0.7cm;
-        overflow : hidden;
-    }
-    .product_price_per_uom_price_only {
-        font-size: 9px; line-height: 3em;
-        width: 100%; text-align: center;
-    }
-    .product_sell_by_weight {
-        font-size: 11px;
-        text-align: center;
-        position: relative;
-        bottom: 0.7em;
-        right: 0.5em;
+        position : relative; left: 0.25cm; bottom: 0.31cm;
     }
-    .option_print_code{
+
+    // ========== Codes
+    .option_print_codes{
       text-align: center;
       font-size: 6px;
-      margin-bottom: 4px;
     }
     .wrap_barcode_image{
         overflow: hidden;
-        position: relative; bottom: 0.17cm;
-        height: 0.35cm;
+        position: relative; bottom: 0.24cm;
+        height: 0.30cm;
     }
     .wrap_barcode_image > img{
         width: 3.8cm;