diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php index 5ad1648001ea6fa144d8446cacdc6f65e79cd0ac..20d57fda97c77ce230541e6ff89b072457945e32 100644 --- a/htdocs/core/modules/export/export_csv.modules.php +++ b/htdocs/core/modules/export/export_csv.modules.php @@ -26,8 +26,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php'; /** - * \class ExportCsv - * \brief Class to build export files with format CSV + * Class to build export files with format CSV */ class ExportCsv extends ModeleExports { @@ -239,7 +238,8 @@ class ExportCsv extends ModeleExports $this->col=0; foreach($array_selected_sorted as $code => $value) { - $alias=str_replace(array('.','-'),'_',$code); + if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-'),'_',$code); + else $alias=substr($code, strpos($code, ' as ') + 4); if (empty($alias)) dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.'); $newvalue=$outputlangs->convToOutputCharset($objp->$alias); diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php index e6c7972633e564961b96e8b363e5d78ad3a60c3f..9e489f0b3e82abd993eab13b871336d2da3cde3a 100644 --- a/htdocs/core/modules/export/export_excel.modules.php +++ b/htdocs/core/modules/export/export_excel.modules.php @@ -28,8 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; /** - * \class ExportExcel - * \brief Class to build export files with Excel format + * Class to build export files with Excel format */ class ExportExcel extends ModeleExports { @@ -276,7 +275,8 @@ class ExportExcel extends ModeleExports foreach($array_selected_sorted as $code => $value) { - $alias=str_replace(array('.','-'),'_',$code); + if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-'),'_',$code); + else $alias=substr($code, strpos($code, ' as ') + 4); if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.'); $newvalue=$objp->$alias; diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php index 82e2e99e2a200d4548db91d3c21d80e2f08c6a1d..d0b17be331da4ee33a66f62cebe5405937161210 100755 --- a/htdocs/core/modules/export/export_excel2007.modules.php +++ b/htdocs/core/modules/export/export_excel2007.modules.php @@ -29,8 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; /** - * \class ExportExcel2007 - * \brief Class to build export files with Excel format + * Class to build export files with Excel format */ class ExportExcel2007 extends ExportExcel { @@ -277,7 +276,8 @@ class ExportExcel2007 extends ExportExcel foreach($array_selected_sorted as $code => $value) { - $alias=str_replace(array('.','-'),'_',$code); + if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-'),'_',$code); + else $alias=substr($code, strpos($code, ' as ') + 4); if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.'); $newvalue=$objp->$alias; diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php index 07c475e7cc231235e4d6703a616b9ef0ec512d88..c0b8eb5f6177b131dad6e05eeef19132ffb97e50 100644 --- a/htdocs/core/modules/export/export_tsv.modules.php +++ b/htdocs/core/modules/export/export_tsv.modules.php @@ -27,8 +27,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php'; /** - * \class ExportTsv - * \brief Class to build export files with format TSV + * Class to build export files with format TSV */ class ExportTsv extends ModeleExports { @@ -212,7 +211,8 @@ class ExportTsv extends ModeleExports $this->col=0; foreach($array_selected_sorted as $code => $value) { - $alias=str_replace(array('.','-'),'_',$code); + if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-'),'_',$code); + else $alias=substr($code, strpos($code, ' as ') + 4); if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.'); $newvalue=$objp->$alias;