From 9e39c73f5f68f6b46454cb0accff42c819f8fa12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 16 Jul 2015 13:28:40 +0200
Subject: [PATCH] Better translation

---
 htdocs/langs/en_US/margins.lang |  5 ++++-
 htdocs/margin/admin/margin.php  | 15 +++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang
index bc7446f51f9..eeaace73523 100644
--- a/htdocs/langs/en_US/margins.lang
+++ b/htdocs/langs/en_US/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-MARGIN_TYPE=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeBrute=Raw margin
 MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
 MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card<br/>Margin on Weighted Average Price (WAP) : Selling price - Product Weighted Average Price
 CostPrice=Cost price
 BuyingCost=Cost price
 UnitCharges=Unit charges
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 9a0f55010ab..2ad51c4fb28 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -31,6 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 $langs->load("admin");
 $langs->load("bills");
 $langs->load("margins");
+$langs->load("stocks");
 
 if (! $user->admin) accessforbidden();
 
@@ -137,11 +138,13 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"typemarges\">";
 print '<tr '.$bc[$var].'>';
 print '<td>'.$langs->trans("MARGIN_TYPE").'</td>';
-print '<td align="right">'.$langs->trans('MargeBrute');
+print '<td>';
 print ' <input type="radio" name="MARGIN_TYPE" value="1" ';
 if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1')
 	print 'checked ';
-print '/><br>';
+print '/> ';
+print $langs->trans('MargeType1');
+print '<br>';
 /*print $langs->trans('MargeNette');
 print ' <input type="radio" name="MARGIN_TYPE" value="2" ';
 if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '2')
@@ -150,18 +153,18 @@ print '/>';*/
 // TODO Check that PMP is available when stock module is not enabled. If not, make this choice greyed when stock module disabled.
 //if (! empty($conf->stock->enabled))
 //{
-	print $langs->trans('MargeNette');
 	print ' <input type="radio" name="MARGIN_TYPE" value="pmp" ';
 	if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
 		print 'checked ';
-	print '/>';
+	print '/> ';
+	print $langs->trans('MargeType2');
 //}
 print '</td>';
 print '<td>';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" class="button">';
 print '</td>';
-print '<td>'.$langs->trans('MARGIN_TYPE_DETAILS');
-print ' ('.$langs->trans("PMP").')';
+print '<td>'.$langs->trans('MarginTypeDesc');
+print ' ('.$langs->trans("PMPValueShort").')';
 print '</td>';
 print '</tr>';
 print '</form>';