|
@@ -267,8 +267,8 @@ if ($socid > 0) {
|
|
|
$remise_all = $remise_user = 0;
|
|
|
$sql = "SELECT SUM(rc.amount_ht) as amount, rc.fk_user";
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
|
|
|
- $sql .= " WHERE rc.fk_soc = ".$object->id;
|
|
|
- $sql .= " AND rc.entity = ".$conf->entity;
|
|
|
+ $sql .= " WHERE rc.fk_soc = ".((int) $object->id);
|
|
|
+ $sql .= " AND rc.entity = ".((int) $conf->entity);
|
|
|
$sql .= " AND discount_type = 0"; // Exclude supplier discounts
|
|
|
$sql .= " AND (fk_facture_line IS NULL AND fk_facture IS NULL)";
|
|
|
$sql .= " GROUP BY rc.fk_user";
|
|
@@ -297,8 +297,8 @@ if ($socid > 0) {
|
|
|
$remise_all = $remise_user = 0;
|
|
|
$sql = "SELECT SUM(rc.amount_ht) as amount, rc.fk_user";
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
|
|
|
- $sql .= " WHERE rc.fk_soc = ".$object->id;
|
|
|
- $sql .= " AND rc.entity = ".$conf->entity;
|
|
|
+ $sql .= " WHERE rc.fk_soc = ".((int) $object->id);
|
|
|
+ $sql .= " AND rc.entity = ".((int) $conf->entity);
|
|
|
$sql .= " AND discount_type = 1"; // Exclude customer discounts
|
|
|
$sql .= " AND (fk_invoice_supplier_line IS NULL AND fk_invoice_supplier IS NULL)";
|
|
|
$sql .= " GROUP BY rc.fk_user";
|
|
@@ -408,8 +408,8 @@ if ($socid > 0) {
|
|
|
$sql .= " fa.ref as ref, fa.type as type";
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."societe_remise_except as rc";
|
|
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
|
|
|
- $sql .= " WHERE rc.fk_soc = ".$object->id;
|
|
|
- $sql .= " AND rc.entity = ".$conf->entity;
|
|
|
+ $sql .= " WHERE rc.fk_soc = ".((int) $object->id);
|
|
|
+ $sql .= " AND rc.entity = ".((int) $conf->entity);
|
|
|
$sql .= " AND u.rowid = rc.fk_user";
|
|
|
$sql .= " AND rc.discount_type = 0"; // Eliminate supplier discounts
|
|
|
$sql .= " AND (rc.fk_facture_line IS NULL AND rc.fk_facture IS NULL)";
|
|
@@ -547,8 +547,8 @@ if ($socid > 0) {
|
|
|
$sql .= " fa.ref, fa.type as type";
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."societe_remise_except as rc";
|
|
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
|
|
|
- $sql .= " WHERE rc.fk_soc = ".$object->id;
|
|
|
- $sql .= " AND rc.entity = ".$conf->entity;
|
|
|
+ $sql .= " WHERE rc.fk_soc = ".((int) $object->id);
|
|
|
+ $sql .= " AND rc.entity = ".((int) $conf->entity);
|
|
|
$sql .= " AND u.rowid = rc.fk_user";
|
|
|
$sql .= " AND rc.discount_type = 1"; // Eliminate customer discounts
|
|
|
$sql .= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)";
|
|
@@ -700,7 +700,7 @@ if ($socid > 0) {
|
|
|
$sql .= " , ".MAIN_DB_PREFIX."facturedet as fc";
|
|
|
$sql .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
|
|
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
|
|
|
- $sql .= " WHERE rc.fk_soc =".$object->id;
|
|
|
+ $sql .= " WHERE rc.fk_soc = ".((int) $object->id);
|
|
|
$sql .= " AND rc.fk_facture_line = fc.rowid";
|
|
|
$sql .= " AND fc.fk_facture = f.rowid";
|
|
|
$sql .= " AND rc.fk_user = u.rowid";
|
|
@@ -718,7 +718,7 @@ if ($socid > 0) {
|
|
|
$sql2 .= " , ".MAIN_DB_PREFIX."user as u";
|
|
|
$sql2 .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
|
|
|
$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
|
|
|
- $sql2 .= " WHERE rc.fk_soc =".$object->id;
|
|
|
+ $sql2 .= " WHERE rc.fk_soc = ".((int) $object->id);
|
|
|
$sql2 .= " AND rc.fk_facture = f.rowid";
|
|
|
$sql2 .= " AND rc.fk_user = u.rowid";
|
|
|
$sql2 .= " AND rc.discount_type = 0"; // Eliminate supplier discounts
|
|
@@ -860,7 +860,7 @@ if ($socid > 0) {
|
|
|
$sql .= " , ".MAIN_DB_PREFIX."facture_fourn_det as fc";
|
|
|
$sql .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
|
|
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
|
|
|
- $sql .= " WHERE rc.fk_soc =".$object->id;
|
|
|
+ $sql .= " WHERE rc.fk_soc = ".((int) $object->id);
|
|
|
$sql .= " AND rc.fk_invoice_supplier_line = fc.rowid";
|
|
|
$sql .= " AND fc.fk_facture_fourn = f.rowid";
|
|
|
$sql .= " AND rc.fk_user = u.rowid";
|
|
@@ -878,7 +878,7 @@ if ($socid > 0) {
|
|
|
$sql2 .= " , ".MAIN_DB_PREFIX."user as u";
|
|
|
$sql2 .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
|
|
|
$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
|
|
|
- $sql2 .= " WHERE rc.fk_soc =".$object->id;
|
|
|
+ $sql2 .= " WHERE rc.fk_soc = ".((int) $object->id);
|
|
|
$sql2 .= " AND rc.fk_invoice_supplier = f.rowid";
|
|
|
$sql2 .= " AND rc.fk_user = u.rowid";
|
|
|
$sql2 .= " AND rc.discount_type = 1"; // Eliminate customer discounts
|