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

Fix: socid was not caught.

Browse Source 
Fix: numbering modules was not correctly scanned.
This commit is contained in:
Laurent Destailleur 2014-06-11 18:01:15 +02:00
parent 40742e84a9
commit bb8516274e
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/projet/fiche.php
View File

@ -56,7 +56,7 @@ if ($object->id > 0)
} }
// Security check // Security check
$socid=0; $socid=GETPOST('socid');
if ($user->societe_id > 0) $socid=$user->societe_id; if ($user->societe_id > 0) $socid=$user->societe_id;
$result = restrictedArea($user, 'projet', $object->id); $result = restrictedArea($user, 'projet', $object->id);
@ -376,6 +376,10 @@ if ($action == 'create' && $user->rights->projet->creer)
/* /*
* Create * Create
*/ */
$thirdparty=new Societe($db);
if ($socid > 0) $thirdparty->fetch($socid);
print_fiche_titre($langs->trans("NewProject")); print_fiche_titre($langs->trans("NewProject"));
dol_htmloutput_mesg($mesg); dol_htmloutput_mesg($mesg);
@ -388,12 +392,28 @@ if ($action == 'create' && $user->rights->projet->creer)
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
$defaultref=''; $defaultref='';
$obj = empty($conf->global->PROJECT_ADDON)?'mod_project_simple':$conf->global->PROJECT_ADDON; $modele = empty($conf->global->PROJECT_ADDON)?'mod_project_simple':$conf->global->PROJECT_ADDON;
if (! empty($conf->global->PROJECT_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/project/".$conf->global->PROJECT_ADDON.".php"))
// Search template files
$file=''; $classname=''; $filefound=0;
$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
foreach($dirmodels as $reldir)
{ {
require_once DOL_DOCUMENT_ROOT ."/core/modules/project/".$conf->global->PROJECT_ADDON.'.php'; $file=dol_buildpath($reldir."core/modules/project/".$modele.'.php',0);
$modProject = new $obj; if (file_exists($file))
$defaultref = $modProject->getNextValue($soc,$object); {
$filefound=1;
$classname = $modele;
break;
}
}
if ($filefound)
{
$result=dol_include_once($reldir."core/modules/project/".$modele.'.php');
$modProject = new $classname;
$defaultref = $modProject->getNextValue($thirdparty,$object);
} }
if (is_numeric($defaultref) && $defaultref <= 0) $defaultref=''; if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';