diff --git a/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php b/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php index 58863e8a657..09445e745f2 100644 --- a/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php +++ b/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php @@ -395,10 +395,6 @@ class pdf_standard_movementstock extends ModelePDFMovement $file = $dir."/".$objectref.".pdf"; } - $stockFournisseur = new ProductFournisseur($this->db); - $supplierprices = $stockFournisseur->list_product_fournisseur_price($object->id); - $object->supplierprices = $supplierprices; - $productstatic = new Product($this->db); if (!file_exists($dir)) { diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php index ab0f60ec417..715ce4722d6 100644 --- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php +++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php @@ -245,7 +245,6 @@ class doc_generic_product_odt extends ModelePDFProduct } $productFournisseur = new ProductFournisseur($this->db); $supplierprices = $productFournisseur->list_product_fournisseur_price($object->id); - $object->supplierprices = $supplierprices; $dir = $conf->product->dir_output; $objectref = dol_sanitizeFileName($object->ref); @@ -415,8 +414,8 @@ class doc_generic_product_odt extends ModelePDFProduct // Replace tags of lines try { $listlines = $odfHandler->setSegment('supplierprices'); - if (!empty($object->supplierprices)) { - foreach ($object->supplierprices as $supplierprice) { + if (!empty($supplierprices)) { + foreach ($supplierprices as $supplierprice) { $array_lines = $this->get_substitutionarray_each_var_object($supplierprice, $outputlangs); complete_substitutions_array($array_lines, $outputlangs, $object, $supplierprice, "completesubstitutionarray_lines"); // Call the ODTSubstitutionLine hook diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php index 413bfb7cb5c..5fa750236e4 100644 --- a/htdocs/core/modules/product/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php @@ -159,10 +159,6 @@ class pdf_standard extends ModelePDFProduct $file = $dir."/".$objectref.".pdf"; } - $productFournisseur = new ProductFournisseur($this->db); - $supplierprices = $productFournisseur->list_product_fournisseur_price($object->id); - $object->supplierprices = $supplierprices; - if (!file_exists($dir)) { if (dol_mkdir($dir) < 0) { $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir); diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php index 3faa7f75fc4..001d37a4146 100644 --- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php +++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php @@ -248,7 +248,6 @@ class doc_generic_stock_odt extends ModelePDFStock $stockFournisseur = new ProductFournisseur($this->db); $supplierprices = $stockFournisseur->list_stock_fournisseur_price($object->id); - $object->supplierprices = $supplierprices; $dir = $conf->product->dir_output; $objectref = dol_sanitizeFileName($object->ref); @@ -419,8 +418,8 @@ class doc_generic_stock_odt extends ModelePDFStock $foundtagforlines = 0; dol_syslog($e->getMessage(), LOG_INFO); } - if ($foundtagforlines && !empty($object->supplierprices)) { - foreach ($object->supplierprices as $supplierprice) { + if ($foundtagforlines && !empty($supplierprices)) { + foreach ($supplierprices as $supplierprice) { $array_lines = $this->get_substitutionarray_each_var_object($supplierprice, $outputlangs); complete_substitutions_array($array_lines, $outputlangs, $object, $supplierprice, "completesubstitutionarray_lines"); // Call the ODTSubstitutionLine hook diff --git a/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php b/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php index 82ed75d83b4..33d6b725c21 100644 --- a/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php +++ b/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php @@ -195,10 +195,6 @@ class pdf_standard_stock extends ModelePDFStock $file = $dir."/".$objectref.".pdf"; } - $stockFournisseur = new ProductFournisseur($this->db); - $supplierprices = $stockFournisseur->list_product_fournisseur_price($object->id); - $object->supplierprices = $supplierprices; - $productstatic = new Product($this->db); if (!file_exists($dir)) { diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php index 81a79e66e20..9445f517bf3 100644 --- a/htdocs/product/class/api_products.class.php +++ b/htdocs/product/class/api_products.class.php @@ -2231,8 +2231,6 @@ class Products extends DolibarrApi unset($object->fk_bank); unset($object->fk_account); - unset($object->supplierprices); // Must use another API to get them - if (!DolibarrApiAccess::$user->hasRight('stock', 'lire')) { unset($object->stock_reel); unset($object->stock_theorique); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index c7fb45d999d..87cc0b7f444 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -777,13 +777,6 @@ class Product extends CommonObject */ public $price_autogen = 0; - /** - * Array with list of supplier prices of product - * - * @var ProductFournisseur[] - */ - public $supplierprices; - /** * Array with list of sub-products for Kits * diff --git a/htdocs/workstation/class/api_workstations.class.php b/htdocs/workstation/class/api_workstations.class.php index 5e1661e08f9..e19cba1b72b 100644 --- a/htdocs/workstation/class/api_workstations.class.php +++ b/htdocs/workstation/class/api_workstations.class.php @@ -47,7 +47,7 @@ class Workstations extends DolibarrApi */ public function __construct() { - global $db, $conf; + global $db; $this->db = $db; $this->workstation = new Workstation($this->db); @@ -185,8 +185,8 @@ class Workstations extends DolibarrApi /** * Clean sensible object datas * - * @param Object $object Object to clean - * @return Object Object with cleaned properties + * @param Object $object Object to clean + * @return Object Object with cleaned properties */ protected function _cleanObjectDatas($object) { @@ -284,8 +284,6 @@ class Workstations extends DolibarrApi unset($object->fk_bank); unset($object->fk_account); - unset($object->supplierprices); - unset($object->stock_reel); unset($object->stock_theorique); unset($object->stock_warehouse);