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

Fix: Bad fix

Browse Source
This commit is contained in:
Laurent Destailleur 2012-08-03 18:43:30 +02:00
parent 983c38a33d
commit a2641b89e7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/install/etape1.php
View File

@ -362,6 +362,7 @@ if (! $error && $db->connected && $action == "set")
} }
} }
} }
if ($error) if ($error)
{ {
print "<tr><td>".$langs->trans("ErrorDirDoesNotExists",$main_data_dir); print "<tr><td>".$langs->trans("ErrorDirDoesNotExists",$main_data_dir);
@ -375,14 +376,14 @@ if (! $error && $db->connected && $action == "set")
{ {
//ODT templates //ODT templates
require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$srcroot='./doctemplates'; $srcroot=$main_dir.'/install/doctemplates';
$destroot=$main_data_dir.'/doctemplates'; $destroot=$main_data_dir.'/doctemplates';
$docs=array('thirdparties' => 'thirdparty', 'proposals' => 'proposal', 'orders' => 'order', 'invoices' => 'invoice'); $docs=array('thirdparties' => 'thirdparty', 'proposals' => 'proposal', 'orders' => 'order', 'invoices' => 'invoice');
foreach($docs as $dir => $file) foreach($docs as $cursordir => $cursorfile)
{ {
$src=$srcroot.'/thirdparties/template_'.$file.'.odt'; $src=$srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
$dirodt=$destroot.'/'.$dir; $dirodt=$destroot.'/'.$cursordir;
$dest=$dirodt.'/template_'.$file.'.odt'; $dest=$dirodt.'/template_'.$cursorfile.'.odt';
dol_mkdir($dirodt); dol_mkdir($dirodt);
$result=dol_copy($src,$dest,0,0); $result=dol_copy($src,$dest,0,0);