diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 98f2ea1f466..bb7f94e6f54 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -155,7 +155,7 @@ if ($resql) print '
'; print ''; print ''; - print_liste_field_titre($langs->trans("Ref"),"index.php","rowid","&socid=$socid","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Ref"),"index.php","fac.rowid","&socid=$socid","","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("RefSupplier"),"index.php","facnumber","&socid=$socid","","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Date"),"index.php","fac.datef","&socid=$socid","",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),"index.php","fac.libelle","&socid=$socid","","",$sortfield,$sortorder); @@ -169,14 +169,14 @@ if ($resql) print ''; print ''; print ''; print ''; print ''; print ''; print "\n"; - $facturestatic = new FactureFournisseur($db); + $facturestatic=new FactureFournisseur($db); + $supplierstatic=new Fournisseur($db); $var=true; $total=0; @@ -203,11 +204,14 @@ if ($resql) print '\n"; - print '"; - print ''; + print '"; + print ''; print ''; print ''; print ''; $total+=$obj->total_ht; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 3fa892f0f59..1658441b977 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -387,7 +387,7 @@ if (! $_GET['action'] && ! $_POST['action']) $i = 0; $var=True; - print_barre_liste($langs->trans('Payments'), $page, 'paiement.php','',$sortfield,$sortorder,'',$num); + print_barre_liste($langs->trans('SupplierPayments'), $page, 'paiement.php','',$sortfield,$sortorder,'',$num); print '
'; - print ''; + print ''; print ''; - print ''; + print ''; print ' '; - print ''; + print ''; print ''; print ''; @@ -189,7 +189,8 @@ if ($resql) print '
'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->ref.""; if (($obj->paye == 0) && ($obj->fk_statut > 0) && $obj->date_echeance < (time() - $conf->facture->fournisseur->warning_delay)) print img_picto($langs->trans("Late"),"warning"); print "'.dolibarr_trunc($obj->facnumber,12)."'.dolibarr_print_date($obj->datef).''.dolibarr_trunc($obj->facnumber,10)."'.dolibarr_print_date($obj->datef,'day').''.dolibarr_trunc($obj->libelle,36).''; - print ''.img_object($langs->trans("ShowSupplier"),"company").' '.$obj->nom.''; + $supplierstatic->id=$obj->socid; + $supplierstatic->nom=$obj->nom; + print $supplierstatic->getNomUrl(1,'',12); + //print ''.img_object($langs->trans("ShowSupplier"),"company").' '.$obj->nom.''; print ''.price($obj->total_ht).''.price($obj->total_ttc).'
'; print ''; print_liste_field_titre($langs->trans('RefPayment'),'paiement.php','rowid','','','',$sortfield,$sortorder); diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index a2685d3b0d0..6d147940a7a 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -48,6 +48,7 @@ DatePayment=Payment date DeletePayment=Delete payment ConfirmDeletePayment=Are you sure you want to delete this payment ? ConfirmConvertToReduc=Do you want to convert this credit note into absolute discount ?
The amount of this credit note will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer. +SupplierPayments=Suppliers payments ReceivedPayments=Received payments ReceivedCustomersPayments=Payments received from customers ReceivedCustomersPaymentsToValid=Received customers payments to validate diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 1c4aac2dc31..d5b2d4ee543 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -47,6 +47,7 @@ DatePayment=Date paiement DeletePayment=Supprimer le paiement ConfirmDeletePayment=Etes vous sur de vouloir supprimer ce paiement ? ConfirmConvertToReduc=Voulez-vous convertir cet avoir en réduction future ?
Le montant de cet avoir sera alors stocké en réduction fixe en attente pour le client. Cette dernière pourra être utilisée pour réduire le montant d'une facture en cours ou prochaine de ce client. +SupplierPayments=Réglements fournisseurs ReceivedPayments=Réglements reçus ReceivedCustomersPayments=Réglements reçus du client ReceivedCustomersPaymentsToValid=Réglements clients reçus à valider