diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 720d9bd5d2b..558f1607dd5 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1547,7 +1547,7 @@ if ($_GET['action'] == 'create') } print ''; } - $db->free(); + $db->free($resql); } else { @@ -2291,7 +2291,8 @@ else // Third party print ''.$langs->trans('Company').''; - print ''.$soc->getNomUrl(1,'compta').''; + print ''.$soc->getNomUrl(1,'compta'); + print '   ('.$langs->trans('OtherBills').')'; print ''; // Type diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 3a594a9cf75..f113fd4e4b6 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -700,7 +700,9 @@ else print ''; // Third party - print ''.$langs->trans('Supplier').''.$societe->getNomUrl(1).' ('.$langs->trans('OtherBills').')'; + print ''.$langs->trans('Supplier').''.$societe->getNomUrl(1); + print '   ('.$langs->trans('OtherBills').')'; + print ''; // Type print ''.$langs->trans('Type').''; @@ -754,7 +756,7 @@ else if ($conf->projet->enabled) $nbrows++; print ''; - $sql = 'SELECT '.$db->pdate('datep').' as dp, pf.amount,'; + $sql = 'SELECT datep as dp, pf.amount,'; $sql .= ' c.libelle as paiement_type, p.num_paiement, p.rowid'; $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id'; @@ -784,7 +786,7 @@ else $objp = $db->fetch_object($result); $var=!$var; print ''; - print ''.img_object($langs->trans('Payment'),'payment').' '.dol_print_date($objp->dp,'day')."\n"; + print ''.img_object($langs->trans('ShowPayment'),'payment').' '.dol_print_date($db->jdate($objp->dp),'day')."\n"; print ''.$objp->paiement_type.' '.$objp->num_paiement.''; print ''.price($objp->amount).' '.$langs->trans('Currency'.$conf->monnaie).'';