diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 92214e2f9d5..3532125ed8e 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -64,7 +64,6 @@ $userid=GETPOST('userid','int'); $search_ref=GETPOST('sf_ref')?GETPOST('sf_ref','alpha'):GETPOST('search_ref','alpha'); $search_refcustomer=GETPOST('search_refcustomer','alpha'); $search_societe=GETPOST('search_societe','alpha'); -$search_paymentmode=GETPOST('search_paymentmode','alpha'); $search_montant_ht=GETPOST('search_montant_ht','alpha'); $search_montant_ttc=GETPOST('search_montant_ttc','alpha'); $search_status=GETPOST('search_status','alpha'); @@ -143,7 +142,7 @@ if (! $sall) $sql = 'SELECT'; else $sql = 'SELECT DISTINCT'; $sql.= ' f.rowid as facid, f.facnumber, f.ref_client, f.type, f.note_private, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc,'; $sql.= ' f.datef as df, f.date_lim_reglement as datelimite,'; -$sql.= ' f.paye as paye, f.fk_statut, f.fk_mode_reglement, '; +$sql.= ' f.paye as paye, f.fk_statut,'; $sql.= ' s.nom, s.rowid as socid, s.code_client, s.client '; if (! $sall) $sql.= ', SUM(pf.amount) as am'; // To be able to sort on status $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s'; @@ -187,10 +186,6 @@ if ($search_societe) { $sql .= natural_search('s.nom', $search_societe); } -if ($search_paymentmode) -{ - $sql.= ' AND f.fk_mode_reglement = '.$search_paymentmode; -} if ($search_montant_ht) { $sql.= ' AND f.total = \''.$db->escape(price2num(trim($search_montant_ht))).'\''; @@ -265,7 +260,6 @@ if ($resql) if ($search_ref) $param.='&search_ref=' .$search_ref; if ($search_refcustomer) $param.='&search_refcustomer=' .$search_refcustomer; if ($search_societe) $param.='&search_societe=' .$search_societe; - if ($search_societe) $param.='&search_paymentmode=' .$search_paymentmode; if ($search_sale > 0) $param.='&search_sale=' .$search_sale; if ($search_user > 0) $param.='&search_user=' .$search_user; if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht; @@ -294,7 +288,7 @@ if ($resql) if ($moreforfilter) { print ''; - print ''; + print ''; print $moreforfilter; print ''; } @@ -305,7 +299,6 @@ if ($resql) print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'f.datef','',$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateDue"),$_SERVER['PHP_SELF'],"f.date_lim_reglement",'',$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Company'),$_SERVER['PHP_SELF'],'s.nom','',$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('PaymentMode'),$_SERVER['PHP_SELF'],'f.fk_mode_reglement','',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('AmountHT'),$_SERVER['PHP_SELF'],'f.total','',$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('AmountVAT'),$_SERVER['PHP_SELF'],'f.tva','',$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('AmountTTC'),$_SERVER['PHP_SELF'],'f.total_ttc','',$param,'align="right"',$sortfield,$sortorder); @@ -329,10 +322,6 @@ if ($resql) print ''; print ' '; print ''; - print ''; - $form->select_types_paiements($search_paymentmode, 'search_paymentmode'); - print ''; - print ''; print ' '; print ''; @@ -415,11 +404,6 @@ if ($resql) print $thirdparty->getNomUrl(1,'customer'); print ''; - // Payment mode - print ''; - $form->form_modes_reglement($_SERVER['PHP_SELF'], $objp->fk_mode_reglement, 'none'); - print ''; - print ''.price($objp->total_ht,0,$langs).''; print ''.price($objp->total_tva,0,$langs).'';