Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX when 2 extra fields are mandatory in 2 different entities

Browse Source
This commit is contained in:
Laurent Destailleur
2019-03-21 12:33:39 +01:00
parent 032aa869e4
commit a1fe1bb58c
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/class/commonobject.class.php
View File

@@ -4997,7 +4997,10 @@ abstract class CommonObject
{
foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval)
{
$sql.=",".$tmpkey;
if (! isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) // If field not already added previously
{
$sql.=",".$tmpkey;
}
}
}
$sql .= ") VALUES (".$this->id;
@@ -5023,8 +5026,11 @@ abstract class CommonObject
{
foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval)
{
if (in_array($tmpval, array('int', 'double'))) $sql.=", 0";
else $sql.=", ''";
if (! isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) // If field not already added previously
{
if (in_array($tmpval, array('int', 'double'))) $sql.=", 0";
else $sql.=", ''";
}
}
}