diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 3f7944915664b30b3a6f58d3f425b5c06365f364..d02d78b01bb241f0103f4a357a41f3f8b7c9c2db 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 '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>'; print '<td align="right">'.price($total).'</td>'; - print '<td align="center"> </td>'; - print '<td align="center"> </td>'; + print '<td colspan="2"> </td>'; print '<td align="right">'.price($total)."</td>"; print "</tr>"; @@ -349,7 +348,6 @@ while($j<$numlt) print '<tr class="liste_titre">'; 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 "<td>".$obj->label."</td>\n"; - print '<td align="right">'.price($obj->amount)."</td>"; - // Ref payment $tva_static->id=$obj->rowid; $tva_static->ref=$obj->rowid; @@ -380,10 +376,7 @@ while($j<$numlt) $i++; } - print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("Total").'</td>'; - print '<td align="right">'.price($total)."</td>"; - print '<td align="center"> </td>'; - print '<td align="center"> </td>'; + print '<tr class="liste_total"><td align="right" colspan="4">'.$langs->trans("Total").'</td>'; print '<td align="right">'.price($total)."</td>"; print "</tr>"; @@ -431,7 +424,6 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read) print '<tr class="liste_titre">'; 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 "<td>".$obj->label."</td>\n"; - print '<td align="right">'.($obj->salary?price($obj->salary):'')."</td>"; - // 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 '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>'; - print '<td align="right"></td>'; // A total here has no sense - print '<td align="center"> </td>'; - print '<td align="center"> </td>'; + print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Total").'</td>'; print '<td align="right">'.price($total)."</td>"; print "</tr>"; diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php index f279e97b47850f62c0a442e82caf5e8633092517..f83499e0cd7c93fa477e875918ceeded1d7467d9 100644 --- a/htdocs/compta/salaries/index.php +++ b/htdocs/compta/salaries/index.php @@ -1,7 +1,7 @@ <?php -/* Copyright (C) 2011-2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.com> - * Copyright (C) 2015-2016 Laurent Destailleur <eldy@users.sourceforge.net> - * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr> +/* Copyright (C) 2011-2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.com> + * Copyright (C) 2015-2016 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr> * * 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 '<table class="noborder" width="100%">'; print '<tr class="liste_titre">'; 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 '<td class="liste_titre" align="left">'; print '<input class="flat" type="text" size="3" name="search_ref" value="'.$search_ref.'">'; print '</td>'; - // People + // Employee print '<td class="liste_titre">'; print '<input class="flat" type="text" size="6" name="search_user" value="'.$search_user.'">'; print '</td>'; - // Current salary - print '<td class="liste_titre"> </td>'; // Label print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.$search_label.'"></td>'; // Date @@ -200,10 +197,8 @@ if ($result) $salstatic->ref=$obj->rowid; // Ref print "<td>".$salstatic->getNomUrl(1)."</td>\n"; - // User name + // Employee print "<td>".$userstatic->getNomUrl(1)."</td>\n"; - // Current salary - print "<td>".($obj->salary?price($obj->salary):'')."</td>\n"; // Label payment print "<td>".dol_trunc($obj->label,40)."</td>\n"; // Date payment @@ -220,7 +215,7 @@ if ($result) $i++; } - print '<tr class="liste_total"><td colspan="6" class="liste_total">'.$langs->trans("Total").'</td>'; + print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td>'; print '<td class="liste_total" align="right">'.price($total)."</td>"; print "<td></td></tr>";