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

Fix : extrafields for propale were note saved after creation

Browse Source
This commit is contained in:
jfefe 2013-03-06 00:18:41 +01:00
parent 9877466594
commit 9eee5f9509
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/comm/propal.php
View File

@ -338,6 +338,15 @@ else if ($action == 'add' && $user->rights->propal->creer)
}
}
// Get extra fields
foreach($_POST as $key => $value)
{
if (preg_match("/^options_/",$key))
{
$object->array_options[$key]=GETPOST($key);
}
}
$id = $object->create($user);
}

20
htdocs/comm/propal/class/propal.class.php
View File

@ -622,7 +622,7 @@ class Propal extends CommonObject
*/
function create($user='', $notrigger=0)
{
global $langs,$conf,$mysoc;
global $langs,$conf,$mysoc,$hookmanager;
$error=0;
$now=dol_now();
@ -802,6 +802,24 @@ class Propal extends CommonObject
$resql=$this->update_price(1);
if ($resql)
{
// Actions on extra fields (by external module or standard code)
// FIXME le hook fait double emploi avec le trigger !!
$hookmanager->initHooks(array('propaldao'));
$parameters=array('socid'=>$this->id);
$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (empty($reshook))
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
$result=$this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
}
else if ($reshook < 0) $error++;
if (! $notrigger)
{
// Appel des triggers