diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 491c4ca041a..3bae221e6dd 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3108,13 +3108,13 @@ else if ($id > 0 || ! empty($ref)) if ($object->type == Facture::TYPE_CREDIT_NOTE) $sign = - 1; - $nbrows = 9; - $nbcols = 2; + $nbrows = 8; + $nbcols = 3; if (! empty($conf->projet->enabled)) $nbrows ++; - if (! empty($conf->banque->enabled)) - $nbcols ++; - // if (! empty($soc->outstandingbill)) $nbrows++; + if (! empty($conf->banque->enabled)) { + $nbrows ++; $nbcols++; + } if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) $nbrows ++; if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index b7e22e9e42f..c1346c357d5 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1271,6 +1271,7 @@ if (empty($reshook)) $form = new Form($db); $formfile = new FormFile($db); $bankaccountstatic=new Account($db); +$paymentstatic=new PaiementFourn($db); llxHeader('',$langs->trans('SupplierInvoice'),''); @@ -1871,7 +1872,7 @@ else /* * List of payments */ - $nbrows=9; $nbcols=2; + $nbrows=9; $nbcols=3; if (! empty($conf->projet->enabled)) $nbrows++; if (! empty($conf->banque->enabled)) { $nbrows++; $nbcols++; } if (! empty($conf->incoterm->enabled)) $nbrows++; @@ -1882,10 +1883,10 @@ else print ''; - $sql = 'SELECT p.datep as dp, p.num_paiement, p.rowid, p.fk_bank,'; + $sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,'; $sql.= ' c.id as paiement_type,'; $sql.= ' pf.amount,'; - $sql.= ' ba.rowid as baid, ba.ref, ba.label'; + $sql.= ' ba.rowid as baid, ba.ref as baref, ba.label'; $sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid'; @@ -1902,6 +1903,7 @@ else print ''; print ''; print ''; + print ''; print ''; if (! empty($conf->banque->enabled)) print ''; print ''; @@ -1915,16 +1917,23 @@ else { $objp = $db->fetch_object($result); $var=!$var; - print ''; - print '\n"; + print ''; + print ''; print ''; if (! empty($conf->banque->enabled)) { $bankaccountstatic->id=$objp->baid; - $bankaccountstatic->ref=$objp->ref; - $bankaccountstatic->label=$objp->ref; + $bankaccountstatic->ref=$objp->baref; + $bankaccountstatic->label=$objp->baref; print '';
'.$langs->trans('Payments').''.$langs->trans('Date').''.$langs->trans('Type').''.$langs->trans('BankAccount').''.$langs->trans('Amount').'
'.img_object($langs->trans('ShowPayment'),'payment').' '.dol_print_date($db->jdate($objp->dp),'day')."
'; + $paymentstatic->id=$objp->rowid; + $paymentstatic->datepaye=$db->jdate($objp->dp); + $paymentstatic->ref=$objp->ref; + $paymentstatic->num_paiement=$objp->num_paiement; + $paymentstatic->payment_code=$objp->payment_code; + print $paymentstatic->getNomUrl(1); + print ''.dol_print_date($db->jdate($objp->dp), 'day') . ''; print $form->form_modes_reglement(null, $objp->paiement_type,'none').' '.$objp->num_paiement; print ''; if ($objp->baid > 0) print $bankaccountstatic->getNomUrl(1,'transactions'); print '