diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index a562b87c4d0..19edd54987a 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -215,12 +215,8 @@ class Conf // Sous module bons d'expedition $this->expedition_bon->enabled=defined("MAIN_SUBMODULE_EXPEDITION")?MAIN_SUBMODULE_EXPEDITION:0; - $this->expedition_bon->dir_output=$rootfordata."/expedition/sending"; - $this->expedition_bon->dir_temp =$rootfordata."/expedition/sending/temp"; // Sous module bons de livraison $this->livraison_bon->enabled=defined("MAIN_SUBMODULE_LIVRAISON")?MAIN_SUBMODULE_LIVRAISON:0; - $this->livraison_bon->dir_output=$rootfordata."/expedition/receipt"; - $this->livraison_bon->dir_temp =$rootfordata."/expedition/receipt/temp"; // Module don $this->don->dir_output=$rootfordata."/dons"; diff --git a/htdocs/document.php b/htdocs/document.php index 58486bf9569..5711af3fbab 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -248,7 +248,7 @@ if ($modulepart) { $accessallowed=1; } - $original_file=$conf->expedition_bon->dir_output.'/'.$original_file; + $original_file=$conf->expedition->dir_output."/sending/".$original_file; //$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'"; } @@ -260,7 +260,7 @@ if ($modulepart) { $accessallowed=1; } - $original_file=$conf->livraison_bon->dir_output.'/'.$original_file; + $original_file=$conf->expedition->dir_output."/receipt/".$original_file; //$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'"; } diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 7e1f97a9e1d..8e24805cc44 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -848,7 +848,7 @@ else if ($conf->expedition_bon->enabled) { $expeditionref = dol_sanitizeFileName($expedition->ref); - $filedir = $conf->expedition_bon->dir_output . "/" .$expeditionref; + $filedir = $conf->expedition->dir_output . "/sending/" .$expeditionref; $urlsource = $_SERVER["PHP_SELF"]."?id=".$expedition->id; diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index 3cd870a6b56..8d87cec21aa 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -91,7 +91,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition $this->expe = $object; //Verification de la configuration - if ($conf->expedition_bon->dir_output) + if ($conf->expedition->dir_output."/sending") { //Creation du Client $soc = new Societe($this->db); @@ -116,13 +116,13 @@ Class pdf_expedition_merou extends ModelePdfExpedition // Definition de $dir et $file if ($object->specimen) { - $dir = $conf->expedition_bon->dir_output; + $dir = $conf->expedition->dir_output."/sending"; $file = $dir . "/SPECIMEN.pdf"; } else { $expref = dol_sanitizeFileName($object->ref); - $dir = $conf->expedition_bon->dir_output . "/" . $expref; + $dir = $conf->expedition->dir_output . "/sending/" . $expref; $file = $dir . "/" . $expref . ".pdf"; } diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php index 68c04be5033..65ff9fd4868 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php @@ -237,18 +237,18 @@ Class pdf_expedition_rouget extends ModelePdfExpedition $outputlangs->load("products"); $outputlangs->load("propal"); - if ($conf->expedition_bon->dir_output) + if ($conf->expedition->dir_output."/sending") { // Definition de $dir et $file if ($object->specimen) { - $dir = $conf->expedition_bon->dir_output; + $dir = $conf->expedition->dir_output."/sending"; $file = $dir . "/SPECIMEN.pdf"; } else { $expref = dol_sanitizeFileName($object->ref); - $dir = $conf->expedition_bon->dir_output . "/" . $expref; + $dir = $conf->expedition->dir_output."/sending/" . $expref; $file = $dir . "/" . $expref . ".pdf"; } diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index c18ecee33ad..a7d64caf9eb 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -104,7 +104,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $outputlangs->load("deliveries"); $outputlangs->load("sendings"); - if ($conf->livraison_bon->dir_output) + if ($conf->expedition->dir_output."/receipt") { // If $object is id instead of object if (! is_object($object)) @@ -122,7 +122,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder $nblignes = sizeof($object->lignes); $objectref = dol_sanitizeFileName($object->ref); - $dir = $conf->livraison_bon->dir_output; + $dir = $conf->expedition->dir_output."/receipt"; if (! eregi('specimen',$objectref)) $dir.= "/" . $objectref; $file = $dir . "/" . $objectref . ".pdf"; diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 2ff908e6196..30b02e738b1 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -125,7 +125,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $outputlangs->load("deliveries"); $outputlangs->load("sendings"); - if ($conf->livraison_bon->dir_output) + if ($conf->expedition->dir_output."/receipt") { // If $object is id instead of object if (! is_object($object)) @@ -143,7 +143,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder $nblignes = sizeof($object->lignes); $objectref = dol_sanitizeFileName($object->ref); - $dir = $conf->livraison_bon->dir_output; + $dir = $conf->expedition->dir_output."/receipt"; if (! eregi('specimen',$objectref)) $dir.= "/" . $objectref; $file = $dir . "/" . $objectref . ".pdf"; diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/includes/modules/modExpedition.class.php index e783c7e35f8..916b9ae01da 100644 --- a/htdocs/includes/modules/modExpedition.class.php +++ b/htdocs/includes/modules/modExpedition.class.php @@ -60,39 +60,12 @@ class modExpedition extends DolibarrModules $this->picto = "sending"; // Data directories to create when module is enabled - // TODO Replace with simple directories - $this->dirs = array(); - $r=0; - - $this->dirs[$r][0] = "output"; - $this->dirs[$r][1] = "/expedition"; - $r++; - $this->dirs[$r][0] = "temp"; - $this->dirs[$r][1] = "/expedition/temp"; - $r++; - $this->dirs[$r][0] = "output"; - $this->dirs[$r][1] = "/expedition/sending"; - $this->dirs[$r][2] = 1; - $this->dirs[$r][3] = ''; - $this->dirs[$r][4] = "expedition_bon"; - $r++; - $this->dirs[$r][0] = "temp"; - $this->dirs[$r][1] = "/expedition/sending/temp"; - $this->dirs[$r][2] = 1; - $this->dirs[$r][3] = ''; - $this->dirs[$r][4] = "expedition_bon"; - $r++; - $this->dirs[$r][0] = "output"; - $this->dirs[$r][1] = "/expedition/receipt"; - $this->dirs[$r][2] = 1; - $this->dirs[$r][3] = ''; - $this->dirs[$r][4] = "livraison_bon"; - $r++; - $this->dirs[$r][0] = "temp"; - $this->dirs[$r][1] = "/expedition/receipt/temp"; - $this->dirs[$r][2] = 1; - $this->dirs[$r][3] = ''; - $this->dirs[$r][4] = "livraison_bon"; + $this->dirs = array("/expedition/temp", + "/expedition/sending", + "/expedition/sending/temp", + "/expedition/receipt", + "/expedition/receipt/temp" + ); // Config pages $this->config_page_url = array("confexped.php"); diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index 7d6af0a1a42..1e26f4837c4 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -583,7 +583,7 @@ else */ $livraisonref = dol_sanitizeFileName($livraison->ref); - $filedir = $conf->livraison_bon->dir_output . '/' . $livraisonref; + $filedir = $conf->expedition->dir_output . "/receipt/" . $livraisonref; $urlsource = $_SERVER["PHP_SELF"]."?id=".$livraison->id; $genallowed=$user->rights->expedition->livraison->creer;