From 267ba24820d7a37ae22612495676bd1d5dc1e395 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Jan 2015 21:41:40 +0100 Subject: [PATCH] Generalize option PROJECT_SHOW_REF_INTO_LISTS --- htdocs/fourn/commande/list.php | 53 +++++++++++++++++++++++----------- htdocs/fourn/facture/list.php | 30 ++++++++++++------- 2 files changed, 56 insertions(+), 27 deletions(-) diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 4f0974abd10..5cb8e3fbd57 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -74,6 +74,11 @@ if ($search_status == '') $search_status=-1; * View */ +$thirdpartytmp = new Fournisseur($db); +$commandestatic=new CommandeFournisseur($db); +$formfile = new FormFile($db); +$formorder = new FormOrder($db); + $title = $langs->trans("SuppliersOrders"); if ($socid > 0) { @@ -84,11 +89,6 @@ if ($socid > 0) llxHeader('',$title); -$commandestatic=new CommandeFournisseur($db); -$formfile = new FormFile($db); -$formorder = new FormOrder($db); - - if ($sortorder == "") $sortorder="DESC"; if ($sortfield == "") $sortfield="cf.date_creation"; $offset = $conf->liste_limit * $page ; @@ -100,12 +100,13 @@ $offset = $conf->liste_limit * $page ; $sql = "SELECT s.rowid as socid, s.nom as name, cf.date_commande as dc,"; $sql.= " cf.rowid,cf.ref, cf.ref_supplier, cf.fk_statut, cf.total_ttc, cf.fk_user_author,cf.date_livraison,"; +$sql.= " p.rowid as project_id, p.ref as project_ref,"; $sql.= " u.login"; -$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,"; +$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,"; $sql.= " ".MAIN_DB_PREFIX."commande_fournisseur as cf"; -if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; -$sql.= ")"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON cf.fk_user_author = u.rowid"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = cf.fk_projet"; +if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE cf.fk_soc = s.rowid "; $sql.= " AND cf.entity = ".$conf->entity; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; @@ -172,14 +173,15 @@ if ($resql) if ($search_refsupp) $param.="&search_refsupp=".$search_refsupp; if ($socid) $param.="&socid=".$socid; if ($search_status >= 0) $param.="&search_status=".$search_status; - + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords); print '
'; print ''; print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cf.ref","",$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("RefSupplier"),$_SERVER["PHP_SELF"],"cf.ref_supplier","",$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder); + if (empty($conf->global->SUPPLIER_ORDER_HIDE_REF_SUPPLIER)) print_liste_field_titre($langs->trans("RefSupplier"),$_SERVER["PHP_SELF"],"cf.ref_supplier","",$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Thirdparty"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder); + if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Author"),$_SERVER["PHP_SELF"],"u.login","",$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"total_ttc","",$param,$sortfield,$sortorder); print_liste_field_titre($langs->trans("OrderDate"),$_SERVER["PHP_SELF"],"dc","",$param,'align="center"',$sortfield,$sortorder); @@ -191,8 +193,13 @@ if ($resql) print ''; print ''; - print ''; + if (empty($conf->global->SUPPLIER_ORDER_HIDE_REF_SUPPLIER)) print ''; print ''; + if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) + { + print ''; + } print ''; print ''; print ''; @@ -224,12 +231,24 @@ if ($resql) print ''."\n"; // Ref Supplier - print ''."\n"; + if (empty($conf->global->SUPPLIER_ORDER_HIDE_REF_SUPPLIER)) print ''."\n"; + // Thirdparty + print ''."\n"; - // Company - print ''."\n"; + // Project + if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) + { + $projectstatic->id=$obj->project_id; + $projectstatic->ref=$obj->project_ref; + print ''; + } // Author $userstatic->id=$obj->fk_user_author; @@ -268,7 +287,7 @@ if ($resql) } print "
'; + print ' '.$obj->ref_supplier.''.$obj->ref_supplier.''; + $thirdpartytmp->id = $obj->socid; + $thirdpartytmp->name = $obj->name; + print $thirdpartytmp->getNomUrl(1,'supplier'); + print ''.img_object($langs->trans("ShowCompany"),"company").' '; - print $obj->name.''; + if ($obj->project_id > 0) print $projectstatic->getNomUrl(1); + print '
\n"; print "
\n"; - + print '
'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'
'; $db->free($resql); diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 2a01602eadc..d59870d8fc5 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -125,11 +125,11 @@ llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:Factur $sql = "SELECT s.rowid as socid, s.nom as name, "; $sql.= " fac.rowid as facid, fac.ref, fac.ref_supplier, fac.datef, fac.date_lim_reglement as date_echeance,"; -$sql.= " fac.total_ht, fac.total_ttc, fac.paye as paye, fac.fk_statut as fk_statut, fac.libelle"; -if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) $sql.=", p.rowid as project_id, p.ref as project_ref"; +$sql.= " fac.total_ht, fac.total_ttc, fac.paye as paye, fac.fk_statut as fk_statut, fac.libelle,"; +$sql.= " p.rowid as project_id, p.ref as project_ref"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as fac"; -if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = fac.fk_projet"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = fac.fk_projet"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE fac.entity = ".$conf->entity; $sql.= " AND fac.fk_soc = s.rowid"; @@ -226,7 +226,7 @@ if ($resql) print ''; print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"fac.ref,fac.rowid","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("RefSupplier"),$_SERVER["PHP_SELF"],"ref_supplier","",$param,"",$sortfield,$sortorder); + if (empty($conf->global->SUPPLIER_INVOICE_HIDE_REF_SUPPLIER)) print_liste_field_titre($langs->trans("RefSupplier"),$_SERVER["PHP_SELF"],"ref_supplier","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"fac.datef,fac.rowid","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"fac.date_lim_reglement","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"fac.libelle","",$param,"",$sortfield,$sortorder); @@ -244,9 +244,12 @@ if ($resql) print ''; - print ''; + if (empty($conf->global->SUPPLIER_INVOICE_HIDE_REF_SUPPLIER)) + { + print ''; + } print '"; + print '\n"; - print '"; + + // Ref supplier + if (empty($conf->global->SUPPLIER_INVOICE_HIDE_REF_SUPPLIER)) print '"; + print ''; print ''; - print ''; + print ''; if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) print ''; print ''; print '';
'; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; //print ' '.$langs->trans('Year').': '; @@ -292,6 +295,7 @@ if ($resql) $var=!$var; print "
'; $facturestatic->id=$obj->facid; $facturestatic->ref=$obj->ref; @@ -301,7 +305,10 @@ if ($resql) $filedir=$conf->fournisseur->dir_output.'/facture' . '/' . dol_sanitizeFileName($obj->facid).'/0/'.dol_sanitizeFileName($obj->ref); print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir); print "'.dol_trunc($obj->ref_supplier,10)."'.$obj->ref_supplier."'.dol_print_date($db->jdate($obj->datef),'day').''.dol_print_date($db->jdate($obj->date_echeance),'day'); if (($obj->paye == 0) && ($obj->fk_statut > 0) && $obj->date_echeance && $db->jdate($obj->date_echeance) < ($now - $conf->facture->fournisseur->warning_delay)) print img_picto($langs->trans("Late"),"warning"); @@ -325,7 +332,7 @@ if ($resql) $total+=$obj->total_ht; $total_ttc+=$obj->total_ttc; - // Affiche statut de la facture + // Status print ''; // TODO le montant deja paye objp->am n'est pas definie //print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5,$objp->am); @@ -339,9 +346,12 @@ if ($resql) if ($i == min($num,$limit)) { + $rowspan=5; + if (empty($conf->global->SUPPLIER_INVOICE_HIDE_REF_SUPPLIER)) $rowspan++; + // Print total print '
'.$langs->trans("Total").''.$langs->trans("Total").''.price($total).''.price($total_ttc).'