diff --git a/htdocs/admin/avoir.php b/htdocs/admin/avoir.php index 501b036ef4c..e04dd601b0c 100644 --- a/htdocs/admin/avoir.php +++ b/htdocs/admin/avoir.php @@ -317,11 +317,12 @@ print "\n"; print " ".$langs->trans("Name")."\n"; print " ".$langs->trans("Value")."\n"; print "\n"; -print "\n ".$langs->trans("Directory")."\n ".$conf->societe->dir_avoir."\n\n"; +print "\n ".$langs->trans("PathDirectory")."\n ".$conf->facture->dir_output."\n\n"; print "\n"; $db->close(); -llxFooter(); + +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 5a8d7791086..9e23814e9c5 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -472,6 +472,23 @@ print ''; print ''; +/* + * Repertoire + */ +print '
'; +print_titre($langs->trans("PathToDocuments")); + +print "\n"; +print "\n"; +print " \n"; +print " \n"; +print "\n"; +print "\n \n \n\n"; +print "
".$langs->trans("Name")."".$langs->trans("Value")."
".$langs->trans("PathDirectory")."".$conf->facture->dir_output."
\n"; + + + + $db->close(); llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 13a616429bc..2c744e3e686 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -407,6 +407,7 @@ PropalSetup=Commercial proposals module setup CreateForm=Create forms NumberOfProductLines=Number of product lines PathToDocuments=Path to documents +PathDirectory=Directory ProposalsNumberingModules=Commercial proposal numbering modules ProposalsPDFModules=Commercial proposal documents models ClassifiedInvoiced=Classified invoiced diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index a9a6172afe9..5a6056fc344 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -407,6 +407,7 @@ PropalSetup=Configuration du module Propositions Commerciales CreateForm=Création formulaire NumberOfProductLines=Nombre de lignes produits PathToDocuments=Chemins d'accès aux documents +PathDirectory=Répertoire ProposalsNumberingModules=Modules de numérotation des propositions commerciales ProposalsPDFModules=Modèles de documents de propositions commerciales ClassifiedInvoiced=Classé facturée diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 991841248c3..2f123ba7261 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -238,7 +238,6 @@ $conf->societe->enabled=defined("MAIN_MODULE_SOCIETE")?MAIN_MODULE_SOCIETE:0; $conf->societe->dir_output=DOL_DATA_ROOT."/societe"; $conf->societe->dir_images=DOL_DATA_ROOT."/societe/images"; $conf->societe->dir_logos=DOL_DATA_ROOT."/societe/logos"; -$conf->societe->dir_avoir=DOL_DATA_ROOT."/societe/avoirs"; if (defined('SOCIETE_OUTPUTDIR') && SOCIETE_OUTPUTDIR) { $conf->societe->dir_output=SOCIETE_OUTPUTDIR; } # Pour passer outre le rep par defaut // Module commercial $conf->commercial->enabled=defined("MAIN_MODULE_COMMERCIAL")?MAIN_MODULE_COMMERCIAL:0;