From f8f4fd3a6f255bb36b52f54ca8d126038a7ee345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Fri, 3 May 2013 08:16:31 +0200
Subject: [PATCH] Enhanced fix
---
htdocs/compta/prelevement/class/bonprelevement.class.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 41198fd90c8..144c4f5e451 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -589,7 +589,8 @@ class BonPrelevement extends CommonObject
* Renvoie toutes les factures presente
* dans un bon de prelevement
*/
- $sql = "SELECT fk_facture, SUM(pl.amount)";
+ $sql = "SELECT fk_facture";
+ if ($amounts) $sql .= ", SUM(pl.amount)";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql.= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
@@ -597,7 +598,7 @@ class BonPrelevement extends CommonObject
$sql.= " AND pl.fk_prelevement_bons = p.rowid";
$sql.= " AND p.rowid = ".$this->id;
$sql.= " AND p.entity = ".$conf->entity;
- $sql.= " GROUP BY fk_facture";
+ if ($amounts) $sql.= " GROUP BY fk_facture";
$resql=$this->db->query($sql);
if ($resql)
--
GitLab