lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add: can defined submodule name (ex: $conf->module->submodule->dir_output)

Browse Source 
Add: can change the module name if different (ex: $conf->newmodulename->dir_output)
This commit is contained in:
Regis Houssin 2009-04-30 15:40:18 +00:00
parent 67bcc243f9
commit 21964691da
13 changed files with 49 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/document.php
View File

@ -180,7 +180,7 @@ if ($modulepart)
{
$accessallowed=1;
}
$original_file=$conf->fournisseur->dir_commande.'/'.$original_file;
$original_file=$conf->fournisseur->commande->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='$refname'";
}
@ -192,7 +192,7 @@ if ($modulepart)
{
$accessallowed=1;
}
$original_file=$conf->fournisseur->dir_facture.'/'.$original_file;
$original_file=$conf->fournisseur->facture->dir_output.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='$refname'";
}
@ -240,7 +240,7 @@ if ($modulepart)
{
$accessallowed=1;
}
$original_file=$conf->expedition->dir_bon_expedition.'/'.$original_file;
$original_file=$conf->expedition_bon->dir_output.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
@ -252,7 +252,7 @@ if ($modulepart)
{
$accessallowed=1;
}
$original_file=$conf->expedition->dir_bon_livraison.'/'.$original_file;
$original_file=$conf->livraison_bon->dir_output.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
@ -276,7 +276,7 @@ if ($modulepart)
//{
$accessallowed=1;
//}
$original_file=$conf->commercial->dir_actions.'/'.$original_file;
$original_file=$conf->actions->dir_output.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
@ -288,7 +288,7 @@ if ($modulepart)
//{
$accessallowed=1;
//}
$original_file = $conf->commercial->dir_actions_temp."/".$original_file;
$original_file = $conf->actions->dir_temp."/".$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}

2
htdocs/expedition/fiche.php
View File

