From f9dec36d7a93f654c78d92d922fac290873a77ab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 11 Nov 2012 15:44:02 +0100 Subject: [PATCH] Fix: Regression --- .../compta/sociales/class/chargesociales.class.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 2c5896bbee3..41f93281f85 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -401,14 +401,23 @@ class ChargeSociales extends CommonObject */ function getSommePaiement() { - global $conf; + $table='paiementcharge'; + $field='fk_charge'; - $sql = 'SELECT SUM(amount) as amount'; + $sql = 'SELECT sum(amount) as amount'; + $sql.= ' FROM '.MAIN_DB_PREFIX.$table; + $sql.= ' WHERE '.$field.' = '.$this->id; + // No need to filter on conf->entity because there is already a filter on the primary key of element. + // getSommePaiement must return list of paiement for this id, whatever is the entity. + // Filtering on entity must be before or later probably + /* + $sql = 'SELECT SUM(pc.amount) as amount'; $sql.= ' FROM '.MAIN_DB_PREFIX.'paiementcharge as pc'; $sql.= ', '.MAIN_DB_PREFIX.'chargesociales as c'; $sql.= ' WHERE c.entity = '.$conf->entity; $sql.= ' AND pc.fk_charge = c.rowid'; $sql.= ' AND pc.fk_charge = '.$this->id; + */ dol_syslog(get_class($this)."::getSommePaiement sql=".$sql, LOG_DEBUG); $resql=$this->db->query($sql);