Debug v19
This commit is contained in:
parent
78600b0f61
commit
be58db508d
2 changed files with 7 additions and 8 deletions
|
|
@ -168,16 +168,13 @@ if (isModEnabled('supplier_invoice')) {
|
|||
$invoicestatic->date = $db->jdate($obj->datef);
|
||||
$invoicestatic->date_echeance = $db->jdate($obj->date_lim_reglement);
|
||||
$invoicestatic->total_ttc = $obj->total_ttc;
|
||||
$alreadypayed = $invoicestatic->getSommePaiement();
|
||||
|
||||
$alreadypayed = $invoicestatic->getSommePaiement();
|
||||
|
||||
$thirdpartystatic->id = $obj->socid;
|
||||
$thirdpartystatic->name = $obj->name;
|
||||
$thirdpartystatic->email = $obj->email;
|
||||
$thirdpartystatic->tva_intra = $obj->tva_intra;
|
||||
$thirdpartystatic->siren = $obj->idprof1;
|
||||
$thirdpartystatic->siret = $obj->idprof2;
|
||||
$thirdpartystatic->ape = $obj->idprof3;
|
||||
$thirdpartystatic->idprof1 = $obj->idprof1;
|
||||
$thirdpartystatic->idprof2 = $obj->idprof2;
|
||||
$thirdpartystatic->idprof3 = $obj->idprof3;
|
||||
|
|
@ -186,7 +183,6 @@ if (isModEnabled('supplier_invoice')) {
|
|||
$thirdpartystatic->idprof6 = $obj->idprof6;
|
||||
|
||||
|
||||
|
||||
print '<tr class="oddeven"><td class="nowraponall">';
|
||||
print $invoicestatic->getNomUrl(1, 'withdraw');
|
||||
print '</td>';
|
||||
|
|
@ -233,8 +229,11 @@ if (isModEnabled('salaries')) {
|
|||
if ($numRow) {
|
||||
while ($j < $numRow && $j<10) {
|
||||
$objSalary = $db->fetch_object($resql2);
|
||||
|
||||
$user->fetch($objSalary->fk_user);
|
||||
|
||||
$salary->fetch($objSalary->fk_salary);
|
||||
|
||||
$alreadypayedS = $salary->getSommePaiement();
|
||||
|
||||
print '<tr class="oddeven"><td class="nowraponall">';
|
||||
|
|
@ -242,14 +241,14 @@ if (isModEnabled('salaries')) {
|
|||
print '</td>';
|
||||
|
||||
print '<td class="tdoverflowmax150">';
|
||||
print $user->getNomUrl(1);
|
||||
print $user->getNomUrl(-1);
|
||||
print '</td>';
|
||||
|
||||
print '<td class="right">';
|
||||
print '<span class="amount">'.price($objSalary->amount).'</span>';
|
||||
print '</td>';
|
||||
|
||||
print '<td class="right">';
|
||||
print '<td class="right" title="'.$langs->trans("DateRequest").'">';
|
||||
print dol_print_date($db->jdate($objSalary->date_demande), 'day');
|
||||
print '</td>';
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ if (isModEnabled('project')) {
|
|||
}
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("compta", "bills", "users", "salaries", "hrm"));
|
||||
$langs->loadLangs(array("compta", "bills", "users", "salaries", "hrm", "withdrawals"));
|
||||
|
||||
$id = GETPOST('id', 'int');
|
||||
$ref = GETPOST('ref', 'alpha');
|
||||
|
|
|
|||
Loading…
Reference in a new issue