diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index b7927fe4652..195243def00 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -26,6 +26,7 @@ */ require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); $langs->load("admin"); $langs->load("companies"); @@ -580,7 +581,7 @@ else // Forme juridique $var=!$var; print ''.$langs->trans("JuridicalStatus").''; - print $form->forme_juridique_name($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE,1); + print getFormeJuridiqueLabel($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE,1); print ''; // ProfId1 diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 9cbfd2654f2..6af65be1137 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -618,11 +618,12 @@ if ($step == 4 && $datatoexport) print ' '; print ''; - // test d'affichage du tableau excel et csv - + + // Test d'affichage du tableau excel et csv //print '
'; - //viewExcelFileContent($conf->export->dir_temp.'/1/export_commande_1.xls',5,3); - //viewCsvFileContent($conf->export->dir_temp.'/1/export_commande_1.csv',5); + //require_once(DOL_DOCUMENT_ROOT.'/lib/viewfiles.lib.php'); + //viewExcelFileContent($conf->export->dir_temp.'/1/export_member_1.xls',5,3); + //viewCsvFileContent($conf->export->dir_temp.'/1/export_member_1.csv',5); //print '
'; } diff --git a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php index 7f35d3332e2..14f1f1347a7 100644 --- a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php +++ b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php @@ -19,7 +19,6 @@ * or see http://www.gnu.org/ * * $Id$ - * $Source$ */ /** @@ -33,6 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/fourn/commande/modules/modules_commandefournisseur.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/product.class.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); /** @@ -779,13 +779,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $outputlangs->load("dict"); - $html=new Form($this->db); - // Premiere ligne d'info réglementaires $ligne1=""; if ($this->emetteur->forme_juridique_code) { - $ligne1.=($ligne1?" - ":"").$html->forme_juridique_name($this->emetteur->forme_juridique_code); + $ligne1.=($ligne1?" - ":"").getFormeJuridiqueLabel($this->emetteur->forme_juridique_code); } if ($this->emetteur->capital) { diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 6e039b688cb..1bada626895 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -195,6 +195,7 @@ class Form if ($pays_code) $sql .= " AND p.code = '".$pays_code."'"; $sql .= " ORDER BY p.code, d.code_departement"; + dolibarr_syslog("Form::select_departement sql=".$sql); $result=$this->db->query($sql); if ($result) { @@ -263,6 +264,7 @@ class Form $sql = "SELECT r.rowid, r.code_region as code, r.nom as libelle, r.active, p.libelle as libelle_pays FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_pays as p"; $sql .= " WHERE r.fk_pays=p.rowid AND r.active = 1 and p.active = 1 ORDER BY libelle_pays, libelle ASC"; + dolibarr_syslog("Form::select_region sql=".$sql); if ($this->db->query($sql)) { print ''; @@ -842,6 +850,7 @@ class Form function select_produits($selected='',$htmlname='productid',$filtretype='',$limit=20,$price_level=0) { global $langs,$conf; + if ($conf->global->PRODUIT_USE_SEARCH_TO_SELECT) { print ''; @@ -901,8 +910,7 @@ class Form $sql.= " ORDER BY p.nbvente DESC"; if ($limit) $sql.= " LIMIT $limit"; - dolibarr_syslog("Form::select_produits_do sql=$sql",LOG_DEBUG); - + dolibarr_syslog("Form::select_produits_do sql=".$sql, LOG_DEBUG); $result=$this->db->query($sql); if (! $result) dolibarr_print_error($this->db); @@ -913,6 +921,8 @@ class Form $sqld.= " FROM ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."product_det as d "; $sqld.= " WHERE d.fk_product=p.rowid AND p.envente=1 AND d.lang='". $langs->getDefaultLang() ."'"; $sqld.= " ORDER BY p.nbvente DESC"; + + dolibarr_syslog("Form::select_departement sql=".$sql, LOG_DEBUG); $resultd = $this->db->query($sqld); if ( $resultd ) $objtp = $this->db->fetch_object($resultd); } @@ -964,6 +974,8 @@ class Form $sql.= "FROM ".MAIN_DB_PREFIX."product_price "; $sql.= "where fk_product='".$objp->rowid."' and price_level=".$price_level; $sql.= " order by date_price DESC limit 1"; + + dolibarr_syslog("Form::select_produits_do sql=".$sql); $result2 = $this->db->query($sql); $objp2 = $this->db->fetch_object($result2); if ($objp2) @@ -1068,8 +1080,7 @@ class Form if ($ajaxkeysearch && $ajaxkeysearch != '') $sql.=" AND (pf.ref_fourn like '%".$ajaxkeysearch."%' OR p.label like '%".$ajaxkeysearch."%')"; $sql.= " ORDER BY pf.ref_fourn DESC"; - dolibarr_syslog("Form::select_produits_fournisseurs sql=".$sql,LOG_DEBUG); - + dolibarr_syslog("Form::select_produits_fournisseurs_do sql=".$sql,LOG_DEBUG); $result=$this->db->query($sql); if ($result) { @@ -1167,8 +1178,7 @@ class Form $sql.= " AND p.rowid = ".$productid; $sql.= " ORDER BY s.nom, pf.ref_fourn DESC"; - dolibarr_syslog("Form::select_product_fourn_price sql=$sql",LOG_DEBUG); - + dolibarr_syslog("Form::select_product_fourn_price sql=".$sql,LOG_DEBUG); $result=$this->db->query($sql); if ($result) @@ -1245,6 +1255,7 @@ class Form $sql .= " WHERE a.fk_societe = ".$socid; $sql .= " ORDER BY a.label ASC"; + dolibarr_syslog("Form::select_adresse_livraison sql=".$sql); if ($this->db->query($sql)) { print ''; @@ -1524,6 +1534,8 @@ class Form $sql.= " WHERE clos = '".$statut."'"; if ($filtre) $sql.=" AND ".$filtre; $sql.= " ORDER BY rowid"; + + dolibarr_syslog("Form::select_comptes sql=".$sql); $result = $this->db->query($sql); if ($result) { @@ -1613,6 +1625,7 @@ class Form $sql = "SELECT rowid, code, civilite, active FROM ".MAIN_DB_PREFIX."c_civilite"; $sql .= " WHERE active = 1"; + dolibarr_syslog("Form::select_civilite sql=".$sql); if ($this->db->query($sql)) { print '