lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better translation

Browse Source
This commit is contained in:
Laurent Destailleur 2015-07-16 13:28:40 +02:00
parent 1d0a8ceca9
commit 9e39c73f5f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/langs/en_US/margins.lang
View File

@ -30,10 +30,13 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal 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_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 MargeBrute=Raw margin
MargeNette=Net 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 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 CostPrice=Cost price
BuyingCost=Cost price BuyingCost=Cost price
UnitCharges=Unit charges UnitCharges=Unit charges

15
htdocs/margin/admin/margin.php
View File

@ -31,6 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("bills"); $langs->load("bills");
$langs->load("margins"); $langs->load("margins");
$langs->load("stocks");
if (! $user->admin) accessforbidden(); 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 "<input type=\"hidden\" name=\"action\" value=\"typemarges\">";
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td>'.$langs->trans("MARGIN_TYPE").'</td>'; 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" '; print ' <input type="radio" name="MARGIN_TYPE" value="1" ';
if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1') if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1')
print 'checked '; print 'checked ';
print '/><br>'; print '/> ';
print $langs->trans('MargeType1');
print '<br>';
/*print $langs->trans('MargeNette'); /*print $langs->trans('MargeNette');
print ' <input type="radio" name="MARGIN_TYPE" value="2" '; print ' <input type="radio" name="MARGIN_TYPE" value="2" ';
if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '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. // 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)) //if (! empty($conf->stock->enabled))
//{ //{
print $langs->trans('MargeNette');
print ' <input type="radio" name="MARGIN_TYPE" value="pmp" '; print ' <input type="radio" name="MARGIN_TYPE" value="pmp" ';
if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp') if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
print 'checked '; print 'checked ';
print '/>'; print '/> ';
print $langs->trans('MargeType2');
//} //}
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" class="button">'; print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" class="button">';
print '</td>'; print '</td>';
print '<td>'.$langs->trans('MARGIN_TYPE_DETAILS'); print '<td>'.$langs->trans('MarginTypeDesc');
print ' ('.$langs->trans("PMP").')'; print ' ('.$langs->trans("PMPValueShort").')';
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
print '</form>'; print '</form>';