use ifsql function

htdocs/margin/agentMargins.php

@@ -127,8 +127,8 @@ print '</form>';
 $sql = "SELECT s.nom, s.rowid as socid, s.code_client, s.client, u.rowid as agent,";
 $sql.= " u.login, u.name, u.firstname,";
 $sql.= " sum(d.total_ht) as selling_price,";
-$sql.= " IF (f.type =2,sum(d.buy_price_ht * d.qty *-1),sum(d.buy_price_ht * d.qty)) as buying_price, ";
-$sql.= " IF (f.type =2,sum((d.price + d.buy_price_ht) * d.qty),sum((d.price - d.buy_price_ht) * d.qty)) as marge" ;
+$sql.= $db->ifsql('f.type =2','sum(d.buy_price_ht * d.qty *-1)','sum(d.buy_price_ht * d.qty)')." as buying_price, ";
+$sql.= $db->ifsql('f.type =2','sum((d.price + d.buy_price_ht) * d.qty)','sum((d.price - d.buy_price_ht) * d.qty)')." as marge" ;
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."facture as f";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact e ON e.element_id = f.rowid and e.statut = 4 and e.fk_c_type_contact = ".(empty($conf->global->AGENT_CONTACT_TYPE)?-1:$conf->global->AGENT_CONTACT_TYPE);

htdocs/margin/customerMargins.php

@@ -156,8 +156,8 @@ print '</form>';
 $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client, s.client,";
 $sql.= " f.facnumber, f.total as total_ht,";
 $sql.= " sum(d.total_ht) as selling_price,";
-$sql.= " IF (f.type =2,sum(d.buy_price_ht * d.qty *-1),sum(d.buy_price_ht * d.qty)) as buying_price, ";
-$sql.= " IF (f.type =2,sum((d.price + d.buy_price_ht) * d.qty),sum((d.price - d.buy_price_ht) * d.qty)) as marge," ;
+$sql.= $db->ifsql('f.type =2','sum(d.buy_price_ht * d.qty *-1)','sum(d.buy_price_ht * d.qty)')." as buying_price, ";
+$sql.= $db->ifsql('f.type =2','sum((d.price + d.buy_price_ht) * d.qty)','sum((d.price - d.buy_price_ht) * d.qty)')." as marge," ;
 $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."facture as f";

htdocs/margin/productMargins.php

@@ -158,8 +158,8 @@ print '</form>';
 $sql = "SELECT DISTINCT d.fk_product, p.label, p.rowid, p.fk_product_type, p.ref,";
 $sql.= " f.facnumber, f.total as total_ht,";
 $sql.= " sum(d.total_ht) as selling_price,";
-$sql.= " IF (f.type =2,sum(d.buy_price_ht * d.qty *-1),sum(d.buy_price_ht * d.qty)) as buying_price, ";
-$sql.= " IF (f.type =2,sum((d.price + d.buy_price_ht) * d.qty),sum((d.price - d.buy_price_ht) * d.qty)) as marge," ;
+$sql.= $db->ifsql('f.type =2','sum(d.buy_price_ht * d.qty *-1)','sum(d.buy_price_ht * d.qty)')." as buying_price, ";
+$sql.= $db->ifsql('f.type =2','sum((d.price + d.buy_price_ht) * d.qty)','sum((d.price - d.buy_price_ht) * d.qty)')." as marge," ;
 $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."product as p";

htdocs/margin/tabs/productMargins.php

@@ -131,9 +131,9 @@ if ($id > 0 || ! empty($ref))
 		$sql = "SELECT DISTINCT s.nom, s.rowid as socid, s.code_client,";
 		$sql.= " f.facnumber, f.total as total_ht,";
 		$sql.= " d.total_ht as selling_price,";
-        $sql.= " IF (f.type =2,(d.buy_price_ht * d.qty *-1),(d.buy_price_ht * d.qty)) as buying_price, ";
-        $sql.= " IF (f.type =2,d.qty *-1,d.qty) as qty,";
-        $sql.= " IF (f.type =2,((d.price + d.buy_price_ht) * d.qty),((d.price - d.buy_price_ht) * d.qty)) as marge," ;
+        $sql.= $db->ifsql('f.type =2','(d.buy_price_ht * d.qty *-1)','(d.buy_price_ht * d.qty)')." as buying_price, ";
+        $sql.= $db->ifsql('f.type =2','d.qty *-1','d.qty')." as qty,";
+        $sql.= $db->ifsql('f.type =2','((d.price + d.buy_price_ht) * d.qty)','((d.price - d.buy_price_ht) * d.qty)')." as marge," ;
 		$sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";

htdocs/margin/tabs/thirdpartyMargins.php

@@ -130,8 +130,8 @@ if ($socid > 0)
 		$sql.= " f.facnumber, f.total as total_ht,";
 		$sql.= " sum(d.total_ht) as selling_price,";
 
-        $sql.= " IF (f.type =2,sum(d.buy_price_ht * d.qty *-1),sum(d.buy_price_ht * d.qty)) as buying_price, ";
-        $sql.= " IF (f.type =2,sum((d.price + d.buy_price_ht) * d.qty),sum((d.price - d.buy_price_ht) * d.qty)) as marge," ;
+        $sql.= $db->ifsql('f.type =2','sum(d.buy_price_ht * d.qty *-1)','sum(d.buy_price_ht * d.qty)')." as buying_price, ";
+        $sql.= $db->ifsql('f.type =2','sum((d.price + d.buy_price_ht) * d.qty)','sum((d.price - d.buy_price_ht) * d.qty)')." as marge," ;
 		$sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql.= ", ".MAIN_DB_PREFIX."facture as f";