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

Unique extrafields are reset when cloning contract

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-16 22:13:29 +02:00
parent eeb919dcda
commit 9415486059
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/contrat/class/contrat.class.php
View File

@ -2382,7 +2382,7 @@ class Contrat extends CommonObject
*/ */
function createFromClone($socid = 0, $notrigger=0) function createFromClone($socid = 0, $notrigger=0)
{ {
global $db, $user, $langs, $conf, $hookmanager; global $db, $user, $langs, $conf, $hookmanager, $extrafields;
dol_include_once('/projet/class/project.class.php'); dol_include_once('/projet/class/project.class.php');
@ -2391,6 +2391,7 @@ class Contrat extends CommonObject
$error = 0; $error = 0;
$this->fetch($this->id); $this->fetch($this->id);
// Load dest object // Load dest object
$clonedObj = clone $this; $clonedObj = clone $this;
$clonedObj->socid = $socid; $clonedObj->socid = $socid;
@ -2401,8 +2402,23 @@ class Contrat extends CommonObject
$objsoc->fetch($clonedObj->socid); $objsoc->fetch($clonedObj->socid);
// $clonedObj->id=0; // Clean data
$clonedObj->statut = 0; $clonedObj->statut = 0;
// Clean extrafields
if (is_array($clonedObj->array_options) && count($clonedObj->array_options) > 0)
{
$extrafields->fetch_name_optionals_label($this->element);
foreach($clonedObj->array_options as $key => $option)
{
$shortkey = preg_replace('/options_/', '', $key);
//var_dump($shortkey); var_dump($extrafields->attributes[$this->element]['unique'][$shortkey]);
if (! empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
{
//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
unset($clonedObj->array_options[$key]);
}
}
}
if (empty($conf->global->CONTRACT_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT . "/core/modules/contract/" . $conf->global->CONTRACT_ADDON . ".php")) { if (empty($conf->global->CONTRACT_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT . "/core/modules/contract/" . $conf->global->CONTRACT_ADDON . ".php")) {
$this->error = 'ErrorSetupNotComplete'; $this->error = 'ErrorSetupNotComplete';
@ -2417,8 +2433,8 @@ class Contrat extends CommonObject
$clonedObj->ref = $modContract->getNextValue($objsoc, $clonedObj); $clonedObj->ref = $modContract->getNextValue($objsoc, $clonedObj);
// get extrafields so they will be clone // get extrafields so they will be clone
foreach ( $this->lines as $line ) { foreach ($this->lines as $line) {
$line->fetch_optionals($line->rowid); $line->fetch_optionals($line->id);
} }
// Create clone // Create clone