diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 188084ad152..312972aa8a7 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -48,6 +48,7 @@ if ($user->societe_id > 0) $paymentstatic=new Paiement($db); $accountstatic=new Account($db); +$companystatic=new Societe($db); /* @@ -68,16 +69,14 @@ $sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, p.amount,"; $sql.= " p.statut, p.num_paiement,"; //$sql.= " c.libelle as paiement_type,"; $sql.= " c.code as paiement_code,"; -$sql.= " ba.rowid as bid, ba.label"; -$sql.= " FROM ".MAIN_DB_PREFIX."c_paiement as c,"; -$sql.= " ".MAIN_DB_PREFIX."paiement as p"; +$sql.= " ba.rowid as bid, ba.label,"; +$sql.= " s.rowid as socid, s.nom"; +$sql.= " FROM ".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement 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"; -if ($socid) -{ - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid"; -} +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid"; $sql.= " WHERE p.fk_paiement = c.id"; if ($socid) { @@ -94,11 +93,12 @@ if ($_GET["orphelins"]) // Option qui ne sert qu'au debogage $sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, p.amount,"; $sql.= " p.statut, p.num_paiement,"; //$sql.= " c.libelle as paiement_type"; - $sql.= " c.code as paiement_code"; + $sql.= " c.code as paiement_code,"; + $sql.= " s.rowid as socid, s.nom"; $sql.= " FROM ".MAIN_DB_PREFIX."paiement as p,"; $sql.= " ".MAIN_DB_PREFIX."c_paiement as c"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf"; - $sql.= " ON p.rowid = pf.fk_paiement"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid"; $sql.= " WHERE p.fk_paiement = c.id AND pf.rowid IS NULL"; } $sql .= " ORDER BY $sortfield $sortorder"; @@ -120,19 +120,19 @@ if ($resql) print ''; print_liste_field_titre($langs->trans("Ref"),"liste.php","p.rowid","",$paramlist,"",$sortfield); print_liste_field_titre($langs->trans("Date"),"liste.php","dp","",$paramlist,'align="center"',$sortfield); + print_liste_field_titre($langs->trans("ThirdParty"),"liste.php","c.libelle","",$paramlist,"",$sortfield); print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","",$paramlist,"",$sortfield); print_liste_field_titre($langs->trans("Account"),"liste.php","ba.label","",$paramlist,"",$sortfield); - print_liste_field_titre($langs->trans("Amount"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield); + print_liste_field_titre($langs->trans("AmountTTC"),"liste.php","p.amount","",$paramlist,'align="right"',$sortfield); print_liste_field_titre($langs->trans("Status"),"liste.php","p.statut","",$paramlist,'align="right"',$sortfield); - print ' '; print "\n"; // Lignes des champs de filtre print ''; - print ' '; + print ' '; print ''; print ''; - print ''; + print ''; print ''; print ''; print "\n"; @@ -149,7 +149,19 @@ if ($resql) print $paymentstatic->getNomUrl(1); print ''; - print ''.dolibarr_print_date($objp->dp).''; + print ''.dolibarr_print_date($objp->dp,'day').''; + + // Company + print ''; + if ($objp->socid) + { + $companystatic->id=$objp->socid; + $companystatic->nom=$objp->nom; + print $companystatic->getNomUrl(1,'',24); + } + else print ' '; + print ''; + print ''.$langs->trans("PaymentTypeShort".$objp->paiement_code).' '.$objp->num_paiement.''; print ''; if ($objp->bid) @@ -162,15 +174,9 @@ if ($resql) print ''; print ''.price($objp->amount).''; print ''; + if ($objp->statut == 0) print ''; print $paymentstatic->LibStatut($objp->statut,5); - print ''; - - print ''; - if ($objp->statut == 0) - { - print ''.$langs->trans("Validate").''; - } - else print ' '; + if ($objp->statut == 0) print ''; print ''; print ''; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 2a7ac664bea..07885f58108 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -1,7 +1,7 @@ * Copyright (C) 2004 Éric Seigne - * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004-2007 Laurent Destailleur * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005 Marc Barilley / Ocebo * @@ -385,10 +385,9 @@ if (! $_GET['action'] && ! $_POST['action']) print_barre_liste($langs->trans('Payments'), $page, 'paiement.php','',$sortfield,$sortorder,'',$num); print ''; print ''; - print ''; - print_liste_field_titre($langs->trans('Bill'),'paiement.php','facnumber','','','',$sortfield); - print_liste_field_titre($langs->trans('Company'),'paiement.php','s.nom','','','',$sortfield); + print_liste_field_titre($langs->trans('Ref'),'paiement.php','rowid','','','',$sortfield); print_liste_field_titre($langs->trans('Date'),'paiement.php','dp','','','',$sortfield); + print_liste_field_titre($langs->trans('ThirdParty'),'paiement.php','s.nom','','','',$sortfield); print_liste_field_titre($langs->trans('Type'),'paiement.php','c.libelle','','','',$sortfield); print_liste_field_titre($langs->trans('Account'),'paiement.php','ba.label','','','',$sortfield); print_liste_field_titre($langs->trans('AmountTTC'),'paiement.php','f.amount','','','align="right"',$sortfield); @@ -400,16 +399,17 @@ if (! $_GET['action'] && ! $_POST['action']) $objp = $db->fetch_object($resql); $var=!$var; print ''; + + // Ref print ''; - print ''; + + // Date + print '\n"; + print ''; - print '\n"; print '\n"; print '
'.$langs->trans('Ref').'
'.img_object($langs->trans('ShowPayment'),'payment').' '.$objp->rowid.''; - if ($objp->facid) print ''.img_object($langs->trans('ShowBill'),'bill').' '.dolibarr_trunc($objp->facnumber,16).''; - else print ' '; - print ''.dolibarr_print_date($objp->dp,'day')."'; if ($objp->socid) print ''.img_object($langs->trans('ShowCompany'),'company').' '.dolibarr_trunc($objp->nom,32).''; else print ' '; print ''.dolibarr_print_date($objp->dp)."'.dolibarr_trunc($objp->paiement_type.' '.$objp->num_paiement,32)."'; if ($objp->bid) print ''.img_object($langs->trans("ShowAccount"),'account').' '.dolibarr_trunc($objp->label,24).'';