Merge pull request #2157 from altatof/fix_margin_jalon

FIX: avoid milestones in margin calculation
Dolibarr · Dec 18, 2014 · 6154563 · 6154563
2 parents fbb25ea + a4a1a99
commit 6154563
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
@@ -119,6 +119,7 @@
 $sql.= ", ".MAIN_DB_PREFIX."user as u";
 $sql.= " WHERE f.fk_soc = s.rowid";
 $sql.= " AND sc.fk_soc = f.fk_soc";
+$sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
 if (! empty($conf->global->AGENT_CONTACT_TYPE))
 	$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
 else

diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
@@ -173,6 +173,7 @@
 $sql.= " AND f.fk_statut > 0";
 $sql.= " AND s.entity = ".$conf->entity;
 $sql.= " AND d.fk_facture = f.rowid";
+$sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
 if ($client)
   $sql.= " AND f.fk_soc = ".$socid;
 if (!empty($startdate))