@@ -225,10 +225,10 @@ discard block |
||
225 | 225 | $sqlsearchpackage .= ' WHERE entity IN ('.getEntity('product_fournisseur_price').")"; |
226 | 226 | $sqlsearchpackage .= " AND fk_product = ".((int) $objp->fk_product); |
227 | 227 | $sqlsearchpackage .= " AND ref_fourn = '".$this->db->escape($objp->ref_supplier)."'"; |
228 | - $sqlsearchpackage .= " AND quantity <= ".((float) $objp->qty); // required to be qualified |
|
229 | - $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= ".((float) $objp->qty).")"; // required to be qualified |
|
228 | + $sqlsearchpackage .= " AND quantity <= ".((float) $objp->qty); // required to be qualified |
|
229 | + $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= ".((float) $objp->qty).")"; // required to be qualified |
|
230 | 230 | $sqlsearchpackage .= " AND fk_soc = ".((int) $objp->socid); |
231 | - $sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first |
|
231 | + $sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first |
|
232 | 232 | $sqlsearchpackage .= " LIMIT 1"; |
233 | 233 | |
234 | 234 | $resqlsearchpackage = $this->db->query($sqlsearchpackage); |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | $sql .= "null,"; |
360 | 360 | } |
361 | 361 | $sql .= "'".$this->db->escape((string) $this->product_type)."',"; |
362 | - $sql .= ((int) $this->special_code) . ","; |
|
362 | + $sql .= ((int) $this->special_code).","; |
|
363 | 363 | $sql .= "'".$this->db->escape((string) $this->rang)."',"; |
364 | 364 | $sql .= "'".$this->db->escape((string) $this->qty)."', "; |
365 | 365 | $sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape((string) $this->vat_src_code)."'").","; |