diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 3f794491566..d02d78b01bb 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -280,8 +280,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
}
print '
'.$langs->trans("Total").' ';
print ''.price($total).' ';
- print ' ';
- print ' ';
+ print ' ';
print ''.price($total)." ";
print " ";
@@ -349,7 +348,6 @@ while($j<$numlt)
print '';
print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"pv.datev","",$param,'width="120"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"pv.label","",$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"pv.rowid","",$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"pv.datep","",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
@@ -367,8 +365,6 @@ while($j<$numlt)
print "".$obj->label." \n";
- print ''.price($obj->amount)." ";
-
// Ref payment
$tva_static->id=$obj->rowid;
$tva_static->ref=$obj->rowid;
@@ -380,10 +376,7 @@ while($j<$numlt)
$i++;
}
- print ' '.$langs->trans("Total").' ';
- print ''.price($total)." ";
- print ' ';
- print ' ';
+ print ''.$langs->trans("Total").' ';
print ''.price($total)." ";
print " ";
@@ -431,7 +424,6 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
print '';
print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"s.dateep","",$param,'width="140px"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"s.rowid","",$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
@@ -450,8 +442,6 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
print "".$obj->label." \n";
- print ''.($obj->salary?price($obj->salary):'')." ";
-
// Ref payment
$sal_static->id=$obj->rowid;
$sal_static->ref=$obj->rowid;
@@ -463,10 +453,7 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
$i++;
}
- print ' '.$langs->trans("Total").' ';
- print ' '; // A total here has no sense
- print ' ';
- print ' ';
+ print ''.$langs->trans("Total").' ';
print ''.price($total)." ";
print " ";
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index f279e97b478..f83499e0cd7 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -1,7 +1,7 @@
- * Copyright (C) 2015-2016 Laurent Destailleur
- * Copyright (C) 2015 Jean-François Ferry
+/* Copyright (C) 2011-2016 Alexandre Spangaro
+ * Copyright (C) 2015-2016 Laurent Destailleur
+ * Copyright (C) 2015 Jean-François Ferry
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -145,8 +145,7 @@ if ($result)
print '';
print '';
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"s.salary","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Employee"),$_SERVER["PHP_SELF"],"u.rowid","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"s.label","",$param,'align="left"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
@@ -159,12 +158,10 @@ if ($result)
print '';
print ' ';
print ' ';
- // People
+ // Employee
print '';
print ' ';
print ' ';
- // Current salary
- print ' ';
// Label
print ' ';
// Date
@@ -200,10 +197,8 @@ if ($result)
$salstatic->ref=$obj->rowid;
// Ref
print "".$salstatic->getNomUrl(1)." \n";
- // User name
+ // Employee
print "".$userstatic->getNomUrl(1)." \n";
- // Current salary
- print "".($obj->salary?price($obj->salary):'')." \n";
// Label payment
print "".dol_trunc($obj->label,40)." \n";
// Date payment
@@ -220,7 +215,7 @@ if ($result)
$i++;
}
- print ' '.$langs->trans("Total").' ';
+ print ''.$langs->trans("Total").' ';
print ''.price($total)." ";
print " ";