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

FIX dir for modules must not have s at end (fix contracts into contract)

Browse Source
This commit is contained in:
Laurent Destailleur 2018-06-06 23:47:48 +02:00
parent 76f0236bb6
commit d10c9cf565
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/conf.class.php
View File

@ -387,8 +387,8 @@ class Conf
$this->productbatch->multidir_temp =array($this->entity => $rootfordata."/produitlot/temp"); $this->productbatch->multidir_temp =array($this->entity => $rootfordata."/produitlot/temp");
// Module contrat // Module contrat
$this->contrat->dir_output=$rootfordata."/contracts"; $this->contrat->dir_output=$rootfordata."/contract";
$this->contrat->dir_temp =$rootfordata."/contracts/temp"; $this->contrat->dir_temp =$rootfordata."/contract/temp";
// Module bank // Module bank
$this->bank->dir_output=$rootfordata."/bank"; $this->bank->dir_output=$rootfordata."/bank";
$this->bank->dir_temp =$rootfordata."/bank/temp"; $this->bank->dir_temp =$rootfordata."/bank/temp";

6
htdocs/core/lib/functions.lib.php
View File

@ -1390,11 +1390,11 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
$dir_output = $conf->$modulepart->multidir_output[$entity] . "/"; $dir_output = $conf->$modulepart->multidir_output[$entity] . "/";
if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice'))) if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice')))
{ {
$subdir = get_exdir($object->id, 2, 0, 0, $object, $modulepart).$objectref; // the objectref dir is not include into get_exdir when used with level=2, so we add it here $subdir = get_exdir($object->id, 2, 0, 1, $object, $modulepart).$objectref; // the objectref dir is not included into get_exdir when used with level=2, so we add it here
} }
else else
{ {
$subdir = get_exdir($object->id, 0, 0, 0, $object, $modulepart); $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);
} }
$filepath = $dir_output . $subdir . "/"; $filepath = $dir_output . $subdir . "/";
@ -5331,7 +5331,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
// TODO // TODO
// We will enhance here a common way of forging path for document storage // We will enhance here a common way of forging path for document storage
// Here, object->id, object->ref and modulepart are required. // Here, object->id, object->ref and modulepart are required.
if (in_array($modulepart, array('thirdparty','contact','member','propal','proposal','commande','order','facture','invoice','shipment','expensereport'))) if (in_array($modulepart, array('thirdparty','contact','member','propal','proposal','commande','order','facture','invoice','shipment','contract','expensereport')))
{ {
$path=($object->ref?$object->ref:$object->id); $path=($object->ref?$object->ref:$object->id);
} }

33
htdocs/install/upgrade2.php
View File

