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

Try to aplpy enhancements defined into

Browse Source 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/38958-resolu-probleme-exports#38968
This commit is contained in:
Laurent Destailleur 2013-02-26 20:15:20 +01:00
parent 402fe2e417
commit bdcb6bdef5
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/modules/export/export_csv.modules.php
View File

@ -26,8 +26,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php';
/** /**
* \class ExportCsv * Class to build export files with format CSV
* \brief Class to build export files with format CSV
*/ */
class ExportCsv extends ModeleExports class ExportCsv extends ModeleExports
{ {
@ -239,7 +238,8 @@ class ExportCsv extends ModeleExports
$this->col=0; $this->col=0;
foreach($array_selected_sorted as $code => $value) 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.'); if (empty($alias)) dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
$newvalue=$outputlangs->convToOutputCharset($objp->$alias); $newvalue=$outputlangs->convToOutputCharset($objp->$alias);

6
htdocs/core/modules/export/export_excel.modules.php
View File

@ -28,8 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
/** /**
* \class ExportExcel * Class to build export files with Excel format
* \brief Class to build export files with Excel format
*/ */
class ExportExcel extends ModeleExports class ExportExcel extends ModeleExports
{ {
@ -276,7 +275,8 @@ class ExportExcel extends ModeleExports
foreach($array_selected_sorted as $code => $value) 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.'); if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
$newvalue=$objp->$alias; $newvalue=$objp->$alias;

6
htdocs/core/modules/export/export_excel2007.modules.php
View File

@ -29,8 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
/** /**
* \class ExportExcel2007 * Class to build export files with Excel format
* \brief Class to build export files with Excel format
*/ */
class ExportExcel2007 extends ExportExcel class ExportExcel2007 extends ExportExcel
{ {
@ -277,7 +276,8 @@ class ExportExcel2007 extends ExportExcel
foreach($array_selected_sorted as $code => $value) 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.'); if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
$newvalue=$objp->$alias; $newvalue=$objp->$alias;

6
htdocs/core/modules/export/export_tsv.modules.php
View File

@ -27,8 +27,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php';
/** /**
* \class ExportTsv * Class to build export files with format TSV
* \brief Class to build export files with format TSV
*/ */
class ExportTsv extends ModeleExports class ExportTsv extends ModeleExports
{ {
@ -212,7 +211,8 @@ class ExportTsv extends ModeleExports
$this->col=0; $this->col=0;
foreach($array_selected_sorted as $code => $value) 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.'); if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
$newvalue=$objp->$alias; $newvalue=$objp->$alias;