From 739de365c030c0aefd40249cb97315599616aa52 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 12 Oct 2020 13:52:50 +0200 Subject: [PATCH 1/8] load stat_bom --- htdocs/core/lib/product.lib.php | 4 +-- htdocs/product/class/product.class.php | 42 ++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index dfc57313add..2bd0dc1ced2 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -360,13 +360,13 @@ function show_stats_for_company($product, $socid) if (!empty($conf->mrp->enabled) && $user->rights->mrp->read) { $nblines++; - //$ret = $product->load_stats_mo($socid); + $ret = $product->load_stats_mo($socid); if ($ret < 0) dol_print_error($db); $langs->load("orders"); print ''; print ''.img_object('', 'mrp').' '.$langs->trans("MO").''; print ''; - print $product->stats_mo['suppliers']; + print $product->stats_mo['customers']; print ''; print $product->stats_mo['nb']; print ''; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 18565347072..f4cc018ff31 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2357,6 +2357,48 @@ class Product extends CommonObject } } + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Charge tableau des stats OF pour le produit/service + * + * @param int $socid Id societe + * @return integer Tableau des stats dans $this->stats_mo, <0 if ko >0 if ok + */ + public function load_stats_mo($socid = 0) { + // phpcs:enable + global $conf, $user, $hookmanager; + + $sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,"; + $sql .= " SUM(c.qty) as qty"; + $sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as c"; + if (!$user->rights->societe->client->voir && !$socid) { + $sql .= "INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=c.fk_soc AND sc.fk_user = ".$user->id; + } + $sql .= " WHERE "; + $sql .= " c.entity IN (".getEntity('mo').")"; + + $sql .= " AND c.fk_product =".$this->id; + if ($socid > 0) { + $sql .= " AND c.fk_soc = ".$socid; + } + + $result = $this->db->query($sql); + if ($result) { + $obj = $this->db->fetch_object($result); + $this->stats_mo['customers'] = $obj->nb_customers ? $obj->nb_customers : 0; + $this->stats_mo['nb'] = $obj->nb; + $this->stats_mo['qty'] = $obj->qty ? $obj->qty : 0; + + $parameters = array('socid' => $socid); + $reshook = $hookmanager->executeHooks('loadStatsCustomerProposal', $parameters, $this, $action); + if ($reshook > 0) $this->stats_mo = $hookmanager->resArray['stats_mo']; + + return 1; + } else { + $this->error = $this->db->error(); + return -1; + } + } // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** From 74155a49be7b9650a93b74b40da1d6510d782bf3 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 14 Oct 2020 08:42:57 +0200 Subject: [PATCH 2/8] finish BOM stat referent object --- htdocs/core/lib/product.lib.php | 16 +++++-- htdocs/product/class/product.class.php | 66 ++++++++++++++++---------- 2 files changed, 53 insertions(+), 29 deletions(-) diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index 2bd0dc1ced2..d97b66443de 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -346,6 +346,7 @@ function product_lot_admin_prepare_head() function show_stats_for_company($product, $socid) { global $conf, $langs, $user, $db; + $form = new Form($db); $nblines = 0; @@ -366,11 +367,20 @@ function show_stats_for_company($product, $socid) print ''; print ''.img_object('', 'mrp').' '.$langs->trans("MO").''; print ''; - print $product->stats_mo['customers']; + 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_toproduce'],$langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_mo['customers_produced'],$langs->trans("QtyAlreadyProduced")); print ''; - print $product->stats_mo['nb']; + 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_toproduce'],$langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_mo['nb_produced'],$langs->trans("QtyAlreadyProduced")); print ''; - print $product->stats_mo['qty']; + 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_toproduce'],$langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_mo['qty_produced'],$langs->trans("QtyAlreadyProduced")); print ''; print ''; } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index f4cc018ff31..4197facf313 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2366,38 +2366,52 @@ class Product extends CommonObject */ public function load_stats_mo($socid = 0) { // phpcs:enable - global $conf, $user, $hookmanager; + global $user, $hookmanager; - $sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,"; - $sql .= " SUM(c.qty) as qty"; - $sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as c"; - if (!$user->rights->societe->client->voir && !$socid) { - $sql .= "INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=c.fk_soc AND sc.fk_user = ".$user->id; - } - $sql .= " WHERE "; - $sql .= " c.entity IN (".getEntity('mo').")"; + $error=0; - $sql .= " AND c.fk_product =".$this->id; - if ($socid > 0) { - $sql .= " AND c.fk_soc = ".$socid; + foreach(array('toconsume','consumed','toproduce','produced') as $role) { + $this->stats_mo['customers_'.$role] = 0; + $this->stats_mo['nb_'.$role] = 0; + $this->stats_mo['qty_'.$role] = 0; + + $sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,"; + $sql .= " SUM(mp.qty) as qty"; + $sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as c"; + $sql .= " INNER JOIN ".MAIN_DB_PREFIX."mrp_production as mp ON mp.fk_mo=c.rowid"; + if (!$user->rights->societe->client->voir && !$socid) { + $sql .= "INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=c.fk_soc AND sc.fk_user = ".$user->id; + } + $sql .= " WHERE "; + $sql .= " c.entity IN (".getEntity('mo').")"; + + $sql .= " AND mp.fk_product =".$this->id; + $sql .= " AND mp.role ='".$role."'"; + if ($socid > 0) { + $sql .= " AND c.fk_soc = ".$socid; + } + + $result = $this->db->query($sql); + if ($result) { + $obj = $this->db->fetch_object($result); + $this->stats_mo['customers_'.$role] = $obj->nb_customers ? $obj->nb_customers : 0; + $this->stats_mo['nb_'.$role] = $obj->nb ? $obj->nb : 0; + $this->stats_mo['qty_'.$role] = $obj->qty ? $obj->qty : 0; + } else { + $this->error = $this->db->error(); + $error++; + } } - $result = $this->db->query($sql); - if ($result) { - $obj = $this->db->fetch_object($result); - $this->stats_mo['customers'] = $obj->nb_customers ? $obj->nb_customers : 0; - $this->stats_mo['nb'] = $obj->nb; - $this->stats_mo['qty'] = $obj->qty ? $obj->qty : 0; - - $parameters = array('socid' => $socid); - $reshook = $hookmanager->executeHooks('loadStatsCustomerProposal', $parameters, $this, $action); - if ($reshook > 0) $this->stats_mo = $hookmanager->resArray['stats_mo']; - - return 1; - } else { - $this->error = $this->db->error(); + if (!empty($error)) { return -1; } + + $parameters = array('socid' => $socid); + $reshook = $hookmanager->executeHooks('loadStatsCustomerMO', $parameters, $this, $action); + if ($reshook > 0) $this->stats_mo = $hookmanager->resArray['stats_mo']; + + return 1; } // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps From 7abb0caf91f0c279fa6e621fc351e85d6f3534a8 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Wed, 14 Oct 2020 06:47:16 +0000 Subject: [PATCH 3/8] Fixing style errors. --- htdocs/core/lib/product.lib.php | 24 ++++++++++++------------ htdocs/product/class/product.class.php | 5 +++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index d97b66443de..7b18079e7b9 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -367,20 +367,20 @@ function show_stats_for_company($product, $socid) print ''; print ''.img_object('', 'mrp').' '.$langs->trans("MO").''; print ''; - 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_toproduce'],$langs->trans("QtyToProduce")); - print $form->textwithpicto($product->stats_mo['customers_produced'],$langs->trans("QtyAlreadyProduced")); + 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_toproduce'], $langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_mo['customers_produced'], $langs->trans("QtyAlreadyProduced")); print ''; - 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_toproduce'],$langs->trans("QtyToProduce")); - print $form->textwithpicto($product->stats_mo['nb_produced'],$langs->trans("QtyAlreadyProduced")); + 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_toproduce'], $langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_mo['nb_produced'], $langs->trans("QtyAlreadyProduced")); print ''; - 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_toproduce'],$langs->trans("QtyToProduce")); - print $form->textwithpicto($product->stats_mo['qty_produced'],$langs->trans("QtyAlreadyProduced")); + 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_toproduce'], $langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_mo['qty_produced'], $langs->trans("QtyAlreadyProduced")); print ''; print ''; } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 4197facf313..bcb46a3f77e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2364,13 +2364,14 @@ class Product extends CommonObject * @param int $socid Id societe * @return integer Tableau des stats dans $this->stats_mo, <0 if ko >0 if ok */ - public function load_stats_mo($socid = 0) { + public function load_stats_mo($socid = 0) + { // phpcs:enable global $user, $hookmanager; $error=0; - foreach(array('toconsume','consumed','toproduce','produced') as $role) { + foreach (array('toconsume','consumed','toproduce','produced') as $role) { $this->stats_mo['customers_'.$role] = 0; $this->stats_mo['nb_'.$role] = 0; $this->stats_mo['qty_'.$role] = 0; From ee67d2b1a8df2a4c70f75027d2ca3c7a4dab6b61 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 14 Oct 2020 10:30:39 +0200 Subject: [PATCH 4/8] fixnhish bom product stats --- htdocs/core/lib/product.lib.php | 84 +++++--- htdocs/product/class/product.class.php | 67 ++++++ htdocs/product/stats/bom.php | 277 +++++++++++++++++++++++++ 3 files changed, 400 insertions(+), 28 deletions(-) create mode 100644 htdocs/product/stats/bom.php diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index d97b66443de..1b87088a98b 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -357,34 +357,7 @@ function show_stats_for_company($product, $socid) print ''.$langs->trans("TotalQuantity").''; print ''; - // MO - if (!empty($conf->mrp->enabled) && $user->rights->mrp->read) - { - $nblines++; - $ret = $product->load_stats_mo($socid); - if ($ret < 0) dol_print_error($db); - $langs->load("orders"); - print ''; - print ''.img_object('', 'mrp').' '.$langs->trans("MO").''; - print ''; - 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_toproduce'],$langs->trans("QtyToProduce")); - print $form->textwithpicto($product->stats_mo['customers_produced'],$langs->trans("QtyAlreadyProduced")); - print ''; - 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_toproduce'],$langs->trans("QtyToProduce")); - print $form->textwithpicto($product->stats_mo['nb_produced'],$langs->trans("QtyAlreadyProduced")); - print ''; - 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_toproduce'],$langs->trans("QtyToProduce")); - print $form->textwithpicto($product->stats_mo['qty_produced'],$langs->trans("QtyAlreadyProduced")); - print ''; - print ''; - } - // Customer proposals + // Customer proposals if (!empty($conf->propal->enabled) && $user->rights->propale->lire) { $nblines++; @@ -512,6 +485,61 @@ function show_stats_for_company($product, $socid) print ''; } + // BOM + if (!empty($conf->bom->enabled) && $user->rights->bom->read) + { + $nblines++; + $ret = $product->load_stats_bom($socid); + if ($ret < 0) { + setEventMessage($product->error,'errors'); + } + $langs->load("mrp"); + + print ''; + print ''.img_object('', 'mrp').' '.$langs->trans("BOM").''; + print ''; + + print ''; + print $form->textwithpicto($product->stats_bom['nb_toproduce'],$langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_bom['nb_toconsume'],$langs->trans("ToConsume")); + print ''; + print $form->textwithpicto($product->stats_bom['qty_toproduce'],$langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_bom['qty_toconsume'],$langs->trans("ToConsume")); + print ''; + print ''; + } + + + // MO + if (!empty($conf->mrp->enabled) && $user->rights->mrp->read) + { + $nblines++; + $ret = $product->load_stats_mo($socid); + if ($ret < 0) { + setEventMessage($product->error,'errors'); + } + $langs->load("mrp"); + print ''; + print ''.img_object('', 'mrp').' '.$langs->trans("MO").''; + print ''; + 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_toproduce'],$langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_mo['customers_produced'],$langs->trans("QtyAlreadyProduced")); + print ''; + 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_toproduce'],$langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_mo['nb_produced'],$langs->trans("QtyAlreadyProduced")); + print ''; + 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_toproduce'],$langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_mo['qty_produced'],$langs->trans("QtyAlreadyProduced")); + print ''; + print ''; + } + return $nblines++; } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 4197facf313..3e9be60d81e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2414,6 +2414,73 @@ class Product extends CommonObject return 1; } + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Charge tableau des stats OF pour le produit/service + * + * @param int $socid Id societe + * @return integer Tableau des stats dans $this->stats_mo, <0 if ko >0 if ok + */ + public function load_stats_bom($socid = 0) { + // phpcs:enable + global $user, $hookmanager; + + $error=0; + + $this->stats_bom['nb_toproduce'] = 0; + $this->stats_bom['nb_toconsume'] = 0; + $this->stats_bom['qty_toproduce'] = 0; + $this->stats_bom['qty_toconsume'] = 0; + + $sql = "SELECT COUNT(DISTINCT b.rowid) as nb_toproduce,"; + $sql .= " b.qty as qty_toproduce"; + $sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b"; + $sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid"; + $sql .= " WHERE "; + $sql .= " b.entity IN (".getEntity('bom').")"; + $sql .= " AND b.fk_product =".$this->id; + + $result = $this->db->query($sql); + if ($result) { + $obj = $this->db->fetch_object($result); + $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; + + } else { + $this->error = $this->db->error(); + $error++; + } + + $sql = "SELECT COUNT(DISTINCT bl.rowid) as nb_toconsume,"; + $sql .= " SUM(bl.qty) as qty_toconsume"; + $sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b"; + $sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid"; + $sql .= " WHERE "; + $sql .= " b.entity IN (".getEntity('bom').")"; + $sql .= " AND bl.fk_product =".$this->id; + + $result = $this->db->query($sql); + if ($result) { + $obj = $this->db->fetch_object($result); + $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; + + } else { + $this->error = $this->db->error(); + $error++; + } + + if (!empty($error)) { + return -1; + } + + $parameters = array('socid' => $socid); + $reshook = $hookmanager->executeHooks('loadStatsCustomerMO', $parameters, $this, $action); + if ($reshook > 0) $this->stats_bom = $hookmanager->resArray['stats_bom']; + + return 1; + } + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Charge tableau des stats propale pour le produit/service diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php new file mode 100644 index 00000000000..4fd4586bb17 --- /dev/null +++ b/htdocs/product/stats/bom.php @@ -0,0 +1,277 @@ + + * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2005-2009 Regis Houssin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/product/stats/mo.php + * \ingroup product mo + * \brief Page of MO referring product + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; + +// Load translation files required by the page +$langs->loadLangs(array('mrp', 'products', 'companies')); + +$id = GETPOST('id', 'int'); +$ref = GETPOST('ref', 'alpha'); + +// Security check +$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : '')); +$fieldtype = (!empty($ref) ? 'ref' : 'rowid'); +if ($user->socid) $socid = $user->socid; +$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype); + +// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +$hookmanager->initHooks(array('productstatscontract')); + +$mesg = ''; +$option = ''; + +// Load variable for pagination +$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; +$sortfield = GETPOST("sortfield", 'alpha'); +$sortorder = GETPOST("sortorder", 'alpha'); +$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); +if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 +$offset = $limit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; +if (!$sortorder) $sortorder = "DESC"; +if (!$sortfield) $sortfield = "b.date_valid"; + + +/* + * View + */ + +$form = new Form($db); + +if ($id > 0 || !empty($ref)) +{ + $product = new Product($db); + $result = $product->fetch($id, $ref); + + $object = $product; + + $parameters = array('id'=>$id); + $reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + + llxHeader("", "", $langs->trans("CardProduct".$product->type)); + + if ($result > 0) + { + $head = product_prepare_head($product); + $titre = $langs->trans("CardProduct".$product->type); + $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); + dol_fiche_head($head, 'referers', $titre, -1, $picto); + + $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + + $linkback = ''.$langs->trans("BackToList").''; + + $shownav = 1; + if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0; + + dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref'); + + print '
'; + + print '
'; + print ''; + + $nboflines = show_stats_for_company($product, $socid); + + print "
"; + + print '
'; + print '
'; + + dol_fiche_end(); + + $now = dol_now(); + + //Calcul total qty and amount for global if full scan list + $total_qty_toconsume = 0; + $total_qty_toproduce = 0; + $bom_data_result=array(); + + + //Qauntity to produce + $sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,"; + $sql .= " b.qty as qty_toproduce"; + $sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b"; + $sql .= " WHERE "; + $sql .= " b.entity IN (".getEntity('bom').")"; + $sql .= " AND b.fk_product =".$product->id; + $sql .= $db->order($sortfield, $sortorder); + + // Count total nb of records + $totalofrecords = ''; + if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) + { + $result = $db->query($sql); + if ($result) { + $totalofrecords = $db->num_rows($result); + while ($objp = $db->fetch_object($result)) { + $total_qty_toproduce += $objp->qty_toproduce; + } + } else { + dol_print_error($db); + } + } + $sql .= $db->plimit($limit + 1, $offset); + + $result = $db->query($sql); + if ($result) { + $bomtmp = new BOM($db); + $num = $db->num_rows($result); + $i = 0; + if ($num > 0) { + while ($i < min($num, $limit)) { + $objp = $db->fetch_object($result); + $bomtmp->id = $objp->rowid; + $bomtmp->ref = $objp->ref; + $bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production'); + $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]['date_valid']=dol_print_date($db->jdate($objp->date_valid), 'dayhour'); + $bom_data_result[$objp->rowid]['status']=$bomtmp->LibStatut($objp->status,5); + $i++; + } + } + }else { + dol_print_error($db); + } + $db->free($result); + + //Qauntity to consume + $sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,"; + $sql .= " SUM(bl.qty) as qty_toconsume"; + $sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b"; + $sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid"; + $sql .= " WHERE "; + $sql .= " b.entity IN (".getEntity('bom').")"; + $sql .= " AND bl.fk_product=".$product->id; + $sql .= " GROUP BY b.rowid, b.ref, b.date_valid, b.status"; + $sql .= $db->order($sortfield, $sortorder); + + // Count total nb of records + $totalofrecords = ''; + if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) + { + $result = $db->query($sql); + if ($result) { + $totalofrecords = $db->num_rows($result); + while ($objp = $db->fetch_object($result)) { + $total_qty_toconsume += $objp->qty_toconsume; + } + } else { + dol_print_error($db); + } + } + $sql .= $db->plimit($limit + 1, $offset); + + $result = $db->query($sql); + if ($result) { + $bomtmp = new BOM($db); + $num = $db->num_rows($result); + $i = 0; + if ($num > 0) { + while ($i < min($num, $limit)) { + $objp = $db->fetch_object($result); + $bomtmp->id = $objp->rowid; + $bomtmp->ref = $objp->ref; + + if (!array_key_exists($objp->rowid,$bom_data_result)) { + $bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production'); + $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]['date_valid']=dol_print_date($db->jdate($objp->date_valid), 'dayhour'); + $bom_data_result[$objp->rowid]['status']=$bomtmp->LibStatut($objp->status,5); + } else { + $bom_data_result[$objp->rowid]['qty_toconsume']+=($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0); + } + $i++; + } + } + }else { + dol_print_error($db); + } + $db->free($result); + + + if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit); + if (!empty($id)) $option .= '&id='.$product->id; + if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month); + if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year); + + print '
'."\n"; + if (!empty($sortfield)) + print ''; + if (!empty($sortorder)) + print ''; + + print_barre_liste($langs->trans("BOMs"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1); + + if (!empty($page)) $option .= '&page='.urlencode($page); + + print '
'; + print ''; + + print ''; + print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "b.rowid", "", "&id=".$product->id, '', $sortfield, $sortorder); + print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "b.date_valid", "", "&id=".$product->id, 'align="center"', $sortfield, $sortorder); + print_liste_field_titre("ToConsume", $_SERVER["PHP_SELF"], "", "", "&id=".$product->id, '', $sortfield, $sortorder, 'center '); + print_liste_field_titre("QtyToProduce", $_SERVER["PHP_SELF"], "", "", "&id=".$product->id, '', $sortfield, $sortorder, 'center '); + print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "b.status", "", "&id=".$product->id, '', $sortfield, $sortorder, 'center '); + print "\n"; + + if (!empty($bom_data_result)) { + + foreach ($bom_data_result as $data) + { + print ''; + print '\n"; + print ""; + print ''; + print ''; + print ''; + print "\n"; + } + print '
'; + print $data['link']; + print ""; + print $data['date_valid']."'.$data['qty_toconsume'].''.$data['qty_toproduce'].''.$data['status'].'
'; + print '
'; + print '
'; + } + } +} else { + dol_print_error(); +} + +// End of page +llxFooter(); +$db->close(); From 8bfb04ea7f3fad592a93c92ac2a5bfc57a33fd6b Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Wed, 14 Oct 2020 08:34:30 +0000 Subject: [PATCH 5/8] Fixing style errors. --- htdocs/core/lib/product.lib.php | 36 +++++++++++++------------- htdocs/product/class/product.class.php | 5 ++-- htdocs/product/stats/bom.php | 7 +++-- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index 1b87088a98b..8c0253e927c 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -491,7 +491,7 @@ function show_stats_for_company($product, $socid) $nblines++; $ret = $product->load_stats_bom($socid); if ($ret < 0) { - setEventMessage($product->error,'errors'); + setEventMessage($product->error, 'errors'); } $langs->load("mrp"); @@ -500,11 +500,11 @@ function show_stats_for_company($product, $socid) print ''; print ''; - 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_toproduce'], $langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_bom['nb_toconsume'], $langs->trans("ToConsume")); print ''; - 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_toproduce'], $langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_bom['qty_toconsume'], $langs->trans("ToConsume")); print ''; print ''; } @@ -516,26 +516,26 @@ function show_stats_for_company($product, $socid) $nblines++; $ret = $product->load_stats_mo($socid); if ($ret < 0) { - setEventMessage($product->error,'errors'); + setEventMessage($product->error, 'errors'); } $langs->load("mrp"); print ''; print ''.img_object('', 'mrp').' '.$langs->trans("MO").''; print ''; - 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_toproduce'],$langs->trans("QtyToProduce")); - print $form->textwithpicto($product->stats_mo['customers_produced'],$langs->trans("QtyAlreadyProduced")); + 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_toproduce'], $langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_mo['customers_produced'], $langs->trans("QtyAlreadyProduced")); print ''; - 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_toproduce'],$langs->trans("QtyToProduce")); - print $form->textwithpicto($product->stats_mo['nb_produced'],$langs->trans("QtyAlreadyProduced")); + 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_toproduce'], $langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_mo['nb_produced'], $langs->trans("QtyAlreadyProduced")); print ''; - 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_toproduce'],$langs->trans("QtyToProduce")); - print $form->textwithpicto($product->stats_mo['qty_produced'],$langs->trans("QtyAlreadyProduced")); + 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_toproduce'], $langs->trans("QtyToProduce")); + print $form->textwithpicto($product->stats_mo['qty_produced'], $langs->trans("QtyAlreadyProduced")); print ''; print ''; } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index d9a1928d021..b1e64e0af73 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2422,7 +2422,8 @@ class Product extends CommonObject * @param int $socid Id societe * @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 global $user, $hookmanager; @@ -2446,7 +2447,6 @@ class Product extends CommonObject $obj = $this->db->fetch_object($result); $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; - } else { $this->error = $this->db->error(); $error++; @@ -2465,7 +2465,6 @@ class Product extends CommonObject $obj = $this->db->fetch_object($result); $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; - } else { $this->error = $this->db->error(); $error++; diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php index 4fd4586bb17..03b873995fb 100644 --- a/htdocs/product/stats/bom.php +++ b/htdocs/product/stats/bom.php @@ -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_toconsume']=0; $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++; } } @@ -204,12 +204,12 @@ if ($id > 0 || !empty($ref)) $bomtmp->id = $objp->rowid; $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]['qty_toproduce']=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]['status']=$bomtmp->LibStatut($objp->status,5); + $bom_data_result[$objp->rowid]['status']=$bomtmp->LibStatut($objp->status, 5); } else { $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 "\n"; if (!empty($bom_data_result)) { - foreach ($bom_data_result as $data) { print ''; From 14a3e30270bf18b54c6e8b95bb5dbb22ef599f1c Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 14 Oct 2020 11:20:27 +0200 Subject: [PATCH 6/8] fix travis --- htdocs/product/class/product.class.php | 2 +- htdocs/product/stats/bom.php | 2 +- htdocs/product/stats/mo.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index d9a1928d021..d375a78aa9a 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2387,7 +2387,7 @@ class Product extends CommonObject $sql .= " c.entity IN (".getEntity('mo').")"; $sql .= " AND mp.fk_product =".$this->id; - $sql .= " AND mp.role ='".$role."'"; + $sql .= " AND mp.role ='".$this->db->escape($role)."'"; if ($socid > 0) { $sql .= " AND c.fk_soc = ".$socid; } diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php index 4fd4586bb17..f2cd8dbf5d7 100644 --- a/htdocs/product/stats/bom.php +++ b/htdocs/product/stats/bom.php @@ -83,7 +83,7 @@ if ($id > 0 || !empty($ref)) $head = product_prepare_head($product); $titre = $langs->trans("CardProduct".$product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'referers', $titre, -1, $picto); + print dol_get_fiche_head($head, 'referers', $titre, -1, $picto); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php index d8dfa9053e8..54af6217831 100644 --- a/htdocs/product/stats/mo.php +++ b/htdocs/product/stats/mo.php @@ -85,7 +85,7 @@ if ($id > 0 || !empty($ref)) $head = product_prepare_head($product); $titre = $langs->trans("CardProduct".$product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); - dol_fiche_head($head, 'referers', $titre, -1, $picto); + print dol_get_fiche_head($head, 'referers', $titre, -1, $picto); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; From 2d1d76b5a3fd7eb27f1db51094b72ce72a6cce12 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 14 Oct 2020 12:26:10 +0200 Subject: [PATCH 7/8] add credentials --- htdocs/product/stats/bom.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php index 4b24763747a..7614d2dcc50 100644 --- a/htdocs/product/stats/bom.php +++ b/htdocs/product/stats/bom.php @@ -2,6 +2,7 @@ /* Copyright (C) 2003-2007 Rodolphe Quiedeville * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2020 Floiran Henry * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From 90df353f0c108e1745c404a95dbc1229630692de Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 14 Oct 2020 14:30:07 +0200 Subject: [PATCH 8/8] fix number of lines --- htdocs/product/stats/bom.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php index 7614d2dcc50..6f8ebf3ef58 100644 --- a/htdocs/product/stats/bom.php +++ b/htdocs/product/stats/bom.php @@ -234,7 +234,7 @@ if ($id > 0 || !empty($ref)) if (!empty($sortorder)) print ''; - print_barre_liste($langs->trans("BOMs"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1); + print_barre_liste($langs->trans("BOMs"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', count($bom_data_result), count($bom_data_result), '', 0, '', '', $limit, 0, 0, 1); if (!empty($page)) $option .= '&page='.urlencode($page);