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

Added option EXPORT_CSV_SEPARATOR_TO_USE and EXPORT_CSV_FORCE_CHARSET

Browse Source
This commit is contained in:
Laurent Destailleur 2009-02-14 00:36:49 +00:00
parent 288b29925d
commit f338666b7f
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/includes/modules/export/export_csv.modules.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2006-2008 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2006-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -20,17 +20,17 @@
/** /**
* \file htdocs/includes/modules/export/export_csv.modules.php * \file htdocs/includes/modules/export/export_csv.modules.php
* \ingroup export * \ingroup export
* \brief Fichier de la classe permettant de g<EFBFBD>n<EFBFBD>rer les export au format CSV * \brief File to build exports with CSV format
* \author Laurent Destailleur * \author Laurent Destailleur
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
/** /**
* \class ExportCsv * \class ExportCsv
* \brief Classe permettant de g<EFBFBD>n<EFBFBD>rer les factures au mod<EFBFBD>le Crabe * \brief Classe permettant de generer les factures au modele Crabe
*/ */
class ExportCsv extends ModeleExports class ExportCsv extends ModeleExports
{ {
@ -42,15 +42,15 @@ class ExportCsv extends ModeleExports
var $label_lib; var $label_lib;
var $version_lib; var $version_lib;
var $separator=','; var $separator;
var $handle; // Handle fichier var $handle; // Handle fichier
/** /**
\brief Constructeur * \brief Constructeur
\param db Handler acc<EFBFBD>s base de donn<EFBFBD>e * \param db Handler acces base de donnee
*/ */
function ExportCsv($db) function ExportCsv($db)
{ {
global $conf; global $conf;
@ -65,6 +65,9 @@ class ExportCsv extends ModeleExports
// If driver use an external library, put its name here // If driver use an external library, put its name here
$this->label_lib='Dolibarr'; $this->label_lib='Dolibarr';
$this->version_lib=DOL_VERSION; $this->version_lib=DOL_VERSION;
$this->separator=',';
if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
} }
function getDriverId() function getDriverId()
@ -99,10 +102,10 @@ class ExportCsv extends ModeleExports
/** /**
* \brief Open output file * \brief Open output file
* \param file Path of filename * \param file Path of filename
* \return int <0 if KO, >=0 if OK * \return int <0 if KO, >=0 if OK
*/ */
function open_file($file,$outputlangs) function open_file($file,$outputlangs)
{ {
global $langs; global $langs;
@ -139,6 +142,9 @@ class ExportCsv extends ModeleExports
*/ */
function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs) function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs)
{ {
global $conf;
if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET)) $outputlangs->charset_output=$conf->global->EXPORT_CSV_FORCE_CHARSET;
foreach($array_selected_sorted as $code => $value) foreach($array_selected_sorted as $code => $value)
{ {
$newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]); $newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);
@ -156,12 +162,15 @@ class ExportCsv extends ModeleExports
*/ */
function write_record($array_alias,$array_selected_sorted,$objp,$outputlangs) function write_record($array_alias,$array_selected_sorted,$objp,$outputlangs)
{ {
$this->col=0; global $conf;
if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET)) $outputlangs->charset_output=$conf->global->EXPORT_CSV_FORCE_CHARSET;
$this->col=0;
foreach($array_selected_sorted as $code => $value) foreach($array_selected_sorted as $code => $value)
{ {
$alias=$array_alias[$code]; $alias=$array_alias[$code];
if (empty($alias)) dolibarr_print_error('','Bad value for field with code='.$code.'. Try to redefine export.'); if (empty($alias)) dolibarr_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
$newvalue=$objp->$alias; $newvalue=$outputlangs->convToOutputCharset($objp->$alias);
// Translation newvalue // Translation newvalue
if (eregi('^\((.*)\)$',$newvalue,$reg)) if (eregi('^\((.*)\)$',$newvalue,$reg))

4
htdocs/translate.class.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* *************************************************************************** /* ***************************************************************************
* Copyright (C) 2001 Eric Seigne <erics@rycks.com> * Copyright (C) 2001 Eric Seigne <erics@rycks.com>
* Copyright (C) 2004-2008 Destailleur Laurent <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Destailleur Laurent <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -43,7 +43,7 @@ class Translate {
var $cache_labels=array(); // Cache for labels var $cache_labels=array(); // Cache for labels
var $charset_inputfile=array(); // To store charset encoding used for language var $charset_inputfile=array(); // To store charset encoding used for language
var $charset_output='UTF-8'; // Codage used by default for "trans" method output if $conf->character_set_client not defined (should never happen) var $charset_output='UTF-8'; // Codage used by "trans" method outputs
/** /**