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

Fix: Regression

Browse Source
This commit is contained in:
Laurent Destailleur 2012-11-11 15:44:23 +01:00
parent 1e6e7af9f7
commit 599300dfec
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/sociales/class/chargesociales.class.php
View File

@ -401,14 +401,23 @@ class ChargeSociales extends CommonObject
*/ */
function getSommePaiement() 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.= ' FROM '.MAIN_DB_PREFIX.'paiementcharge as pc';
$sql.= ', '.MAIN_DB_PREFIX.'chargesociales as c'; $sql.= ', '.MAIN_DB_PREFIX.'chargesociales as c';
$sql.= ' WHERE c.entity = '.$conf->entity; $sql.= ' WHERE c.entity = '.$conf->entity;
$sql.= ' AND pc.fk_charge = c.rowid'; $sql.= ' AND pc.fk_charge = c.rowid';
$sql.= ' AND pc.fk_charge = '.$this->id; $sql.= ' AND pc.fk_charge = '.$this->id;
*/
dol_syslog(get_class($this)."::getSommePaiement sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::getSommePaiement sql=".$sql, LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);