From 3ef9fe2c40fed0bf33a43f96456b2d056ac24ae8 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 4 Jun 2016 18:10:40 +0200
Subject: [PATCH] Fix product supplier price modification with multicompany
---
htdocs/core/class/html.form.class.php | 2 +-
htdocs/fourn/class/fournisseur.product.class.php | 2 +-
htdocs/product/class/product.class.php | 4 ++--
htdocs/product/fournisseurs.php | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8fb0118cd2e..64ec3d4afdd 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2278,7 +2278,7 @@ class Form
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
- $sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+ $sql.= " WHERE p.entity IN (".getEntity('productprice', 1).")";
$sql.= " AND p.tobuy = 1";
$sql.= " AND s.fournisseur = 1";
$sql.= " AND p.rowid = ".$productid;
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 9c889a97d97..f64ef0e1d95 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -433,7 +433,7 @@ class ProductFournisseur extends Product
$sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.unitcharges, pfp.info_bits, pfp.delivery_time_days";
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
- $sql.= " WHERE pfp.entity IN (".getEntity('product', 1).")";
+ $sql.= " WHERE pfp.entity IN (".getEntity('productprice', 1).")";
$sql.= " AND pfp.fk_soc = s.rowid";
$sql.= " AND pfp.fk_product = ".$prodid;
if (empty($sortfield)) $sql.= " ORDER BY s.nom, pfp.quantity, pfp.price";
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index ba2eac00cd9..79c21cfcbdf 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2631,7 +2631,7 @@ class Product extends CommonObject
$sql.= " WHERE fk_soc = ".$id_fourn;
$sql.= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
$sql.= " AND fk_product != ".$this->id;
- $sql.= " AND entity = ".$conf->entity;
+ $sql.= " AND entity IN (".getEntity('productprice', 1).")";
dol_syslog(get_class($this)."::add_fournisseur", LOG_DEBUG);
$resql=$this->db->query($sql);
@@ -2655,7 +2655,7 @@ class Product extends CommonObject
else $sql.= " AND (ref_fourn = '' OR ref_fourn IS NULL)";
$sql.= " AND quantity = '".$quantity."'";
$sql.= " AND fk_product = ".$this->id;
- $sql.= " AND entity = ".$conf->entity;
+ $sql.= " AND entity IN (".getEntity('productprice', 1).")";
dol_syslog(get_class($this)."::add_fournisseur", LOG_DEBUG);
$resql=$this->db->query($sql);
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 2665ae8fd1e..a03c5f5b755 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -152,7 +152,7 @@ if (empty($reshook))
{
$error++;
$langs->load("errors");
- setEventMessages($langs->trans("ErrorFieldMustBeANumeric",'eeee'), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldMustBeANumeric",$langs->transnoentities("VATRateForSupplierProduct")), null, 'errors');
}
if (empty($quantity))
{
--
GitLab