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

Fix: Removed duplicate translation

Browse Source
This commit is contained in:
Laurent Destailleur 2014-03-20 00:21:52 +01:00
parent f62ebbb5b1
commit 63bb09fbdf
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,12 +18,11 @@ MarginDetails=Margin details
ProductMargins=Product margins ProductMargins=Product margins
CustomerMargins=Customer margins CustomerMargins=Customer margins
AgentMargins=Agent margins SalesRepresentativeMargins=Sales representative margins
ProductService=Product or Service ProductService=Product or Service
AllProducts=All products and services AllProducts=All products and services
ChooseProduct/Service=Choose product or service ChooseProduct/Service=Choose product or service
CommercialAgent=Commercial agent
StartDate=Start date StartDate=Start date
EndDate=End date EndDate=End date

4
htdocs/margin/agentMargins.php
View File

@ -84,7 +84,7 @@ dol_fiche_head($head, 'agentMargins', $titre, 0, $picto);
print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">'; print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans('CommercialAgent').'</td>'; print '<tr><td width="20%">'.$langs->trans('SalesRepresentative').'</td>';
print '<td colspan="4">'; print '<td colspan="4">';
print $form->select_dolusers($agentid,'agentid',1); print $form->select_dolusers($agentid,'agentid',1);
print '</td></tr>'; print '</td></tr>';
@ -155,7 +155,7 @@ if ($result)
if ($agentid > 0) if ($agentid > 0)
print_liste_field_titre($langs->trans("Customer"),$_SERVER["PHP_SELF"],"s.nom","","&amp;agentid=".$agentid,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Customer"),$_SERVER["PHP_SELF"],"s.nom","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
else else
print_liste_field_titre($langs->trans("CommercialAgent"),$_SERVER["PHP_SELF"],"u.lastname","","&amp;agentid=".$agentid,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("SalesRepresentative"),$_SERVER["PHP_SELF"],"u.lastname","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("SellingPrice"),$_SERVER["PHP_SELF"],"selling_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("SellingPrice"),$_SERVER["PHP_SELF"],"selling_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("BuyingPrice"),$_SERVER["PHP_SELF"],"buying_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("BuyingPrice"),$_SERVER["PHP_SELF"],"buying_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);

2
htdocs/margin/lib/margins.lib.php
View File

@ -73,7 +73,7 @@ function marges_prepare_head()
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT."/margin/agentMargins.php"; $head[$h][0] = DOL_URL_ROOT."/margin/agentMargins.php";
$head[$h][1] = $langs->trans("AgentMargins"); $head[$h][1] = $langs->trans("SalesRepresentativeMargins");
$head[$h][2] = 'agentMargins'; $head[$h][2] = 'agentMargins';
$h++; $h++;