Skip to content
Snippets Groups Projects
Commit bdcb6bde authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files
parent 402fe2e4
Branches
Tags
No related merge requests found
......@@ -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);
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment