Merge pull request #296 from cbattarel/develop

also take lines without buying_price in commissions
This commit is contained in:
Regis Houssin 2012-08-07 01:14:00 -07:00
commit fd2a06bc6b

View File

@ -160,8 +160,6 @@ else
$sql.= " AND f.fk_statut > 1";
$sql.= " AND s.entity = ".$conf->entity;
$sql.= " AND d.fk_facture = f.rowid";
if ($conf->global->COMMISSION_BASE == "MARGIN")
$sql.= " AND d.buy_price_ht IS NOT NULL AND d.buy_price_ht <> 0";
if ($agentid > 0)
$sql.= " AND sc.fk_user = $agentid";
if (!empty($startdate))