From f1849993e14fbf28b587a7a10b041997d1637031 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Thu, 12 Dec 2019 11:20:02 +0100
Subject: [PATCH] fixup! [ADD] percent margin on pos.order and pos.order.line
 (following same logic as OCA/margin-analysis/account_invoice_margin module ;
 [ADD] margin and margin percent on tree pos order view ; [UPD] Description
 and translation

---
 pos_margin/i18n/fr.po          | 28 +++++++++++++++++-----------
 pos_margin/i18n/pos_margin.pot | 16 ++++++++++++++--
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/pos_margin/i18n/fr.po b/pos_margin/i18n/fr.po
index 8cf4d09e..a3161477 100644
--- a/pos_margin/i18n/fr.po
+++ b/pos_margin/i18n/fr.po
@@ -6,11 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-15 11:05+0000\n"
-"PO-Revision-Date: 2019-08-15 11:05+0000\n"
+"POT-Creation-Date: 2019-12-12 10:19+0000\n"
+"PO-Revision-Date: 2019-12-12 10:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
@@ -23,12 +22,8 @@ msgstr "Prix de revient"
 
 #. module: pos_margin
 #: model:ir.model.fields,help:pos_margin.field_pos_order__margin
-msgid ""
-"It gives profitability by calculating the difference between the Unit Price "
-"and the cost price."
-msgstr ""
-"Il donne la rentabilité en calculant la différence entre le prix unitaire et "
-"le prix de revient."
+msgid "It gives profitability by calculating the difference between the Unit Price and the cost price."
+msgstr "Il donne la rentabilité en calculant la différence entre le prix unitaire et le prix de revient."
 
 #. module: pos_margin
 #: model:ir.model.fields,field_description:pos_margin.field_pos_order__margin
@@ -36,6 +31,12 @@ msgstr ""
 msgid "Margin"
 msgstr "Marge"
 
+#. module: pos_margin
+#: model:ir.model.fields,field_description:pos_margin.field_pos_order__margin_percent
+#: model:ir.model.fields,field_description:pos_margin.field_pos_order_line__margin_percent
+msgid "Margin (%)"
+msgstr "Marge (%)"
+
 #. module: pos_margin
 #: model:ir.model.fields,field_description:pos_margin.field_report_pos_order__margin_rate
 msgid "Margin Rate"
@@ -43,7 +44,6 @@ msgstr "Taux de marque"
 
 #. module: pos_margin
 #: model:ir.model.fields,field_description:pos_margin.field_report_pos_order__margin_total
-#: model_terms:ir.ui.view,arch_db:pos_margin.view_pos_order_tree
 msgid "Margin Total"
 msgstr "Marge Totale"
 
@@ -60,4 +60,10 @@ msgstr "Commandes du point de vente"
 #. module: pos_margin
 #: model:ir.model,name:pos_margin.model_report_pos_order
 msgid "Point of Sale Orders Report"
-msgstr ""
+msgstr "Rapport sur les commandes au point de vente"
+
+#. module: pos_margin
+#: model_terms:ir.ui.view,arch_db:pos_margin.view_pos_order_tree
+msgid "Total"
+msgstr "Total"
+
diff --git a/pos_margin/i18n/pos_margin.pot b/pos_margin/i18n/pos_margin.pot
index db529121..6be334b4 100644
--- a/pos_margin/i18n/pos_margin.pot
+++ b/pos_margin/i18n/pos_margin.pot
@@ -1,11 +1,13 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* pos_margin
+#   * pos_margin
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-12-12 10:18+0000\n"
+"PO-Revision-Date: 2019-12-12 10:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -29,6 +31,12 @@ msgstr ""
 msgid "Margin"
 msgstr ""
 
+#. module: pos_margin
+#: model:ir.model.fields,field_description:pos_margin.field_pos_order__margin_percent
+#: model:ir.model.fields,field_description:pos_margin.field_pos_order_line__margin_percent
+msgid "Margin (%)"
+msgstr ""
+
 #. module: pos_margin
 #: model:ir.model.fields,field_description:pos_margin.field_report_pos_order__margin_rate
 msgid "Margin Rate"
@@ -36,7 +44,6 @@ msgstr ""
 
 #. module: pos_margin
 #: model:ir.model.fields,field_description:pos_margin.field_report_pos_order__margin_total
-#: model_terms:ir.ui.view,arch_db:pos_margin.view_pos_order_tree
 msgid "Margin Total"
 msgstr ""
 
@@ -55,3 +62,8 @@ msgstr ""
 msgid "Point of Sale Orders Report"
 msgstr ""
 
+#. module: pos_margin
+#: model_terms:ir.ui.view,arch_db:pos_margin.view_pos_order_tree
+msgid "Total"
+msgstr ""
+