@ -254,7 +254,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
migrate_rename_directories($db,$langs,$conf,'/societe','/mycompany'); migrate_rename_directories($db,$langs,$conf,'/societe','/mycompany');
} }
// Script for VX (X<2.8) -> V2.8 // Script for 2.8
$afterversionarray=explode('.','2.7.9'); $afterversionarray=explode('.','2.7.9');
$beforeversionarray=explode('.','2.8.9'); $beforeversionarray=explode('.','2.8.9');
//print $versionto.' '.versioncompare($versiontoarray,$afterversionarray).' '.versioncompare($versiontoarray,$beforeversionarray); //print $versionto.' '.versioncompare($versiontoarray,$afterversionarray).' '.versioncompare($versiontoarray,$beforeversionarray);
@ -281,7 +281,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
migrate_project_task_actors($db,$langs,$conf); migrate_project_task_actors($db,$langs,$conf);
} }
// Script for VX (X<2.9) -> V2.9 // Script for 2.9
$afterversionarray=explode('.','2.8.9'); $afterversionarray=explode('.','2.8.9');
$beforeversionarray=explode('.','2.9.9'); $beforeversionarray=explode('.','2.9.9');
if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0) if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
@ -295,7 +295,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
migrate_shipping_delivery2($db,$langs,$conf); migrate_shipping_delivery2($db,$langs,$conf);
} }
// Script for VX (X<3.0) -> V3.0 // Script for 3.0
$afterversionarray=explode('.','2.9.9'); $afterversionarray=explode('.','2.9.9');
$beforeversionarray=explode('.','3.0.9'); $beforeversionarray=explode('.','3.0.9');
if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0) if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
@ -303,7 +303,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
// No particular code // No particular code
} }
// Script for VX (X<3.1) -> V3.1 // Script for 3.1
$afterversionarray=explode('.','3.0.9'); $afterversionarray=explode('.','3.0.9');
$beforeversionarray=explode('.','3.1.9'); $beforeversionarray=explode('.','3.1.9');
if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0) if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
@ -313,7 +313,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
migrate_actioncomm_element($db,$langs,$conf); migrate_actioncomm_element($db,$langs,$conf);
} }
// Script for VX (X<3.2) -> V3.2 // Script for 3.2
$afterversionarray=explode('.','3.1.9'); $afterversionarray=explode('.','3.1.9');
$beforeversionarray=explode('.','3.2.9'); $beforeversionarray=explode('.','3.2.9');
if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0) if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
@ -325,7 +325,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
migrate_clean_association($db,$langs,$conf); migrate_clean_association($db,$langs,$conf);
} }
// Script for VX (X<3.3) -> V3.3 // Script for 3.3
$afterversionarray=explode('.','3.2.9'); $afterversionarray=explode('.','3.2.9');
$beforeversionarray=explode('.','3.3.9'); $beforeversionarray=explode('.','3.3.9');
if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0) if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
@ -333,7 +333,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
migrate_categorie_association($db,$langs,$conf); migrate_categorie_association($db,$langs,$conf);
} }
// Script for VX (X<3.4) -> V3.4 // Script for 3.4
// No specific scripts // No specific scripts
// Tasks to do always and only into last targeted version // Tasks to do always and only into last targeted version
@ -344,7 +344,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
migrate_event_assignement($db,$langs,$conf); migrate_event_assignement($db,$langs,$conf);
} }
// Scripts for last version // Scripts for 3.9
$afterversionarray=explode('.','3.7.9'); $afterversionarray=explode('.','3.7.9');
$beforeversionarray=explode('.','3.8.9'); $beforeversionarray=explode('.','3.8.9');
if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0) if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
@ -352,7 +352,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
// No particular code // No particular code
} }
// Scripts for last version // Scripts for 4.0
$afterversionarray=explode('.','3.9.9'); $afterversionarray=explode('.','3.9.9');
$beforeversionarray=explode('.','4.0.9'); $beforeversionarray=explode('.','4.0.9');
if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0) if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
@ -360,7 +360,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
migrate_rename_directories($db,$langs,$conf,'/fckeditor','/medias'); migrate_rename_directories($db,$langs,$conf,'/fckeditor','/medias');
} }
// Scripts for last version // Scripts for 5.0
$afterversionarray=explode('.','4.0.9'); $afterversionarray=explode('.','4.0.9');
$beforeversionarray=explode('.','5.0.9'); $beforeversionarray=explode('.','5.0.9');
if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0) if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
@ -372,7 +372,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
migrate_remise_except_entity($db,$langs,$conf); migrate_remise_except_entity($db,$langs,$conf);
} }
// Scripts for last version // Scripts for 6.0
$afterversionarray=explode('.','5.0.9'); $afterversionarray=explode('.','5.0.9');
$beforeversionarray=explode('.','6.0.9'); $beforeversionarray=explode('.','6.0.9');
if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0) if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
@ -393,7 +393,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
} }
} }
// Scripts for last version // Scripts for 7.0
$afterversionarray=explode('.','6.0.9'); $afterversionarray=explode('.','6.0.9');
$beforeversionarray=explode('.','7.0.9'); $beforeversionarray=explode('.','7.0.9');
if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0) if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
@ -403,6 +403,15 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
migrate_reset_blocked_log($db,$langs,$conf); migrate_reset_blocked_log($db,$langs,$conf);
} }
// Scripts for 8.0
$afterversionarray=explode('.','7.0.9');
$beforeversionarray=explode('.','8.0.9');
if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
{
migrate_rename_directories($db,$langs,$conf,'/contracts','/contract');
}
} }
// Code executed only if migration is LAST ONE. Must always be done. // Code executed only if migration is LAST ONE. Must always be done.