Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6098 from atm-florian/develop

Browse Source 
FIX : Do not include separate extrafields into export
This commit is contained in:
Laurent Destailleur
2016-12-10 11:30:00 +01:00
committed by GitHub
parent 3b193e2e22 9da324031c
commit e83bb0f50c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/extrafieldsinexport.inc.php
View File

@@ -42,9 +42,11 @@ if ($resql) // This can fail when class is used on old database (during migra
if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp; if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
break; break;
} }
if ($obj->type!='separate') {
$this->export_fields_array[$r][$fieldname]=$fieldlabel; $this->export_fields_array[$r][$fieldname]=$fieldlabel;
$this->export_TypeFields_array[$r][$fieldname]=$typeFilter; $this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
$this->export_entities_array[$r][$fieldname]=$keyforelement; $this->export_entities_array[$r][$fieldname]=$keyforelement;
} }
}
} }
// End add axtra fields // End add axtra fields