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

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-23 19:19:10 +01:00
commit d4f3d14b65
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/commonfieldsinexport.inc.php
View File

@ -19,7 +19,7 @@ if (class_exists($keyforclass))
$fieldname = $keyforalias . '.' . $keyfield; $fieldname = $keyforalias . '.' . $keyfield;
$fieldlabel = ucfirst($valuefield['label']); $fieldlabel = ucfirst($valuefield['label']);
$typeFilter = "Text"; $typeFilter = "Text";
$typefield=preg_replace('/\(.*$/', '', $valuefield['type']); // double(24,8) -> double $typefield = preg_replace('/\(.*$/', '', $valuefield['type']); // double(24,8) -> double
switch ($typefield) { switch ($typefield) {
case 'int': case 'int':
case 'integer': case 'integer':
@ -47,7 +47,10 @@ if (class_exists($keyforclass))
* break; * break;
*/ */
} }
$helpfield=preg_replace('/\(.*$/', '', $valuefield['help']); $helpfield = '';
if (! empty($valuefield['help'])) {
$helpfield = preg_replace('/\(.*$/', '', $valuefield['help']);
}
if ($valuefield['enabled']) { if ($valuefield['enabled']) {
$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;