Correct typo

Dolibarr · Oct 29, 2016 · 52e0d1c · 52e0d1c
1 parent 4f5c5a2
commit 52e0d1c
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
@@ -534,14 +534,14 @@
 print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
 print '</tr>';
 
-if ($mysoc->tva_assuj == 'franchise')	// Non assujeti
+if ($mysoc->tva_assuj == 'franchise')	// Non assujetti
 {
     // Total
     print '<tr>';
     print '<td colspan="4">&nbsp;</td>';
     print '</tr>';
 
-    print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Profit").'</td>';
+    print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Result").'</td>';
     if ($modecompta == 'CREANCES-DETTES')
     	print '<td class="border" align="right">'.price($total_ht).'</td>';
     print '<td align="right">'.price($total_ttc).'</td>';
@@ -572,7 +572,7 @@
 	$sql.= " WHERE p.entity = ".$conf->entity;
 	if (! empty($date_start) && ! empty($date_end))
 		$sql.= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'";
-		
+
 	$sql.= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm";
 	$sql.= " ORDER BY u.firstname";
 
@@ -599,7 +599,7 @@
 	            $var = !$var;
 	            print "<tr ".$bc[$var]."><td>&nbsp;</td>";
 
-	            print "<td>".$langs->trans("Salaries")." <a href=\"".DOL_URL_ROOT."/compta/salaries/index.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
+	            print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/compta/salaries/index.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
 	            if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
 	            print '<td align="right">'.price(-$obj->amount).'</td>';
@@ -639,9 +639,8 @@
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
 		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
 		$sql.= " AND p.fk_statut>=5";
-		
+
 		$column='p.date_valid';
-
 	} else {
 		$sql = "SELECT p.rowid, p.ref, u.rowid as userid, u.firstname, u.lastname, date_format(pe.datep,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
@@ -650,12 +649,12 @@
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
 		$sql.= " WHERE p.entity = ".getEntity('expensereport',1);
 		$sql.= " AND p.fk_statut>=5";
-		
+
 		$column='pe.datep';
 	}
 
 	print '<tr><td colspan="4">'.$langs->trans("ExpenseReport").'</td></tr>';
-	
+
 	if (! empty($date_start) && ! empty($date_end))
 		$sql.= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'";
 
@@ -709,12 +708,12 @@
 }
 
 /*
- * Donation
+ * Donations
  */
 
 if (! empty($conf->don->enabled))
 {
-	print '<tr><td colspan="4">'.$langs->trans("Donation").'</td></tr>';
+	print '<tr><td colspan="4">'.$langs->trans("Donations").'</td></tr>';
 	if ($modecompta == 'CREANCES-DETTES')
 	{
     	$sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
@@ -975,7 +974,7 @@
 }
 
 
-if ($mysoc->tva_assuj != 'franchise')	// Assujeti
+if ($mysoc->tva_assuj != 'franchise')	// Assujetti
 {
     print '<tr class="liste_total">';
     if ($modecompta == 'CREANCES-DETTES')
@@ -995,14 +994,14 @@
 $reshook=$hookmanager->executeHooks('addBalanceLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 print $hookmanager->resPrint;
 
-if ($mysoc->tva_assuj != 'franchise')	// Assujeti
+if ($mysoc->tva_assuj != 'franchise')	// Assujetti
 {
     // Total
     print '<tr>';
     print '<td colspan="4">&nbsp;</td>';
     print '</tr>';
 
-    print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Profit").'</td>';
+    print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Result").'</td>';
     if ($modecompta == 'CREANCES-DETTES')
     	print '<td class="liste_total" align="right">'.price(price2num($total_ht,'MT')).'</td>';
     print '<td class="liste_total" align="right">'.price(price2num($total_ttc,'MT')).'</td>';