diff --git a/htdocs/product/card.php b/htdocs/product/card.php index f0bfd090eaa..a11f6b8ca8a 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1607,10 +1607,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { $tooltip .= $langs->trans("GenericMaskCodes5"); print ''.$langs->trans("ManageLotMask").''; if ($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') { - $mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK; + $mask = ! empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK; } if ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') { - $mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK; + $mask = ! empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK; } $inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK; $inherited_mask_sn = $conf->global->SN_ADVANCED_MASK; @@ -1802,7 +1802,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { } // Traceability - if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) { + if ( empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) { print ''.$langs->trans("LifeTime").''; print ''.$langs->trans("QCFrequency").''; } @@ -2285,7 +2285,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { } // Traceability - if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) { + if ( empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) { print ''.$langs->trans("LifeTime").''.$object->lifetime.' '; !empty($object->lifetime) ? print $langs->trans('Days') : print ''; print ''; diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php index ace2cfa0008..718acef6970 100644 --- a/htdocs/product/class/html.formproduct.class.php +++ b/htdocs/product/class/html.formproduct.class.php @@ -672,114 +672,4 @@ class FormProduct } } } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Return select list of productbatch status - * - * @param string $selected Id or Code of preselected incoterm - * @param string $htmlname Name of html select object - * @param string $htmloption Options html on select object - * @param array $events Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled'))) - * @return string HTML string with select and input - */ - public function selectProductbatchQcstatus($selected = '', $htmlname = 'fk_qcstatus', $htmloption = '', $forcecombo = 0, $events = array()) - { - // phpcs:enable - global $conf, $langs, $user; - - $langs->load("dict"); - - $out = ''; - $statusArray = array(); - - $sql = "SELECT code, label"; - $sql .= " FROM ".MAIN_DB_PREFIX."c_productbatch_qcstatus"; - $sql .= " WHERE active > 0"; - $sql .= " ORDER BY code ASC"; - - dol_syslog(get_class($this)."::select_productbatch_qcstatus", LOG_DEBUG); - $resql = $this->db->query($sql); - if ($resql) { - if ($conf->use_javascript_ajax && !$forcecombo) { - include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; - $out .= ajax_combobox($htmlname, $events); - } - - $out .= ''; - - if ($user->admin) { - $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); - } - } else { - dol_print_error($this->db); - } - - return $out; - } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Load into the cache productbatch status - * - * @return int Nb of loaded lines, 0 if already loaded, <0 if KO - */ - public function load_cache_productbatch_qcstatus() - { - // phpcs:enable - global $langs; - - dol_syslog(__METHOD__, LOG_DEBUG); - - $sql = "SELECT s.rowid, s.code, s.label"; - $sql .= " FROM ".MAIN_DB_PREFIX."c_productbatch_qcstatus as s"; - $sql .= " WHERE s.active > 0"; - $sql .= " ORDER BY s.code ASC"; - - $resql = $this->db->query($sql); - if ($resql) { - $num = $this->db->num_rows($resql); - $i = 0; - - while ($i < $num) { - $obj = $this->db->fetch_object($resql); - - // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut - $label = ($obj->code != $langs->trans($obj->code) ? $langs->trans($obj->code) : $langs->trans($obj->label)); - $this->cache_productbatch_qcstatus[$obj->code] = $label; - $i++; - } - - asort($this->cache_productbatch_qcstatus); - - return $num; - } else { - dol_print_error($this->db); - return -1; - } - } - }