diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index f113fd4e4b6..795d5b56b3a 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -548,12 +548,12 @@ else print ''.$langs->trans('Label').''; print ''; - print ''.$langs->trans('DateInvoice').''; - $html->select_date($fac->datep,'','','','',"update"); + print ''.$langs->trans('DateInvoice').''; + $html->select_date($fac->datep,'','','','',"update",1,1); print ''; - print ''.$langs->trans('DateEcheance').''; - $html->select_date($fac->date_echeance,'ech','','','',"update"); + print ''.$langs->trans('DateEcheance').''; + $html->select_date($fac->date_echeance,'ech','','','',"update",1,1); if (($fac->paye == 0) && ($fac->statut > 0) && $fac->date_echeance < ($now - $conf->facture->fournisseur->warning_delay)) print img_picto($langs->trans("Late"),"warning"); print ''; @@ -570,44 +570,6 @@ else print ''; print ''; print ''; - - /* - * Lines of invoice - */ - print '
'; - $var=true; - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - for ($i = 0 ; $i < sizeof($fac->lignes) ; $i++) - { - $var=!$var; - - // Affichage simple de la ligne - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - } - - print '
'.$langs->trans('Label').''.$langs->trans('VAT').''.$langs->trans('PriceUHT').''.$langs->trans('PriceUTTC').''.$langs->trans('Qty').''.$langs->trans('TotalHT').''.$langs->trans('TotalTTC').' 
'.$fac->lignes[$i]->description.''.vatrate($fac->lignes[$i]->tva_tx).'%'.price($fac->lignes[$i]->pu_ht,'MU').''.($fac->lignes[$i]->pu_ttc?price($fac->lignes[$i]->pu_ttc,'MU'):' ').''.$fac->lignes[$i]->qty.''.price($fac->lignes[$i]->total_ht,'MT').''.price($fac->lignes[$i]->total_ttc,'MT').''; - print ''.img_edit().''; - print ''; - print ''.img_delete().''; - print '
'; } else { @@ -700,9 +662,7 @@ else print ''; // Third party - print ''.$langs->trans('Supplier').''.$societe->getNomUrl(1); - print '   ('.$langs->trans('OtherBills').')'; - print ''; + print ''.$langs->trans('Supplier').''.$societe->getNomUrl(1).' ('.$langs->trans('OtherBills').')'; // Type print ''.$langs->trans('Type').''; @@ -756,7 +716,7 @@ else if ($conf->projet->enabled) $nbrows++; print ''; - $sql = 'SELECT datep as dp, pf.amount,'; + $sql = 'SELECT '.$db->pdate('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'; @@ -786,7 +746,7 @@ else $objp = $db->fetch_object($result); $var=!$var; print ''; - print ''.img_object($langs->trans('ShowPayment'),'payment').' '.dol_print_date($db->jdate($objp->dp),'day')."\n"; + print ''.img_object($langs->trans('Payment'),'payment').' '.dol_print_date($objp->dp,'day')."\n"; print ''.$objp->paiement_type.' '.$objp->num_paiement.''; print ''.price($objp->amount).' '.$langs->trans('Currency'.$conf->monnaie).'';