@ -850,7 +850,7 @@ else
if ($conf->expedition_bon->enabled)
{
$expeditionref = dol_sanitizeFileName($expedition->ref);
$filedir = $conf->expedition->dir_bon_expedition . "/" .$expeditionref;
$filedir = $conf->expedition_bon->dir_output . "/" .$expeditionref;
$urlsource = $_SERVER["PHP_SELF"]."?id=".$expedition->id;

6
htdocs/fourn/commande/document.php
View File

@ -76,7 +76,7 @@ if ($commande->fetch($_GET['id'],$_GET['ref']) < 0)
// Envoi fichier
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
$upload_dir = $conf->fournisseur->dir_commande . "/" . dol_sanitizeFileName($commande->ref);
$upload_dir = $conf->fournisseur->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref);
if (! is_dir($upload_dir)) create_exdir($upload_dir);
if (is_dir($upload_dir))
@ -98,7 +98,7 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
// Delete
if ($action=='delete')
{
$upload_dir = $conf->fournisseur->dir_commande . "/" . dol_sanitizeFileName($commande->ref);
$upload_dir = $conf->fournisseur->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref);
$file = $upload_dir . '/' . urldecode($_GET['urlfile']);
dol_delete_file($file);
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
@ -117,7 +117,7 @@ if ($id > 0 || ! empty($ref))
{
llxHeader();
$upload_dir = $conf->fournisseur->dir_commande.'/'.dol_sanitizeFileName($commande->ref);
$upload_dir = $conf->fournisseur->commande->dir_output.'/'.dol_sanitizeFileName($commande->ref);
$soc = new Societe($db);
$soc->fetch($commande->socid);

4
htdocs/fourn/commande/fiche.php
View File

@ -996,9 +996,9 @@ if ($id > 0 || ! empty($ref))
* Documents generes
*/
$comfournref = dol_sanitizeFileName($commande->ref);
$file = $conf->fournisseur->dir_commande . '/' . $comfournref . '/' . $comfournref . '.pdf';
$file = $conf->fournisseur->commande->dir_output . '/' . $comfournref . '/' . $comfournref . '.pdf';
$relativepath = $comfournref.'/'.$comfournref.'.pdf';
$filedir = $conf->fournisseur->dir_commande . '/' . $comfournref;
$filedir = $conf->fournisseur->commande->dir_output . '/' . $comfournref;
$urlsource=$_SERVER["PHP_SELF"]."?id=".$commande->id;
$genallowed=$user->rights->fournisseur->commande->creer;
$delallowed=$user->rights->fournisseur->commande->supprimer;

6
htdocs/fourn/facture/document.php
View File

@ -69,7 +69,7 @@ if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC))
$facture = new FactureFournisseur($db);
if ($facture->fetch($facid))
{
$upload_dir = $conf->fournisseur->dir_facture.'/'.get_exdir($facture->id,2).$facture->id;
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$facture->id;
if (! is_dir($upload_dir)) create_exdir($upload_dir);
@ -98,7 +98,7 @@ if ($action=='delete')
$facture = new FactureFournisseur($db);
if ($facture->fetch($facid))
{
$upload_dir = $conf->fournisseur->dir_facture.'/'.get_exdir($facture->id,2).$facture->id;
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$facture->id;
$file = $upload_dir . '/' . urldecode($_GET['urlfile']);
dol_delete_file($file);
@ -120,7 +120,7 @@ if ($facid > 0)
{
$facture->fetch_fournisseur();
$upload_dir = $conf->fournisseur->dir_facture.'/'.get_exdir($facture->id,2).$facture->id;
$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($facture->id,2).$facture->id;
$head = facturefourn_prepare_head($facture);
dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'));

6
htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
View File

@ -96,7 +96,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$this->expe = $obj;
//Verification de la configuration
if ($conf->expedition->dir_bon_expedition)
if ($conf->expedition_bon->dir_output)
{
//Creation du Client
$soc = new Societe($this->db);
@ -121,13 +121,13 @@ Class pdf_expedition_merou extends ModelePdfExpedition
// Definition de $dir et $file
if ($this->expe->specimen)
{
$dir = $conf->expedition->dir_bon_expedition;
$dir = $conf->expedition_bon->dir_output;
$file = $dir . "/SPECIMEN.pdf";
}
else
{
$expref = dol_sanitizeFileName($this->expe->ref);
$dir = $conf->expedition->dir_bon_expedition . "/" . $expref;
$dir = $conf->expedition_bon->dir_output . "/" . $expref;
$file = $dir . "/" . $expref . ".pdf";
}

6
htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
View File

@ -140,20 +140,20 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
$outputlangs->setPhpLang();
if ($conf->expedition->dir_bon_expedition)
if ($conf->expedition_bon->dir_output)
{
$this->expe = $obj;
// D<>finition de $dir et $file
if ($this->expe->specimen)
{
$dir = $conf->expedition->dir_bon_expedition;
$dir = $conf->expedition_bon->dir_output;
$file = $dir . "/SPECIMEN.pdf";
}
else
{
$expref = dol_sanitizeFileName($this->expe->ref);
$dir = $conf->expedition->dir_bon_expedition . "/" . $expref;
$dir = $conf->expedition_bon->dir_output . "/" . $expref;
$file = $dir . "/" . $expref . ".pdf";
}

4
htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
View File

@ -106,7 +106,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$outputlangs->setPhpLang();
if ($conf->expedition->dir_bon_livraison)
if ($conf->livraison_bon->dir_output)
{
// If $delivery is id instead of object
if (! is_object($delivery))
@ -124,7 +124,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$nblignes = sizeof($delivery->lignes);
$deliveryref = dol_sanitizeFileName($delivery->ref);
$dir = $conf->expedition->dir_bon_livraison;
$dir = $conf->livraison_bon->dir_output;
if (! eregi('specimen',$deliveryref)) $dir.= "/" . $deliveryref;
$file = $dir . "/" . $deliveryref . ".pdf";

4
htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
View File

@ -127,7 +127,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$outputlangs->setPhpLang();
if ($conf->expedition->dir_bon_livraison)
if ($conf->livraison_bon->dir_output)
{
// If $delivery is id instead of object
if (! is_object($delivery))
@ -145,7 +145,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$nblignes = sizeof($delivery->lignes);
$deliveryref = dol_sanitizeFileName($delivery->ref);
$dir = $conf->expedition->dir_bon_livraison;
$dir = $conf->livraison_bon->dir_output;
if (! eregi('specimen',$deliveryref)) $dir.= "/" . $deliveryref;
$file = $dir . "/" . $deliveryref . ".pdf";

2
htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
View File

@ -230,7 +230,7 @@ function supplier_order_delete_preview($db, $propalid)
$client = new Societe($db);
$client->fetch($comfourn->socid);
if ($conf->fournisseur->dir_commande)
if ($conf->fournisseur->commande->dir_output)
{
$comfournref = dol_sanitizeFileName($comfourn->ref);
$dir = $conf->commande->dir_output . "/" . $comfournref ;

43
htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2008 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
*
* This program is free software; you can redistribute it and/or modify
@ -22,8 +22,7 @@
/**
* \file htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
* \ingroup fournisseur
* \brief Fichier de la classe permettant de g<EFBFBD>n<EFBFBD>rer les commandes fournisseurs au mod<EFBFBD>le Muscadet
* \author Regis Houssin
* \brief Fichier de la classe permettant de generer les commandes fournisseurs au modele Muscadet
* \version $Id$
*/
@ -35,14 +34,14 @@ require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
/**
* \class pdf_muscadet
* \brief Classe permettant de g<EFBFBD>n<EFBFBD>rer les commandes fournisseurs au mod<EFBFBD>le Muscadet
* \brief Classe permettant de generer les commandes fournisseurs au modele Muscadet
*/
class pdf_muscadet extends ModelePDFSuppliersOrders
{
/**
* \brief Constructeur
* \param db Handler acc<EFBFBD>s base de donn<EFBFBD>e
* \param db Handler acces base de donnee
*/
function pdf_muscadet($db)
{
@ -67,8 +66,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$this->option_logo = 1; // Affiche logo
$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
$this->option_modereg = 1; // Affiche mode r<EFBFBD>glement
$this->option_condreg = 1; // Affiche conditions r<EFBFBD>glement
$this->option_modereg = 1; // Affiche mode reglement
$this->option_condreg = 1; // Affiche conditions reglement
$this->option_codeproduitservice = 1; // Affiche code produit-service
$this->option_multilang = 1; // Dispo en plusieurs langues
@ -77,7 +76,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Recupere emmetteur
$this->emetteur=$mysoc;
if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2); // Par defaut, si n'<EFBFBD>tait pas d<>fini
if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2); // Par defaut, si n'etait pas defini
// Defini position des colonnes
$this->posxdesc=$this->marge_gauche+1;
@ -93,8 +92,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
}
/**
\brief Renvoi derni<EFBFBD>re erreur
\return string Derni<EFBFBD>re erreur
\brief Renvoi derniere erreur
\return string Derniere erreur
*/
function pdferror()
{
@ -124,9 +123,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$outputlangs->setPhpLang();
if ($conf->fournisseur->dir_commande)
if ($conf->fournisseur->commande->dir_output)
{
// D<EFBFBD>finition de l'objet $com (pour compatibilite ascendante)
// Definition de l'objet $com (pour compatibilite ascendante)
if (! is_object($com))
{
$id = $com;
@ -135,16 +134,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
}
$deja_regle = "";
// D<EFBFBD>finition de $dir et $file
// Definition de $dir et $file
if ($com->specimen)
{
$dir = $conf->fournisseur->dir_commande;
$dir = $conf->fournisseur->commande->dir_output;
$file = $dir . "/SPECIMEN.pdf";
}
else
{
$comref = dol_sanitizeFileName($com->ref);
$dir = $conf->fournisseur->dir_commande . "/" . $comref;
$dir = $conf->fournisseur->commande->dir_output . "/" . $comref;
$file = $dir . "/" . $comref . ".pdf";
}
@ -168,7 +167,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf=new FPDI_Protection('P','mm',$this->format);
$pdfrights = array('print'); // Ne permet que l'impression du document
$pdfuserpass = ''; // Mot de passe pour l'utilisateur final
$pdfownerpass = NULL; // Mot de passe du propri<EFBFBD>taire, cr<63><72> al<61>atoirement si pas d<>fini
$pdfownerpass = NULL; // Mot de passe du proprietaire, cree aleatoirement si pas defini
$pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass);
}
else
@ -217,7 +216,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
{
$tab_top = 88;
$pdf->SetFont('Arial','', 9); // Dans boucle pour g<EFBFBD>rer multi-page
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page
$pdf->SetXY ($this->posxdesc-1, $tab_top);
$pdf->MultiCell(190, 3, $outputlangs->convToOutputCharset($com->note_public), 0, 'J');
$nexY = $pdf->GetY();
@ -247,11 +246,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Description de la ligne produit
$libelleproduitservice=pdf_getlinedesc($com->lignes[$i],$outputlangs);
$pdf->SetFont('Arial','', 9); // Dans boucle pour g<EFBFBD>rer multi-page
$pdf->SetFont('Arial','', 9); // Dans boucle pour gerer multi-page
$pdf->writeHTMLCell(108, 3, $this->posxdesc-1, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
$pdf->SetFont('Arial','', 9); // On repositionne la police par d<EFBFBD>faut
$pdf->SetFont('Arial','', 9); // On repositionne la police par defaut
$nexY = $pdf->GetY();
@ -387,7 +386,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
}
/**
* \brief Affiche le total <EFBFBD> payer
* \brief Affiche le total a payer
* \param pdf Objet PDF
* \param object Objet order
* \param deja_regle Montant deja regle
@ -440,7 +439,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$index = 0;
}
// Affichage des totaux de TVA par taux (conform<EFBFBD>ment <20> r<>glementation)
// Affichage des totaux de TVA par taux (conformement a reglementation)
$pdf->SetFillColor(248,248,248);
foreach( $this->tva as $tvakey => $tvaval )
@ -524,7 +523,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
{
global $conf;
// Montants exprim<EFBFBD>s en (en tab_top - 1
// Montants exprimes en (en tab_top - 1
$pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',8);
$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie));

2
htdocs/includes/triggers/interface_modNotification_Notification.class.php
View File

@ -132,7 +132,7 @@ class InterfaceNotification
$action_notify = 3;
$ref = dol_sanitizeFileName($object->ref);
$filepdf = $conf->fournisseur->dir_commande . '/' . $ref . '/' . $ref . '.pdf';
$filepdf = $conf->fournisseur->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
$mesg = 'La commande fournisseur '.$object->ref." a été validée.\n";
$notify = new Notify($this->db);

2
htdocs/livraison/fiche.php
View File

@ -582,7 +582,7 @@ else
*/
$livraisonref = dol_sanitizeFileName($livraison->ref);
$filedir = $conf->expedition->dir_bon_livraison . '/' . $livraisonref;
$filedir = $conf->livraison_bon->dir_output . '/' . $livraisonref;
$urlsource = $_SERVER["PHP_SELF"]."?id=".$livraison->id;
$genallowed=$user->rights->expedition->livraison->creer;