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

Merge branch 'dev_objectrefferent_for_BOM' of github.com:FHenry/dolibarr into dev_objectrefferent_for_BOM

Browse Source
This commit is contained in:
Florian HENRY 2020-10-14 11:20:48 +02:00
commit ca37827e72
3 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/product/class/product.class.php
View File

@ -2422,7 +2422,8 @@ class Product extends CommonObject
* @param int $socid Id societe * @param int $socid Id societe
* @return integer Tableau des stats dans $this->stats_mo, <0 if ko >0 if ok * @return integer Tableau des stats dans $this->stats_mo, <0 if ko >0 if ok
*/ */
public function load_stats_bom($socid = 0) { public function load_stats_bom($socid = 0)
{
// phpcs:enable // phpcs:enable
global $user, $hookmanager; global $user, $hookmanager;
@ -2446,7 +2447,6 @@ class Product extends CommonObject
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
$this->stats_bom['nb_toproduce'] = $obj->nb_toproduce ? $obj->nb_toproduce : 0; $this->stats_bom['nb_toproduce'] = $obj->nb_toproduce ? $obj->nb_toproduce : 0;
$this->stats_bom['qty_toproduce'] = $obj->qty_toproduce ? price2num($obj->qty_toproduce) : 0; $this->stats_bom['qty_toproduce'] = $obj->qty_toproduce ? price2num($obj->qty_toproduce) : 0;
} else { } else {
$this->error = $this->db->error(); $this->error = $this->db->error();
$error++; $error++;
@ -2465,7 +2465,6 @@ class Product extends CommonObject
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
$this->stats_bom['nb_toconsume'] = $obj->nb_toconsume ? $obj->nb_toconsume : 0; $this->stats_bom['nb_toconsume'] = $obj->nb_toconsume ? $obj->nb_toconsume : 0;
$this->stats_bom['qty_toconsume'] = $obj->qty_toconsume ? price2num($obj->qty_toconsume) : 0; $this->stats_bom['qty_toconsume'] = $obj->qty_toconsume ? price2num($obj->qty_toconsume) : 0;
} else { } else {
$this->error = $this->db->error(); $this->error = $this->db->error();
$error++; $error++;

1
htdocs/product/stats/bom.php
View File

@ -249,7 +249,6 @@ if ($id > 0 || !empty($ref))
print "</tr>\n"; print "</tr>\n";
if (!empty($bom_data_result)) { if (!empty($bom_data_result)) {
foreach ($bom_data_result as $data) foreach ($bom_data_result as $data)
{ {
print '<tr class="oddeven">'; print '<tr class="oddeven">';