lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX #13749

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-27 14:38:45 +02:00
parent 17a4447ccb
commit ed045b2673
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/api/class/api.class.php
View File

@ -137,6 +137,15 @@ class DolibarrApi
unset($object->labelStatus); unset($object->labelStatus);
unset($object->labelStatusShort); unset($object->labelStatusShort);
unset($object->stats_propale);
unset($object->stats_commande);
unset($object->stats_contrat);
unset($object->stats_facture);
unset($object->stats_commande_fournisseur);
unset($object->stats_reception);
unset($object->stats_mrptoconsume);
unset($object->stats_mrptoproduce);
unset($object->element); unset($object->element);
unset($object->fk_element); unset($object->fk_element);
unset($object->table_element); unset($object->table_element);

18
htdocs/product/class/api_products.class.php
View File

@ -669,8 +669,6 @@ class Products extends DolibarrApi
} }
/** /**
* List purchase prices
*
* Get a list of all purchase prices of products * Get a list of all purchase prices of products
* *
* @param string $sortfield Sort field * @param string $sortfield Sort field
@ -702,11 +700,11 @@ class Products extends DolibarrApi
if ($supplier > 0) { if ($supplier > 0) {
$sql .= " AND s.fk_soc = ".$db->escape($supplier); $sql .= " AND s.fk_soc = ".$db->escape($supplier);
} }
$sql .= " AND s.fk_product = t.rowid "; $sql .= " AND s.fk_product = t.rowid";
// Select products of given category // Select products of given category
if ($category > 0) { if ($category > 0) {
$sql .= " AND c.fk_categorie = ".$db->escape($category); $sql .= " AND c.fk_categorie = ".$db->escape($category);
$sql .= " AND c.fk_product = t.rowid "; $sql .= " AND c.fk_product = t.rowid";
} }
if ($mode == 1) { if ($mode == 1) {
// Show only products // Show only products
@ -739,10 +737,15 @@ class Products extends DolibarrApi
while ($i < $min) while ($i < $min)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$product_static = new Product($db);
if ($product_static->fetch($obj->rowid)) { $product_fourn = new ProductFournisseur($this->db);
$obj_ret[] = $this->_cleanObjectDatas($product_static); $product_fourn_list = $product_fourn->list_product_fournisseur_price($obj->rowid, '', '', 0, 0);
foreach($product_fourn_list as $tmpobj) {
$this->_cleanObjectDatas($tmpobj);
} }
//var_dump($product_fourn_list->db);exit;
$obj_ret[$obj->rowid] = $product_fourn_list;
$i++; $i++;
} }
} }
@ -1527,6 +1530,7 @@ class Products extends DolibarrApi
unset($object->prices_by_qty_id); unset($object->prices_by_qty_id);
unset($object->libelle); unset($object->libelle);
unset($object->product_id_already_linked); unset($object->product_id_already_linked);
unset($object->reputations);
unset($object->name); unset($object->name);
unset($object->firstname); unset($object->firstname);