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

36
htdocs/core/lib/product.lib.php
View File

@ -491,7 +491,7 @@ function show_stats_for_company($product, $socid)
$nblines++; $nblines++;
$ret = $product->load_stats_bom($socid); $ret = $product->load_stats_bom($socid);
if ($ret < 0) { if ($ret < 0) {
setEventMessage($product->error,'errors'); setEventMessage($product->error, 'errors');
} }
$langs->load("mrp"); $langs->load("mrp");
@ -500,11 +500,11 @@ function show_stats_for_company($product, $socid)
print '</td><td class="right">'; print '</td><td class="right">';
print '</td><td class="right">'; print '</td><td class="right">';
print $form->textwithpicto($product->stats_bom['nb_toproduce'],$langs->trans("QtyToProduce")); print $form->textwithpicto($product->stats_bom['nb_toproduce'], $langs->trans("QtyToProduce"));
print $form->textwithpicto($product->stats_bom['nb_toconsume'],$langs->trans("ToConsume")); print $form->textwithpicto($product->stats_bom['nb_toconsume'], $langs->trans("ToConsume"));
print '</td><td class="right">'; print '</td><td class="right">';
print $form->textwithpicto($product->stats_bom['qty_toproduce'],$langs->trans("QtyToProduce")); print $form->textwithpicto($product->stats_bom['qty_toproduce'], $langs->trans("QtyToProduce"));
print $form->textwithpicto($product->stats_bom['qty_toconsume'],$langs->trans("ToConsume")); print $form->textwithpicto($product->stats_bom['qty_toconsume'], $langs->trans("ToConsume"));
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
} }
@ -516,26 +516,26 @@ function show_stats_for_company($product, $socid)
$nblines++; $nblines++;
$ret = $product->load_stats_mo($socid); $ret = $product->load_stats_mo($socid);
if ($ret < 0) { if ($ret < 0) {
setEventMessage($product->error,'errors'); setEventMessage($product->error, 'errors');
} }
$langs->load("mrp"); $langs->load("mrp");
print '<tr><td>'; print '<tr><td>';
print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("MO").'</a>'; print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("MO").'</a>';
print '</td><td class="right">'; print '</td><td class="right">';
print $form->textwithpicto($product->stats_mo['customers_toconsume'],$langs->trans("ToConsume")); print $form->textwithpicto($product->stats_mo['customers_toconsume'], $langs->trans("ToConsume"));
print $form->textwithpicto($product->stats_mo['customers_consumed'],$langs->trans("QtyAlreadyConsumed")); print $form->textwithpicto($product->stats_mo['customers_consumed'], $langs->trans("QtyAlreadyConsumed"));
print $form->textwithpicto($product->stats_mo['customers_toproduce'],$langs->trans("QtyToProduce")); print $form->textwithpicto($product->stats_mo['customers_toproduce'], $langs->trans("QtyToProduce"));
print $form->textwithpicto($product->stats_mo['customers_produced'],$langs->trans("QtyAlreadyProduced")); print $form->textwithpicto($product->stats_mo['customers_produced'], $langs->trans("QtyAlreadyProduced"));
print '</td><td class="right">'; print '</td><td class="right">';
print $form->textwithpicto($product->stats_mo['nb_toconsume'],$langs->trans("ToConsume")); print $form->textwithpicto($product->stats_mo['nb_toconsume'], $langs->trans("ToConsume"));
print $form->textwithpicto($product->stats_mo['nb_consumed'],$langs->trans("QtyAlreadyConsumed")); print $form->textwithpicto($product->stats_mo['nb_consumed'], $langs->trans("QtyAlreadyConsumed"));
print $form->textwithpicto($product->stats_mo['nb_toproduce'],$langs->trans("QtyToProduce")); print $form->textwithpicto($product->stats_mo['nb_toproduce'], $langs->trans("QtyToProduce"));
print $form->textwithpicto($product->stats_mo['nb_produced'],$langs->trans("QtyAlreadyProduced")); print $form->textwithpicto($product->stats_mo['nb_produced'], $langs->trans("QtyAlreadyProduced"));
print '</td><td class="right">'; print '</td><td class="right">';
print $form->textwithpicto($product->stats_mo['qty_toconsume'],$langs->trans("ToConsume")); print $form->textwithpicto($product->stats_mo['qty_toconsume'], $langs->trans("ToConsume"));
print $form->textwithpicto($product->stats_mo['qty_consumed'],$langs->trans("QtyAlreadyConsumed")); print $form->textwithpicto($product->stats_mo['qty_consumed'], $langs->trans("QtyAlreadyConsumed"));
print $form->textwithpicto($product->stats_mo['qty_toproduce'],$langs->trans("QtyToProduce")); print $form->textwithpicto($product->stats_mo['qty_toproduce'], $langs->trans("QtyToProduce"));
print $form->textwithpicto($product->stats_mo['qty_produced'],$langs->trans("QtyAlreadyProduced")); print $form->textwithpicto($product->stats_mo['qty_produced'], $langs->trans("QtyAlreadyProduced"));
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
} }

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++;

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

@ -157,7 +157,7 @@ if ($id > 0 || !empty($ref))
$bom_data_result[$objp->rowid]['qty_toproduce']+=($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0); $bom_data_result[$objp->rowid]['qty_toproduce']+=($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0);
$bom_data_result[$objp->rowid]['qty_toconsume']=0; $bom_data_result[$objp->rowid]['qty_toconsume']=0;
$bom_data_result[$objp->rowid]['date_valid']=dol_print_date($db->jdate($objp->date_valid), 'dayhour'); $bom_data_result[$objp->rowid]['date_valid']=dol_print_date($db->jdate($objp->date_valid), 'dayhour');
$bom_data_result[$objp->rowid]['status']=$bomtmp->LibStatut($objp->status,5); $bom_data_result[$objp->rowid]['status']=$bomtmp->LibStatut($objp->status, 5);
$i++; $i++;
} }
} }
@ -204,12 +204,12 @@ if ($id > 0 || !empty($ref))
$bomtmp->id = $objp->rowid; $bomtmp->id = $objp->rowid;
$bomtmp->ref = $objp->ref; $bomtmp->ref = $objp->ref;
if (!array_key_exists($objp->rowid,$bom_data_result)) { if (!array_key_exists($objp->rowid, $bom_data_result)) {
$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production'); $bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
$bom_data_result[$objp->rowid]['qty_toproduce']=0; $bom_data_result[$objp->rowid]['qty_toproduce']=0;
$bom_data_result[$objp->rowid]['qty_toconsume']+=($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0); $bom_data_result[$objp->rowid]['qty_toconsume']+=($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
$bom_data_result[$objp->rowid]['date_valid']=dol_print_date($db->jdate($objp->date_valid), 'dayhour'); $bom_data_result[$objp->rowid]['date_valid']=dol_print_date($db->jdate($objp->date_valid), 'dayhour');
$bom_data_result[$objp->rowid]['status']=$bomtmp->LibStatut($objp->status,5); $bom_data_result[$objp->rowid]['status']=$bomtmp->LibStatut($objp->status, 5);
} else { } else {
$bom_data_result[$objp->rowid]['qty_toconsume']+=($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0); $bom_data_result[$objp->rowid]['qty_toconsume']+=($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
} }
@ -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">';