From 633a15f10dfab83606d870099053aa72b4c99b52 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2013 14:09:54 +0100
Subject: [PATCH] Fix: Usage of order into export broken when filters are used
---
dev/skeletons/modMyModule.class.php | 1 +
htdocs/core/modules/modBanque.class.php | 2 +-
htdocs/exports/class/export.class.php | 8 ++++++--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index 4d7bf0df4ae..149228d5ce4 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -228,6 +228,7 @@ class modMyModule extends DolibarrModules
// $this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+ // $this->export_sql_order[$r] .=' ORDER BY s.nom';
// $r++;
}
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index ba00c90faca..1bae9f61129 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -159,7 +159,7 @@ class modBanque extends DolibarrModules
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON bu.url_id = s.rowid';
$this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account';
$this->export_sql_end[$r] .=' AND ba.entity = '.$conf->entity;
- $this->export_sql_end[$r] .=' ORDER BY b.datev, b.num_releve';
+ $this->export_sql_order[$r] .=' ORDER BY b.datev, b.num_releve';
}
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index fb3e0fcebb7..463cd85fc3f 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -34,7 +34,9 @@ class Export
var $array_export_code=array(); // Tableau de "idmodule_numlot"
var $array_export_module=array(); // Tableau de "nom de modules"
var $array_export_label=array(); // Tableau de "libelle de lots"
- var $array_export_sql=array(); // Tableau des "requetes sql"
+ var $array_export_sql_start=array(); // Tableau des "requetes sql"
+ var $array_export_sql_end=array(); // Tableau des "requetes sql"
+ var $array_export_sql_order=array(); // Tableau des "requetes sql"
var $array_export_fields=array(); // Tableau des listes de champ+libelle a exporter
var $array_export_TypeFields=array(); // Tableau des listes de champ+Type de filtre
var $array_export_FilterValue=array(); // Tableau des listes de champ+Valeur a filtrer
@@ -177,6 +179,7 @@ class Export
// Requete sql du dataset
$this->array_export_sql_start[$i]=$module->export_sql_start[$r];
$this->array_export_sql_end[$i]=$module->export_sql_end[$r];
+ $this->array_export_sql_order[$i]=$module->export_sql_order[$r];
//$this->array_export_sql[$i]=$module->export_sql[$r];
dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(! empty($module->export_fields_code[$r])?count($module->export_fields_code[$r]):''));
@@ -234,7 +237,8 @@ class Export
}
$sql.=$sqlWhere;
}
-
+ $sql.=$this->array_export_sql_order[$indice];
+
return $sql;
}
--
GitLab