diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 63d4b9930ed..c2ef7fc7a45 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -534,14 +534,14 @@ if ($modecompta == 'CREANCES-DETTES')
print '
'.price(-$subtotal_ttc).' | ';
print '';
-if ($mysoc->tva_assuj == 'franchise') // Non assujeti
+if ($mysoc->tva_assuj == 'franchise') // Non assujetti
{
// Total
print '';
print '| | ';
print '
';
- print '| '.$langs->trans("Profit").' | ';
+ print '
| '.$langs->trans("Result").' | ';
if ($modecompta == 'CREANCES-DETTES')
print ''.price($total_ht).' | ';
print ''.price($total_ttc).' | ';
@@ -572,7 +572,7 @@ if (! empty($conf->salaries->enabled))
$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 @@ if (! empty($conf->salaries->enabled))
$var = !$var;
print "
| | ";
- print "".$langs->trans("Salaries")." fk_user."\">".$obj->firstname." ".$obj->lastname." | \n";
+ print "".$langs->trans("Salary")." fk_user."\">".$obj->firstname." ".$obj->lastname." | \n";
if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount).' | ';
print ''.price(-$obj->amount).' | ';
@@ -639,9 +639,8 @@ if (! empty($conf->expensereport->enabled))
$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 @@ if (! empty($conf->expensereport->enabled))
$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 '
| '.$langs->trans("ExpenseReport").' |
';
-
+
if (! empty($date_start) && ! empty($date_end))
$sql.= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'";
@@ -709,12 +708,12 @@ if (! empty($conf->expensereport->enabled))
}
/*
- * Donation
+ * Donations
*/
if (! empty($conf->don->enabled))
{
- print '| '.$langs->trans("Donation").' |
';
+ print '| '.$langs->trans("Donations").' |
';
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 @@ else
}
-if ($mysoc->tva_assuj != 'franchise') // Assujeti
+if ($mysoc->tva_assuj != 'franchise') // Assujetti
{
print '';
if ($modecompta == 'CREANCES-DETTES')
@@ -995,14 +994,14 @@ $hookmanager->initHooks(array('externalbalance'));
$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 '
';
print '| | ';
print '
';
- print '| '.$langs->trans("Profit").' | ';
+ print '
| '.$langs->trans("Result").' | ';
if ($modecompta == 'CREANCES-DETTES')
print ''.price(price2num($total_ht,'MT')).' | ';
print ''.price(price2num($total_ttc,'MT')).' | ';