From 739de365c030c0aefd40249cb97315599616aa52 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 12 Oct 2020 13:52:50 +0200 Subject: [PATCH 01/22] 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 43a029ef2f9bf7abd0d1f885db4ac4cd0d24baec Mon Sep 17 00:00:00 2001 From: davidNDU Date: Tue, 13 Oct 2020 15:59:50 +0300 Subject: [PATCH 02/22] Model Builder template/class/myobject.class.php faulty SQL statement --- htdocs/modulebuilder/template/class/myobject.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php index 18ca9b5ea20..2c03c3dd2a9 100644 --- a/htdocs/modulebuilder/template/class/myobject.class.php +++ b/htdocs/modulebuilder/template/class/myobject.class.php @@ -568,7 +568,7 @@ class MyObject extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element; $sql .= " SET ref = '".$this->db->escape($num)."',"; $sql .= " status = ".self::STATUS_VALIDATED; - if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."',"; + if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."'"; if (!empty($this->fields['fk_user_valid'])) $sql .= ", fk_user_valid = ".$user->id; $sql .= " WHERE rowid = ".$this->id; From dfff32f23947416c42e2078492dacf6f0016775e Mon Sep 17 00:00:00 2001 From: "Sekan, Tobias" Date: Tue, 13 Oct 2020 15:09:25 +0200 Subject: [PATCH 03/22] Selectable columns on sales tax list --- htdocs/compta/tva/list.php | 619 +++++++++++++++++++++++-------------- 1 file changed, 391 insertions(+), 228 deletions(-) diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php index 82829fca12e..9bae56e23a3 100644 --- a/htdocs/compta/tva/list.php +++ b/htdocs/compta/tva/list.php @@ -1,8 +1,9 @@ - * Copyright (C) 2004-2020 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2011-2019 Alexandre Spangaro +/* Copyright (C) 2001-2003 Rodolphe Quiedeville + * Copyright (C) 2004-2020 Laurent Destailleur + * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2011-2019 Alexandre Spangaro + * Copyright (C) 2020 Tobias Sekan * * 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 @@ -19,12 +20,18 @@ */ /** - * \file htdocs/compta/tva/list.php - * \ingroup tax - * \brief List of VAT payments + * \file htdocs/compta/tva/list.php + * \ingroup tax + * \brief List of VAT payments */ require '../../main.inc.php'; + +// Security check +$socid = GETPOST('socid', 'int'); +if ($user->socid) $socid = $user->socid; +$result = restrictedArea($user, 'tax', '', '', 'charges'); + require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; @@ -34,61 +41,79 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php'; // Load translation files required by the page $langs->loadLangs(array('compta', 'bills')); -// Security check -$socid = GETPOST('socid', 'int'); -if ($user->socid) $socid = $user->socid; -$result = restrictedArea($user, 'tax', '', '', 'charges'); +$action = GETPOST('action', 'alpha'); +$massaction = GETPOST('massaction', 'alpha'); +$confirm = GETPOST('confirm', 'alpha'); +$optioncss = GETPOST('optioncss', 'alpha'); +$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'salestaxeslist'; -$search_ref = GETPOST('search_ref', 'int'); -$search_label = GETPOST('search_label', 'alpha'); -$search_account = GETPOST('search_account', 'int'); -$search_dateend_start = dol_mktime(0, 0, 0, GETPOST('search_dateend_startmonth', 'int'), GETPOST('search_dateend_startday', 'int'), GETPOST('search_dateend_startyear', 'int')); -$search_dateend_end = dol_mktime(23, 59, 59, GETPOST('search_dateend_endmonth', 'int'), GETPOST('search_dateend_endday', 'int'), GETPOST('search_dateend_endyear', 'int')); -$search_datepayment_start = dol_mktime(0, 0, 0, GETPOST('search_datepayment_startmonth', 'int'), GETPOST('search_datepayment_startday', 'int'), GETPOST('search_datepayment_startyear', 'int')); -$search_datepayment_end = dol_mktime(23, 59, 59, GETPOST('search_datepayment_endmonth', 'int'), GETPOST('search_datepayment_endday', 'int'), GETPOST('search_datepayment_endyear', 'int')); -$search_amount = GETPOST('search_amount', 'alpha'); -$month = GETPOST("month", "int"); -$year = GETPOST("year", "int"); +$search_ref = GETPOST('search_ref', 'alpha'); +$search_label = GETPOST('search_label', 'alpha'); +$search_dateend_start = dol_mktime(0, 0, 0, GETPOST('search_dateend_startmonth', 'int'), GETPOST('search_dateend_startday', 'int'), GETPOST('search_dateend_startyear', 'int')); +$search_dateend_end = dol_mktime(23, 59, 59, GETPOST('search_dateend_endmonth', 'int'), GETPOST('search_dateend_endday', 'int'), GETPOST('search_dateend_endyear', 'int')); +$search_datepayment_start = dol_mktime(0, 0, 0, GETPOST('search_datepayment_startmonth', 'int'), GETPOST('search_datepayment_startday', 'int'), GETPOST('search_datepayment_startyear', 'int')); +$search_datepayment_end = dol_mktime(23, 59, 59, GETPOST('search_datepayment_endmonth', 'int'), GETPOST('search_datepayment_endday', 'int'), GETPOST('search_datepayment_endyear', 'int')); +$search_type = GETPOST('search_type', 'int'); +$search_cheque = GETPOST('search_cheque', 'alpha'); +$search_account = GETPOST('search_account', 'int'); +$search_amount = GETPOST('search_amount', 'alpha'); -$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 +$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 (!$sortfield) $sortfield = "t.datev"; -if (!$sortorder) $sortorder = "DESC"; -$filtre = $_GET["filtre"]; +if (!$sortfield) $sortfield = 't.datev'; +if (!$sortorder) $sortorder = 'DESC'; -if (empty($_REQUEST['typeid'])) -{ - $newfiltre = str_replace('filtre=', '', $filtre); - $filterarray = explode('-', $newfiltre); - foreach ($filterarray as $val) +$arrayfields = array( + 't.rowid' =>array('checked'=>1, 'position'=>10, 'label'=>"Ref",), + 't.label' =>array('checked'=>1, 'position'=>20, 'label'=>"Label"), + 't.datev' =>array('checked'=>1, 'position'=>30, 'label'=>"PeriodEndDate"), + 't.datep' =>array('checked'=>1, 'position'=>40, 'label'=>"DatePayment"), + 't.fk_typepayment' =>array('checked'=>1, 'position'=>50, 'label'=>"Type"), + 't.num_payment' =>array('checked'=>1, 'position'=>60, 'label'=>"Numero", 'tooltip'=>"ChequeOrTransferNumber"), + 'transaction' =>array('checked'=>1, 'position'=>70, 'label'=>"BankTransactionLine", 'enabled'=>(!empty($conf->banque->enabled))), + 'ba.label' =>array('checked'=>1, 'position'=>80, 'label'=>"Account", 'enable'=>(!empty($conf->banque->enabled))), + 't.amount' =>array('checked'=>1, 'position'=>90, 'label'=>"PayedByThisPayment"), +); +$arrayfields = dol_sort_array($arrayfields, 'position'); + +// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +$hookmanager->initHooks(array('salestaxeslist')); +$object = new Tva($db); + + +/* + * Actions + */ + +$parameters = array('socid'=>$socid); +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + + +if (empty($reshook)) { + include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; + + if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers { - $part = explode(':', $val); - if ($part[0] == 't.fk_typepayment') $typeid = $part[1]; + $search_ref = ''; + $search_label = ''; + $search_dateend_start = ''; + $search_dateend_end = ''; + $search_datepayment_start = ''; + $search_datepayment_end = ''; + $search_type = ''; + $search_cheque = ''; + $search_account = ''; + $search_amount = ''; } -} else { - $typeid = $_REQUEST['typeid']; -} - -if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers -{ - $search_ref = ""; - $search_label = ""; - $search_dateend_start = ''; - $search_dateend_end = ''; - $search_datepayment_start = ''; - $search_datepayment_end = ''; - $search_account = ''; - $search_amount = ""; - $year = ""; - $month = ""; - $typeid = ""; } @@ -96,194 +121,332 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x' * View */ -llxHeader('', $langs->trans("VATPayments")); - $form = new Form($db); $formother = new FormOther($db); $tva_static = new Tva($db); $bankstatic = new Account($db); +$accountingjournal = new AccountingJournal($db); +$bankline = new AccountLine($db); + +llxHeader('', $langs->trans("VATPayments")); + +$sql = 'SELECT t.rowid, t.amount, t.label, t.datev, t.datep, t.fk_typepayment as type, t.num_payment, t.fk_bank'; +$sql .= ', ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel'; +$sql .= ', pst.code as payment_code'; +$sql .= ' FROM '.MAIN_DB_PREFIX.'tva as t'; +$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pst ON t.fk_typepayment = pst.id'; +$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid'; +$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid'; +$sql .= ' WHERE t.entity IN ('.getEntity($object->element).')'; + +if (!empty($search_ref)) $sql .= natural_search('t.rowid', $search_ref); +if (!empty($search_label)) $sql .= natural_search('t.label', $search_label); +if (!empty($search_dateend_start)) $sql .= ' AND t.datev >= "'.$db->idate($search_dateend_start).'"'; +if (!empty($search_dateend_end)) $sql .= ' AND t.datev <= "'.$db->idate($search_dateend_end).'"'; +if (!empty($search_datepayment_start)) $sql .= ' AND t.datep >= "'.$db->idate($search_datepayment_start).'"'; +if (!empty($search_datepayment_end)) $sql .= ' AND t.datep <= "'.$db->idate($search_datepayment_end).'"'; +if (!empty($search_type) && $search_type > 0) $sql .= ' AND t.fk_typepayment='.$search_type; +if (!empty($search_cheque)) $sql .= natural_search('t.num_payment', $search_cheque); +if (!empty($search_account) && $search_account > 0) $sql .= ' AND b.fk_account='.$search_account; +if (!empty($search_amount)) $sql .= natural_search('t.amount', price2num(trim($search_amount)), 1); -$sql = "SELECT t.rowid, t.amount, t.label, t.datev, t.datep, t.fk_typepayment as type, t.num_payment, t.fk_bank, pst.code as payment_code,"; -$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel"; -$sql .= " FROM ".MAIN_DB_PREFIX."tva as t"; -$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON t.fk_typepayment = pst.id"; -$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid"; -$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid"; -$sql .= " WHERE t.entity IN (".getEntity('tax').")"; -if ($search_ref) $sql .= natural_search("t.rowid", $search_ref); -if ($search_label) $sql .= natural_search("t.label", $search_label); -if ($search_account > 0) $sql .= " AND b.fk_account=".$search_account; -if ($search_amount) $sql .= natural_search("t.amount", price2num(trim($search_amount)), 1); -if ($search_dateend_start) $sql .= " AND t.datev >= '".$db->idate($search_dateend_start)."'"; -if ($search_dateend_end) $sql .= " AND t.datev <= '".$db->idate($search_dateend_end)."'"; -if ($search_datepayment_start) $sql .= " AND t.datep >= '".$db->idate($search_datepayment_start)."'"; -if ($search_datepayment_end) $sql .= " AND t.datep <= '".$db->idate($search_datepayment_end)."'"; -if ($filtre) { - $filtre = str_replace(":", "=", $filtre); - $sql .= " AND ".$filtre; -} -if ($typeid) { - $sql .= " AND t.fk_typepayment=".$typeid; -} $sql .= $db->order($sortfield, $sortorder); -$totalnboflines = 0; -$result = $db->query($sql); -if ($result) -{ - $totalnboflines = $db->num_rows($result); + +$nbtotalofrecords = ''; +if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { + $result = $db->query($sql); + $nbtotalofrecords = $db->num_rows($result); + + // if total resultset is smaller then paging size (filtering), goto and load page 0 + if (($page * $limit) > $nbtotalofrecords) { + $page = 0; + $offset = 0; + } } + $sql .= $db->plimit($limit + 1, $offset); $result = $db->query($sql); -if ($result) +if (!$result) { - $num = $db->num_rows($result); - $i = 0; - $total = 0; - - $param = ''; - if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage; - if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit; - if ($typeid) $param .= '&typeid='.$typeid; - - $url = DOL_URL_ROOT.'/compta/tva/card.php?action=create'; - if (!empty($socid)) $url .= '&socid='.$socid; - $newcardbutton = dolGetButtonTitle($langs->trans('NewVATPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer); - - print '
'; - if ($optioncss != '') print ''; - print ''; - print ''; - print ''; - print ''; - - print_barre_liste($langs->trans("VATPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1); - - print '
'; - print ''."\n"; - - print ''; - // Ref - print ''; - // Label - print ''; - // Date end period - print ''; - // Account - if (!empty($conf->banque->enabled)) - { - print ''; - } - // Amount - print ''; - print ''; - print "\n"; - - print ''; - print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "t.rowid", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "t.label", "", $param, 'align="left"', $sortfield, $sortorder); - print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "t.datev", "", $param, 'align="center"', $sortfield, $sortorder); - print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "t.datep", "", $param, 'align="center"', $sortfield, $sortorder); - print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'left '); - if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "t.amount", "", $param, '', $sortfield, $sortorder, 'right '); - print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch '); - print "\n"; - - while ($i < min($num, $limit)) - { - $obj = $db->fetch_object($result); - - if ($obj->payment_code <> '') - { - $type = ''; - } else { - $type = ''; - } - - print ''; - - $tva_static->id = $obj->rowid; - $tva_static->ref = $obj->rowid; - - // Ref - print "\n"; - // Label - print "\n"; - // Date end period - print '\n"; - // Date payment - print '\n"; - // Type - print $type; - // Account - if (!empty($conf->banque->enabled)) - { - print ''; - } - // Amount - $total = $total + $obj->amount; - print '"; - print ""; - print "\n"; - - $i++; - } - - $colspan = 5; - if (!empty($conf->banque->enabled)) $colspan++; - print ''; - print ''; - print ""; - - print "
'; - print '
'; - print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')); - print '
'; - print '
'; - print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to')); - print '
'; - // Date payment - print '		'; - print '
'; - print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')); - print '
'; - print '
'; - print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to')); - print '
'; - // Type - print '		'; - $form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16); - print ''; - $form->select_comptes($search_account, 'search_account', 0, '', 1); - print ''; - $searchpicto = $form->showFilterAndCheckAddButtons(0); - print $searchpicto; - print '
'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.' 
".$tva_static->getNomUrl(1)."".dol_trunc($obj->label, 40)."'.dol_print_date($db->jdate($obj->datev), 'day')."'.dol_print_date($db->jdate($obj->datep), 'day')."'; - if ($obj->fk_bank > 0) - { - $bankstatic->id = $obj->bid; - $bankstatic->ref = $obj->bref; - $bankstatic->number = $obj->bnumber; - $bankstatic->account_number = $obj->account_number; - - $accountingjournal = new AccountingJournal($db); - $accountingjournal->fetch($obj->fk_accountancy_journal); - $bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1); - - $bankstatic->label = $obj->blabel; - print $bankstatic->getNomUrl(1); - } else print ' '; - print ''.price($obj->amount)." 
'.$langs->trans("Total").''.price($total).' 
"; - print '
'; - - print '
'; - - $db->free($result); -} else { - dol_print_error($db); + dol_print_error($db); + llxFooter(); + $db->close(); + exit; } +$num = $db->num_rows($result); + +$param = ''; +if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) $param .= '&contextpage='.$contextpage; +if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit; +if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss); + +if (!empty($search_ref)) $param .= '&search_ref="'.$search_ref.'"'; +if (!empty($search_label)) $param .= '&search_label="'.$search_label.'"'; +if (!empty($search_dateend_start)) $param .= '&search_dateend_startyear='.GETPOST('search_dateend_startyear', 'int'); +if (!empty($search_dateend_start)) $param .= '&search_dateend_startmonth='.GETPOST('search_dateend_startmonth', 'int'); +if (!empty($search_dateend_start)) $param .= '&search_dateend_startday='.GETPOST('search_dateend_startday', 'int'); +if (!empty($search_dateend_end)) $param .= '&search_dateend_endyear='.GETPOST('search_dateend_endyear', 'int'); +if (!empty($search_dateend_end)) $param .= '&search_dateend_endmonth='.GETPOST('search_dateend_endmonth', 'int'); +if (!empty($search_dateend_end)) $param .= '&search_dateend_endday='.GETPOST('search_dateend_endday', 'int'); +if (!empty($search_datepayment_start)) $param .= '&search_datepayment_startyear='.GETPOST('search_datepayment_startyear', 'int'); +if (!empty($search_datepayment_start)) $param .= '&search_datepayment_startmonth='.GETPOST('search_datepayment_startmonth', 'int'); +if (!empty($search_datepayment_start)) $param .= '&search_datepayment_startday='.GETPOST('search_datepayment_startday', 'int'); +if (!empty($search_datepayment_end)) $param .= '&search_datepayment_endyear='.GETPOST('search_datepayment_endyear', 'int'); +if (!empty($search_datepayment_end)) $param .= '&search_datepayment_endmonth='.GETPOST('search_datepayment_endmonth', 'int'); +if (!empty($search_datepayment_end)) $param .= '&search_datepayment_endday='.GETPOST('search_datepayment_endday', 'int'); +if (!empty($search_type) && $search_type > 0) $param .= '&search_type='.$search_type; +if (!empty($search_cheque)) $param .= '&search_cheque="'.$search_cheque.'"'; +if (!empty($search_account) && $search_account > 0) $param .= '&search_account='.$search_account; +if (!empty($search_amount)) $param .= '&search_amount="'.$search_amount.'"'; + +print '
'; +if ($optioncss != '') print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; + +$url = DOL_URL_ROOT.'/compta/tva/card.php?action=create'; +if (!empty($socid)) $url .= '&socid='.$socid; +$newcardbutton = dolGetButtonTitle($langs->trans('NewVATPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer); +print_barre_liste($langs->trans("VATPayments"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1); + +$varpage = empty($contextpage) ? $_SERVER['PHP_SELF'] : $contextpage; +$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields +if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1); + +print '
'; +print ''; + +print ''; + +// Filters: Lines (placeholder) +if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) { + print ''; +} + +// Filter: Ref +if (!empty($arrayfields['t.rowid']['checked'])) { + print ''; +} + +// Filter: Label +if (!empty($arrayfields['t.label']['checked'])) { + print ''; +} + +// Filter: Date end period +if (!empty($arrayfields['t.datev']['checked'])) { + print ''; +} + +// Filter: Date payment +if (!empty($arrayfields['t.datep']['checked'])) { + print ''; +} + +// Filter: Type +if (!empty($arrayfields['t.fk_typepayment']['checked'])) { + print ''; +} + +// Filter: Cheque number +if (!empty($arrayfields['t.num_payment']['checked'])) { + print ''; +} + +// Filter: Bank transaction number +if (!empty($arrayfields['transaction']['checked'])) { + print ''; +} + +// Filter: Bank account +if (!empty($arrayfields['ba.label']['checked'])) { + print ''; +} + +// Filter: Amount +if (!empty($arrayfields['t.amount']['checked'])) { + print ''; +} + +// Fields from hook +$parameters = array('arrayfields'=>$arrayfields); +$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook +print $hookmanager->resPrint; + +// Filter: Buttons +print ''; + +print ''; + +print ''; +if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder); +if (!empty($arrayfields['t.rowid']['checked'])) print_liste_field_titre($arrayfields['t.rowid']['label'], $_SERVER['PHP_SELF'], 't.rowid', '', $param, '', $sortfield, $sortorder); +if (!empty($arrayfields['t.label']['checked'])) print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER['PHP_SELF'], 't.label', '', $param, 'align="left"', $sortfield, $sortorder); +if (!empty($arrayfields['t.datev']['checked'])) print_liste_field_titre($arrayfields['t.datev']['label'], $_SERVER['PHP_SELF'], 't.datev', '', $param, 'align="center"', $sortfield, $sortorder); +if (!empty($arrayfields['t.datep']['checked'])) print_liste_field_titre($arrayfields['t.datep']['label'], $_SERVER['PHP_SELF'], 't.datep', '', $param, 'align="center"', $sortfield, $sortorder); +if (!empty($arrayfields['t.fk_typepayment']['checked'])) print_liste_field_titre($arrayfields['t.fk_typepayment']['label'], $_SERVER['PHP_SELF'], 't.fk_typepayment', '', $param, '', $sortfield, $sortorder, 'left '); +if (!empty($arrayfields['t.num_payment']['checked'])) print_liste_field_titre($arrayfields['t.num_payment']['label'], $_SERVER['PHP_SELF'], 't.num_payment', '', $param, '', $sortfield, $sortorder, '', $arrayfields['t.num_payment']['tooltip']); +if (!empty($arrayfields['transaction']['checked'])) print_liste_field_titre($arrayfields['transaction']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder); +if (!empty($arrayfields['ba.label']['checked'])) print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER['PHP_SELF'], 'ba.label', '', $param, '', $sortfield, $sortorder, 'left '); +if (!empty($arrayfields['t.amount']['checked'])) print_liste_field_titre($arrayfields['t.amount']['label'], $_SERVER['PHP_SELF'], 't.amount', '', $param, '', $sortfield, $sortorder, 'right '); + +// Hook fields +$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder); +$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook +print $hookmanager->resPrint; + +print_liste_field_titre($selectedfields, $_SERVER['PHP_SELF'], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); +print ''; + +$checkedCount = 0; +foreach ($arrayfields as $column) { + if ($column['checked']) { + $checkedCount++; + } +} + +$i = 0; +$totalarray = array(); +while ($i < min($num, $limit)) { + $obj = $db->fetch_object($result); + + $tva_static->id = $obj->rowid; + $tva_static->ref = $obj->rowid; + + print ''; + + // No + if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) { + print ''; + if (!$i) $totalarray['nbfield']++; + } + + // Ref + if (!empty($arrayfields['t.rowid']['checked'])) { + print ''; + if (!$i) $totalarray['nbfield']++; + } + + // Label + if (!empty($arrayfields['t.label']['checked'])) { + print ''; + if (!$i) $totalarray['nbfield']++; + } + + // Date end period + if (!empty($arrayfields['t.datev']['checked'])) { + print ''; + if (!$i) $totalarray['nbfield']++; + } + + // Date payment + if (!empty($arrayfields['t.datep']['checked'])) { + print ''; + if (!$i) $totalarray['nbfield']++; + } + + // Type + if (!empty($arrayfields['t.fk_typepayment']['checked'])) + { + print ''; + if (!$i) $totalarray['nbfield']++; + } + + // Cheque number + if (!empty($arrayfields['t.num_payment']['checked'])) { + print ''; + if (!$i) $totalarray['nbfield']++; + } + + // Bank transaction + if (!empty($arrayfields['transaction']['checked'])) { + $bankline->fetch($obj->fk_bank); + print ''; + if (!$i) $totalarray['nbfield']++; + } + + // Account + if (!empty($arrayfields['ba.label']['checked'])) { + print ''; + if (!$i) $totalarray['nbfield']++; + } + + // Amount + $total = $total + $obj->amount; + print ''; + if (!$i) $totalarray['nbfield']++; + $totalarray['pos'][$totalarray['nbfield']] = 'amount'; + $totalarray['val']['amount'] += $objp->amount; + + // Buttons + print ''; + + print ''; + + $i++; +} + +// Add a buttons placeholder for the total line +$totalarray['nbfield']++; + +// Show total line +include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php'; + +print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print '
'; + print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From")); + print '
'; + print '
'; + print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to")); + print '
'; + print '		'; + print '
'; + print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From")); + print '
'; + print '
'; + print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to")); + print '
'; + print '		'; + $form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 16); + print ''; + print ''; + print ''; + print ''; + $form->select_comptes($search_account, 'search_account', 0, '', 1); + print ''; + print ''; + print ''; +print $form->showFilterAndCheckAddButtons(0); +print '
'.(($offset * $limit) + $i).''.$tva_static->getNomUrl(1).''.dol_trunc($obj->label, 40).''.dol_print_date($db->jdate($obj->datev), 'day').''.dol_print_date($db->jdate($obj->datep), 'day').''.$langs->trans("PaymentTypeShort".$obj->payment_code).''.$obj->num_payment.''.$bankline->getNomUrl(1, 0).''; + if ($obj->fk_bank > 0) { + $bankstatic->id = $obj->bid; + $bankstatic->ref = $obj->bref; + $bankstatic->number = $obj->bnumber; + $bankstatic->account_number = $obj->account_number; + + $accountingjournal->fetch($obj->fk_accountancy_journal); + $bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1); + + $bankstatic->label = $obj->blabel; + print $bankstatic->getNomUrl(1); + } + print ''.price($obj->amount).'
'; +print '
'; +print '
'; + +$db->free($result); + // End of page llxFooter(); $db->close(); From f28e1dc4fbf67bdd19f0ee5ab4fde793c20bfbff Mon Sep 17 00:00:00 2001 From: "Sekan, Tobias" Date: Tue, 13 Oct 2020 15:27:42 +0200 Subject: [PATCH 04/22] cleanup --- htdocs/compta/tva/list.php | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php index 9bae56e23a3..9fbbad9420a 100644 --- a/htdocs/compta/tva/list.php +++ b/htdocs/compta/tva/list.php @@ -282,7 +282,7 @@ if (!empty($arrayfields['t.num_payment']['checked'])) { print ''; } -// Filter: Bank transaction number +// Filter: Bank transaction number (placeholder) if (!empty($arrayfields['transaction']['checked'])) { print ''; print ''; @@ -315,16 +315,16 @@ print ''; print ''; print ''; -if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder); -if (!empty($arrayfields['t.rowid']['checked'])) print_liste_field_titre($arrayfields['t.rowid']['label'], $_SERVER['PHP_SELF'], 't.rowid', '', $param, '', $sortfield, $sortorder); -if (!empty($arrayfields['t.label']['checked'])) print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER['PHP_SELF'], 't.label', '', $param, 'align="left"', $sortfield, $sortorder); -if (!empty($arrayfields['t.datev']['checked'])) print_liste_field_titre($arrayfields['t.datev']['label'], $_SERVER['PHP_SELF'], 't.datev', '', $param, 'align="center"', $sortfield, $sortorder); -if (!empty($arrayfields['t.datep']['checked'])) print_liste_field_titre($arrayfields['t.datep']['label'], $_SERVER['PHP_SELF'], 't.datep', '', $param, 'align="center"', $sortfield, $sortorder); -if (!empty($arrayfields['t.fk_typepayment']['checked'])) print_liste_field_titre($arrayfields['t.fk_typepayment']['label'], $_SERVER['PHP_SELF'], 't.fk_typepayment', '', $param, '', $sortfield, $sortorder, 'left '); -if (!empty($arrayfields['t.num_payment']['checked'])) print_liste_field_titre($arrayfields['t.num_payment']['label'], $_SERVER['PHP_SELF'], 't.num_payment', '', $param, '', $sortfield, $sortorder, '', $arrayfields['t.num_payment']['tooltip']); -if (!empty($arrayfields['transaction']['checked'])) print_liste_field_titre($arrayfields['transaction']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder); -if (!empty($arrayfields['ba.label']['checked'])) print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER['PHP_SELF'], 'ba.label', '', $param, '', $sortfield, $sortorder, 'left '); -if (!empty($arrayfields['t.amount']['checked'])) print_liste_field_titre($arrayfields['t.amount']['label'], $_SERVER['PHP_SELF'], 't.amount', '', $param, '', $sortfield, $sortorder, 'right '); +if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder); +if (!empty($arrayfields['t.rowid']['checked'])) print_liste_field_titre($arrayfields['t.rowid']['label'], $_SERVER['PHP_SELF'], 't.rowid', '', $param, '', $sortfield, $sortorder); +if (!empty($arrayfields['t.label']['checked'])) print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER['PHP_SELF'], 't.label', '', $param, 'align="left"', $sortfield, $sortorder); +if (!empty($arrayfields['t.datev']['checked'])) print_liste_field_titre($arrayfields['t.datev']['label'], $_SERVER['PHP_SELF'], 't.datev', '', $param, 'align="center"', $sortfield, $sortorder); +if (!empty($arrayfields['t.datep']['checked'])) print_liste_field_titre($arrayfields['t.datep']['label'], $_SERVER['PHP_SELF'], 't.datep', '', $param, 'align="center"', $sortfield, $sortorder); +if (!empty($arrayfields['t.fk_typepayment']['checked'])) print_liste_field_titre($arrayfields['t.fk_typepayment']['label'], $_SERVER['PHP_SELF'], 't.fk_typepayment', '', $param, '', $sortfield, $sortorder, 'left '); +if (!empty($arrayfields['t.num_payment']['checked'])) print_liste_field_titre($arrayfields['t.num_payment']['label'], $_SERVER['PHP_SELF'], 't.num_payment', '', $param, '', $sortfield, $sortorder, '', $arrayfields['t.num_payment']['tooltip']); +if (!empty($arrayfields['transaction']['checked'])) print_liste_field_titre($arrayfields['transaction']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder); +if (!empty($arrayfields['ba.label']['checked'])) print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER['PHP_SELF'], 'ba.label', '', $param, '', $sortfield, $sortorder, 'left '); +if (!empty($arrayfields['t.amount']['checked'])) print_liste_field_titre($arrayfields['t.amount']['label'], $_SERVER['PHP_SELF'], 't.amount', '', $param, '', $sortfield, $sortorder, 'right '); // Hook fields $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder); @@ -334,13 +334,6 @@ print $hookmanager->resPrint; print_liste_field_titre($selectedfields, $_SERVER['PHP_SELF'], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); print ''; -$checkedCount = 0; -foreach ($arrayfields as $column) { - if ($column['checked']) { - $checkedCount++; - } -} - $i = 0; $totalarray = array(); while ($i < min($num, $limit)) { From dcd8a88e7282994eaa48d83fd844c14b102740c6 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 13 Oct 2020 13:28:23 +0000 Subject: [PATCH 05/22] Fixing style errors. --- htdocs/compta/tva/list.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php index 9fbbad9420a..554143e7a7e 100644 --- a/htdocs/compta/tva/list.php +++ b/htdocs/compta/tva/list.php @@ -361,19 +361,19 @@ while ($i < min($num, $limit)) { print ''.dol_trunc($obj->label, 40).''; if (!$i) $totalarray['nbfield']++; } - + // Date end period if (!empty($arrayfields['t.datev']['checked'])) { print ''.dol_print_date($db->jdate($obj->datev), 'day').''; if (!$i) $totalarray['nbfield']++; } - + // Date payment if (!empty($arrayfields['t.datep']['checked'])) { print ''.dol_print_date($db->jdate($obj->datep), 'day').''; if (!$i) $totalarray['nbfield']++; } - + // Type if (!empty($arrayfields['t.fk_typepayment']['checked'])) { @@ -402,10 +402,10 @@ while ($i < min($num, $limit)) { $bankstatic->ref = $obj->bref; $bankstatic->number = $obj->bnumber; $bankstatic->account_number = $obj->account_number; - + $accountingjournal->fetch($obj->fk_accountancy_journal); $bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1); - + $bankstatic->label = $obj->blabel; print $bankstatic->getNomUrl(1); } From 4ee6cedbe695b121e47c5af3be25d11b19c06d2e Mon Sep 17 00:00:00 2001 From: bahfir abbes Date: Thu, 8 Oct 2020 00:23:59 +0100 Subject: [PATCH 06/22] =?UTF-8?q?Option=20d=E2=80=99Activation=20du=20fich?= =?UTF-8?q?ier=20global=20de=20configuration.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/core/class/conf.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 3d6526690a7..ce726265006 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -235,7 +235,7 @@ class Conf $filesList = explode(":", $this->global->LOCAL_CONSTS_FILES); foreach ($filesList as $file) { $file = dol_sanitizeFileName($file); - include_once DOL_DOCUMENT_ROOT."/".$file."/".$file."_consts.php"; // This file can run code like setting $this->global->XXX vars. + dol_include_once($file."/".$file."_consts.php"); // This file can run code like setting $this->global->XXX vars. } } From ad21f1e293283088ebfef56a4c2d9030bd99a00d Mon Sep 17 00:00:00 2001 From: bahfir abbes Date: Tue, 13 Oct 2020 23:49:38 +0100 Subject: [PATCH 07/22] fix:boolean values in showinputfield are 1 and 0 not 'on' and 'off' --- htdocs/core/actions_addupdatedelete.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php index cee75415eee..ad82d15c5a9 100644 --- a/htdocs/core/actions_addupdatedelete.inc.php +++ b/htdocs/core/actions_addupdatedelete.inc.php @@ -74,7 +74,7 @@ if ($action == 'add' && !empty($permissiontoadd)) } elseif (preg_match('/^(integer|price|real|double)/', $object->fields[$key]['type'])) { $value = price2num(GETPOST($key, 'alphanohtml')); // To fix decimal separator according to lang setup } elseif ($object->fields[$key]['type'] == 'boolean') { - $value = (GETPOST($key) == 'on' ? 1 : 0); + $value = (GETPOST($key) == '1' ? 1 : 0); } else { $value = GETPOST($key, 'alphanohtml'); } From 8b0a6d7f404e6b2c8eb11f09354a52272b4cec2e Mon Sep 17 00:00:00 2001 From: bahfir abbes Date: Wed, 14 Oct 2020 00:18:36 +0100 Subject: [PATCH 08/22] fix:two fields with same ids is incorrect html --- htdocs/admin/company.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 7ab04adf923..a099547fbc0 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -558,13 +558,13 @@ $langs->load("companies"); // Managing Director(s) print ''; -print ''; +print ''; // GDPR contact print ''; print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc")); print ''; -print ''; +print ''; // Capital print ''; From 74155a49be7b9650a93b74b40da1d6510d782bf3 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 14 Oct 2020 08:42:57 +0200 Subject: [PATCH 09/22] 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 10/22] 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 5d33761b13fd8b5863305fe1dba83125fd921002 Mon Sep 17 00:00:00 2001 From: amunaadh Date: Wed, 14 Oct 2020 11:26:18 +0545 Subject: [PATCH 11/22] API test added for addUsers Co-authored-by: Swikriti Tripathi --- package.json | 2 +- .../features/Api/apiAddUsers.feature | 67 +++++ .../features/{ => WebUI}/addUsers.feature | 0 .../features/{ => WebUI}/listUsers.feature | 0 .../features/{ => WebUI}/login.feature | 0 .../features/{ => WebUI}/logout.feature | 0 test/acceptance/pageObjects/listUsersPage.js | 4 +- test/acceptance/setup.js | 77 ++++++ .../stepDefinitions/addUsersContext.js | 228 ++++++++++-------- 9 files changed, 268 insertions(+), 110 deletions(-) create mode 100644 test/acceptance/features/Api/apiAddUsers.feature rename test/acceptance/features/{ => WebUI}/addUsers.feature (100%) rename test/acceptance/features/{ => WebUI}/listUsers.feature (100%) rename test/acceptance/features/{ => WebUI}/login.feature (100%) rename test/acceptance/features/{ => WebUI}/logout.feature (100%) create mode 100644 test/acceptance/setup.js diff --git a/package.json b/package.json index 67f24dd541a..496c34e7387 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "nightwatch-api": "^3.0.1" }, "scripts": { - "test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty" + "test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/setup.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty" }, "dependencies": { "cucumber-pretty": "^6.0.0", diff --git a/test/acceptance/features/Api/apiAddUsers.feature b/test/acceptance/features/Api/apiAddUsers.feature new file mode 100644 index 00000000000..32d94a7b3cf --- /dev/null +++ b/test/acceptance/features/Api/apiAddUsers.feature @@ -0,0 +1,67 @@ +Feature: Add user + As an admin + I want to add users + So that the authorized access is possible + + Scenario: Admin adds user without permission + Given the user with login "harrypotter@gmail.com" does not exist + When the admin creates user with following details using API + | last name | Potter | + | login | harrypotter@gmail.com | + | password | password | + Then the response status code should be "200" + And user with login "harrypotter@gmail.com" should exist + + Scenario: Admin creates already existing user + Given the admin has created the following users + | login | last name | password | + | Harry | Potter | hello123 | + When the admin creates user with following details using API + | last name | Potter | + | login | Harry | + | password | hello123 | + Then the response status code should be "500" + And the response message should be "ErrorLoginAlreadyExists" + + Scenario Outline: Admin adds user with incomplete essential credentials + Given the user with login "Harry" does not exist + When the admin creates user with following details using API + | last name | | + | login | Harry | + | password | | + Then the response status code should be "200" + And user with login "Harry" should exist + Examples: + | last name | password | + | | | + | Manson | | + | | 123 | + + Scenario Outline: Admin adds user without login + Given the user with login "harrypotter@gmail.com" does not exist + When the admin creates user with following details using API + | last name | | + | login | | + | password | | + Then the response status code should be "500" + And the response message should be "Field 'Login' is required" + Examples: + | last name | password | + | Potter | Hello123 | + | Potter | | + | | hello123 | + + Scenario Outline: Admin adds user with last name as special characters + Given the user with login "" does not exist + When the admin creates user with following details using API + | last name | | + | login | | + | password | password | + Then the response status code should be "200" + And user with login "" should exist + Examples: + | last name | login | + | swi@ | s$5^2 | + | g!!@%ui | नेपाली | + | swikriti@h | सिमप्ले $%#?&@name.txt | + | !@#$%^&*()-_+ | España§àôœ€ | \ No newline at end of file diff --git a/test/acceptance/features/addUsers.feature b/test/acceptance/features/WebUI/addUsers.feature similarity index 100% rename from test/acceptance/features/addUsers.feature rename to test/acceptance/features/WebUI/addUsers.feature diff --git a/test/acceptance/features/listUsers.feature b/test/acceptance/features/WebUI/listUsers.feature similarity index 100% rename from test/acceptance/features/listUsers.feature rename to test/acceptance/features/WebUI/listUsers.feature diff --git a/test/acceptance/features/login.feature b/test/acceptance/features/WebUI/login.feature similarity index 100% rename from test/acceptance/features/login.feature rename to test/acceptance/features/WebUI/login.feature diff --git a/test/acceptance/features/logout.feature b/test/acceptance/features/WebUI/logout.feature similarity index 100% rename from test/acceptance/features/logout.feature rename to test/acceptance/features/WebUI/logout.feature diff --git a/test/acceptance/pageObjects/listUsersPage.js b/test/acceptance/pageObjects/listUsersPage.js index 6f9df509d5f..3567bb576ab 100644 --- a/test/acceptance/pageObjects/listUsersPage.js +++ b/test/acceptance/pageObjects/listUsersPage.js @@ -30,7 +30,7 @@ module.exports = { elements: { userRow: { - selector: '//table[contains(@class,"tagtable liste")]/tbody/tr[position()>2]', + selector: '//table[contains(@class,"tagtable")]/tbody/tr[position()>2]', locateStrategy: 'xpath' }, @@ -40,7 +40,7 @@ module.exports = { }, userList: { - selector: '//table[contains(@class,"tagtable liste")]/tbody/tr[position()>2]/td/a//span[normalize-space(@class="nopadding usertext")][.="%s"]/../../following-sibling::td[.="%s"]', + selector: '//table[contains(@class,"tagtable")]/tbody/tr[position()>2]/td/a//span[normalize-space(@class="nopadding usertext")][.="%s"]/../../following-sibling::td[.="%s"]', locateStrategy: 'xpath' } } diff --git a/test/acceptance/setup.js b/test/acceptance/setup.js new file mode 100644 index 00000000000..eeed97b3466 --- /dev/null +++ b/test/acceptance/setup.js @@ -0,0 +1,77 @@ +const { Before, After } = require('cucumber'); +const { client } = require('nightwatch-api'); +const fetch = require('node-fetch'); +let initialUsers = {}; +let dolApiKey = ''; + +const getUsers = async function () { + const header = {}; + const url = client.globals.backend_url + 'api/index.php/users'; + const users = {}; + header['Accept'] = 'application/json'; + header['DOLAPIKEY'] = dolApiKey; + await fetch(url, { + method: 'GET', + headers: header + }) + .then(async (response) => { + const json_response = await response.json(); + for (const user of json_response) { + users[user.id] = user.id; + } + }); + return users; +}; + +Before(async function getDolApiKey() { + const header = {} + const adminUsername = client.globals.adminUsername; + const adminPassword = client.globals.adminPassword; + const params = new URLSearchParams() + params.set('login', adminUsername) + params.set('password', adminPassword) + const apiKey = `http://localhost/dolibarr/htdocs/api/index.php/login?${params.toString()}`; + header['Accept'] = 'application/json' + await fetch(apiKey, { + method: 'GET', + headers: header + }) + .then(async (response) => { + const jsonResponse = await response.json() + dolApiKey = jsonResponse['success']['token'] + client.globals.dolApiKey = dolApiKey + }) +}) + +Before(async () => { + initialUsers = await getUsers(); +}); + +After(async () => { + const finalUsers = await getUsers(); + const header = {}; + const url = client.globals.backend_url + 'api/index.php/users/'; + header['Accept'] = 'application/json'; + header['DOLAPIKEY'] = dolApiKey; + let found; + for (const finaluser in finalUsers) { + for (const initialuser in initialUsers) { + found = false; + if (initialuser === finaluser) { + found = true; + break; + } + } + if (!found) { + await fetch(url + finaluser, { + method: 'DELETE', + headers: header + }) + .then(res => { + if (res.status < 200 || res.status >= 400) { + throw new Error("Failed to delete user: " + res.statusText); + } + }); + } + } +}); \ No newline at end of file diff --git a/test/acceptance/stepDefinitions/addUsersContext.js b/test/acceptance/stepDefinitions/addUsersContext.js index 22dc218d04a..385f731b8f7 100644 --- a/test/acceptance/stepDefinitions/addUsersContext.js +++ b/test/acceptance/stepDefinitions/addUsersContext.js @@ -1,142 +1,156 @@ -const { Before, Given, When, Then, After } = require('cucumber'); -const { client } = require('nightwatch-api'); +const {Given, When, Then} = require('cucumber'); +const {client} = require('nightwatch-api'); const fetch = require('node-fetch'); -let initialUsers = {}; -let dolApiKey = ''; +const assert = require('assert'); +let response; +let Login = {}; Given('the administrator has logged in using the webUI', async function () { - await client.page.loginPage().navigate().waitForLoginPage(); - await client.page.loginPage().userLogsInWithUsernameAndPassword(client.globals.adminUsername, client.globals.adminPassword); - return client.page.loginPage().userIsLoggedIn(client.globals.adminUsername); + await client.page.loginPage().navigate().waitForLoginPage(); + await client.page.loginPage().userLogsInWithUsernameAndPassword(client.globals.adminUsername, client.globals.adminPassword); + return client.page.loginPage().userIsLoggedIn(client.globals.adminUsername); }); Given('the administrator has browsed to the new users page', function () { - return client.page.homePage().browsedToNewUserPage(); + return client.page.homePage().browsedToNewUserPage(); }); When('the admin creates user with following details', function (datatable) { - return client.page.addUsersPage().adminCreatesUser(datatable); + return client.page.addUsersPage().adminCreatesUser(datatable); }); Then('new user {string} should be created', function (lastname) { - return client.page.addUsersPage().newUserShouldBeCreated(lastname); + return client.page.addUsersPage().newUserShouldBeCreated(lastname); }); Then('message {string} should be displayed in the webUI', function (message) { - return client.page.addUsersPage().noPermissionMessage(message); + return client.page.addUsersPage().noPermissionMessage(message); }); Then('message {string} should not be displayed in the webUI', function (message) { - return client.page.addUsersPage().noPermissionDefinedMessageNotShown(message); + return client.page.addUsersPage().noPermissionDefinedMessageNotShown(message); }); Then('new user {string} should not be created', function (lastname) { - return client.page.addUsersPage().userNotCreated(lastname); + return client.page.addUsersPage().userNotCreated(lastname); }); Given('a user has been created with following details', function (dataTable) { - return adminHasCreatedUser(dataTable); + return adminHasCreatedUser(dataTable); }); Given('the admin has created the following users', function (dataTable) { - return adminHasCreatedUser(dataTable); + return adminHasCreatedUser(dataTable); }); -const getUsers = async function () { - const header = {}; - const url = client.globals.backend_url + 'api/index.php/users'; - const users = {}; - header['Accept'] = 'application/json'; - header['DOLAPIKEY'] = dolApiKey; - await fetch(url, { - method: 'GET', - headers: header - }) - .then(async (response) => { - const json_response = await response.json(); - for (const user of json_response) { - users[user.id] = user.id; - } - }); - return users; +When('the admin creates user with following details using API', function (dataTable) { + return adminCreatesUserWithAPI(dataTable); +}); + +Given('the user with login {string} does not exist', async function (login) { + await userDoesNotExist(login); +}); + +Then('the response status code should be {string}', function (expectedStatusCode) { + return getStatusCode(expectedStatusCode); +}); + +Then('user with login {string} should exist', function (login) { + return userShouldExist(login); +}); + +Then('the response message should be {string}', function (expectedResponseMessage) { + return getResponseMessage(expectedResponseMessage); +}); + +const createUserRequest = function (login, lastname, password) { + const header = {}; + const url = client.globals.backend_url + 'api/index.php/users'; + header['Accept'] = 'application/json'; + header['DOLAPIKEY'] = client.globals.dolApiKey; + header['Content-Type'] = 'application/json'; + return fetch(url, { + method: 'POST', + headers: header, + body: JSON.stringify( + { + login: login, + lastname: lastname, + pass: password + } + ) + }); +}; + +const adminCreatesUserWithAPI = function (dataTable) { + const userDetails = dataTable.rowsHash(); + return createUserRequest(userDetails['login'], userDetails['last name'], userDetails['password']) + .then((res) => { + response = res; + }); }; const adminHasCreatedUser = async function (dataTable) { - const header = {}; - const url = client.globals.backend_url + 'api/index.php/users'; - header['Accept'] = 'application/json'; - header['DOLAPIKEY'] = dolApiKey; - header['Content-Type'] = 'application/json'; - const userDetails = dataTable.hashes(); - for (const user of userDetails) { - await fetch(url, { - method: 'POST', - headers: header, - body: JSON.stringify( - { - login: user['login'], - lastname: user['last name'], - pass: user['password'] - } - ) - }) - .then((response) => { - if (response.status < 200 || response.status >= 400) { - throw new Error('Failed to create user: ' + user['login'] + - ' ' + response.statusText); - } - return response.text(); - }); - } + const userDetails = dataTable.hashes(); + for (const user of userDetails) { + await createUserRequest(user['login'], user['last name'], user['password']) + .then((response) => { + if (response.status < 200 || response.status >= 400) { + throw new Error('Failed to create user: ' + user['login'] + + ' ' + response.statusText); + } + }); + } }; -Before(async () => { - const header = {} - const adminUsername = client.globals.adminUsername; - const adminPassword = client.globals.adminPassword; - const params = new URLSearchParams() - params.set('login', adminUsername) - params.set('password', adminPassword) - const apiKey = `http://localhost/dolibarr/htdocs/api/index.php/login?${params.toString()}`; - header['Accept'] = 'application/json' - await fetch(apiKey, { - method: 'GET', - headers: header - }) - .then(async (response) => { - const jsonResponse = await response.json() - dolApiKey = jsonResponse['success']['token'] - }) -}) -Before(async () => { - initialUsers = await getUsers(); -}); +const getUsersLogin = async function () { + const header = {}; + const url = client.globals.backend_url + 'api/index.php/users/'; + header['Accept'] = 'application/json'; + header['DOLAPIKEY'] = client.globals.dolApiKey; + header['Content-Type'] = 'application/json'; + await fetch(url, { + method: 'GET', + headers: header + }) + .then(async (response) => { + const json_response = await response.json(); + for (const user of json_response) { + Login[user.login] = user.login; + } + }); +}; -After(async () => { - const finalUsers = await getUsers(); - const header = {}; - const url = client.globals.backend_url + 'api/index.php/users/'; - header['Accept'] = 'application/json'; - header['DOLAPIKEY'] = dolApiKey; - let found; - for (const finaluser in finalUsers) { - for (const initialuser in initialUsers) { - found = false; - if (initialuser === finaluser) { - found = true; - break; - } - } - if (!found) { - await fetch(url + finaluser, { - method: 'DELETE', - headers: header - }) - .then(res => { - if (res.status < 200 || res.status >= 400) { - throw new Error("Failed to delete user: " + res.statusText); - } - }); - } - } -}); +const userDoesNotExist = async function (login) { + await getUsersLogin(); + if (login in Login) { + Login = {}; + throw new Error(`user ${login} exists`); + } + Login = {}; + return; +}; + +const userShouldExist = async function (login) { + await getUsersLogin(); + if (login in Login) { + Login = {}; + return; + } else { + Login = {}; + throw new Error(`User ${login} does not Exist`); + } +}; + +const getStatusCode = async function (expectedStatusCode) { + const actualStatusCode = response.status.toString(); + return assert.strictEqual(actualStatusCode, expectedStatusCode, + `The expected status code was ${expectedStatusCode} but got ${actualStatusCode}`); +}; + +const getResponseMessage = async function (expectedResponseMessage) { + const json_response = await response.json(); + const actualResponseMessage = json_response['error']['0']; + return assert.strictEqual(actualResponseMessage, expectedResponseMessage, + `the expected response message was ${expectedResponseMessage} but got ${actualResponseMessage}`); +}; \ No newline at end of file From ee67d2b1a8df2a4c70f75027d2ca3c7a4dab6b61 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 14 Oct 2020 10:30:39 +0200 Subject: [PATCH 12/22] 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 13/22] 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 14/22] 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 15/22] 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 16/22] 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); From 3cf2b6b5eb940c89bc309343d6b39a71a4b1fee2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 14 Oct 2020 15:01:50 +0200 Subject: [PATCH 17/22] Doc comment. --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7b705b4bd87..8714b0aa765 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2048,7 +2048,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang * PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows * WARNING: This function always use PHP server timezone to return locale informations !!! * Usage must be avoid. - * FIXME: Replace this with PHP date function and a parameter $gm + * FIXME: Replace content of this function with PHP date functions and a parameter $gm * * @param int $timestamp Timestamp * @param boolean $fast Fast mode From 98eb11be62ea838cc7cf42895eab97ce5f7a2c1e Mon Sep 17 00:00:00 2001 From: ATM-Nicolas Date: Wed, 14 Oct 2020 16:59:05 +0200 Subject: [PATCH 18/22] NEW : Fill ECM src object fields in dol_add_file_process --- htdocs/core/actions_linkedfiles.inc.php | 4 ++-- htdocs/core/lib/files.lib.php | 14 +++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php index 3caeeed6678..75633c75585 100644 --- a/htdocs/core/actions_linkedfiles.inc.php +++ b/htdocs/core/actions_linkedfiles.inc.php @@ -56,10 +56,10 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC)) if (!empty($upload_dirold) && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) { - $result = dol_add_file_process($upload_dirold, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs); + $result = dol_add_file_process($upload_dirold, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs, $object); } elseif (!empty($upload_dir)) { - $result = dol_add_file_process($upload_dir, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs); + $result = dol_add_file_process($upload_dir, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs, $object); } } } diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 63047ed0e7b..ec26783c775 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1506,9 +1506,10 @@ function dol_init_file_process($pathtoscan = '', $trackid = '') * @param string $link Link to add (to add a link instead of a file) * @param string $trackid Track id (used to prefix name of session vars to avoid conflict) * @param int $generatethumbs 1=Generate also thumbs for uploaded image files + * @param Object $object Object used to set 'src_object_*' fields * @return int <=0 if KO, >0 if OK */ -function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1) +function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1, $object = null) { global $db, $user, $conf, $langs; @@ -1602,7 +1603,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess // Update index table of files (llx_ecm_files) if ($donotupdatesession == 1) { - $result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', 0); + $result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', 0, $object); if ($result < 0) { if ($allowoverwrite) { @@ -1718,9 +1719,10 @@ function dol_remove_file_process($filenb, $donotupdatesession = 0, $donotdeletef * @param string $fullpathorig Full path of origin for file (can be '') * @param string $mode How file was created ('uploaded', 'generated', ...) * @param int $setsharekey Set also the share key + * @param Object $object Object used to set 'src_object_*' fields * @return int <0 if KO, 0 if nothing done, >0 if OK */ -function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uploaded', $setsharekey = 0) +function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uploaded', $setsharekey = 0, $object = null) { global $db, $user; @@ -1743,6 +1745,12 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo $ecmfile->gen_or_uploaded = $mode; $ecmfile->description = ''; // indexed content $ecmfile->keyword = ''; // keyword content + + if(! is_null($object) && ! empty($object->id)) { + $ecmfile->src_object_id = $object->id; + $ecmfile->src_object_type = $object->element; + } + if ($setsharekey) { require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; From e8ea7125e5a89f5c8fd7f4e0471f8774ab58d50e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 14 Oct 2020 17:11:22 +0200 Subject: [PATCH 19/22] Removed the FIXME. The dol_getdate can now use a timezone. --- htdocs/core/lib/functions.lib.php | 59 ++++++++++++++------------ test/phpunit/FunctionsLibTest.php | 70 +++++++++++++++++++++++++++++-- 2 files changed, 98 insertions(+), 31 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 8714b0aa765..31d6de721b2 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2045,13 +2045,12 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang /** * Return an array with locale date info. - * PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows - * WARNING: This function always use PHP server timezone to return locale informations !!! - * Usage must be avoid. - * FIXME: Replace content of this function with PHP date functions and a parameter $gm + * WARNING: This function use PHP server timezone by default to return locale informations. + * Be aware to add the third parameter to "UTC" if you need to work on UTC. * * @param int $timestamp Timestamp - * @param boolean $fast Fast mode + * @param boolean $fast Fast mode. deprecated. + * @param string $forcetimezone '' to use the PHP server timezone. Or use a form like 'Europe/Paris' or '+0200' to force timezone. * @return array Array of informations * If no fast mode: * 'seconds' => $secs, @@ -2061,34 +2060,40 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang * 'wday' => $dow, 0=sunday, 6=saturday * 'mon' => $month, * 'year' => $year, - * 'yday' => floor($secsInYear/$_day_power), - * 'weekday' => gmdate('l',$_day_power*(3+$dow)), - * 'month' => gmdate('F',mktime(0,0,0,$month,2,1971)), - * If fast mode: - * 'seconds' => $secs, - * 'minutes' => $min, - * 'hours' => $hour, - * 'mday' => $day, - * 'mon' => $month, - * 'year' => $year, - * 'yday' => floor($secsInYear/$_day_power), - * 'leap' => $leaf, - * 'ndays' => $ndays + * 'yday' => floor($secsInYear/$_day_power) * @see dol_print_date(), dol_stringtotime(), dol_mktime() */ -function dol_getdate($timestamp, $fast = false) +function dol_getdate($timestamp, $fast = false, $forcetimezone = '') { global $conf; - $usealternatemethod = false; - if ($timestamp <= 0) $usealternatemethod = true; // <= 1970 - if ($timestamp >= 2145913200) $usealternatemethod = true; // >= 2038 - - if ($usealternatemethod) - { - $arrayinfo = adodb_getdate($timestamp, $fast); + if (empty($conf->global->MAIN_USE_OLD_FUNCTIONS_FOR_GETDATE)) { + //$datetimeobj = new DateTime('@'.$timestamp); + $datetimeobj = new DateTime(); + $datetimeobj->setTimestamp($timestamp); // Use local PHP server timezone + if ($forcetimezone) $datetimeobj->setTimezone(new DateTimeZone($forcetimezone)); // (add timezone relative to the date entered) + $arrayinfo = array( + 'year'=>((int) date_format($datetimeobj, 'Y')), + 'mon'=>((int) date_format($datetimeobj, 'm')), + 'mday'=>((int) date_format($datetimeobj, 'd')), + 'wday'=>((int) date_format($datetimeobj, 'w')), + 'yday'=>((int) date_format($datetimeobj, 'z')), + 'hours'=>((int) date_format($datetimeobj, 'H')), + 'minutes'=>((int) date_format($datetimeobj, 'i')), + 'seconds'=>((int) date_format($datetimeobj, 's')) + ); } else { - $arrayinfo = getdate($timestamp); + // PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows + $usealternatemethod = false; + if ($timestamp <= 0) $usealternatemethod = true; // <= 1970 + if ($timestamp >= 2145913200) $usealternatemethod = true; // >= 2038 + + if ($usealternatemethod) + { + $arrayinfo = adodb_getdate($timestamp, $fast); + } else { + $arrayinfo = getdate($timestamp); + } } return $arrayinfo; diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index d113cde8035..2cb4d98610c 100644 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -1257,9 +1257,6 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase $conf->global->MAIN_START_WEEK = 0; - $tmp=dol_getdate(1); // 1/1/1970 and 1 second = thirday - $this->assertEquals(4, $tmp['wday']); - $tmp=dol_getdate(24*60*60+1); // 2/1/1970 and 1 second = friday $this->assertEquals(5, $tmp['wday']); @@ -1271,12 +1268,77 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase $tmp=dol_getdate(24*60*60+1); // 2/1/1970 and 1 second = friday $this->assertEquals(5, $tmp['wday']); + $tmp=dol_getdate(1, false, "Europe/Paris"); // 1/1/1970 and 1 second = thirday + $this->assertEquals(1970, $tmp['year']); + $this->assertEquals(1, $tmp['mon']); + $this->assertEquals(1, $tmp['mday']); + $this->assertEquals(4, $tmp['wday']); + $this->assertEquals(0, $tmp['yday']); + $this->assertEquals(1, $tmp['hours']); // We are winter, so we are GMT+1 even during summer + $this->assertEquals(0, $tmp['minutes']); + $this->assertEquals(1, $tmp['seconds']); + + $tmp=dol_getdate(15638401, false, "Europe/Paris"); // 1/7/1970 and 1 second = wednesday + $this->assertEquals(1970, $tmp['year']); + $this->assertEquals(7, $tmp['mon']); + $this->assertEquals(1, $tmp['mday']); + $this->assertEquals(3, $tmp['wday']); + $this->assertEquals(181, $tmp['yday']); + $this->assertEquals(1, $tmp['hours']); // There is no daylight in 1970, so we are GMT+1 even during summer + $this->assertEquals(0, $tmp['minutes']); + $this->assertEquals(1, $tmp['seconds']); + + $tmp=dol_getdate(1593561601, false, "Europe/Paris"); // 1/7/2020 and 1 second = wednesday + $this->assertEquals(2020, $tmp['year']); + $this->assertEquals(7, $tmp['mon']); + $this->assertEquals(1, $tmp['mday']); + $this->assertEquals(3, $tmp['wday']); + $this->assertEquals(182, $tmp['yday']); // 182 and not 181, due to the 29th february + $this->assertEquals(2, $tmp['hours']); // There is a daylight, so we are GMT+2 + $this->assertEquals(0, $tmp['minutes']); + $this->assertEquals(1, $tmp['seconds']); + + $conf->global->MAIN_USE_OLD_FUNCTIONS_FOR_GETDATE = 1; + + $tmp=dol_getdate(1); // 1/1/1970 and 1 second = thirday + $this->assertEquals(1970, $tmp['year']); + $this->assertEquals(1, $tmp['mon']); + $this->assertEquals(1, $tmp['mday']); + $this->assertEquals(4, $tmp['wday']); + $this->assertEquals(0, $tmp['yday']); + // We must disable this because on CI, timezone is may be UTC or something else + //$this->assertEquals(1, $tmp['hours']); // We are winter, so we are GMT+1 even during summer + $this->assertEquals(0, $tmp['minutes']); + $this->assertEquals(1, $tmp['seconds']); + + $tmp=dol_getdate(15638401); // 1/7/1970 and 1 second = wednesday + $this->assertEquals(1970, $tmp['year']); + $this->assertEquals(7, $tmp['mon']); + $this->assertEquals(1, $tmp['mday']); + $this->assertEquals(3, $tmp['wday']); + $this->assertEquals(181, $tmp['yday']); + // We must disable this because on CI, timezone is may be UTC or something else + //$this->assertEquals(1, $tmp['hours']); // There is no daylight in 1970, so we are GMT+1 even during summer + $this->assertEquals(0, $tmp['minutes']); + $this->assertEquals(1, $tmp['seconds']); + + $tmp=dol_getdate(1593561601); // 1/7/2020 and 1 second = wednesday + $this->assertEquals(2020, $tmp['year']); + $this->assertEquals(7, $tmp['mon']); + $this->assertEquals(1, $tmp['mday']); + $this->assertEquals(3, $tmp['wday']); + $this->assertEquals(182, $tmp['yday']); // 182 and not 181, due to the 29th february + // We must disable this because on CI, timezone is may be UTC or something else + //$this->assertEquals(2, $tmp['hours']); // There is a daylight, so we are GMT+2 + $this->assertEquals(0, $tmp['minutes']); + $this->assertEquals(1, $tmp['seconds']); + return true; } /** - * testDolGetDate + * testMakeSubstitutions * * @return boolean */ From ee19f3fc946428a62abe4c222878046a24c71f6d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 14 Oct 2020 17:16:35 +0200 Subject: [PATCH 20/22] Update actions_addupdatedelete.inc.php --- htdocs/core/actions_addupdatedelete.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php index ad82d15c5a9..219d35e46fb 100644 --- a/htdocs/core/actions_addupdatedelete.inc.php +++ b/htdocs/core/actions_addupdatedelete.inc.php @@ -74,7 +74,7 @@ if ($action == 'add' && !empty($permissiontoadd)) } elseif (preg_match('/^(integer|price|real|double)/', $object->fields[$key]['type'])) { $value = price2num(GETPOST($key, 'alphanohtml')); // To fix decimal separator according to lang setup } elseif ($object->fields[$key]['type'] == 'boolean') { - $value = (GETPOST($key) == '1' ? 1 : 0); + $value = ((GETPOST($key) == '1' || GETPOST($key) == 'on') ? 1 : 0); } else { $value = GETPOST($key, 'alphanohtml'); } From ba001803ed2042ea6a7f9cf8cb8af58fcbd05588 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 14 Oct 2020 17:35:14 +0200 Subject: [PATCH 21/22] Update files.lib.php --- htdocs/core/lib/files.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index ec26783c775..55a2fc58d6b 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1746,7 +1746,7 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo $ecmfile->description = ''; // indexed content $ecmfile->keyword = ''; // keyword content - if(! is_null($object) && ! empty($object->id)) { + if (is_object($object) && $object->id > 0) { $ecmfile->src_object_id = $object->id; $ecmfile->src_object_type = $object->element; } From fc69b8892340c782753c737818078712d7163a19 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 14 Oct 2020 18:03:02 +0200 Subject: [PATCH 22/22] Update doc --- test/acceptance/README.md | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/test/acceptance/README.md b/test/acceptance/README.md index b3d550392c4..cf97408be7f 100644 --- a/test/acceptance/README.md +++ b/test/acceptance/README.md @@ -24,7 +24,7 @@ We can run selenium by two ways: ###Run the acceptance tests - * In `nightwatch.conf.js` file inside the root directory of the project and inside the configuration file following environment variable has been specified. We can change the default values according to our local configuration. +* In `nightwatch.conf.js` file inside the root directory of the project and inside the configuration file following environment variable has been specified. We can change the default values according to our local configuration. ``` const admin_username = process.env.ADMIN_USERNAME || 'dolibarr'; @@ -33,24 +33,23 @@ We can run selenium by two ways: const launch_url = process.env.LAUNCH_URL || 'http://localhost/dolibarr/htdocs/'; ``` - * You can run test using following commands + +* You can run test using following commands `yarn run test:e2e test/acceptance/features/` - For example: `yarn run test:e2e test/acceptance/features/addUsers.feature` + For example: `yarn run test:e2e test/acceptance/features/addUsers.feature` - OR - - `LAUNCH_URL='' ADMIN_USERNAME='' ADMIN_PASSWORD='' yarn run test:e2e test/acceptance/features/` + Or: `LAUNCH_URL=''; ADMIN_USERNAME=''; ADMIN_PASSWORD=''; yarn run test:e2e test/acceptance/features/` - The full script to run the acceptance tests is specified in `scripts` object of `package.json` file inside the project's root directory as : + The full script to run the acceptance tests is specified in `scripts` object of `package.json` file inside the project's root directory as : - `"test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty"` + `"test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty"` - After you run the above command you can see the test running. For that : + After you run the above command you can see the test running. For that : - * open `Remmina` (Remmina is a Remote Desktop Client and comes installed with Ubuntu) +* open `Remmina` (Remmina is a Remote Desktop Client and comes installed with Ubuntu) - * choose `VNC` and enter `localhost` on the address bar +* choose `VNC` and enter `localhost` on the address bar - * enter `secret` as the password +* enter `secret` as the password