diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index 902b75584cf..53b1e557f25 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -187,9 +187,10 @@ class ExportCsv extends ModeleExports
* @param array $array_export_fields_label Array with list of label of fields
* @param array $array_selected_sorted Array with list of field to export
* @param Translate $outputlangs Object lang to translate values
+ * @param array $array_types Array with types of fields
* @return int <0 if KO, >0 if OK
*/
- function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs)
+ function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
{
global $conf;
@@ -204,7 +205,7 @@ class ExportCsv extends ModeleExports
foreach($array_selected_sorted as $code => $value)
{
- $newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);
+ $newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
$newvalue=$this->csv_clean($newvalue,$outputlangs->charset_output);
fwrite($this->handle,$newvalue.$this->separator);
@@ -242,15 +243,12 @@ class ExportCsv extends ModeleExports
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);
+
+ $newvalue=$outputlangs->convToOutputCharset($objp->$alias); // objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
$typefield=isset($array_types[$code])?$array_types[$code]:'';
-
+
// Translation newvalue
- if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
- {
- $newvalue=$outputlangs->transnoentities($reg[1]);
- }
+ if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
$newvalue=$this->csv_clean($newvalue,$outputlangs->charset_output);
@@ -284,11 +282,12 @@ class ExportCsv extends ModeleExports
return 0;
}
+
/**
* Clean a cell to respect rules of CSV file cells
*
* @param string $newvalue String to clean
- * @param string $charset Output character set
+ * @param string $charset Input AND Output character set
* @return string Value cleaned
*/
function csv_clean($newvalue, $charset)
@@ -296,7 +295,9 @@ class ExportCsv extends ModeleExports
$addquote=0;
// Rule Dolibarr: No HTML
+ //print $charset.' '.$newvalue."\n";
$newvalue=dol_string_nohtmltag($newvalue,1,$charset);
+ //print $charset.' '.$newvalue."\n";
// Rule 1 CSV: No CR, LF in cells
$newvalue=str_replace("\r",'',$newvalue);
diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php
index 8f6801e8521..ea0110dfe9b 100644
--- a/htdocs/core/modules/export/export_excel.modules.php
+++ b/htdocs/core/modules/export/export_excel.modules.php
@@ -158,7 +158,7 @@ class ExportExcel extends ModeleExports
$outputlangs->charset_output='ISO-8859-1'; // Because Excel 5 format is ISO
}
- dol_syslog("ExportExcel::open_file file=".$file);
+ dol_syslog(get_class($this)."::open_file file=".$file);
$this->file=$file;
$ret=1;
@@ -187,7 +187,7 @@ class ExportExcel extends ModeleExports
$this->workbook->setActiveSheetIndex(0);
$this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
- $this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(15);
+ $this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
}
return $ret;
}
@@ -212,9 +212,10 @@ class ExportExcel extends ModeleExports
* @param array $array_export_fields_label Array with list of label of fields
* @param array $array_selected_sorted Array with list of field to export
* @param Translate $outputlangs Object lang to translate values
+ * @param array $array_types Array with types of fields
* @return int <0 if KO, >0 if OK
*/
- function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs)
+ function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
{
// Create a format for the column headings
if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
@@ -231,7 +232,7 @@ class ExportExcel extends ModeleExports
else
{
$this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
- $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
+ $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
}
$this->col=0;
@@ -247,6 +248,10 @@ class ExportExcel extends ModeleExports
else
{
$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $outputlangs->transnoentities($alias));
+ if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Number','TextAuto'))) // Set autowidth for some types
+ {
+ $this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
+ }
}
$this->col++;
}
@@ -341,18 +346,17 @@ class ExportExcel extends ModeleExports
$this->worksheet->write($this->row, $this->col, $newvalue);
}
else
- {
- if ($typefield == 'Text')
+ {
+ if ($typefield == 'Text' || $typefield == 'TextAuto')
{
//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, (string) $newvalue);
$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
+ $this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
}
else
{
- //$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
- //if ($typefield == 'Text') $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
}
}
@@ -412,6 +416,29 @@ class ExportExcel extends ModeleExports
return $newvalue;
}
+
+
+ /**
+ * Convert a column to letter (1->A, 0->B, 27->AA, ...)
+ *
+ * @param int $c Column position
+ * @return string Letter
+ */
+ function column2Letter($c)
+ {
+
+ $c = intval($c);
+ if ($c <= 0) return '';
+
+ while ($c != 0)
+ {
+ $p = ($c - 1) % 26;
+ $c = intval(($c - $p) / 26);
+ $letter = chr(65 + $p) . $letter;
+ }
+
+ return $letter;
+ }
}
?>
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index 65fefd0d39a..6d9a585e6be 100755
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -72,311 +72,6 @@ class ExportExcel2007 extends ExportExcel
$this->row=0;
}
- /**
- * getDriverLabel
- *
- * @return int
- */
- function getDriverId()
- {
- return $this->id;
- }
-
- /**
- * getDriverLabel
- *
- * @return string Return driver label
- */
- function getDriverLabel()
- {
- return $this->label;
- }
-
- /**
- * getDriverDesc
- *
- * @return string
- */
- function getDriverDesc()
- {
- return $this->desc;
- }
-
- /**
- * getDriverExtension
- *
- * @return string
- */
- function getDriverExtension()
- {
- return $this->extension;
- }
-
- /**
- * getDriverVersion
- *
- * @return string
- */
- function getDriverVersion()
- {
- return $this->version;
- }
-
- /**
- * getLibLabel
- *
- * @return string
- */
- function getLibLabel()
- {
- return $this->label_lib;
- }
-
- /**
- * getLibVersion
- *
- * @return string
- */
- function getLibVersion()
- {
- return $this->version_lib;
- }
-
-
- /**
- * Open output file
- *
- * @param string $file File name to generate
- * @param Translate $outputlangs Output language object
- * @return int <0 if KO, >=0 if OK
- */
- function open_file($file,$outputlangs)
- {
- global $user,$conf,$langs;
-
- if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
- {
- $outputlangs->charset_output='ISO-8859-1'; // Because Excel 5 format is ISO
- }
-
- dol_syslog("ExportExcel::open_file file=".$file);
- $this->file=$file;
-
- $ret=1;
-
- $outputlangs->load("exports");
- if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
- {
- require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
- require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
- require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
- $this->workbook = new writeexcel_workbookbig($file);
- $this->workbook->set_tempdir($conf->export->dir_temp); // Set temporary directory
- $this->workbook->set_sheetname($outputlangs->trans("Sheet"));
- $this->worksheet = &$this->workbook->addworksheet();
- }
- else
- {
- require_once PHPEXCEL_PATH.'PHPExcel.php';
- require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
- $this->workbook = new PHPExcel();
- $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
- //$this->workbook->getProperties()->setLastModifiedBy('Dolibarr '.DOL_VERSION);
- $this->workbook->getProperties()->setTitle($outputlangs->trans("Export").' - '.$file);
- $this->workbook->getProperties()->setSubject($outputlangs->trans("Export").' - '.$file);
- $this->workbook->getProperties()->setDescription($outputlangs->trans("Export").' - '.$file);
-
- $this->workbook->setActiveSheetIndex(0);
- $this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
- $this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
- }
- return $ret;
- }
-
- /**
- * Write header
- *
- * @param Translate $outputlangs Object lang to translate values
- * @return int <0 if KO, >0 if OK
- */
- function write_header($outputlangs)
- {
- //$outputlangs->charset_output='ISO-8859-1'; // Because Excel 5 format is ISO
-
- return 0;
- }
-
-
- /**
- * Output title line into file
- *
- * @param array $array_export_fields_label Array with list of label of fields
- * @param array $array_selected_sorted Array with list of field to export
- * @param Translate $outputlangs Object lang to translate values
- * @return int <0 if KO, >0 if OK
- */
- function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs)
- {
- // Create a format for the column headings
- if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
- {
- $outputlangs->charset_output='ISO-8859-1'; // Because Excel 5 format is ISO
-
- $formatheader =$this->workbook->addformat();
- $formatheader->set_bold();
- $formatheader->set_color('blue');
- //$formatheader->set_size(12);
- //$formatheader->set_font("Courier New");
- //$formatheader->set_align('center');
- }
- else
- {
- $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
- $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
- }
-
- $this->col=0;
- foreach($array_selected_sorted as $code => $value)
- {
- $alias=$array_export_fields_label[$code];
- //print "dd".$alias;
- if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
- if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
- {
- $this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
- }
- else
- {
- $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $outputlangs->transnoentities($alias));
- }
- $this->col++;
- }
- $this->row++;
- return 0;
- }
-
- /**
- * Output record line into file
- *
- * @param array $array_selected_sorted Array with list of field to export
- * @param resource $objp A record from a fetch with all fields from select
- * @param Translate $outputlangs Object lang to translate values
- * @param array $array_types Array with types of fields
- * @return int <0 if KO, >0 if OK
- */
- function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
- {
- // Create a format for the column headings
- if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
- {
- $outputlangs->charset_output='ISO-8859-1'; // Because Excel 5 format is ISO
- }
-
- // Define first row
- $this->col=0;
-
- foreach($array_selected_sorted as $code => $value)
- {
- 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;
-
- $newvalue=$this->excel_clean($newvalue);
- $typefield=isset($array_types[$code])?$array_types[$code]:'';
-
- // Traduction newvalue
- if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
- {
- $newvalue=$outputlangs->transnoentities($reg[1]);
- }
- else
- {
- $newvalue=$outputlangs->convToOutputCharset($newvalue);
- }
-
- //var_dump($code.' '.$alias.' '.$newvalue.' '.$typefield);
-
- if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i',$newvalue))
- {
- if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
- {
- $formatdate=$this->workbook->addformat();
- $formatdate->set_num_format('yyyy-mm-dd');
- //$formatdate->set_num_format(0x0f);
- $arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
- //print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'
';
- $newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]); // $newvalue=strval(36892.521); directly does not work because . will be convert into , later
- $this->worksheet->write($this->row, $this->col, $newvalue, PHPExcel_Shared_Date::PHPToExcel($formatdate));
- }
- else
- {
- $newvalue=dol_stringtotime($newvalue);
- $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
- $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
- $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
- }
- }
- elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
- {
- if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
- {
- $formatdatehour=$this->workbook->addformat();
- $formatdatehour->set_num_format('yyyy-mm-dd hh:mm:ss');
- //$formatdatehour->set_num_format(0x0f);
- $arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
- //print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'
';
- $newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]); // $newvalue=strval(36892.521); directly does not work because . will be convert into , later
- $this->worksheet->write($this->row, $this->col, $newvalue, $formatdatehour);
- }
- else
- {
- $newvalue=dol_stringtotime($newvalue);
- $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
- $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
- $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
- }
- }
- else
- {
- if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
- {
- $this->worksheet->write($this->row, $this->col, $newvalue);
- }
- else
- {
- if ($typefield == 'Text')
- {
- //$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
- $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, (string) $newvalue);
- $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
- $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
- $this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
- }
- else
- {
- $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
- }
- }
- }
- $this->col++;
- }
- $this->row++;
- return 0;
- }
-
-
- /**
- * Write footer
- *
- * @param Translate $outputlangs Output language object
- * @return int <0 if KO, >0 if OK
- */
- function write_footer($outputlangs)
- {
- return 0;
- }
-
/**
* Close Excel file
@@ -400,20 +95,6 @@ class ExportExcel2007 extends ExportExcel
return 0;
}
-
- /**
- * Clean a cell to respect rules of Excel file cells
- *
- * @param string $newvalue String to clean
- * @return string Value cleaned
- */
- function excel_clean($newvalue)
- {
- // Rule Dolibarr: No HTML
- $newvalue=dol_string_nohtmltag($newvalue);
-
- return $newvalue;
- }
}
?>
diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php
index edc08dc6840..12062b94804 100644
--- a/htdocs/core/modules/export/export_tsv.modules.php
+++ b/htdocs/core/modules/export/export_tsv.modules.php
@@ -182,13 +182,14 @@ class ExportTsv extends ModeleExports
* @param array $array_export_fields_label Array with list of label of fields
* @param array $array_selected_sorted Array with list of field to export
* @param Translate $outputlangs Object lang to translate values
+ * @param array $array_types Array with types of fields
* @return int <0 if KO, >0 if OK
*/
- function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs)
+ function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
{
foreach($array_selected_sorted as $code => $value)
{
- $newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);
+ $newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
fwrite($this->handle,$newvalue.$this->separator);
@@ -218,14 +219,11 @@ class ExportTsv extends ModeleExports
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=$outputlangs->convToOutputCharset($objp->$alias);
+ $newvalue=$outputlangs->convToOutputCharset($objp->$alias); // objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
$typefield=isset($array_types[$code])?$array_types[$code]:'';
// Translation newvalue
- if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
- {
- $newvalue=$outputlangs->transnoentities($reg[1]);
- }
+ if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
@@ -262,7 +260,7 @@ class ExportTsv extends ModeleExports
* Clean a cell to respect rules of TSV file cells
*
* @param string $newvalue String to clean
- * @param string $charset Output character set
+ * @param string $charset Input AND Output character set
* @return string Value cleaned
*/
function tsv_clean($newvalue, $charset)
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 2311c6fe66e..b90922b3206 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -520,7 +520,7 @@ class Export
$objmodel->write_header($outputlangs);
// Genere ligne de titre
- $objmodel->write_title($this->array_export_fields[$indice],$array_selected,$outputlangs);
+ $objmodel->write_title($this->array_export_fields[$indice],$array_selected,$outputlangs,$this->array_export_TypeFields[$indice]);
$var=true;
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 88758563815..9d26dd7d126 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -176,7 +176,7 @@ if ($result >= 0)
$objmodel->write_header($outputlangs);
// Genere ligne de titre
- $objmodel->write_title($array_fields,$array_selected,$outputlangs);
+ $objmodel->write_title($array_fields,$array_selected,$outputlangs,$array_export_TypeFields);
// Recherche les ecritures pour le releve
@@ -221,7 +221,7 @@ if ($result >= 0)
// Libelle
$reg=array();
preg_match('/\((.+)\)/i',$objp->label,$reg); // Si texte entoure de parenthese on tente recherche de traduction
- if ($reg[1] && $langs->trans($reg[1])!=$reg[1]) $description=$langs->trans($reg[1]);
+ if ($reg[1] && $langs->transnoentitiesnoconv($reg[1])!=$reg[1]) $description=$langs->transnoentitiesnoconv($reg[1]);
else $description=$objp->label;
/*
@@ -256,13 +256,13 @@ if ($result >= 0)
{
$paymentsocialcontributionstatic->fetch($links[$key]['url_id']);
if ($accountelem) $accountelem.= ', ';
- $accountelem.=$langs->trans("SocialContribution").' '.$paymentsocialcontributionstatic->ref;
+ $accountelem.=$langs->transnoentitiesnoconv("SocialContribution").' '.$paymentsocialcontributionstatic->ref;
}
elseif ($links[$key]['type']=='payment_vat')
{
$paymentvatstatic->fetch($links[$key]['url_id']);
if ($accountelem) $accountelem.= ', ';
- $accountelem.=$langs->trans("VATPayments").' '.$paymentvatstatic->ref;
+ $accountelem.=$langs->transnoentitiesnoconv("VATPayments").' '.$paymentvatstatic->ref;
}
elseif ($links[$key]['type']=='banktransfert')
{
@@ -273,9 +273,9 @@ if ($result >= 0)
$banklinestatic->fetch($links[$key]['url_id']);
$bankstatic->id=$banklinestatic->fk_account;
$bankstatic->label=$banklinestatic->bank_account_label;
- $comment.= ' ('.$langs->trans("from").' ';
+ $comment.= ' ('.$langs->transnoentitiesnoconv("from").' ';
$comment.= $bankstatic->getNomUrl(1,'transactions');
- $comment.= ' '.$langs->trans("toward").' ';
+ $comment.= ' '.$langs->transnoentitiesnoconv("toward").' ';
$bankstatic->id=$objp->bankid;
$bankstatic->label=$objp->bankref;
$comment.= $bankstatic->getNomUrl(1,'');
@@ -286,9 +286,9 @@ if ($result >= 0)
if ($comment) $comment.= ' ';
$bankstatic->id=$objp->bankid;
$bankstatic->label=$objp->bankref;
- $comment.= ' ('.$langs->trans("from").' ';
+ $comment.= ' ('.$langs->transnoentitiesnoconv("from").' ';
$comment.= $bankstatic->getNomUrl(1,'');
- $comment.= ' '.$langs->trans("toward").' ';
+ $comment.= ' '.$langs->transnoentitiesnoconv("toward").' ';
$banklinestatic->fetch($links[$key]['url_id']);
$bankstatic->id=$banklinestatic->fk_account;
$bankstatic->label=$banklinestatic->bank_account_label;
@@ -312,8 +312,8 @@ if ($result >= 0)
{
if ($accountelem) $accountelem.= ', ';
//$accountelem.= '';
- //$accountelem.= img_object($langs->trans('ShowBill'),'bill').' ';
- $accountelem.= $langs->trans("SocialContribution");
+ //$accountelem.= img_object($langs->transnoentitiesnoconv('ShowBill'),'bill').' ';
+ $accountelem.= $langs->transnoentitiesnoconv("SocialContribution");
//$accountelem.= '';
$newline=0;
}