From 31f147622a27a9a1914c0df8ea3368bca0c7e58a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 12:25:31 +0100 Subject: [PATCH 01/23] The deprecated GET parameter "&sall=" has been removed, use now the "&search_all=". --- ChangeLog | 7 ++-- htdocs/adherents/list.php | 2 +- htdocs/admin/tools/listevents.php | 33 +++++++++++-------- htdocs/comm/mailing/list.php | 2 +- htdocs/comm/propal/list.php | 2 +- htdocs/commande/list.php | 2 +- htdocs/commande/list_det.php | 2 +- htdocs/compta/bank/various_payment/list.php | 2 +- .../compta/cashcontrol/cashcontrol_list.php | 2 +- htdocs/compta/facture/list.php | 2 +- htdocs/compta/paiement/list.php | 2 +- htdocs/contact/list.php | 2 +- htdocs/contrat/list.php | 2 +- htdocs/core/lib/functions.lib.php | 2 +- htdocs/don/list.php | 2 +- htdocs/don/paiement/list.php | 2 +- .../conferenceorbooth_list.php | 2 +- htdocs/expedition/list.php | 2 +- htdocs/expensereport/list.php | 2 +- htdocs/expensereport/payment/list.php | 2 +- htdocs/fichinter/list.php | 2 +- htdocs/fourn/commande/list.php | 2 +- htdocs/fourn/facture/list.php | 2 +- htdocs/fourn/paiement/list.php | 2 +- htdocs/holiday/list.php | 2 +- htdocs/hrm/evaluation_list.php | 2 +- htdocs/hrm/job_list.php | 2 +- htdocs/hrm/position.php | 2 +- htdocs/hrm/position_list.php | 2 +- htdocs/hrm/skill_card.php | 2 +- htdocs/hrm/skill_list.php | 2 +- htdocs/intracommreport/list.php | 4 +-- htdocs/mrp/mo_list.php | 4 +-- htdocs/multicurrency/multicurrency_rate.php | 2 +- htdocs/opensurvey/list.php | 2 +- htdocs/product/list.php | 2 +- htdocs/product/reassort.php | 2 +- htdocs/product/reassortlot.php | 2 +- htdocs/product/stock/list.php | 2 +- htdocs/product/stock/movement_list.php | 2 +- htdocs/product/stock/productlot_list.php | 2 +- htdocs/product/stock/replenish.php | 2 +- htdocs/product/stock/valo.php | 2 +- htdocs/projet/list.php | 16 ++++++--- htdocs/projet/tasks/list.php | 2 +- htdocs/reception/list.php | 2 +- htdocs/societe/list.php | 2 +- htdocs/supplier_proposal/list.php | 2 +- htdocs/ticket/list.php | 2 +- htdocs/user/group/list.php | 2 +- htdocs/user/list.php | 2 +- htdocs/variants/list.php | 2 +- htdocs/webhook/target_list.php | 2 +- 53 files changed, 87 insertions(+), 73 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed7cf76603c32..a31cf7fac5308 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,12 +21,13 @@ The following changes may create regressions for some external modules, but were * Prepare your module for deprecation of triggers code XXX_INSERT to support also XXX_CREATE. * More class properties (with old name in french) are now deprecated in favor of the property name in english. * The json emulator dol_json_encode/decode() is removed. The native json PHP module must be enabled/available (this is the case by default with most PHP installation). -* The experimental and deprecated module WebserviceClient is completely removed (SOAP technology is deprecated). May be replaced with the stable module Webhook. +* The deprecated GET parameter "&sall=" has been removed, use now the "&search_all=". +* The experimental and deprecated module WebserviceClient is completely removed (was never released and use deprecated architecture). May be replaced with the stable module Webhook. * The dynamic properties ->no_button_delete, ->no_button_edit, ->no_button_copy for $object Product that could be set by an external module must no more be set (not allowed by PHP 8.2). A module can already return an array with key 'no_button_delete', 'no_button_edit', 'no_button_copy' for same purpose. * The old function dol_bc($var, $moreclass = '') has been removed. If you called it, just stop to call it. -* The trigger code CATEGORY_LINK and CATEGORY_UNLINK has been replaced with code CATEGORY_MODIFY. You can read ->context['linkto'] or ->context['unlinkoff' to detect we want to make a link or unlink. -* The property ->domiciliation and ->propio on bank accounts has been deprecated and replaced with property ->address and ->owner_name +* The trigger code CATEGORY_LINK and CATEGORY_UNLINK has been replaced with code CATEGORY_MODIFY. You can read ->context['linkto'] or ->context['unlinkoff' to detect if we want to make a link or unlink. +* The property ->domiciliation and ->propio on bank accounts has been deprecated and replaced with property ->address and ->owner_name everywhere. * If you were using the substitution key __MEMBER_CIVILITY__, you must now use __MEMBER_TITLE__ diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 0e349810944ca..7bfcc4c2d7991 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -110,7 +110,7 @@ $search_status = $statut; // For backward compatibility } -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); if ($search_status < -2) { $search_status = ''; diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 9893e9c394648..d9b28022a1cbf 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -39,18 +39,9 @@ * @var User $user */ -if (!$user->admin) { - accessforbidden(); -} - $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); - -// Security check -if ($user->socid > 0) { - $action = ''; - $socid = $user->socid; -} +$optioncss = GETPOST("optioncss", "aZ"); // Option for the css output (always '' except when 'print') // Load translation files required by the page $langs->loadLangs(array("companies", "admin", "users", "other","withdrawals")); @@ -80,7 +71,7 @@ $search_desc = GETPOST("search_desc", "alpha"); $search_ua = GETPOST("search_ua", "restricthtml"); $search_prefix_session = GETPOST("search_prefix_session", "restricthtml"); -$optioncss = GETPOST("optioncss", "aZ"); // Option for the css output (always '' except when 'print') +$search_entity = ($user->entity > 0 ? $user->entity : GETPOSTINT('search_entity')); $now = dol_now(); $nowarray = dol_getdate($now); @@ -101,7 +92,6 @@ $date_end = $date_start + 86400; } - if (!GETPOSTISSET('pageplusoneold') && !GETPOSTISSET('page') && $date_start === '') { // We define date_start and date_end $date_start = dol_get_first_day($nowarray['year'], $nowarray['mon'], 'tzuserrel'); } @@ -139,6 +129,19 @@ ) ); +// Security check +/* +$socid = 0; +if ($user->socid > 0) { + $action = ''; + $socid = $user->socid; +} +*/ + +if (!$user->admin) { + accessforbidden(); +} + /* * Actions @@ -163,6 +166,7 @@ $search_desc = ''; $search_ua = ''; $search_prefix_session = ''; + $search_entity = ''; } // Purge audit events @@ -219,7 +223,7 @@ $sql .= " u.login, u.admin, u.entity, u.firstname, u.lastname, u.statut as status"; $sql .= " FROM ".MAIN_DB_PREFIX."events as e"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user"; -$sql .= " WHERE e.entity IN (".getEntity('event').")"; +$sql .= " WHERE e.entity IN (".($search_entity > 0 ? $search_entity : getEntity('event', (GETPOSTINT('search_current_entity') ? 0 : 1))).")"; if ($date_start !== '') { $sql .= " AND e.dateevent >= '".$db->idate($date_start)."'"; } @@ -286,6 +290,9 @@ if ($optioncss != '') { $param .= '&optioncss='.urlencode($optioncss); } + if ($search_entity != '') { + $param .= '&search_entity='.((int) $search_entity); + } if ($search_rowid) { $param .= '&search_rowid='.urlencode((string) ($search_rowid)); } diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index 1012ce10db5a4..5bb17d3d786bc 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -66,7 +66,7 @@ $pagenext = $page + 1; // Search Fields -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_ref = GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : GETPOST("sref", "alpha"); $search_messtype = GETPOST("search_messtype", "alpha"); $filteremail = GETPOST('filteremail', 'alpha'); diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 998e84506b93f..6d2b714ed17e6 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -86,7 +86,7 @@ $mode = GETPOST('mode', 'alpha'); // Search Fields -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_user = GETPOSTINT('search_user'); if ($search_user == -1) { $search_user = 0; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 659c2781e9799..90de41c3acd52 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -98,7 +98,7 @@ $socid = GETPOSTINT('socid'); -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_product_category = GETPOST('search_product_category', 'intcomma'); $search_id = GETPOST('search_id', 'int'); $search_ref = GETPOST('search_ref', 'alpha') != '' ? GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha'); diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php index 9f81b7dfe706b..b501d46313595 100644 --- a/htdocs/commande/list_det.php +++ b/htdocs/commande/list_det.php @@ -117,7 +117,7 @@ $search_state = GETPOST("search_state", 'alpha'); $search_country = GETPOST("search_country", 'aZ09'); $search_type_thirdparty = GETPOST("search_type_thirdparty", 'intcomma'); -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_user = GETPOST('search_user', 'intcomma'); $search_sale = GETPOST('search_sale', 'intcomma'); $search_total_ht = GETPOST('search_total_ht', 'alpha'); diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php index b882025651df1..46a5828f1d9b9 100644 --- a/htdocs/compta/bank/various_payment/list.php +++ b/htdocs/compta/bank/various_payment/list.php @@ -134,7 +134,7 @@ $search_type_id = ''; } -$search_all = GETPOSTISSET("search_all") ? trim(GETPOST("search_all", 'alpha')) : trim(GETPOST('sall')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); /* * TODO: fill array "$fields" in "/compta/bank/class/paymentvarious.class.php" and use diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php index a9dbd994ebe78..c9b3be80649b2 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_list.php +++ b/htdocs/compta/cashcontrol/cashcontrol_list.php @@ -89,7 +89,7 @@ } // Initialize array of search criteria -$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); +$search_all = GETPOST('search_all', 'alphanohtml'); $search = array(); foreach ($object->fields as $key => $val) { if (GETPOST('search_'.$key, 'alpha') !== '') { diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index fd066ef2e1e11..9e569f2596708 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -77,7 +77,7 @@ // Load translation files required by the page $langs->loadLangs(array('bills', 'companies', 'products', 'categories')); -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility $ref = GETPOST('ref', 'alpha'); diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index dbea0022b80b1..fd5c5b2079940 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -100,7 +100,7 @@ $sortfield = "p.ref"; } -$search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); // List of fields to search into when doing a "search in all" $fieldstosearchall = array( diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index c6b336ddd75c7..f6aedacb6bfdf 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -74,7 +74,7 @@ $contactid = GETPOSTINT('id'); $ref = ''; // There is no ref for contacts -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_cti = preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('search_cti', 'alphanohtml'))); // Phone number without any special chars $search_phone = GETPOST("search_phone", 'alpha'); diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 1158425d53e15..a3adefa252632 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -77,7 +77,7 @@ $search_contract = GETPOST('search_contract', 'alpha'); $search_ref_customer = GETPOST('search_ref_customer', 'alpha'); $search_ref_supplier = GETPOST('search_ref_supplier', 'alpha'); -$search_all = (GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); +$search_all = GETPOST('search_all', 'alphanohtml'); $search_status = GETPOST('search_status', 'alpha'); $search_signed_status = GETPOST('search_signed_status', 'alpha'); $search_user = GETPOST('search_user', 'intcomma'); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index b312c7ac66e68..01b783b615508 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -968,7 +968,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null if ($qualified && isset($user->default_values[$relativepathstring]['filters'][$defkey][$paramname])) { // We must keep $_POST and $_GET here - if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) { + if (isset($_POST['search_all']) || isset($_GET['search_all'])) { // We made a search from quick search menu, do we still use default filter ? if (!getDolGlobalString('MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH')) { $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and , diff --git a/htdocs/don/list.php b/htdocs/don/list.php index 1a3e26fcd891e..da96c68cb042a 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -56,7 +56,7 @@ $type = GETPOST('type', 'aZ'); $search_status = (GETPOST("search_status", 'intcomma') != '') ? GETPOST("search_status", 'intcomma') : "-4"; -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_ref = GETPOST('search_ref', 'alpha'); $search_company = GETPOST('search_company', 'alpha'); $search_thirdparty = GETPOST('search_thirdparty', 'alpha'); diff --git a/htdocs/don/paiement/list.php b/htdocs/don/paiement/list.php index 9d2ff770ae56f..5fd827666516f 100644 --- a/htdocs/don/paiement/list.php +++ b/htdocs/don/paiement/list.php @@ -85,7 +85,7 @@ $sortfield = "pd.rowid"; } -$search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); // List of fields to search into when doing a "search in all" $fieldstosearchall = array( diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php index a4d0813292abd..9924283caa6c5 100644 --- a/htdocs/eventorganization/conferenceorbooth_list.php +++ b/htdocs/eventorganization/conferenceorbooth_list.php @@ -102,7 +102,7 @@ } // Initialize array of search criteria -$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); +$search_all = GETPOST('search_all', 'alphanohtml'); $search = array(); foreach ($object->fields as $key => $val) { if (GETPOST('search_'.$key, 'alpha') !== '') { diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index a555032c122b6..6ca09ff8fb6a5 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -81,7 +81,7 @@ $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datedelivery_endmonth'), GETPOSTINT('search_datedelivery_endday'), GETPOSTINT('search_datedelivery_endyear')); $search_datereceipt_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datereceipt_startmonth'), GETPOSTINT('search_datereceipt_startday'), GETPOSTINT('search_datereceipt_startyear')); $search_datereceipt_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datereceipt_endmonth'), GETPOSTINT('search_datereceipt_endday'), GETPOSTINT('search_datereceipt_endyear')); -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_user = GETPOST('search_user', 'intcomma'); $search_sale = GETPOST('search_sale', 'intcomma'); $search_categ_cus = GETPOST("search_categ_cus", 'intcomma'); diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index e1ff74c3398e6..bea0c16735616 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -103,7 +103,7 @@ } -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_ref = GETPOST('search_ref', 'alpha'); $search_user = GETPOST('search_user', 'intcomma'); diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php index dde2241d6126a..14196f33b9e04 100644 --- a/htdocs/expensereport/payment/list.php +++ b/htdocs/expensereport/payment/list.php @@ -100,7 +100,7 @@ $sortfield = "pndf.datep"; } -$search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); // List of fields to search into when doing a "search in all" $fieldstosearchall = array( diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index e3d606b7169f8..b2debc9e3ca92 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -78,7 +78,7 @@ $search_contrat_ref = GETPOST('search_contrat_ref', 'alpha'); $search_status = GETPOST('search_status', 'alpha'); $search_signed_status = GETPOST('search_signed_status', 'alpha'); -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_date_startday = GETPOSTINT('search_date_startday'); $search_date_startmonth = GETPOSTINT('search_date_startmonth'); $search_date_startyear = GETPOSTINT('search_date_startyear'); diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 95ed76f15c47e..78fb936bfa8d5 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -108,7 +108,7 @@ $search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear); // Use tzserver $search_date_approve_end = dol_mktime(23, 59, 59, $search_date_approve_endmonth, $search_date_approve_endday, $search_date_approve_endyear); -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_product_category = GETPOSTINT('search_product_category'); $search_ref = GETPOST('search_ref', 'alpha'); diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index e32e0d0057c41..8fc931eb42fb2 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -71,7 +71,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierinvoicelist'; $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...) -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_label = GETPOST("search_label", "alpha"); $search_amount_no_tax = GETPOST("search_amount_no_tax", "alpha"); $search_amount_all_tax = GETPOST("search_amount_all_tax", "alpha"); diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php index 1677e827cf48d..b07b9a45add33 100644 --- a/htdocs/fourn/paiement/list.php +++ b/htdocs/fourn/paiement/list.php @@ -96,7 +96,7 @@ $sortfield = "p.datep"; } -$search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); // List of fields to search into when doing a "search in all" $fieldstosearchall = array( diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 53a1a33e2bf3e..cfe0f519db954 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -93,7 +93,7 @@ $sortfield = "cp.ref"; } -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_ref = GETPOST('search_ref', 'alphanohtml'); $search_day_create = GETPOST('search_day_create', 'int'); $search_month_create = GETPOST('search_month_create', 'int'); diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php index d7dcbb1010af8..75af289141372 100644 --- a/htdocs/hrm/evaluation_list.php +++ b/htdocs/hrm/evaluation_list.php @@ -98,7 +98,7 @@ } // Initialize array of search criteria -$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); +$search_all = GETPOST('search_all', 'alphanohtml'); $search = array(); foreach ($object->fields as $key => $val) { if (GETPOST('search_'.$key, 'alpha') !== '') { diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php index b23282cba21c2..b61195bde8b75 100644 --- a/htdocs/hrm/job_list.php +++ b/htdocs/hrm/job_list.php @@ -97,7 +97,7 @@ } // Initialize array of search criteria -$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); +$search_all = GETPOST('search_all', 'alphanohtml'); $search = array(); foreach ($object->fields as $key => $val) { if (GETPOST('search_'.$key, 'alpha') !== '') { diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php index 0a72689c723bd..bb05f0124bfa4 100644 --- a/htdocs/hrm/position.php +++ b/htdocs/hrm/position.php @@ -108,7 +108,7 @@ } // Initialize array of search criteria -$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); +$search_all = GETPOST('search_all', 'alphanohtml'); $search = array(); foreach ($objectposition->fields as $key => $val) { if (GETPOST('search_' . $key, 'alpha') !== '') { diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php index 8643c3397cc5f..fd562ed985884 100644 --- a/htdocs/hrm/position_list.php +++ b/htdocs/hrm/position_list.php @@ -98,7 +98,7 @@ } // Initialize array of search criteria -$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); +$search_all = GETPOST('search_all', 'alphanohtml'); $search = array(); foreach ($object->fields as $key => $val) { if (GETPOST('search_'.$key, 'alpha') !== '') { diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php index b6aab469db4ea..6c4362511eaf8 100644 --- a/htdocs/hrm/skill_card.php +++ b/htdocs/hrm/skill_card.php @@ -591,7 +591,7 @@ } // Initialize array of search criteria - $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); + $search_all = GETPOST('search_all', 'alphanohtml'); $search = array(); foreach ($objectline->fields as $key => $val) { if (GETPOST('search_' . $key, 'alpha') !== '') { diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php index 8450895f3e120..89be7098c2485 100644 --- a/htdocs/hrm/skill_list.php +++ b/htdocs/hrm/skill_list.php @@ -98,7 +98,7 @@ } // Initialize array of search criteria -$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); +$search_all = GETPOST('search_all', 'alphanohtml'); $search = array(); foreach ($object->fields as $key => $val) { if (GETPOST('search_'.$key, 'alpha') !== '') { diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php index 236b0f6a0620f..8bad85d7b15c7 100644 --- a/htdocs/intracommreport/list.php +++ b/htdocs/intracommreport/list.php @@ -51,7 +51,7 @@ $optioncss = GETPOST('optioncss', 'alpha'); $mode = GETPOST('mode', 'aZ'); -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_ref = GETPOST("search_ref", 'alpha'); $search_type = GETPOST("search_type", 'int'); @@ -277,7 +277,7 @@ $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; if ($object->ismultientitymanaged == 1) { - $sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")"; + $sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")"; } else { $sql .= " WHERE 1 = 1"; } diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php index ce957b10297e9..ea434e1187e38 100644 --- a/htdocs/mrp/mo_list.php +++ b/htdocs/mrp/mo_list.php @@ -95,7 +95,7 @@ } // Initialize array of search criteria -$search_all = trim(GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search = array(); foreach ($object->fields as $key => $val) { if (GETPOST('search_'.$key, 'alpha') !== '') { @@ -254,7 +254,7 @@ $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; if ($object->ismultientitymanaged == 1) { - $sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")"; + $sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")"; } else { $sql .= " WHERE 1 = 1"; } diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php index 9ed773acc5806..01d197f073786 100644 --- a/htdocs/multicurrency/multicurrency_rate.php +++ b/htdocs/multicurrency/multicurrency_rate.php @@ -58,7 +58,7 @@ $confirm = GETPOST('confirm', 'alpha'); $toselect = GETPOST('toselect', 'array'); $id_rate_selected = GETPOSTINT('id_rate'); -$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$sall = trim(GETPOST('search_all', 'alphanohtml')); $search_date_sync = dol_mktime(0, 0, 0, GETPOSTINT('search_date_syncmonth'), GETPOSTINT('search_date_syncday'), GETPOSTINT('search_date_syncyear')); $search_date_sync_end = dol_mktime(0, 0, 0, GETPOSTINT('search_date_sync_endmonth'), GETPOSTINT('search_date_sync_endday'), GETPOSTINT('search_date_sync_endyear')); $search_rate = GETPOST('search_rate', 'alpha'); diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index 49c5df14190f4..2da002eb21574 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -49,7 +49,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'opensurveylist'; // To manage different context of search $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') -$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$sall = trim(GETPOST('search_all', 'alphanohtml')); $id = GETPOST('id', 'alpha'); $search_ref = GETPOST('search_ref', 'alpha'); diff --git a/htdocs/product/list.php b/htdocs/product/list.php index cba76bfd5c5c0..28a9d723ad50f 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -86,7 +86,7 @@ $fourn_id = GETPOSTINT("fourn_id"); // Search Criteria -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_id = GETPOST("search_id", 'alpha'); $search_ref = GETPOST("search_ref", 'alpha'); $search_ref_supplier = GETPOST("search_ref_supplier", 'alpha'); diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index 482f39b9580a6..092b69e3be3f8 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -49,7 +49,7 @@ $action = GETPOST('action', 'aZ09'); $sref = GETPOST("sref", 'alpha'); $snom = GETPOST("snom", 'alpha'); -$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$sall = trim(GETPOST('search_all', 'alphanohtml')); $type = GETPOSTISSET('type') ? GETPOSTINT('type') : Product::TYPE_PRODUCT; $search_barcode = GETPOST("search_barcode", 'alpha'); $search_toolowstock = GETPOST('search_toolowstock'); diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php index 81d3528427f34..7093fedc7b488 100644 --- a/htdocs/product/reassortlot.php +++ b/htdocs/product/reassortlot.php @@ -58,7 +58,7 @@ $sref = GETPOST("sref", 'alpha'); $snom = GETPOST("snom", 'alpha'); -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $type = GETPOSTISSET('type') ? GETPOSTINT('type') : Product::TYPE_PRODUCT; $search_barcode = GETPOST("search_barcode", 'alpha'); $search_warehouse = GETPOST('search_warehouse', 'alpha'); diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index 08a75713a2ffa..fdaa3dbad029b 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -57,7 +57,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...) -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_ref = GETPOST("sref", "alpha") ? GETPOST("sref", "alpha") : GETPOST("search_ref", "alpha"); $search_label = GETPOST("snom", "alpha") ? GETPOST("snom", "alpha") : GETPOST("search_label", "alpha"); $search_status = GETPOST("search_status", "intcomma"); diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php index 542a2bcdf6de8..a8ecbeacf72b4 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -77,7 +77,7 @@ $product_id = GETPOST("product_id", 'intcomma'); $show_files = GETPOSTINT('show_files'); -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_date_startday = GETPOSTINT('search_date_startday'); $search_date_startmonth = GETPOSTINT('search_date_startmonth'); $search_date_startyear = GETPOSTINT('search_date_startyear'); diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index d82bc13b10e54..95784d927cc9a 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -94,7 +94,7 @@ } // Initialize array of search criteria -$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); +$search_all = GETPOST('search_all', 'alphanohtml'); $search = array(); foreach ($object->fields as $key => $val) { if (GETPOST('search_'.$key, 'alpha') !== '') { diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 4e0a9ccdd45c1..150984d40641c 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -64,7 +64,7 @@ $action = GETPOST('action', 'aZ09'); $search_ref = GETPOST('search_ref', 'alpha'); $search_label = GETPOST('search_label', 'alpha'); -$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$sall = trim(GETPOST('search_all', 'alphanohtml')); $type = GETPOSTINT('type'); $tobuy = GETPOSTINT('tobuy'); $salert = GETPOST('salert', 'alpha'); diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php index 5e8181c6691c7..e1a543eeeddac 100644 --- a/htdocs/product/stock/valo.php +++ b/htdocs/product/stock/valo.php @@ -42,7 +42,7 @@ $sref = GETPOST("sref", 'alpha'); $snom = GETPOST("snom", 'alpha'); -$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$sall = trim(GETPOST('search_all', 'alphanohtml')); $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; $sortfield = GETPOST('sortfield', 'aZ09comma'); diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index f8d1952aee2f0..f3326d6cbcfe9 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -104,7 +104,9 @@ $pageprev = $page - 1; $pagenext = $page + 1; -$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); +$search_all = GETPOST('search_all', 'alphanohtml'); +$search_entity = ($user->entity > 0 ? $user->entity : GETPOSTINT('search_entity')); + $search_ref = GETPOST("search_ref", 'alpha'); $search_label = GETPOST("search_label", 'alpha'); $search_societe = GETPOST("search_societe", 'alpha'); @@ -429,6 +431,7 @@ $search_price_booth = ''; $search_login = ''; $search_import_key = ''; + $search_entity = ''; $toselect = array(); $search_array_options = array(); $search_category_array = array(); @@ -585,7 +588,7 @@ $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; -$sql .= " WHERE p.entity IN (".getEntity('project', (GETPOSTINT('search_current_entity') ? 0 : 1)).')'; +$sql .= " WHERE p.entity IN (".($search_entity > 0 ? $search_entity : getEntity('project', (GETPOSTINT('search_current_entity') ? 0 : 1))).')'; if (!$user->hasRight('projet', 'all', 'lire')) { $sql .= " AND p.rowid IN (".$db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users } @@ -886,6 +889,12 @@ if ($optioncss != '') { $param .= '&optioncss='.urlencode($optioncss); } +if ($search_all != '') { + $param .= '&search_all='.urlencode($search_all); +} +if ($search_entity != '') { + $param .= '&search_entity='.((int) $search_entity); +} if ($groupby != '') { $param .= '&groupby='.urlencode($groupby); } @@ -893,9 +902,6 @@ if ($socid) { $param .= '&socid='.urlencode((string) $socid); } -if ($search_all != '') { - $param .= '&search_all='.urlencode($search_all); -} if ($search_sday) { $param .= '&search_sday='.urlencode((string) ($search_sday)); } diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index fb01017d44855..a358aec466ea0 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -57,7 +57,7 @@ $id = GETPOSTINT('id'); -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_categ = GETPOST("search_categ", 'intcomma'); $search_projectstatus = GETPOST('search_projectstatus', 'intcomma'); $search_project_ref = GETPOST('search_project_ref'); diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php index d9489cf032131..b8801e6a26dcb 100644 --- a/htdocs/reception/list.php +++ b/htdocs/reception/list.php @@ -87,7 +87,7 @@ $search_date_create_end = dol_mktime(23, 59, 59, $search_date_create_endmonth, $search_date_create_endday, $search_date_create_endyear); $search_billed = GETPOST("search_billed", 'intcomma'); $search_status = GETPOST('search_status', 'intcomma'); -$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'); +$search_all = GETPOST('search_all', 'alphanohtml'); $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; $sortfield = GETPOST('sortfield', 'aZ09comma'); diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 00ee9149fa3c2..5dafaa0b4c610 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -78,7 +78,7 @@ $mode = GETPOST("mode", 'alpha'); // search fields -$search_all = trim(GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_cti = preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('search_cti', 'alphanohtml'))); // Phone number without any special chars $search_id = GETPOST("search_id", 'int'); diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index 5b85682a9fc0e..8046729f74c8d 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -108,7 +108,7 @@ $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha'); $search_status = GETPOST('search_status', 'intcomma'); $search_product_category = GETPOST('search_product_category', 'int'); -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $object_statut = GETPOST('supplier_proposal_statut', 'intcomma'); $search_btn = GETPOST('button_search', 'alpha'); diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index d4f42db9f3b75..553bebec44177 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -122,7 +122,7 @@ }*/ // Initialize array of search criteria -$search_all = (GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall')); +$search_all = trim(GETPOST("search_all", 'alphanohtml')); $search = array(); foreach ($object->fields as $key => $val) { if (GETPOST('search_'.$key, 'alpha') !== '') { diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index e466cca651b62..568d7b6d5d71b 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -51,7 +51,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...) -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_group = GETPOST('search_group'); $search = array(); diff --git a/htdocs/user/list.php b/htdocs/user/list.php index 86eff542802c7..36d0a7df8d91b 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -171,7 +171,7 @@ '@phan-var-force array,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan // Init search fields -$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_user = GETPOST('search_user', 'alpha'); $search_rowid = GETPOST('search_rowid', 'alpha'); $search_login = GETPOST('search_login', 'alpha'); diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index 213bdb5ee0fc7..fbec288d582d9 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -275,7 +275,7 @@ $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; if ($object->ismultientitymanaged == 1) { - $sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")"; + $sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")"; } else { $sql .= " WHERE 1 = 1"; } diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php index 243dee3a8d738..30e70a8ea09c6 100644 --- a/htdocs/webhook/target_list.php +++ b/htdocs/webhook/target_list.php @@ -260,7 +260,7 @@ $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; if ($object->ismultientitymanaged == 1) { - $sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")"; + $sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")"; } else { $sql .= " WHERE 1 = 1"; } From e478f72d2baaaf01b2eca2c1e622b41005a7581e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 13:06:45 +0100 Subject: [PATCH 02/23] debug v21 --- htdocs/admin/tools/listevents.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index d9b28022a1cbf..5b97d1c22f1d2 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -540,6 +540,9 @@ if ($num == 0) { $colspan = 8; + if (!empty($arrayfields['e.prefix_session']['checked'])) { + $colspan++; + } if ($usefilter) { print ''.$langs->trans("NoEventFoundWithCriteria").''; } else { From fd7a766862417cf5198497ee4a507fac5680e962 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 13:33:04 +0100 Subject: [PATCH 03/23] Trans --- .../core/triggers/interface_20_all_Logevents.class.php | 4 +++- htdocs/langs/en_US/users.lang | 9 +++++---- htdocs/langs/fr_FR/users.lang | 7 ++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php index 0934773c55ea7..31a9ee2b99e5a 100644 --- a/htdocs/core/triggers/interface_20_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php @@ -38,7 +38,7 @@ class InterfaceLogevents extends DolibarrTriggers 'USER_LOGOUT' => 'UserLogoff', 'USER_CREATE' => 'NewUserCreated', 'USER_MODIFY' => 'EventUserModified', - 'USER_NEW_PASSWORD' => 'NewUserPassword', + 'USER_NEW_PASSWORD' => 'UserPasswordChange', 'USER_ENABLEDISABLE' => 'UserEnabledDisabled', 'USER_DELETE' => 'UserDeleted', 'USERGROUP_CREATE' => 'NewGroupCreated', @@ -106,6 +106,8 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf // Actions dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id); + + // Set the label of event from the action code and the object properties $this->initEventData(InterfaceLogevents::EVENT_ACTION_DICT[$action], $object); // Add entry in event table diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 1e38f0803513f..0b5f9fb69dbfa 100644 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -110,9 +110,10 @@ ExpectedWorkedHours=Expected hours worked per week ColorUser=Color of the user DisabledInMonoUserMode=Disabled in maintenance mode UserAccountancyCode=User accounting code -UserLogoff=User logout: %s -UserLogged=User logged: %s -UserLoginFailed=User login failed: %s +UserLogoff=User logout +UserLogged=User logged +UserLoginFailed=User login failed +UserPasswordChange=User password change DateOfEmployment=Employment date DateEmployment=Employment DateEmploymentStart=Employment Start Date @@ -137,4 +138,4 @@ ExcludedByFilter=Non qualified by filters but shown to see its hierarchy UserEnabledDisabled=User status changed: %s AlternativeEmailForOAuth2=Alternative Email for OAuth2 login ErrorUpdateCanceledDueToDuplicatedUniqueValue=Error, The update was canceled because one of the pieces of data, that should be unique, already exists -SocialNetworksUser=Social networks for user \ No newline at end of file +SocialNetworksUser=Social networks for user diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang index 13079f53255c9..fd2f27024a6d4 100644 --- a/htdocs/langs/fr_FR/users.lang +++ b/htdocs/langs/fr_FR/users.lang @@ -110,9 +110,10 @@ ExpectedWorkedHours=Heures de travail prévues par semaine ColorUser=Couleur de l'utilisateur DisabledInMonoUserMode=Désactivé en mode maintenance UserAccountancyCode=Code comptable de l'utilisateur -UserLogoff=Déconnexion de l'utilisateur : %s -UserLogged=Utilisateur connecté : %s -UserLoginFailed=Échec de la connexion utilisateur : %s +UserLogoff=Déconnexion de l'utilisateur +UserLogged=Utilisateur connecté +UserLoginFailed=Échec de la connexion utilisateur +UserPasswordChange=Changement de mot de passe DateOfEmployment=Date d'embauche DateEmployment=Emploi DateEmploymentStart=Date d'embauche From 90347030451c7f2d5eaf10e8addc695b3178c980 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 13:52:40 +0100 Subject: [PATCH 04/23] Add more info on audit event password renew --- .../core/triggers/interface_20_all_Logevents.class.php | 5 ++++- htdocs/user/class/user.class.php | 10 +++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php index 31a9ee2b99e5a..b948ef9948444 100644 --- a/htdocs/core/triggers/interface_20_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php @@ -32,7 +32,9 @@ */ class InterfaceLogevents extends DolibarrTriggers { - const EVENT_ACTION_DICT = array( // TODO reduce number of events to CREATE, UPDATE & DELETE. Use object properties to pinpoint precise action. + // List of translation key to use for the description of each event. + // TODO reduce this list of of events to use keep USER_CREATE, USER_MODIFY & USER_DELETE and use $user->context['audit'] = 'text to add' to complete message of event. + const EVENT_ACTION_DICT = array( 'USER_LOGIN' => 'UserLogged', 'USER_LOGIN_FAILED' => 'UserLoginFailed', 'USER_LOGOUT' => 'UserLogoff', @@ -108,6 +110,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id); // Set the label of event from the action code and the object properties + // Take the message code into EVENT_ACTION_DICT and complete with $object properties like $object->context['audit'] $this->initEventData(InterfaceLogevents::EVENT_ACTION_DICT[$action], $object); // Add entry in event table diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 15018d2ee296f..545c471c77def 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -2528,13 +2528,15 @@ public function setPassword($user, $password = '', $changelater = 0, $notrigger $this->oldcopy = clone $this; } + $now = dol_now(); + $this->db->begin(); $sql = "UPDATE ".$this->db->prefix()."user"; $sql .= " SET pass_crypted = '".$this->db->escape($password_crypted)."',"; $sql .= " pass_temp = null"; if (!empty($flagdelsessionsbefore)) { - $sql .= ", flagdelsessionsbefore = '".$this->db->idate(dol_now() - 5, 'gmt')."'"; + $sql .= ", flagdelsessionsbefore = '".$this->db->idate($now - 5, 'gmt')."'"; } if (getDolGlobalString('DATABASE_PWD_ENCRYPTED')) { $sql .= ", pass = null"; @@ -2574,6 +2576,12 @@ public function setPassword($user, $password = '', $changelater = 0, $notrigger dol_syslog(get_class($this)."::setPassword notrigger=".$notrigger." error=".$error, LOG_DEBUG); + // Call trigger for the "security events" log + $user->context['audit'] = 'login='.$user->login; + if (!empty($flagdelsessionsbefore)) { + $user->context['audit'] .= ' - flagdelsessionsbefore set to '.$this->db->idate($now - 5, 'gmt'); + } + if (!$error && !$notrigger) { // Call trigger $result = $this->call_trigger('USER_NEW_PASSWORD', $user); From c79138b892ebf4f5e4ba8b1caeafc635a239fd5b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 14:00:16 +0100 Subject: [PATCH 05/23] Debug v21 --- htdocs/admin/tools/listevents.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 5b97d1c22f1d2..901b494badaee 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -220,7 +220,7 @@ $sql = "SELECT e.rowid, e.type, e.ip, e.user_agent, e.dateevent,"; $sql .= " e.fk_user, e.description, e.prefix_session,"; -$sql .= " u.login, u.admin, u.entity, u.firstname, u.lastname, u.statut as status"; +$sql .= " u.login, u.admin, u.email, u.entity, u.firstname, u.lastname, u.gender, u.photo, u.statut as status"; $sql .= " FROM ".MAIN_DB_PREFIX."events as e"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user"; $sql .= " WHERE e.entity IN (".($search_entity > 0 ? $search_entity : getEntity('event', (GETPOSTINT('search_current_entity') ? 0 : 1))).")"; @@ -483,13 +483,20 @@ $userstatic->admin = $obj->admin; $userstatic->entity = $obj->entity; $userstatic->status = $obj->status; + $userstatic->gender = $obj->gender; + $userstatic->photo = $obj->photo; + $userstatic->firstname = $obj->firstname; + $userstatic->lastname = $obj->lastname; + $userstatic->email = $obj->email; - print $userstatic->getLoginUrl(1); if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) { - print img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingleft"'); + print img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright"'); } elseif ($userstatic->admin) { - print img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingleft"'); + print img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright"'); } + + //print $userstatic->getLoginUrl(-1); + print $userstatic->getNomUrl(-1); } else { print ' '; } From 5f292a4e857442c90a2881c92c61567a2be71226 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 15:02:12 +0100 Subject: [PATCH 06/23] Fix phan --- htdocs/admin/tools/listevents.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 901b494badaee..baafd359e68b4 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -42,6 +42,7 @@ $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); $optioncss = GETPOST("optioncss", "aZ"); // Option for the css output (always '' except when 'print') +$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'listevents'; // Load translation files required by the page $langs->loadLangs(array("companies", "admin", "users", "other","withdrawals")); @@ -223,7 +224,11 @@ $sql .= " u.login, u.admin, u.email, u.entity, u.firstname, u.lastname, u.gender, u.photo, u.statut as status"; $sql .= " FROM ".MAIN_DB_PREFIX."events as e"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user"; -$sql .= " WHERE e.entity IN (".($search_entity > 0 ? $search_entity : getEntity('event', (GETPOSTINT('search_current_entity') ? 0 : 1))).")"; +if ($search_entity > 0) { + $sql .= " WHERE e.entity = ".((int) $search_entity).")"; +} else { + $sql .= " WHERE e.entity IN (".getEntity('event', (GETPOSTINT('search_current_entity') ? 0 : 1)).")"; +} if ($date_start !== '') { $sql .= " AND e.dateevent >= '".$db->idate($date_start)."'"; } From feeda293282e09e049d55add0cef0f1dc14a50f9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 15:08:44 +0100 Subject: [PATCH 07/23] Fix phan --- htdocs/projet/list.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index f3326d6cbcfe9..6f5385ee1e514 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -588,7 +588,11 @@ $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; -$sql .= " WHERE p.entity IN (".($search_entity > 0 ? $search_entity : getEntity('project', (GETPOSTINT('search_current_entity') ? 0 : 1))).')'; +if ($search_entity > 0) { + $sql .= " WHERE p.entity = ".((int) $search_entity); +} else { + $sql .= " WHERE p.entity IN (".getEntity('project', (GETPOSTINT('search_current_entity') ? 0 : 1)).')'; +} if (!$user->hasRight('projet', 'all', 'lire')) { $sql .= " AND p.rowid IN (".$db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users } From d756c4dc277ea66bae05037e742b3d82a93180b5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 15:40:14 +0100 Subject: [PATCH 08/23] NEW Add hook getLoginPageExtraContent, getPasswordResetPageExtraContent and getPasswordForgottenPageExtraContent. --- htdocs/admin/tools/listevents.php | 2 +- htdocs/core/tpl/login.tpl.php | 67 +++++++---------------- htdocs/core/tpl/passwordforgotten.tpl.php | 65 ++++++---------------- htdocs/core/tpl/passwordreset.tpl.php | 56 ++++++------------- 4 files changed, 58 insertions(+), 132 deletions(-) diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index baafd359e68b4..bf28f2f305f1e 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -369,7 +369,7 @@ */ print '
'; - print ''; + print '
'; // Fields title search print ''; diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index d4abcc68c4b3c..ee50a6e134997 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -66,6 +66,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; ' +@phan-var-force HookManager $hookmanager +@phan-var-force string $action @phan-var-force string $captcha @phan-var-force int<0,1> $dol_hide_leftmenu @phan-var-force int<0,1> $dol_hide_topmenu @@ -83,6 +85,19 @@ @phan-var-force int<0,1> $forgetpasslink '; +/** + * @var HookManager $hookmanager + * @var string $action + * @var string $captcha + * @var string $message + * @var string $title + */ + + +/* + * View + */ + header('Cache-Control: Public, must-revalidate'); if (GETPOST('dol_hide_topmenu')) { @@ -106,13 +121,6 @@ $conf->use_javascript_ajax = 1; } -// $captcha is defined - - -/* - * View - */ - $php_self = empty($php_self) ? dol_escape_htmltag($_SERVER['PHP_SELF']) : $php_self; if (!empty($_SERVER["QUERY_STRING"]) && dol_escape_htmltag($_SERVER["QUERY_STRING"])) { $php_self .= '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]); @@ -493,7 +501,7 @@ if (!empty($_SESSION['dol_loginmesg'])) { $message = $_SESSION['dol_loginmesg']; // By default this is an error message } -if ($message) { +if (!empty($message)) { if (!empty($conf->use_javascript_ajax)) { if (preg_match('//', $message)) { // if it contains this comment, this is a warning message $message = str_replace('', '', $message); @@ -579,45 +587,12 @@ echo $moreloginextracontent; } +// Can add extra content +$parameters = array(); +$dummyobject = new stdClass(); +$result = $hookmanager->executeHooks('getLoginPageExtraContent', $parameters, $dummyobject, $action); +print $hookmanager->resPrint; -// TODO Remove this, and add content into hook getLoginPageExtraOptions() instead -// Google Analytics -if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AN_ID')) { - $tmptagarray = explode(',', getDolGlobalString('MAIN_GOOGLE_AN_ID')); - foreach ($tmptagarray as $tmptag) { - print "\n"; - print "\n"; - print " - - - "; - print "\n"; - } -} -// TODO Replace this with a hook -// Google Adsense (need Google module) -if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AD_CLIENT') && getDolGlobalString('MAIN_GOOGLE_AD_SLOT')) { - if (empty($conf->dol_use_jmobile)) { - ?> -

- - -
- diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 57ca6486d3398..272c21ded9d8e 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -39,6 +39,19 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +/** + * @var HookManager $hookmanager + * @var string $action + * @var string $captcha + * @var string $message + * @var string $title + */ + + +/* + * View + */ + header('Cache-Control: Public, must-revalidate'); if (GETPOST('dol_hide_topmenu')) { @@ -62,15 +75,6 @@ $conf->use_javascript_ajax = 1; } -/** - * @var string $captcha - * @var string $message - */ - - -/* - * View - */ $php_self = $_SERVER['PHP_SELF']; $php_self .= dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : ''; @@ -335,45 +339,12 @@ echo $moreloginextracontent; } -// Google Analytics -// TODO Remove this, and add content into hook getPasswordForgottenPageExtraOptions() instead -if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AN_ID')) { - $tmptagarray = explode(',', getDolGlobalString('MAIN_GOOGLE_AN_ID')); - foreach ($tmptagarray as $tmptag) { - print "\n"; - print "\n"; - print " - - - "; - print "\n"; - } -} +// Can add extra content +$parameters = array(); +$dummyobject = new stdClass(); +$result = $hookmanager->executeHooks('getPasswordForgottenPageExtraContent', $parameters, $dummyobject, $action); +print $hookmanager->resPrint; -// TODO Replace this with a hook -// Google Adsense (need Google module) -if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AD_CLIENT') && getDolGlobalString('MAIN_GOOGLE_AD_SLOT')) { - if (empty($conf->dol_use_jmobile)) { - ?> -

- - -
- diff --git a/htdocs/core/tpl/passwordreset.tpl.php b/htdocs/core/tpl/passwordreset.tpl.php index 8b3350bdcc07d..61a27c6853a86 100644 --- a/htdocs/core/tpl/passwordreset.tpl.php +++ b/htdocs/core/tpl/passwordreset.tpl.php @@ -38,6 +38,19 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +/** + * @var HookManager $hookmanager + * @var string $action + * @var string $captcha + * @var string $message + * @var string $title + */ + + +/* + * View + */ + header('Cache-Control: Public, must-revalidate'); if (GETPOST('dol_hide_topmenu')) { @@ -341,45 +354,12 @@ echo $moreloginextracontent; } -// Google Analytics -// TODO Remove this, and add content into hook getPasswordForgottenPageExtraOptions() instead -if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AN_ID')) { - $tmptagarray = explode(',', getDolGlobalString('MAIN_GOOGLE_AN_ID')); - foreach ($tmptagarray as $tmptag) { - print "\n"; - print "\n"; - print " - - - "; - print "\n"; - } -} +// Can add extra content +$parameters = array(); +$dummyobject = new stdClass(); +$result = $hookmanager->executeHooks('getPasswordResetExtraContent', $parameters, $dummyobject, $action); +print $hookmanager->resPrint; -// TODO Replace this with a hook -// Google Adsense (need Google module) -if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AD_CLIENT') && getDolGlobalString('MAIN_GOOGLE_AD_SLOT')) { - if (empty($conf->dol_use_jmobile)) { - ?> -

- - -
- From 00403fc0dc0101f9bee73f36efd31ed3a1f42b6e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 15:43:51 +0100 Subject: [PATCH 09/23] Fix phan --- htdocs/user/class/user.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 545c471c77def..cc1263aa19b83 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -2579,7 +2579,7 @@ public function setPassword($user, $password = '', $changelater = 0, $notrigger // Call trigger for the "security events" log $user->context['audit'] = 'login='.$user->login; if (!empty($flagdelsessionsbefore)) { - $user->context['audit'] .= ' - flagdelsessionsbefore set to '.$this->db->idate($now - 5, 'gmt'); + $user->context['audit'] .= " - flagdelsessionsbefore set to '".$this->db->idate($now - 5, 'gmt')."'"; } if (!$error && !$notrigger) { From 51117eea91641074f7ff94eb8ef88945a2a806ba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 15:49:49 +0100 Subject: [PATCH 10/23] Clean code --- htdocs/admin/tools/listevents.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index bf28f2f305f1e..59c8c18732ed7 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -42,7 +42,7 @@ $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); $optioncss = GETPOST("optioncss", "aZ"); // Option for the css output (always '' except when 'print') -$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'listevents'; +$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search // Load translation files required by the page $langs->loadLangs(array("companies", "admin", "users", "other","withdrawals")); @@ -286,7 +286,7 @@ $i = 0; $param = ''; - if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) { + if ($contextpage && $contextpage != $_SERVER["PHP_SELF"]) { $param .= '&contextpage='.urlencode($contextpage); } if ($limit > 0 && $limit != $conf->liste_limit) { From a1cc6b39bb3bd5acd7fc208a63bfe7c58e25c7dd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 16:34:48 +0100 Subject: [PATCH 11/23] CSS --- htdocs/theme/eldy/global.inc.php | 2 +- htdocs/theme/md/style.css.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 61fb9c01a8db5..36fc7abf17501 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1854,7 +1854,7 @@ cursor: pointer; text-align: center; min-height: 40px; - background: #eee; + background: #f4f4f4; padding: 20px 10px 20px 10px; flex-grow: 1; flex-shrink: 1; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index c2505bf0361e6..fad907a418dc8 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2008,7 +2008,7 @@ cursor: pointer; text-align: center; min-height: 40px; - background: #eee; + background: #f4f4f4; padding: 20px 10px 20px 10px; flex-grow: 1; flex-shrink: 1; From 41a4f42b31121a585cecc9a91a1f9efe97d35826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 7 Nov 2024 17:31:40 +0100 Subject: [PATCH 12/23] add phpdoc and clean phpstan baseline (#31717) * add phpdoc and clean phpstan baseline * add phpdoc and clean phpstan baseline * add phpdoc and clean phpstan baseline * add phpdoc and clean phpstan baseline * add phpdoc and clean phpstan baseline * add phpdoc and clean phpstan baseline * add phpdoc and clean phpstan baseline * add phpdoc and clean phpstan baseline * add phpdoc and clean phpstan baseline * add phpdoc and clean phpstan baseline * add phpdoc and clean phpstan baseline * add phpdoc * add phpdoc * add phpdoc --- build/phpstan/phpstan-baseline.neon | 2055 +---------------- .../class/accountingjournal.class.php | 2 +- htdocs/accountancy/closure/index.php | 6 +- htdocs/accountancy/customer/index.php | 6 +- htdocs/accountancy/expensereport/index.php | 6 +- htdocs/accountancy/supplier/index.php | 6 +- htdocs/admin/fediverse.php | 2 +- .../asset/tpl/accountancy_codes_edit.tpl.php | 11 +- .../asset/tpl/accountancy_codes_view.tpl.php | 12 +- .../tpl/depreciation_options_edit.tpl.php | 10 +- htdocs/core/class/commonobject.class.php | 7 +- htdocs/core/lib/pdf.lib.php | 30 +- htdocs/core/tpl/extrafields_add.tpl.php | 12 + htdocs/core/tpl/extrafields_edit.tpl.php | 8 + htdocs/core/tpl/login.tpl.php | 2 +- htdocs/modulebuilder/index.php | 2 +- scripts/user/sync_groups_dolibarr2ldap.php | 8 + scripts/user/sync_groups_ldap2dolibarr.php | 8 + scripts/user/sync_users_dolibarr2ldap.php | 8 + scripts/user/sync_users_ldap2dolibarr.php | 10 +- scripts/website/regenerate-pages.php | 6 + scripts/withdrawals/build_withdrawal_file.php | 5 + 22 files changed, 155 insertions(+), 2067 deletions(-) diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon index b1ac3909ffcce..a68cbf3f9bd1c 100644 --- a/build/phpstan/phpstan-baseline.neon +++ b/build/phpstan/phpstan-baseline.neon @@ -395,11 +395,6 @@ parameters: count: 1 path: ../../htdocs/accountancy/class/accountingjournal.class.php - - - message: "#^Left side of && is always true\\.$#" - count: 1 - path: ../../htdocs/accountancy/class/accountingjournal.class.php - - message: "#^Negated boolean expression is always true\\.$#" count: 2 @@ -540,11 +535,6 @@ parameters: count: 2 path: ../../htdocs/accountancy/closure/index.php - - - message: "#^Parameter \\#2 \\$page of function print_barre_liste expects int\\|null, string given\\.$#" - count: 3 - path: ../../htdocs/accountancy/closure/index.php - - message: "#^Right side of && is always true\\.$#" count: 2 @@ -560,11 +550,6 @@ parameters: count: 1 path: ../../htdocs/accountancy/customer/card.php - - - message: "#^Parameter \\#2 \\$page of function print_barre_liste expects int\\|null, string given\\.$#" - count: 3 - path: ../../htdocs/accountancy/customer/index.php - - message: "#^Right side of && is always true\\.$#" count: 2 @@ -600,11 +585,6 @@ parameters: count: 1 path: ../../htdocs/accountancy/expensereport/card.php - - - message: "#^Parameter \\#2 \\$page of function print_barre_liste expects int\\|null, string given\\.$#" - count: 3 - path: ../../htdocs/accountancy/expensereport/index.php - - message: "#^Right side of && is always true\\.$#" count: 2 @@ -765,11 +745,6 @@ parameters: count: 1 path: ../../htdocs/accountancy/supplier/card.php - - - message: "#^Parameter \\#2 \\$page of function print_barre_liste expects int\\|null, string given\\.$#" - count: 3 - path: ../../htdocs/accountancy/supplier/index.php - - message: "#^Right side of && is always true\\.$#" count: 2 @@ -875,11 +850,6 @@ parameters: count: 1 path: ../../htdocs/adherents/class/adherent.class.php - - - message: "#^Property CommonObject\\:\\:\\$statut \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 2 - path: ../../htdocs/adherents/class/adherent.class.php - - message: "#^Ternary operator condition is always false\\.$#" count: 2 @@ -1220,11 +1190,6 @@ parameters: count: 2 path: ../../htdocs/admin/fckeditor.php - - - message: "#^Parameter \\#2 \\$page of function print_barre_liste expects int\\|null, string given\\.$#" - count: 1 - path: ../../htdocs/admin/fediverse.php - - message: "#^Variable \\$result might not be defined\\.$#" count: 1 @@ -2245,21 +2210,6 @@ parameters: count: 1 path: ../../htdocs/asset/tpl/accountancy_codes_edit.tpl.php - - - message: "#^Variable \\$db might not be defined\\.$#" - count: 2 - path: ../../htdocs/asset/tpl/accountancy_codes_edit.tpl.php - - - - message: "#^Variable \\$form might not be defined\\.$#" - count: 1 - path: ../../htdocs/asset/tpl/accountancy_codes_edit.tpl.php - - - - message: "#^Variable \\$langs might not be defined\\.$#" - count: 2 - path: ../../htdocs/asset/tpl/accountancy_codes_edit.tpl.php - - message: "#^Variable \\$parameters might not be defined\\.$#" count: 1 @@ -2270,21 +2220,6 @@ parameters: count: 1 path: ../../htdocs/asset/tpl/accountancy_codes_view.tpl.php - - - message: "#^Variable \\$db might not be defined\\.$#" - count: 2 - path: ../../htdocs/asset/tpl/accountancy_codes_view.tpl.php - - - - message: "#^Variable \\$form might not be defined\\.$#" - count: 1 - path: ../../htdocs/asset/tpl/accountancy_codes_view.tpl.php - - - - message: "#^Variable \\$langs might not be defined\\.$#" - count: 2 - path: ../../htdocs/asset/tpl/accountancy_codes_view.tpl.php - - message: "#^Variable \\$parameters might not be defined\\.$#" count: 1 @@ -2295,11 +2230,6 @@ parameters: count: 11 path: ../../htdocs/asset/tpl/depreciation_options_edit.tpl.php - - - message: "#^Variable \\$db might not be defined\\.$#" - count: 2 - path: ../../htdocs/asset/tpl/depreciation_options_edit.tpl.php - - message: "#^Variable \\$form might not be defined\\.$#" count: 1 @@ -4535,11 +4465,6 @@ parameters: count: 3 path: ../../htdocs/compta/bank/class/account.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/compta/bank/class/account.class.php - - message: "#^Variable \\$url in empty\\(\\) always exists and is not falsy\\.$#" count: 2 @@ -5090,11 +5015,6 @@ parameters: count: 1 path: ../../htdocs/compta/facture/card.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/compta/facture/card.php - - message: "#^Result of \\|\\| is always true\\.$#" count: 2 @@ -5405,11 +5325,6 @@ parameters: count: 2 path: ../../htdocs/compta/facture/class/facture.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 2 - path: ../../htdocs/compta/facture/class/facture.class.php - - message: "#^Property Facture\\:\\:\\$fk_facture_source \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -5470,11 +5385,6 @@ parameters: count: 3 path: ../../htdocs/compta/facture/class/facture.class.php - - - message: "#^Result of && is always true\\.$#" - count: 3 - path: ../../htdocs/compta/facture/class/facture.class.php - - message: "#^Result of \\|\\| is always true\\.$#" count: 2 @@ -6445,11 +6355,6 @@ parameters: count: 1 path: ../../htdocs/compta/sociales/card.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/compta/sociales/card.php - - message: "#^Variable \\$resteapayer might not be defined\\.$#" count: 3 @@ -6900,11 +6805,6 @@ parameters: count: 1 path: ../../htdocs/compta/tva/card.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/compta/tva/card.php - - message: "#^Variable \\$accountline might not be defined\\.$#" count: 1 @@ -9860,11 +9760,6 @@ parameters: count: 1 path: ../../htdocs/core/class/timespent.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/core/class/timespent.class.php - - message: "#^Variable \\$url in empty\\(\\) always exists and is not falsy\\.$#" count: 2 @@ -10405,11 +10300,6 @@ parameters: count: 3 path: ../../htdocs/core/lib/pdf.lib.php - - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/lib/pdf.lib.php - - message: "#^Ternary operator condition is always false\\.$#" count: 4 @@ -10725,11 +10615,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/DolibarrModules.class.php - - - message: "#^Property pdf_standard_actions\\:\\:\\$format type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/core/modules/action/doc/pdf_standard_actions.class.php - - message: "#^Ternary operator condition is always true\\.$#" count: 1 @@ -10755,41 +10640,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php - - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php - - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php - - - - message: "#^Parameter \\#4 \\$w of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php - - message: "#^Variable \\$carac_client_name might not be defined\\.$#" count: 1 @@ -10810,11 +10660,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/bank/doc/pdf_ban.modules.php - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/bank/doc/pdf_ban.modules.php - - message: "#^Parameter \\#3 \\$tab_height of method pdf_ban\\:\\:_tableau\\(\\) expects int, float given\\.$#" count: 2 @@ -10825,11 +10670,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php - - message: "#^Parameter \\#3 \\$posy of method pdf_sepamandate\\:\\:_tableau_info\\(\\) expects int, float given\\.$#" count: 1 @@ -10840,16 +10680,6 @@ parameters: count: 2 path: ../../htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php - - message: "#^Variable \\$result might not be defined\\.$#" count: 1 @@ -10895,26 +10725,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/bom/mod_bom_standard.php - - - message: "#^Parameter \\#2 \\$object of method BordereauChequeBlochet\\:\\:_pagefoot\\(\\) expects object, string given\\.$#" - count: 1 - path: ../../htdocs/core/modules/cheque/doc/pdf_blochet.class.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/cheque/doc/pdf_blochet.class.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/cheque/doc/pdf_blochet.class.php - - - - message: "#^Property BordereauChequeBlochet\\:\\:\\$ref_ext has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/cheque/doc/pdf_blochet.class.php - - message: "#^Property mod_chequereceipt_mint\\:\\:\\$prefix has no type specified\\.$#" count: 1 @@ -10930,61 +10740,26 @@ parameters: count: 1 path: ../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php - - message: "#^Parameter \\#2 \\$addpercent of function vatrate expects bool, int given\\.$#" count: 6 path: ../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php - - - message: "#^Parameter \\#3 \\$curx of function pdf_bank expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php - - message: "#^Parameter \\#3 \\$posy of method pdf_einstein\\:\\:_tableau_info\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_einstein\\:\\:_tableau_tot\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php - - message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" count: 2 path: ../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php - - message: "#^Property Commande\\:\\:\\$availability \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -11010,51 +10785,16 @@ parameters: count: 1 path: ../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php - - - - message: "#^Parameter \\#3 \\$curx of function pdf_bank expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php - - message: "#^Parameter \\#3 \\$posy of method pdf_eratosthene\\:\\:drawInfoTable\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_eratosthene\\:\\:drawTotalTable\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php - - message: "#^Property Commande\\:\\:\\$availability \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -11090,31 +10830,11 @@ parameters: count: 1 path: ../../htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/contract/doc/pdf_strato.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/contract/doc/pdf_strato.modules.php - - message: "#^Parameter \\#3 \\$tab_height of method pdf_strato\\:\\:tabSignature\\(\\) expects int, float given\\.$#" count: 2 path: ../../htdocs/core/modules/contract/doc/pdf_strato.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/contract/doc/pdf_strato.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/contract/doc/pdf_strato.modules.php - - message: "#^Ternary operator condition is always false\\.$#" count: 1 @@ -11130,16 +10850,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php - - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php - - message: "#^Parameter \\#3 \\$posy of method pdf_storm\\:\\:_tableau_info\\(\\) expects int, float given\\.$#" count: 1 @@ -11151,92 +10861,32 @@ parameters: path: ../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php - - - - message: "#^Parameter \\#4 \\$w of function pdf_watermark expects int, float given\\.$#" - count: 1 + message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" + count: 2 path: ../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" + message: "#^Variable \\$realpath might not be defined\\.$#" count: 1 path: ../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" + message: "#^Parameter \\#3 \\$posy of method pdf_typhon\\:\\:_tableau_info\\(\\) expects int, float given\\.$#" count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php + path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" count: 2 - path: ../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php + path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" + message: "#^Property pdf_typhon\\:\\:\\$posxcomm has no type specified\\.$#" count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php + path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - message: "#^Variable \\$realpath might not be defined\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php - - - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - - - message: "#^Parameter \\#3 \\$posy of method pdf_typhon\\:\\:_tableau_info\\(\\) expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - - - message: "#^Parameter \\#4 \\$w of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - - - message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" - count: 2 - path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - - - message: "#^Property pdf_typhon\\:\\:\\$posxcomm has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - - - message: "#^Property pdf_typhon\\:\\:\\$posxremainingqty has no type specified\\.$#" + message: "#^Property pdf_typhon\\:\\:\\$posxremainingqty has no type specified\\.$#" count: 1 path: ../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php @@ -11265,16 +10915,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/expedition/doc/pdf_espadon.modules.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_espadon.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_espadon.modules.php - - message: "#^Parameter \\#4 \\$columnText of method CommonDocGenerator\\:\\:printStdColumnContent\\(\\) expects string, float given\\.$#" count: 2 @@ -11290,46 +10930,11 @@ parameters: count: 1 path: ../../htdocs/core/modules/expedition/doc/pdf_espadon.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_espadon.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_espadon.modules.php - - message: "#^Ternary operator condition is always false\\.$#" count: 1 path: ../../htdocs/core/modules/expedition/doc/pdf_espadon.modules.php - - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_merou.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_merou.modules.php - - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_merou.modules.php - - - - message: "#^Parameter \\#4 \\$w of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_merou.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_merou.modules.php - - message: "#^Property pdf_merou\\:\\:\\$destinataire has no type specified\\.$#" count: 1 @@ -11345,36 +10950,16 @@ parameters: count: 1 path: ../../htdocs/core/modules/expedition/doc/pdf_merou.modules.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_rouget\\:\\:_tableau_tot\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php - - message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" count: 2 path: ../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php - - message: "#^Ternary operator condition is always false\\.$#" count: 1 @@ -11385,11 +10970,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/expedition/mod_expedition_safor.php - - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php - - message: "#^Parameter \\#3 \\$posy of method pdf_standard_expensereport\\:\\:tablePayments\\(\\) expects int, float given\\.$#" count: 1 @@ -11400,21 +10980,6 @@ parameters: count: 6 path: ../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php - - - message: "#^Parameter \\#4 \\$w of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php - - message: "#^Property pdf_standard_expensereport\\:\\:\\$postotalttc has no type specified\\.$#" count: 1 @@ -11475,31 +11040,11 @@ parameters: count: 1 path: ../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php - - - - message: "#^Parameter \\#3 \\$curx of function pdf_bank expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php - - message: "#^Parameter \\#3 \\$posy of method pdf_crabe\\:\\:_tableau_info\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_crabe\\:\\:_tableau_tot\\(\\) expects int, float given\\.$#" count: 1 @@ -11510,26 +11055,11 @@ parameters: count: 1 path: ../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php - - message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" count: 2 path: ../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php - - message: "#^Property CommonInvoice\\:\\:\\$type \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -11585,26 +11115,11 @@ parameters: count: 1 path: ../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php - - message: "#^Parameter \\#2 \\$addpercent of function vatrate expects bool, int given\\.$#" count: 7 path: ../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php - - - message: "#^Parameter \\#3 \\$curx of function pdf_bank expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php - - message: "#^Parameter \\#3 \\$posy of method pdf_octopus\\:\\:drawInfoTable\\(\\) expects int, float given\\.$#" count: 1 @@ -11620,31 +11135,11 @@ parameters: count: 3 path: ../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_octopus\\:\\:drawTotalTable\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php - - message: "#^Property CommonObject\\:\\:\\$multicurrency_tx \\(array\\\\|float\\) in isset\\(\\) is not nullable\\.$#" count: 5 @@ -11685,56 +11180,21 @@ parameters: count: 1 path: ../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php - - message: "#^Parameter \\#2 \\$addpercent of function vatrate expects bool, int given\\.$#" count: 6 path: ../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php - - - message: "#^Parameter \\#3 \\$curx of function pdf_bank expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php - - message: "#^Parameter \\#3 \\$posy of method pdf_sponge\\:\\:drawInfoTable\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_sponge\\:\\:drawTotalTable\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php - - message: "#^Property CommonInvoice\\:\\:\\$type \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -11815,26 +11275,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/facture/modules_facture.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php - - message: "#^Ternary operator condition is always false\\.$#" count: 1 @@ -11855,16 +11295,6 @@ parameters: count: 6 path: ../../htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php - - message: "#^Property CommonObject\\:\\:\\$entity \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 2 @@ -12135,21 +11565,11 @@ parameters: count: 1 path: ../../htdocs/core/modules/mailings/xinputuser.modules.php - - - message: "#^Method doc_generic_member_odt\\:\\:get_substitutionarray_object\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/core/modules/member/doc/doc_generic_member_odt.class.php - - message: "#^Parameter \\#2 \\$config of class Odf constructor expects string, array\\ given\\.$#" count: 1 path: ../../htdocs/core/modules/member/doc/doc_generic_member_odt.class.php - - - message: "#^Variable \\$contactobject might not be defined\\.$#" - count: 1 - path: ../../htdocs/core/modules/member/doc/doc_generic_member_odt.class.php - - message: "#^Comparison operation \"\\>\" between 1 and 0 is always true\\.$#" count: 2 @@ -12160,11 +11580,6 @@ parameters: count: 2 path: ../../htdocs/core/modules/member/doc/pdf_standard_member.class.php - - - message: "#^Method pdf_standard_member\\:\\:addSticker\\(\\) has parameter \\$param with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/core/modules/member/doc/pdf_standard_member.class.php - - message: "#^Method pdf_standard_member\\:\\:write_file\\(\\) has parameter \\$object with no value type specified in iterable type array\\.$#" count: 1 @@ -12180,11 +11595,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/member/doc/pdf_standard_member.class.php - - - message: "#^Property CommonStickerGenerator\\:\\:\\$Tformat \\(array\\\\) in empty\\(\\) is not falsy\\.$#" - count: 1 - path: ../../htdocs/core/modules/member/doc/pdf_standard_member.class.php - - message: "#^Function members_card_pdf_create\\(\\) has parameter \\$arrayofmembers with no value type specified in iterable type array\\.$#" count: 1 @@ -12266,64 +11676,39 @@ parameters: path: ../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 + message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" + count: 2 path: ../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" + message: "#^Property pdf_standard_movementstock\\:\\:\\$posxdatemouv has no type specified\\.$#" count: 1 path: ../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php - - message: "#^Parameter \\#4 \\$w of function pdf_watermark expects int, float given\\.$#" + message: "#^Property pdf_standard_movementstock\\:\\:\\$posxidref has no type specified\\.$#" count: 1 path: ../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" + message: "#^Property pdf_standard_movementstock\\:\\:\\$wref has no type specified\\.$#" count: 1 path: ../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php - - message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" - count: 2 + message: "#^Variable \\$lastmovementdate might not be defined\\.$#" + count: 1 path: ../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" + message: "#^Variable \\$result might not be defined\\.$#" count: 1 path: ../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php - - message: "#^Property pdf_standard_movementstock\\:\\:\\$posxdatemouv has no type specified\\.$#" + message: "#^Parameter \\#2 \\$config of class Odf constructor expects string, array\\ given\\.$#" count: 1 - path: ../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php - - - - message: "#^Property pdf_standard_movementstock\\:\\:\\$posxidref has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php - - - - message: "#^Property pdf_standard_movementstock\\:\\:\\$wref has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php - - - - message: "#^Variable \\$lastmovementdate might not be defined\\.$#" - count: 1 - path: ../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php - - - - message: "#^Variable \\$result might not be defined\\.$#" - count: 1 - path: ../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php - - - - message: "#^Parameter \\#2 \\$config of class Odf constructor expects string, array\\ given\\.$#" - count: 1 - path: ../../htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php + path: ../../htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php - message: "#^Property Mo\\:\\:\\$entity \\(int\\) in isset\\(\\) is not nullable\\.$#" @@ -12355,26 +11740,6 @@ parameters: count: 2 path: ../../htdocs/core/modules/mrp/doc/pdf_vinci.modules.php - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/mrp/doc/pdf_vinci.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/mrp/doc/pdf_vinci.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/mrp/doc/pdf_vinci.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/mrp/doc/pdf_vinci.modules.php - - message: "#^Property CommonObject\\:\\:\\$multicurrency_tx \\(array\\\\|float\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -12500,26 +11865,11 @@ parameters: count: 1 path: ../../htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php - - - message: "#^Method pdf_standardlabel\\:\\:addSticker\\(\\) has parameter \\$param with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php - - - - message: "#^Method pdf_standardlabel\\:\\:write_file\\(\\) has parameter \\$arrayofrecords with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php - - message: "#^Parameter \\#6 \\$epaisseur of method CommonStickerGenerator\\:\\:_Croix\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php - - - message: "#^Property CommonStickerGenerator\\:\\:\\$Tformat \\(array\\\\) in empty\\(\\) is not falsy\\.$#" - count: 1 - path: ../../htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php - - message: "#^Comparison operation \"\\>\" between 1 and 0 is always true\\.$#" count: 2 @@ -12530,16 +11880,6 @@ parameters: count: 2 path: ../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php - - - message: "#^Method pdf_tcpdflabel\\:\\:addSticker\\(\\) has parameter \\$param with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php - - - - message: "#^Method pdf_tcpdflabel\\:\\:write_file\\(\\) has parameter \\$arrayofrecords with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php - - message: "#^Parameter \\#5 \\$x of method pdf_tcpdflabel\\:\\:writeBarcode\\(\\) expects int, float given\\.$#" count: 3 @@ -12555,11 +11895,6 @@ parameters: count: 6 path: ../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php - - - message: "#^Property CommonStickerGenerator\\:\\:\\$Tformat \\(array\\\\) in empty\\(\\) is not falsy\\.$#" - count: 1 - path: ../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php - - message: "#^Property pdf_tcpdflabel\\:\\:\\$_align2d has no type specified\\.$#" count: 1 @@ -12585,41 +11920,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php - - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/product/doc/pdf_standard.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/product/doc/pdf_standard.modules.php - - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/product/doc/pdf_standard.modules.php - - - - message: "#^Parameter \\#4 \\$w of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/product/doc/pdf_standard.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/product/doc/pdf_standard.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/product/doc/pdf_standard.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/product/doc/pdf_standard.modules.php - - message: "#^Property Product\\:\\:\\$weight_units \\(int\\|string\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -12655,21 +11955,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/project/doc/pdf_baleine.modules.php - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/project/doc/pdf_baleine.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/project/doc/pdf_baleine.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/project/doc/pdf_baleine.modules.php - - message: "#^Comparison operation \"\\>\\=\" between int\\<0, max\\> and 0 is always true\\.$#" count: 1 @@ -12685,41 +11970,11 @@ parameters: count: 2 path: ../../htdocs/core/modules/project/doc/pdf_beluga.modules.php - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/project/doc/pdf_beluga.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/project/doc/pdf_beluga.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/project/doc/pdf_beluga.modules.php - - message: "#^If condition is always true\\.$#" count: 1 path: ../../htdocs/core/modules/project/doc/pdf_timespent.modules.php - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/project/doc/pdf_timespent.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/project/doc/pdf_timespent.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/project/doc/pdf_timespent.modules.php - - message: "#^Property mod_project_simple\\:\\:\\$prefix has no type specified\\.$#" count: 1 @@ -12815,56 +12070,26 @@ parameters: count: 1 path: ../../htdocs/core/modules/propale/doc/pdf_azur.modules.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/propale/doc/pdf_azur.modules.php - - message: "#^Parameter \\#2 \\$addpercent of function vatrate expects bool, int given\\.$#" count: 6 path: ../../htdocs/core/modules/propale/doc/pdf_azur.modules.php - - - message: "#^Parameter \\#3 \\$curx of function pdf_bank expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/propale/doc/pdf_azur.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/propale/doc/pdf_azur.modules.php - - message: "#^Parameter \\#3 \\$posy of method pdf_azur\\:\\:_tableau_info\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/propale/doc/pdf_azur.modules.php - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/propale/doc/pdf_azur.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_azur\\:\\:_tableau_tot\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/propale/doc/pdf_azur.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/propale/doc/pdf_azur.modules.php - - message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" count: 2 path: ../../htdocs/core/modules/propale/doc/pdf_azur.modules.php - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/propale/doc/pdf_azur.modules.php - - message: "#^Property CommonObject\\:\\:\\$multicurrency_tx \\(array\\\\|float\\) in isset\\(\\) is not nullable\\.$#" count: 5 @@ -12885,51 +12110,21 @@ parameters: count: 1 path: ../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php - - message: "#^Parameter \\#2 \\$addpercent of function vatrate expects bool, int given\\.$#" count: 5 path: ../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php - - - message: "#^Parameter \\#3 \\$curx of function pdf_bank expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php - - message: "#^Parameter \\#3 \\$posy of method pdf_cyan\\:\\:drawInfoTable\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_cyan\\:\\:drawTotalTable\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php - - message: "#^Property CommonObject\\:\\:\\$multicurrency_tx \\(array\\\\|float\\) in isset\\(\\) is not nullable\\.$#" count: 5 @@ -12950,116 +12145,21 @@ parameters: count: 1 path: ../../htdocs/core/modules/propale/mod_propale_marbre.php - - - message: "#^Method pdf_paiement\\:\\:Body\\(\\) has parameter \\$lines with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Property pdf_paiement\\:\\:\\$doc_type has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Property pdf_paiement\\:\\:\\$line_height has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Property pdf_paiement\\:\\:\\$line_per_page has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Property pdf_paiement\\:\\:\\$posxbankaccount has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Property pdf_paiement\\:\\:\\$posxdate has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Property pdf_paiement\\:\\:\\$posxinvoice has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Property pdf_paiement\\:\\:\\$posxinvoiceamount has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Property pdf_paiement\\:\\:\\$posxpaymentamount has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Property pdf_paiement\\:\\:\\$posxpaymenttype has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Property pdf_paiement\\:\\:\\$tab_height has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Property pdf_paiement\\:\\:\\$tab_top has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Variable \\$mod might not be defined\\.$#" - count: 2 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Variable \\$numpaiement might not be defined\\.$#" - count: 2 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - - - message: "#^Variable \\$total_mod might not be defined\\.$#" - count: 2 - path: ../../htdocs/core/modules/rapport/pdf_paiement.class.php - - message: "#^Parameter \\#2 \\$config of class Odf constructor expects string, array\\ given\\.$#" count: 1 path: ../../htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/reception/doc/pdf_squille.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/reception/doc/pdf_squille.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_squille\\:\\:_tableau_tot\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/reception/doc/pdf_squille.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/reception/doc/pdf_squille.modules.php - - message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" count: 2 path: ../../htdocs/core/modules/reception/doc/pdf_squille.modules.php - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/reception/doc/pdf_squille.modules.php - - message: "#^Property Reception\\:\\:\\$trueWeight \\(float\\|int\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -13145,41 +12245,6 @@ parameters: count: 1 path: ../../htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php - - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php - - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php - - - - message: "#^Parameter \\#4 \\$w of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php - - message: "#^Property pdf_standard_stock\\:\\:\\$wref has no type specified\\.$#" count: 1 @@ -13195,41 +12260,16 @@ parameters: count: 1 path: ../../htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php - - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_eagle\\:\\:_tableau_tot\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php - - - message: "#^Parameter \\#4 \\$w of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php - - message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" count: 2 path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php - - message: "#^Variable \\$carac_emetteur_name might not be defined\\.$#" count: 1 @@ -13245,51 +12285,11 @@ parameters: count: 1 path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php - - - message: "#^Parameter \\#3 \\$curx of function pdf_bank expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php - - - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php - - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_eagle_proforma\\:\\:drawTotalTable\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php - - - message: "#^Parameter \\#4 \\$w of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php - - message: "#^Variable \\$carac_emetteur_name might not be defined\\.$#" count: 1 @@ -13330,11 +12330,6 @@ parameters: count: 3 path: ../../htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_canelle\\:\\:_tableau_tot\\(\\) expects int, float given\\.$#" count: 1 @@ -13345,26 +12340,11 @@ parameters: count: 1 path: ../../htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php - - message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" count: 2 path: ../../htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php - - message: "#^Property CommonObject\\:\\:\\$multicurrency_tx \\(array\\\\|float\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -13401,52 +12381,32 @@ parameters: path: ../../htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php - - message: "#^Variable \\$objectref might not be defined\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php - - - - message: "#^Left side of \\|\\| is always false\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php - - - - message: "#^Parameter \\#1 \\$object of method CommonDocGenerator\\:\\:getExtrafieldsInHtml\\(\\) expects CommonObjectLine, CommandeFournisseur given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php - - - - message: "#^Parameter \\#2 \\$addpercent of function vatrate expects bool, int given\\.$#" - count: 3 - path: ../../htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php - - - - message: "#^Parameter \\#3 \\$posy of method pdf_cornas\\:\\:_tableau_info\\(\\) expects int, float given\\.$#" + message: "#^Variable \\$objectref might not be defined\\.$#" count: 1 - path: ../../htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php + path: ../../htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" + message: "#^Left side of \\|\\| is always false\\.$#" count: 1 path: ../../htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_cornas\\:\\:_tableau_tot\\(\\) expects int, float given\\.$#" + message: "#^Parameter \\#1 \\$object of method CommonDocGenerator\\:\\:getExtrafieldsInHtml\\(\\) expects CommonObjectLine, CommandeFournisseur given\\.$#" count: 1 path: ../../htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 + message: "#^Parameter \\#2 \\$addpercent of function vatrate expects bool, int given\\.$#" + count: 3 path: ../../htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" + message: "#^Parameter \\#3 \\$posy of method pdf_cornas\\:\\:_tableau_info\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" + message: "#^Parameter \\#4 \\$posy of method pdf_cornas\\:\\:_tableau_tot\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php @@ -13480,36 +12440,16 @@ parameters: count: 1 path: ../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_muscadet\\:\\:_tableau_tot\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php - - message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" count: 2 path: ../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php - - message: "#^Property CommandeFournisseur\\:\\:\\$multicurrency_tx \\(float\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -13545,16 +12485,6 @@ parameters: count: 6 path: ../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php - - message: "#^Property pdf_standard_supplierpayment\\:\\:\\$posxdate has no type specified\\.$#" count: 1 @@ -13605,56 +12535,16 @@ parameters: count: 1 path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php - - - message: "#^Parameter \\#11 \\$page_largeur of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php - - message: "#^Parameter \\#2 \\$addpercent of function vatrate expects bool, int given\\.$#" count: 5 path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php - - - message: "#^Parameter \\#3 \\$curx of function pdf_bank expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php - - - - message: "#^Parameter \\#4 \\$cury of function pdf_bank expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php - - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php - - message: "#^Parameter \\#5 \\$w of function pdf_writelinedesc expects int, float given\\.$#" count: 2 path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php - - message: "#^Property SupplierProposal\\:\\:\\$multicurrency_tx \\(float\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -13680,31 +12570,11 @@ parameters: count: 3 path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php - - message: "#^Parameter \\#4 \\$posy of method pdf_zenith\\:\\:_tableau_tot\\(\\) expects int, float given\\.$#" count: 1 path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php - - message: "#^Property SupplierProposal\\:\\:\\$multicurrency_tx \\(float\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -14825,21 +13695,11 @@ parameters: count: 1 path: ../../htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php - - - message: "#^Method InterfaceNotification\\:\\:getListOfManagedEvents\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/core/triggers/interface_50_modNotification_Notification.class.php - - message: "#^Property Conf\\:\\:\\$notification \\(stdClass\\) in empty\\(\\) is not falsy\\.$#" count: 1 path: ../../htdocs/core/triggers/interface_50_modNotification_Notification.class.php - - - message: "#^Property InterfaceNotification\\:\\:\\$listofmanagedevents has no type specified\\.$#" - count: 1 - path: ../../htdocs/core/triggers/interface_50_modNotification_Notification.class.php - - message: "#^Left side of && is always true\\.$#" count: 2 @@ -14852,7 +13712,7 @@ parameters: - message: "#^Variable \\$old_MAIN_MAIL_AUTOCOPY_TO might not be defined\\.$#" - count: 2 + count: 1 path: ../../htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php - @@ -14910,21 +13770,11 @@ parameters: count: 2 path: ../../htdocs/cron/card.php - - - message: "#^Method Cronjob\\:\\:fetchAll\\(\\) has parameter \\$filter with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/cron/class/cronjob.class.php - - message: "#^Property CommonObject\\:\\:\\$note_private \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 4 path: ../../htdocs/cron/class/cronjob.class.php - - - message: "#^Property Cronjob\\:\\:\\$classesname has no type specified\\.$#" - count: 1 - path: ../../htdocs/cron/class/cronjob.class.php - - message: "#^Property Cronjob\\:\\:\\$command \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 4 @@ -14990,41 +13840,11 @@ parameters: count: 2 path: ../../htdocs/cron/class/cronjob.class.php - - - message: "#^Property Cronjob\\:\\:\\$md5params has no type specified\\.$#" - count: 1 - path: ../../htdocs/cron/class/cronjob.class.php - - - - message: "#^Property Cronjob\\:\\:\\$methodename has no type specified\\.$#" - count: 1 - path: ../../htdocs/cron/class/cronjob.class.php - - - - message: "#^Property Cronjob\\:\\:\\$module_name has no type specified\\.$#" - count: 1 - path: ../../htdocs/cron/class/cronjob.class.php - - message: "#^Property Cronjob\\:\\:\\$nbrun \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 4 path: ../../htdocs/cron/class/cronjob.class.php - - - message: "#^Property Cronjob\\:\\:\\$objectname has no type specified\\.$#" - count: 1 - path: ../../htdocs/cron/class/cronjob.class.php - - - - message: "#^Property Cronjob\\:\\:\\$params has no type specified\\.$#" - count: 1 - path: ../../htdocs/cron/class/cronjob.class.php - - - - message: "#^Property Cronjob\\:\\:\\$priority has no type specified\\.$#" - count: 1 - path: ../../htdocs/cron/class/cronjob.class.php - - message: "#^Property Cronjob\\:\\:\\$processing \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -15115,16 +13935,6 @@ parameters: count: 1 path: ../../htdocs/datapolicy/class/datapolicycron.class.php - - - message: "#^Property DataPolicyCron\\:\\:\\$error has no type specified\\.$#" - count: 1 - path: ../../htdocs/datapolicy/class/datapolicycron.class.php - - - - message: "#^Property DataPolicyCron\\:\\:\\$output has no type specified\\.$#" - count: 1 - path: ../../htdocs/datapolicy/class/datapolicycron.class.php - - message: "#^Variable \\$baseUri in isset\\(\\) always exists and is not nullable\\.$#" count: 1 @@ -15245,11 +14055,6 @@ parameters: count: 1 path: ../../htdocs/delivery/card.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/delivery/card.php - - message: "#^Variable \\$arrayoptions might not be defined\\.$#" count: 1 @@ -15405,11 +14210,6 @@ parameters: count: 1 path: ../../htdocs/don/class/don.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/don/class/don.class.php - - message: "#^Property Don\\:\\:\\$email \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -15955,61 +14755,11 @@ parameters: count: 16 path: ../../htdocs/emailcollector/class/emailcollector.class.php - - - message: "#^Variable \\$client might not be defined\\.$#" - count: 2 - path: ../../htdocs/emailcollector/class/emailcollector.class.php - - message: "#^Variable \\$newlang in empty\\(\\) always exists and is always falsy\\.$#" count: 1 path: ../../htdocs/emailcollector/class/emailcollector.class.php - - - message: "#^Property EmailCollectorAction\\:\\:\\$actionparam has no type specified\\.$#" - count: 1 - path: ../../htdocs/emailcollector/class/emailcollectoraction.class.php - - - - message: "#^Property EmailCollectorAction\\:\\:\\$fk_emailcollector has no type specified\\.$#" - count: 1 - path: ../../htdocs/emailcollector/class/emailcollectoraction.class.php - - - - message: "#^Property EmailCollectorAction\\:\\:\\$position has no type specified\\.$#" - count: 1 - path: ../../htdocs/emailcollector/class/emailcollectoraction.class.php - - - - message: "#^Property EmailCollectorAction\\:\\:\\$rowid has no type specified\\.$#" - count: 1 - path: ../../htdocs/emailcollector/class/emailcollectoraction.class.php - - - - message: "#^Property EmailCollectorAction\\:\\:\\$type has no type specified\\.$#" - count: 1 - path: ../../htdocs/emailcollector/class/emailcollectoraction.class.php - - - - message: "#^Property EmailCollectorFilter\\:\\:\\$fk_emailcollector has no type specified\\.$#" - count: 1 - path: ../../htdocs/emailcollector/class/emailcollectorfilter.class.php - - - - message: "#^Property EmailCollectorFilter\\:\\:\\$rowid has no type specified\\.$#" - count: 1 - path: ../../htdocs/emailcollector/class/emailcollectorfilter.class.php - - - - message: "#^Property EmailCollectorFilter\\:\\:\\$rulevalue has no type specified\\.$#" - count: 1 - path: ../../htdocs/emailcollector/class/emailcollectorfilter.class.php - - - - message: "#^Property EmailCollectorFilter\\:\\:\\$type has no type specified\\.$#" - count: 1 - path: ../../htdocs/emailcollector/class/emailcollectorfilter.class.php - - message: "#^Left side of && is always false\\.$#" count: 1 @@ -16410,11 +15160,6 @@ parameters: count: 2 path: ../../htdocs/expedition/class/expedition.class.php - - - message: "#^Property CommonObject\\:\\:\\$statut \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 3 - path: ../../htdocs/expedition/class/expedition.class.php - - message: "#^Property Expedition\\:\\:\\$fk_user_author \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 2 @@ -16510,56 +15255,11 @@ parameters: count: 1 path: ../../htdocs/expedition/class/expeditionligne.class.php - - - message: "#^Method ExpeditionLineBatch\\:\\:fetchAll\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/expedition/class/expeditionlinebatch.class.php - - - - message: "#^Property ExpeditionLineBatch\\:\\:\\$batch has no type specified\\.$#" - count: 1 - path: ../../htdocs/expedition/class/expeditionlinebatch.class.php - - - - message: "#^Property ExpeditionLineBatch\\:\\:\\$dluo_qty has no type specified\\.$#" - count: 1 - path: ../../htdocs/expedition/class/expeditionlinebatch.class.php - - - - message: "#^Property ExpeditionLineBatch\\:\\:\\$eatby has no type specified\\.$#" - count: 1 - path: ../../htdocs/expedition/class/expeditionlinebatch.class.php - - - - message: "#^Property ExpeditionLineBatch\\:\\:\\$entrepot_id has no type specified\\.$#" - count: 1 - path: ../../htdocs/expedition/class/expeditionlinebatch.class.php - - - - message: "#^Property ExpeditionLineBatch\\:\\:\\$fk_expeditiondet has no type specified\\.$#" - count: 1 - path: ../../htdocs/expedition/class/expeditionlinebatch.class.php - - - - message: "#^Property ExpeditionLineBatch\\:\\:\\$fk_origin_stock has no type specified\\.$#" - count: 1 - path: ../../htdocs/expedition/class/expeditionlinebatch.class.php - - - - message: "#^Property ExpeditionLineBatch\\:\\:\\$fk_warehouse has no type specified\\.$#" - count: 1 - path: ../../htdocs/expedition/class/expeditionlinebatch.class.php - - message: "#^Property ExpeditionLineBatch\\:\\:\\$qty \\(float\\) in isset\\(\\) is not nullable\\.$#" count: 1 path: ../../htdocs/expedition/class/expeditionlinebatch.class.php - - - message: "#^Property ExpeditionLineBatch\\:\\:\\$sellby has no type specified\\.$#" - count: 1 - path: ../../htdocs/expedition/class/expeditionlinebatch.class.php - - message: "#^If condition is always false\\.$#" count: 1 @@ -16710,11 +15410,6 @@ parameters: count: 1 path: ../../htdocs/expedition/shipment.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/expedition/shipment.php - - message: "#^Variable \\$bc might not be defined\\.$#" count: 1 @@ -16920,11 +15615,6 @@ parameters: count: 1 path: ../../htdocs/expensereport/class/paymentexpensereport.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/expensereport/class/paymentexpensereport.class.php - - message: "#^Property PaymentExpenseReport\\:\\:\\$amount \\(float\\|int\\) in isset\\(\\) is not nullable\\.$#" count: 3 @@ -16960,11 +15650,6 @@ parameters: count: 3 path: ../../htdocs/expensereport/class/paymentexpensereport.class.php - - - message: "#^Variable \\$amount might not be defined\\.$#" - count: 1 - path: ../../htdocs/expensereport/class/paymentexpensereport.class.php - - message: "#^Variable \\$contextpage in empty\\(\\) always exists and is not falsy\\.$#" count: 1 @@ -17250,11 +15935,6 @@ parameters: count: 7 path: ../../htdocs/fichinter/class/fichinter.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/fichinter/class/fichinter.class.php - - message: "#^Property Fichinter\\:\\:\\$ref_client \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 2 @@ -17290,16 +15970,6 @@ parameters: count: 1 path: ../../htdocs/fichinter/class/fichinterrec.class.php - - - message: "#^Property FichinterStats\\:\\:\\$socid has no type specified\\.$#" - count: 1 - path: ../../htdocs/fichinter/class/fichinterstats.class.php - - - - message: "#^Property FichinterStats\\:\\:\\$userid has no type specified\\.$#" - count: 1 - path: ../../htdocs/fichinter/class/fichinterstats.class.php - - message: "#^Right side of && is always false\\.$#" count: 1 @@ -17440,11 +16110,6 @@ parameters: count: 1 path: ../../htdocs/fourn/class/api_supplier_invoices.class.php - - - message: "#^Property SupplierInvoices\\:\\:\\$FIELDS type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/fourn/class/api_supplier_invoices.class.php - - message: "#^Method SupplierOrders\\:\\:_validate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 @@ -17525,33 +16190,13 @@ parameters: count: 1 path: ../../htdocs/fourn/class/api_supplier_orders.class.php - - - message: "#^Method Fournisseur\\:\\:ListArray\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.class.php - - message: "#^If condition is always true\\.$#" count: 3 path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - message: "#^Left side of && is always true\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - - - message: "#^Method CommandeFournisseur\\:\\:generateDocument\\(\\) has parameter \\$moreparams with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - - - message: "#^Method CommandeFournisseur\\:\\:getDispachedLines\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - - - message: "#^Method CommandeFournisseur\\:\\:updateline\\(\\) has parameter \\$array_options with no value type specified in iterable type array\\.$#" + message: "#^Left side of && is always true\\.$#" count: 1 path: ../../htdocs/fourn/class/fournisseur.commande.class.php @@ -17590,11 +16235,6 @@ parameters: count: 1 path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - - message: "#^Property CommandeFournisseur\\:\\:\\$billed has no type specified\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - message: "#^Property CommandeFournisseur\\:\\:\\$cond_reglement_id \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -17605,16 +16245,6 @@ parameters: count: 1 path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - - message: "#^Property CommandeFournisseur\\:\\:\\$methode_commande has no type specified\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - - - message: "#^Property CommandeFournisseur\\:\\:\\$methode_commande_id has no type specified\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - message: "#^Property CommandeFournisseur\\:\\:\\$mode_reglement_id \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -17630,31 +16260,11 @@ parameters: count: 3 path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - - message: "#^Property CommandeFournisseur\\:\\:\\$refuse_note has no type specified\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - - - message: "#^Property CommandeFournisseur\\:\\:\\$remise_percent has no type specified\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - message: "#^Property CommandeFournisseur\\:\\:\\$socid \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 1 path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - - message: "#^Property CommandeFournisseur\\:\\:\\$source has no type specified\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - - - message: "#^Property CommandeFournisseur\\:\\:\\$statut \\(int\\) in isset\\(\\) is not nullable\\.$#" - count: 2 - path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - message: "#^Property CommandeFournisseur\\:\\:\\$total_ht \\(float\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -17715,11 +16325,6 @@ parameters: count: 1 path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - - message: "#^Variable \\$dispatchedlinearray might not be defined\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.commande.class.php - - message: "#^Negated boolean expression is always true\\.$#" count: 1 @@ -17775,16 +16380,6 @@ parameters: count: 2 path: ../../htdocs/fourn/class/fournisseur.facture-rec.ligne.class.php - - - message: "#^Method FactureFournisseur\\:\\:list_qualified_avoir_supplier_invoices\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.facture.class.php - - - - message: "#^Method FactureFournisseur\\:\\:list_replacable_supplier_invoices\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/fourn/class/fournisseur.facture.class.php - - message: "#^Negated boolean expression is always true\\.$#" count: 6 @@ -18055,36 +16650,16 @@ parameters: count: 1 path: ../../htdocs/fourn/class/fournisseur.product.class.php - - - message: "#^Method PaiementFourn\\:\\:generateDocument\\(\\) has parameter \\$moreparams with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/fourn/class/paiementfourn.class.php - - - - message: "#^Method PaiementFourn\\:\\:getBillsArray\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/fourn/class/paiementfourn.class.php - - message: "#^Ternary operator condition is always true\\.$#" count: 1 path: ../../htdocs/fourn/class/paiementfourn.class.php - - - message: "#^Variable \\$mtotal might not be defined\\.$#" - count: 1 - path: ../../htdocs/fourn/class/paiementfourn.class.php - - message: "#^Variable \\$newlang in empty\\(\\) always exists and is always falsy\\.$#" count: 1 path: ../../htdocs/fourn/class/paiementfourn.class.php - - - message: "#^Variable \\$total might not be defined\\.$#" - count: 2 - path: ../../htdocs/fourn/class/paiementfourn.class.php - - message: "#^Left side of && is always false\\.$#" count: 1 @@ -18130,11 +16705,6 @@ parameters: count: 8 path: ../../htdocs/fourn/commande/card.php - - - message: "#^Property CommandeFournisseur\\:\\:\\$statut \\(int\\) in isset\\(\\) is not nullable\\.$#" - count: 2 - path: ../../htdocs/fourn/commande/card.php - - message: "#^Result of && is always false\\.$#" count: 1 @@ -18850,11 +17420,6 @@ parameters: count: 2 path: ../../htdocs/holiday/class/holiday.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/holiday/class/holiday.class.php - - message: "#^Property Holiday\\:\\:\\$events has no type specified\\.$#" count: 1 @@ -19005,11 +17570,6 @@ parameters: count: 1 path: ../../htdocs/hrm/class/evaluationdet.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/hrm/class/evaluationdet.class.php - - message: "#^Left side of && is always false\\.$#" count: 1 @@ -19040,11 +17600,6 @@ parameters: count: 1 path: ../../htdocs/hrm/class/job.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/hrm/class/job.class.php - - message: "#^Left side of && is always false\\.$#" count: 1 @@ -19075,11 +17630,6 @@ parameters: count: 1 path: ../../htdocs/hrm/class/position.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/hrm/class/position.class.php - - message: "#^Left side of && is always false\\.$#" count: 1 @@ -19105,11 +17655,6 @@ parameters: count: 1 path: ../../htdocs/hrm/class/skill.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/hrm/class/skill.class.php - - message: "#^Left side of && is always false\\.$#" count: 1 @@ -19125,11 +17670,6 @@ parameters: count: 1 path: ../../htdocs/hrm/class/skilldet.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/hrm/class/skilldet.class.php - - message: "#^Left side of && is always false\\.$#" count: 1 @@ -19150,11 +17690,6 @@ parameters: count: 1 path: ../../htdocs/hrm/class/skillrank.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/hrm/class/skillrank.class.php - - message: "#^Ternary operator condition is always false\\.$#" count: 1 @@ -20075,11 +18610,6 @@ parameters: count: 1 path: ../../htdocs/intracommreport/card.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/intracommreport/card.php - - message: "#^Variable \\$soc might not be defined\\.$#" count: 1 @@ -20090,41 +18620,11 @@ parameters: count: 1 path: ../../htdocs/intracommreport/class/intracommreport.class.php - - - message: "#^Method IntracommReport\\:\\:addItemFraisDePort\\(\\) has parameter \\$TLinesFraisDePort with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/intracommreport/class/intracommreport.class.php - - message: "#^Parameter \\#3 \\$period_reference of method IntracommReport\\:\\:addItemsFact\\(\\) expects int, string given\\.$#" count: 2 path: ../../htdocs/intracommreport/class/intracommreport.class.php - - - message: "#^Property IntracommReport\\:\\:\\$datec has no type specified\\.$#" - count: 1 - path: ../../htdocs/intracommreport/class/intracommreport.class.php - - - - message: "#^Property IntracommReport\\:\\:\\$declaration has no type specified\\.$#" - count: 1 - path: ../../htdocs/intracommreport/class/intracommreport.class.php - - - - message: "#^Property IntracommReport\\:\\:\\$period has no type specified\\.$#" - count: 1 - path: ../../htdocs/intracommreport/class/intracommreport.class.php - - - - message: "#^Variable \\$categ_fraisdeport might not be defined\\.$#" - count: 1 - path: ../../htdocs/intracommreport/class/intracommreport.class.php - - - - message: "#^Variable \\$res might not be defined\\.$#" - count: 1 - path: ../../htdocs/intracommreport/class/intracommreport.class.php - - message: "#^Variable \\$url in empty\\(\\) always exists and is not falsy\\.$#" count: 2 @@ -20210,11 +18710,6 @@ parameters: count: 1 path: ../../htdocs/knowledgemanagement/class/knowledgerecord.class.php - - - message: "#^Property CommonObject\\:\\:\\$statut \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/knowledgemanagement/class/knowledgerecord.class.php - - message: "#^If condition is always false\\.$#" count: 1 @@ -20310,11 +18805,6 @@ parameters: count: 1 path: ../../htdocs/loan/class/loan.class.php - - - message: "#^Method LoanSchedule\\:\\:paimenttorecord\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/loan/class/loanschedule.class.php - - message: "#^Negated boolean expression is always true\\.$#" count: 1 @@ -20330,36 +18820,6 @@ parameters: count: 2 path: ../../htdocs/loan/class/loanschedule.class.php - - - message: "#^Property LoanSchedule\\:\\:\\$amount_capital has no type specified\\.$#" - count: 1 - path: ../../htdocs/loan/class/loanschedule.class.php - - - - message: "#^Property LoanSchedule\\:\\:\\$amount_insurance has no type specified\\.$#" - count: 1 - path: ../../htdocs/loan/class/loanschedule.class.php - - - - message: "#^Property LoanSchedule\\:\\:\\$amount_interest has no type specified\\.$#" - count: 1 - path: ../../htdocs/loan/class/loanschedule.class.php - - - - message: "#^Property LoanSchedule\\:\\:\\$amounts has no type specified\\.$#" - count: 1 - path: ../../htdocs/loan/class/loanschedule.class.php - - - - message: "#^Property LoanSchedule\\:\\:\\$bank_account has no type specified\\.$#" - count: 1 - path: ../../htdocs/loan/class/loanschedule.class.php - - - - message: "#^Property LoanSchedule\\:\\:\\$bank_line has no type specified\\.$#" - count: 1 - path: ../../htdocs/loan/class/loanschedule.class.php - - message: "#^Property LoanSchedule\\:\\:\\$fk_bank \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 3 @@ -20395,21 +18855,6 @@ parameters: count: 2 path: ../../htdocs/loan/class/loanschedule.class.php - - - message: "#^Property LoanSchedule\\:\\:\\$total has no type specified\\.$#" - count: 1 - path: ../../htdocs/loan/class/loanschedule.class.php - - - - message: "#^Property LoanSchedule\\:\\:\\$type_code has no type specified\\.$#" - count: 1 - path: ../../htdocs/loan/class/loanschedule.class.php - - - - message: "#^Property LoanSchedule\\:\\:\\$type_label has no type specified\\.$#" - count: 1 - path: ../../htdocs/loan/class/loanschedule.class.php - - message: "#^Negated boolean expression is always true\\.$#" count: 1 @@ -20435,21 +18880,6 @@ parameters: count: 3 path: ../../htdocs/loan/class/paymentloan.class.php - - - message: "#^Property PaymentLoan\\:\\:\\$amount_interest \\(float\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 3 - path: ../../htdocs/loan/class/paymentloan.class.php - - - - message: "#^Property PaymentLoan\\:\\:\\$bank_line has no type specified\\.$#" - count: 1 - path: ../../htdocs/loan/class/paymentloan.class.php - - - - message: "#^Property PaymentLoan\\:\\:\\$chid has no type specified\\.$#" - count: 1 - path: ../../htdocs/loan/class/paymentloan.class.php - - message: "#^Property PaymentLoan\\:\\:\\$fk_bank \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 3 @@ -20565,26 +18995,6 @@ parameters: count: 2 path: ../../htdocs/loan/schedule.php - - - message: "#^Property MailmanSpip\\:\\:\\$mladded_ko type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/mailmanspip/class/mailmanspip.class.php - - - - message: "#^Property MailmanSpip\\:\\:\\$mladded_ok type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/mailmanspip/class/mailmanspip.class.php - - - - message: "#^Property MailmanSpip\\:\\:\\$mlremoved_ko type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/mailmanspip/class/mailmanspip.class.php - - - - message: "#^Property MailmanSpip\\:\\:\\$mlremoved_ok type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/mailmanspip/class/mailmanspip.class.php - - message: "#^Elseif condition is always true\\.$#" count: 1 @@ -20750,11 +19160,6 @@ parameters: count: 2 path: ../../htdocs/modulebuilder/index.php - - - message: "#^Parameter \\#2 \\$page of function print_barre_liste expects int\\|null, string given\\.$#" - count: 1 - path: ../../htdocs/modulebuilder/index.php - - message: "#^Right side of && is always true\\.$#" count: 34 @@ -20940,46 +19345,11 @@ parameters: count: 1 path: ../../htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php - - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php - - message: "#^Parameter \\#3 \\$tab_height of method pdf_standard_myobject\\:\\:_tableau\\(\\) expects int, float given\\.$#" count: 6 path: ../../htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php - - - - message: "#^Parameter \\#4 \\$w of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php - - message: "#^Variable \\$object might not be defined\\.$#" count: 1 @@ -21470,11 +19840,6 @@ parameters: count: 1 path: ../../htdocs/opensurvey/class/opensurveysondage.class.php - - - message: "#^Property Opensurveysondage\\:\\:\\$status \\(int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/opensurvey/class/opensurveysondage.class.php - - message: "#^Left side of && is always true\\.$#" count: 1 @@ -21526,8 +19891,8 @@ parameters: path: ../../htdocs/opensurvey/class/opensurveysondage.class.php - - message: "#^Property Opensurveysondage\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 2 + message: "#^Property Opensurveysondage\\:\\:\\$status \\(int\\) in isset\\(\\) is not nullable\\.$#" + count: 1 path: ../../htdocs/opensurvey/class/opensurveysondage.class.php - @@ -21720,11 +20085,6 @@ parameters: count: 1 path: ../../htdocs/partnership/class/partnership_type.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/partnership/class/partnership_type.class.php - - message: "#^Result of \\|\\| is always true\\.$#" count: 2 @@ -22110,16 +20470,6 @@ parameters: count: 1 path: ../../htdocs/product/class/product.class.php - - - message: "#^Method Product\\:\\:fetch_prod_arbo\\(\\) has parameter \\$prod with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/product/class/product.class.php - - - - message: "#^Method Product\\:\\:getFather\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/product/class/product.class.php - - message: "#^Negated boolean expression is always false\\.$#" count: 1 @@ -22205,11 +20555,6 @@ parameters: count: 1 path: ../../htdocs/product/class/product.class.php - - - message: "#^Property Product\\:\\:\\$stock_warehouse has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/class/product.class.php - - message: "#^Property Product\\:\\:\\$type \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -22245,29 +20590,14 @@ parameters: count: 1 path: ../../htdocs/product/class/product.class.php - - - message: "#^Method Productbatch\\:\\:findAll\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/product/class/productbatch.class.php - - - - message: "#^Method Productbatch\\:\\:findAllForProduct\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/product/class/productbatch.class.php - - message: "#^Negated boolean expression is always true\\.$#" count: 1 path: ../../htdocs/product/class/productbatch.class.php - - message: "#^Property CommonObject\\:\\:\\$import_key \\(string\\) in isset\\(\\) is not nullable\\.$#" - count: 3 - path: ../../htdocs/product/class/productbatch.class.php - - - - message: "#^Property Productbatch\\:\\:\\$_table_element has no type specified\\.$#" - count: 1 + message: "#^Property CommonObject\\:\\:\\$import_key \\(string\\) in isset\\(\\) is not nullable\\.$#" + count: 3 path: ../../htdocs/product/class/productbatch.class.php - @@ -22280,11 +20610,6 @@ parameters: count: 1 path: ../../htdocs/product/class/productbatch.class.php - - - message: "#^Property Productbatch\\:\\:\\$fk_product_stock has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/class/productbatch.class.php - - message: "#^Property Productbatch\\:\\:\\$qty \\(float\\) in isset\\(\\) is not nullable\\.$#" count: 3 @@ -22405,11 +20730,6 @@ parameters: count: 1 path: ../../htdocs/product/class/productfournisseurprice.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/product/class/productfournisseurprice.class.php - - message: "#^Negated boolean expression is always true\\.$#" count: 3 @@ -22420,11 +20740,6 @@ parameters: count: 1 path: ../../htdocs/product/class/propalmergepdfproduct.class.php - - - message: "#^Property Propalmergepdfproduct\\:\\:\\$datec has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/class/propalmergepdfproduct.class.php - - message: "#^Property Propalmergepdfproduct\\:\\:\\$file_name \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 4 @@ -22450,11 +20765,6 @@ parameters: count: 4 path: ../../htdocs/product/class/propalmergepdfproduct.class.php - - - message: "#^Property PropalmergepdfproductLine\\:\\:\\$datec has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/class/propalmergepdfproduct.class.php - - message: "#^Variable \\$i might not be defined\\.$#" count: 1 @@ -22507,7 +20817,7 @@ parameters: - message: "#^Negated boolean expression is always true\\.$#" - count: 2 + count: 1 path: ../../htdocs/product/dynamic_price/class/price_global_variable.class.php - @@ -22535,91 +20845,6 @@ parameters: count: 3 path: ../../htdocs/product/dynamic_price/class/price_global_variable_updater.class.php - - - message: "#^Property PriceGlobalVariableUpdater\\:\\:\\$last_status has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_global_variable_updater.class.php - - - - message: "#^Property PriceGlobalVariableUpdater\\:\\:\\$next_update has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_global_variable_updater.class.php - - - - message: "#^Property PriceGlobalVariableUpdater\\:\\:\\$parameters has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_global_variable_updater.class.php - - - - message: "#^Property PriceGlobalVariableUpdater\\:\\:\\$type has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_global_variable_updater.class.php - - - - message: "#^Property PriceGlobalVariableUpdater\\:\\:\\$types has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_global_variable_updater.class.php - - - - message: "#^Property PriceGlobalVariableUpdater\\:\\:\\$update_interval has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_global_variable_updater.class.php - - - - message: "#^Property PriceGlobalVariableUpdater\\:\\:\\$update_min has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_global_variable_updater.class.php - - - - message: "#^Method PriceParser\\:\\:parseExpression\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_parser.class.php - - - - message: "#^Method PriceParser\\:\\:parseProduct\\(\\) has parameter \\$extra_values with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_parser.class.php - - - - message: "#^Method PriceParser\\:\\:parseProductSupplier\\(\\) has parameter \\$extra_values with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_parser.class.php - - - - message: "#^Method PriceParser\\:\\:testExpression\\(\\) has parameter \\$extra_values with no value type specified in iterable type array\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_parser.class.php - - - - message: "#^Property PriceParser\\:\\:\\$db has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_parser.class.php - - - - message: "#^Property PriceParser\\:\\:\\$error_expr has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_parser.class.php - - - - message: "#^Property PriceParser\\:\\:\\$error_parser has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_parser.class.php - - - - message: "#^Property PriceParser\\:\\:\\$limit has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_parser.class.php - - - - message: "#^Property PriceParser\\:\\:\\$separator_chr has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_parser.class.php - - - - message: "#^Property PriceParser\\:\\:\\$special_chr has no type specified\\.$#" - count: 1 - path: ../../htdocs/product/dynamic_price/class/price_parser.class.php - - message: "#^Property PriceExpression\\:\\:\\$expression \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -23075,11 +21300,6 @@ parameters: count: 2 path: ../../htdocs/product/stock/class/entrepot.class.php - - - message: "#^Property Entrepot\\:\\:\\$statut \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/product/stock/class/entrepot.class.php - - message: "#^Method MouvementStock\\:\\:createBatch\\(\\) has parameter \\$dluo with no value type specified in iterable type array\\.$#" count: 1 @@ -23800,11 +22020,6 @@ parameters: count: 1 path: ../../htdocs/product/stock/stocktransfer/class/stocktransferline.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/product/stock/stocktransfer/class/stocktransferline.class.php - - message: "#^Property CommonObject\\:\\:\\$entity \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -24225,21 +22440,11 @@ parameters: count: 2 path: ../../htdocs/projet/class/project.class.php - - - message: "#^Offset 'picto' on array\\{picto\\: non\\-falsy\\-string\\} in isset\\(\\) always exists and is not nullable\\.$#" - count: 1 - path: ../../htdocs/projet/class/project.class.php - - message: "#^Property CommonObject\\:\\:\\$entity \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 1 path: ../../htdocs/projet/class/project.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 2 - path: ../../htdocs/projet/class/project.class.php - - message: "#^Property Project\\:\\:\\$ip \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -26105,11 +24310,6 @@ parameters: count: 2 path: ../../htdocs/reception/class/reception.class.php - - - message: "#^Property CommonObject\\:\\:\\$statut \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 2 - path: ../../htdocs/reception/class/reception.class.php - - message: "#^Property Reception\\:\\:\\$model_pdf \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 2 @@ -26515,41 +24715,6 @@ parameters: count: 1 path: ../../htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php - - - message: "#^Parameter \\#3 \\$h of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php - - - - message: "#^Parameter \\#3 \\$page_height of function pdf_pagehead expects int, float given\\.$#" - count: 1 - path: ../../htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php - - - - message: "#^Parameter \\#4 \\$posx of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php - - - - message: "#^Parameter \\#4 \\$w of function pdf_watermark expects int, float given\\.$#" - count: 1 - path: ../../htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php - - - - message: "#^Parameter \\#5 \\$marge_basse of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php - - - - message: "#^Parameter \\#5 \\$posy of function pdf_writeLinkedObjects expects int, float given\\.$#" - count: 1 - path: ../../htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php - - - - message: "#^Parameter \\#6 \\$marge_gauche of function pdf_pagefoot expects int, float given\\.$#" - count: 1 - path: ../../htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php - - message: "#^Variable \\$outputlangsbis might not be defined\\.$#" count: 7 @@ -26870,11 +25035,6 @@ parameters: count: 1 path: ../../htdocs/salaries/card.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/salaries/card.php - - message: "#^Variable \\$resteapayer might not be defined\\.$#" count: 1 @@ -26955,11 +25115,6 @@ parameters: count: 3 path: ../../htdocs/salaries/class/paymentsalary.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/salaries/class/paymentsalary.class.php - - message: "#^Property PaymentSalary\\:\\:\\$amount \\(float\\) in isset\\(\\) is not nullable\\.$#" count: 3 @@ -27025,31 +25180,11 @@ parameters: count: 3 path: ../../htdocs/salaries/class/salary.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/salaries/class/salary.class.php - - message: "#^Result of && is always false\\.$#" count: 1 path: ../../htdocs/salaries/class/salary.class.php - - - message: "#^Result of && is always true\\.$#" - count: 1 - path: ../../htdocs/salaries/class/salary.class.php - - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/salaries/document.php - - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/salaries/info.php - - message: "#^Negated boolean expression is always false\\.$#" count: 2 @@ -27125,11 +25260,6 @@ parameters: count: 2 path: ../../htdocs/salaries/virement_request.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/salaries/virement_request.php - - message: "#^Variable \\$error might not be defined\\.$#" count: 1 @@ -27975,11 +26105,6 @@ parameters: count: 2 path: ../../htdocs/supplier_proposal/class/supplier_proposal.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/supplier_proposal/class/supplier_proposal.class.php - - message: "#^Property SupplierProposal\\:\\:\\$statut \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -29225,11 +27350,6 @@ parameters: count: 1 path: ../../htdocs/variants/class/ProductAttribute.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/variants/class/ProductAttribute.class.php - - message: "#^Variable \\$url in empty\\(\\) always exists and is not falsy\\.$#" count: 2 @@ -29550,26 +27670,11 @@ parameters: count: 1 path: ../../htdocs/webportal/class/webportalinvoice.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/webportal/class/webportalmember.class.php - - - - message: "#^Property CommonObject\\:\\:\\$statut \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/webportal/class/webportalmember.class.php - - message: "#^Ternary operator condition is always false\\.$#" count: 1 path: ../../htdocs/webportal/class/webportalmember.class.php - - - message: "#^Property CommonObject\\:\\:\\$status \\(array\\\\|int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: ../../htdocs/webportal/class/webportalorder.class.php - - message: "#^If condition is always false\\.$#" count: 1 @@ -30530,112 +28635,22 @@ parameters: count: 1 path: ../../scripts/user/migrate_picture_path.php - - - message: "#^Variable \\$db might not be defined\\.$#" - count: 5 - path: ../../scripts/user/sync_groups_dolibarr2ldap.php - - - - message: "#^Variable \\$hookmanager might not be defined\\.$#" - count: 1 - path: ../../scripts/user/sync_groups_dolibarr2ldap.php - - - - message: "#^Variable \\$langs might not be defined\\.$#" - count: 3 - path: ../../scripts/user/sync_groups_dolibarr2ldap.php - - message: "#^Variable \\$user might not be defined\\.$#" count: 2 path: ../../scripts/user/sync_groups_dolibarr2ldap.php - - - message: "#^Variable \\$conf might not be defined\\.$#" - count: 9 - path: ../../scripts/user/sync_groups_ldap2dolibarr.php - - - - message: "#^Variable \\$db might not be defined\\.$#" - count: 5 - path: ../../scripts/user/sync_groups_ldap2dolibarr.php - - - - message: "#^Variable \\$hookmanager might not be defined\\.$#" - count: 1 - path: ../../scripts/user/sync_groups_ldap2dolibarr.php - - - - message: "#^Variable \\$langs might not be defined\\.$#" - count: 8 - path: ../../scripts/user/sync_groups_ldap2dolibarr.php - - - - message: "#^Variable \\$db might not be defined\\.$#" - count: 5 - path: ../../scripts/user/sync_users_dolibarr2ldap.php - - - - message: "#^Variable \\$hookmanager might not be defined\\.$#" - count: 1 - path: ../../scripts/user/sync_users_dolibarr2ldap.php - - - - message: "#^Variable \\$langs might not be defined\\.$#" - count: 4 - path: ../../scripts/user/sync_users_dolibarr2ldap.php - - message: "#^Variable \\$user might not be defined\\.$#" count: 2 path: ../../scripts/user/sync_users_dolibarr2ldap.php - - message: "#^Variable \\$conf might not be defined\\.$#" - count: 23 - path: ../../scripts/user/sync_users_ldap2dolibarr.php - - - - message: "#^Variable \\$db might not be defined\\.$#" - count: 8 - path: ../../scripts/user/sync_users_ldap2dolibarr.php - - - - message: "#^Variable \\$hookmanager might not be defined\\.$#" + message: "#^Unable to resolve the template type T in call to function array_values$#" count: 1 path: ../../scripts/user/sync_users_ldap2dolibarr.php - - - message: "#^Variable \\$langs might not be defined\\.$#" - count: 11 - path: ../../scripts/user/sync_users_ldap2dolibarr.php - - message: "#^Variable \\$user might not be defined\\.$#" count: 2 path: ../../scripts/user/sync_users_ldap2dolibarr.php - - - - message: "#^Variable \\$db might not be defined\\.$#" - count: 2 - path: ../../scripts/website/regenerate-pages.php - - - - message: "#^Variable \\$hookmanager might not be defined\\.$#" - count: 1 - path: ../../scripts/website/regenerate-pages.php - - - - message: "#^Variable \\$langs might not be defined\\.$#" - count: 1 - path: ../../scripts/website/regenerate-pages.php - - - - message: "#^Variable \\$db might not be defined\\.$#" - count: 3 - path: ../../scripts/withdrawals/build_withdrawal_file.php - - - - message: "#^Variable \\$hookmanager might not be defined\\.$#" - count: 1 - path: ../../scripts/withdrawals/build_withdrawal_file.php diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php index f428ee2700eec..4135e982d140e 100644 --- a/htdocs/accountancy/class/accountingjournal.class.php +++ b/htdocs/accountancy/class/accountingjournal.class.php @@ -211,7 +211,7 @@ public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle } if ($withlabel == 2 && !empty($this->nature)) { $key = $langs->trans("AccountingJournalType".$this->nature); - $transferlabel = ($this->nature && $key != "AccountingJournalType".strtoupper($langs->trans($this->nature)) ? $key : $this->label); + $transferlabel = ($key != "AccountingJournalType".strtoupper($langs->trans($this->nature)) ? $key : $this->label); $label_link .= ' - '.($nourl ? '' : '').$transferlabel.($nourl ? '' : ''); } diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php index 3a81695875c56..e40c0606b84ad 100644 --- a/htdocs/accountancy/closure/index.php +++ b/htdocs/accountancy/closure/index.php @@ -372,7 +372,7 @@ } else { $buttonvalidate = '' . $langs->trans("ValidateMovements") . ''; } - print_barre_liste($langs->trans("OverviewOfMovementsNotValidated"), '', '', '', '', '', '', -1, '', '', 0, $buttonvalidate, '', 0, 1, 0); + print_barre_liste($langs->trans("OverviewOfMovementsNotValidated"), 0, '', '', '', '', '', -1, '', '', 0, $buttonvalidate, '', 0, 1, 0); print '
'; print '
'; @@ -426,7 +426,7 @@ $button = '' . $langs->trans("AccountancyClosureClose") . ''; } } - print_barre_liste('', '', '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0); + print_barre_liste('', 0, '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0); print '
'; @@ -444,7 +444,7 @@ } else { $button = '' . $langs->trans("AccountancyClosureAccountingReversal") . ''; } - print_barre_liste('', '', '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0); + print_barre_liste('', 0, '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0); } // End of page diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index b6d9ed8fa9fc7..e1934a31b0ee2 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -321,7 +321,7 @@ $buttonbind = ''.img_picto($langs->trans("ValidateHistory"), 'link', 'class="pictofixedwidth fa-color-unset"').$langs->trans("ValidateHistory").''; -print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1, 0, $buttonbind); +print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), 0, '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1, 0, $buttonbind); //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, ''); print '
'; @@ -461,7 +461,7 @@ print '
'; -print_barre_liste(img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1); +print_barre_liste(img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesBound"), 0, '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1); //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', ''); print '
'; @@ -582,7 +582,7 @@ print '
'; print '
'; - print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1); + print_barre_liste($langs->trans("OtherInfo"), 0, '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1); //print load_fiche_titre($langs->trans("OtherInfo"), '', ''); print '
'; diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php index 146c245ab04de..0fab2ffd2f9bf 100644 --- a/htdocs/accountancy/expensereport/index.php +++ b/htdocs/accountancy/expensereport/index.php @@ -206,7 +206,7 @@ $buttonbind = ''.img_picto($langs->trans("ValidateHistory"), 'link', 'class="pictofixedwidth fa-color-unset"').$langs->trans("ValidateHistory").''; -print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1, 0, $buttonbind); +print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), 0, '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1, 0, $buttonbind); //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, ''); print '
'; @@ -334,7 +334,7 @@ print '
'; -print_barre_liste(img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1); +print_barre_liste(img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesBound"), 0, '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1); //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', ''); @@ -420,7 +420,7 @@ print '
'; print '
'; - print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1); + print_barre_liste($langs->trans("OtherInfo"), 0, '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1); //print load_fiche_titre($langs->trans("OtherInfo"), '', ''); print '
'; diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index fa14fd5b83cc5..814ec1ab979b3 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -315,7 +315,7 @@ $buttonbind = ''.img_picto($langs->trans("ValidateHistory"), 'link', 'class="pictofixedwidth fa-color-unset"').$langs->trans("ValidateHistory").''; -print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1, 0, $buttonbind); +print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), 0, '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1, 0, $buttonbind); //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, ''); print '
'; @@ -447,7 +447,7 @@ print '
'; -print_barre_liste(img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1); +print_barre_liste(img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesBound"), 0, '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1); //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', ''); print '
'; @@ -559,7 +559,7 @@ print '
'; print '
'; - print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1); + print_barre_liste($langs->trans("OtherInfo"), 0, '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1); //print load_fiche_titre($langs->trans("OtherInfo"), '', ''); print '
'; diff --git a/htdocs/admin/fediverse.php b/htdocs/admin/fediverse.php index 8fe84d1cf60b3..e10baa10207f9 100644 --- a/htdocs/admin/fediverse.php +++ b/htdocs/admin/fediverse.php @@ -274,7 +274,7 @@ $title = $langs->trans("ConfigImportSocialNetwork"); -print_barre_liste($title, '', $_SERVER["PHP_SELF"], '', '', '', '', -1, '', 'tools', 0, '', '', -1, 0, 0, 0, ''); +print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', '', '', '', -1, '', 'tools', 0, '', '', -1, 0, 0, 0, ''); print '
'; diff --git a/htdocs/asset/tpl/accountancy_codes_edit.tpl.php b/htdocs/asset/tpl/accountancy_codes_edit.tpl.php index 8c615fad30c69..8db10c80270a0 100644 --- a/htdocs/asset/tpl/accountancy_codes_edit.tpl.php +++ b/htdocs/asset/tpl/accountancy_codes_edit.tpl.php @@ -25,14 +25,19 @@ * $parameters */ +/** + * @var DoliDB $db + * @var Form $form + * @var FormAccounting $formaccounting + * @var HookManager $hookmanager + * @var Translate $langs + */ + // Protection to avoid direct call of template if (empty($object) || !is_object($object)) { print "Error, template page can't be called as URL"; exit(1); } -/** - * @var HookManager $hookmanager - */ if (!is_object($form)) { $form = new Form($db); diff --git a/htdocs/asset/tpl/accountancy_codes_view.tpl.php b/htdocs/asset/tpl/accountancy_codes_view.tpl.php index f7e5219ca0797..354cc9f39af86 100644 --- a/htdocs/asset/tpl/accountancy_codes_view.tpl.php +++ b/htdocs/asset/tpl/accountancy_codes_view.tpl.php @@ -26,15 +26,19 @@ * $parameters */ +/** + * @var Conf $conf + * @var DoliDB $db + * @var Form $form + * @var HookManager $hookmanager + * @var Translate $langs + */ + // Protection to avoid direct call of template if (empty($object) || !is_object($object)) { print "Error, template page can't be called as URL"; exit(1); } -/** - * @var HookManager $hookmanager - */ - if (!is_object($form)) { $form = new Form($db); diff --git a/htdocs/asset/tpl/depreciation_options_edit.tpl.php b/htdocs/asset/tpl/depreciation_options_edit.tpl.php index 91847f8b355cc..dc654f5c033d9 100644 --- a/htdocs/asset/tpl/depreciation_options_edit.tpl.php +++ b/htdocs/asset/tpl/depreciation_options_edit.tpl.php @@ -26,16 +26,18 @@ * $parameters */ +/** + * @var Conf $conf + * @var DoliDB $db + * @var HookManager $hookmanager + */ + // Protection to avoid direct call of template if (empty($object) || !is_object($object)) { print "Error, template page can't be called as URL"; exit(1); } -/** - * @var HookManager $hookmanager - */ - if (!is_object($form)) { $form = new Form($db); } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index acd418040496c..50ab5f50a7e6a 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -5324,7 +5324,7 @@ public function printObjectLines($action, $seller, $buyer, $selected = 0, $dateS * @param Societe $seller Object of seller third party * @param Societe $buyer Object of buyer third party * @param int $selected ID line selected - * @param ?Extrafields $extrafields Object of extrafields + * @param ?ExtraFields $extrafields Object of extrafields * @param string $defaulttpldir Directory where to find the template (deprecated) * @return void */ @@ -7873,7 +7873,6 @@ function handlemultiinputdisabling(htmlname){ $sqlwhere .= " AND entity = " . ((int) $conf->entity); } $sql .= $sqlwhere; - //print $sql; // Note: $InfoFieldList can be 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:CategoryIdType[:CategoryIdList[:Sortfield]]]]]]' if (isset($InfoFieldList[7]) && preg_match('/^[a-z0-9_\-,]+$/i', $InfoFieldList[7])) { @@ -9085,7 +9084,7 @@ public function validateField($fields, $fieldKey, $fieldValue) * Function to show lines of extrafields with output data. * This function is responsible to output the
and "; + // Ledger account $account_ledger = $k; // Try to force general ledger account depending on type if ($tabtype[$key] == 'payment') { - $account_ledger = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'); + $account_ledger = (!empty($obj->accountancy_code_customer_general)) ? $obj->accountancy_code_customer_general : $account_customer; } if ($tabtype[$key] == 'payment_supplier') { - $account_ledger = getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER'); + $account_ledger = (!empty($obj->accountancy_code_supplier_general)) ? $obj->accountancy_code_supplier_general : $account_supplier; } if ($tabtype[$key] == 'payment_expensereport') { $account_ledger = getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT'); } if ($tabtype[$key] == 'payment_salary') { - $account_ledger = getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT'); + $account_ledger = (!empty($obj->accountancy_code_user_general)) ? $obj->accountancy_code_user_general : $account_employee; } if ($tabtype[$key] == 'payment_vat') { $account_ledger = getDolGlobalString('ACCOUNTING_VAT_PAY_ACCOUNT'); diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 8bab502e242eb..ba68fd31f4150 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -122,8 +122,10 @@ CustomerAccountancyCodeGeneral=General accounting code CustomerAccountancyCode=Customer accounting code SupplierAccountancyCodeGeneral=General accounting code SupplierAccountancyCode=Vendor accounting code +UserAccountancyCodeGeneral=General accounting code CustomerAccountancyCodeShort=Cust. account. code SupplierAccountancyCodeShort=Sup. account. code +UserAccountancyCodeShort=User account. code AccountNumber=Account number NewAccountingAccount=New account Turnover=Turnover invoiced diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php index 8c23cb8f40ef6..2b31b7097f0a1 100644 --- a/htdocs/user/bank.php +++ b/htdocs/user/bank.php @@ -1,13 +1,13 @@ - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2015 Laurent Destailleur - * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2013 Peter Fontaine - * Copyright (C) 2015-2016 Marcos García - * Copyright (C) 2015 Alexandre Spangaro - * Copyright (C) 2021 Gauthier VERDOL - * Copyright (C) 2024 MDW +/* Copyright (C) 2002-2004 Rodolphe Quiedeville + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2015 Laurent Destailleur + * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2013 Peter Fontaine + * Copyright (C) 2015-2016 Marcos García + * Copyright (C) 2015-2024 Alexandre Spangaro + * Copyright (C) 2021 Gauthier VERDOL + * Copyright (C) 2024 MDW * Copyright (C) 2024 Frédéric France * * This program is free software; you can redistribute it and/or modify @@ -48,6 +48,10 @@ require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php'; require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php'; } +if (isModEnabled('accounting')) { + require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php'; +} /** * @var Conf $conf @@ -61,6 +65,10 @@ // Load translation files required by page $langs->loadLangs(array('companies', 'commercial', 'banks', 'bills', 'trips', 'holiday', 'salaries')); +if (isModEnabled('accounting')) { + $langs->load('compta'); +} + $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alphanohtml'); $bankid = GETPOSTINT('bankid'); @@ -231,7 +239,17 @@ } } -// update accountancy_code +// update accountancy_code_user_general +if ($action == 'setaccountancycodeusergeneral' && $usercanadd) { + $result = $object->fetch($id); + $object->accountancy_code_user_general = GETPOST("accountancycodeusergeneral"); + $result = $object->update($user); + if ($result < 0) { + setEventMessages($object->error, $object->errors, 'errors'); + $action = 'editaccountancycodeusergeneral'; + } +} + if ($action == 'setaccountancy_code' && $usercanadd && !$cancel) { $object->accountancy_code = (string) GETPOST('accountancy_code', 'alphanohtml'); $result = $object->update($user); @@ -575,17 +593,6 @@ print ''; } - // Accountancy code - if (isModEnabled('accounting')) { - print ''; - print ''; - print ''; - } - // Employee Number if ($permissiontoreadhr) { print ''; @@ -608,6 +615,35 @@ print ''; } + if (isModEnabled('accounting')) { + // Accountancy code user general + $formaccounting = new FormAccounting($db); + + print ''; + print ''; + + // Accountancy code + print ''; + print ''; + print ''; + } + print '
according to correct number of columns received into $params['colspan'] or
according to $display_type * - * @param Extrafields $extrafields Extrafield Object + * @param ExtraFields $extrafields Extrafield Object * @param string $mode Show output ('view') or input ('create' or 'edit') for extrafield * @param array $params Optional parameters. Example: array('style'=>'class="oddeven"', 'colspan'=>$colspan) * @param string $keysuffix Suffix string to add after name and id of field (can be used to avoid duplicate names) @@ -9383,7 +9382,7 @@ public function showOptionals($extrafields, $mode = 'view', $params = null, $key if (in_array($extrafields->attributes[$this->table_element]['type'][$key], $listoftypestoshowpicto)) { $out .= getPictoForType($extrafields->attributes[$this->table_element]['type'][$key], ($extrafields->attributes[$this->table_element]['type'][$key] == 'text' ? 'tdtop' : '')); } - $out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id, $this->table_element); + $out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', '', $this->id, $this->table_element); break; } diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 7fa9750d85495..1fdc37aa21169 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -723,7 +723,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t * * @param TCPDF $pdf Object PDF * @param Translate $outputlangs Object lang for output - * @param int $page_height Height of page + * @param float $page_height Height of page * @return void */ function pdf_pagehead(&$pdf, $outputlangs, $page_height) @@ -736,9 +736,9 @@ function pdf_pagehead(&$pdf, $outputlangs, $page_height) if (file_exists($filepath)) { $pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF_ALPHA')) { - $pdf->SetAlpha($conf->global->MAIN_USE_BACKGROUND_ON_PDF_ALPHA); + $pdf->SetAlpha(getDolGlobalFloat('MAIN_USE_BACKGROUND_ON_PDF_ALPHA')); } // Option for change opacity of background - $pdf->Image($filepath, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_X : 0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y : 0), 0, $page_height); + $pdf->Image($filepath, getDolGlobalFloat('MAIN_USE_BACKGROUND_ON_PDF_X'), getDolGlobalFloat('MAIN_USE_BACKGROUND_ON_PDF_Y'), 0, $page_height); if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF_ALPHA')) { $pdf->SetAlpha(1); } @@ -776,8 +776,8 @@ function pdf_getSubstitutionArray($outputlangs, $exclude = null, $object = null, * * @param TCPDF $pdf Object PDF * @param Translate $outputlangs Object lang - * @param int $h Height of PDF - * @param int $w Width of PDF + * @param float $h Height of PDF + * @param float $w Width of PDF * @param string $unit Unit of height (mm, pt, ...) * @param string $text Text to show * @return void @@ -815,9 +815,9 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text) $pdf->SetFont('', 'B', 40); $pdf->SetTextColor(255, 0, 0); - //rotate + // rotate $pdf->_out(sprintf('q %.5F %.5F %.5F %.5F %.2F %.2F cm 1 0 0 1 %.2F %.2F cm', cos($watermark_angle), sin($watermark_angle), -sin($watermark_angle), cos($watermark_angle), $watermark_x * $k, ($h - $watermark_y) * $k, -$watermark_x * $k, -($h - $watermark_y) * $k)); - //print watermark + // print watermark $pdf->SetAlpha(0.5); $pdf->SetXY($watermark_x_pos, $watermark_y_pos); @@ -825,7 +825,7 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text) $pdf->SetAlpha(0.3); $pdf->Cell($w - 20, 25, $outputlangs->convToOutputCharset($text), "", 2, "C", 0); - //antirotate + // antirotate $pdf->_out('Q'); $pdf->SetXY($savx, $savy); @@ -840,8 +840,8 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text) * * @param TCPDF $pdf Object PDF * @param Translate $outputlangs Object lang - * @param int $curx X - * @param int $cury Y + * @param float $curx X + * @param float $cury Y * @param Account $account Bank account object * @param int $onlynumber Output only number (bank+desk+key+number according to country, but without name of bank and address) * @param int $default_font_size Default font size @@ -1014,13 +1014,13 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0, * @param Translate $outputlangs Object lang for output * @param string $paramfreetext Constant name of free text * @param ?Societe $fromcompany Object company - * @param int $marge_basse Margin bottom we use for the autobreak - * @param int $marge_gauche Margin left (no more used) + * @param float $marge_basse Margin bottom we use for the autobreak + * @param float $marge_gauche Margin left (no more used) * @param float $page_hauteur Page height * @param CommonObject $object Object shown in PDF * @param int<0,3> $showdetails Show company address details into footer (0=Nothing, 1=Show address, 2=Show managers, 3=Both) * @param int $hidefreetext 1=Hide free text, 0=Show free text - * @param int $page_largeur Page width + * @param float $page_largeur Page width * @param string $watermark Watermark text to print on page * @return int Return height of bottom margin including footer text */ @@ -1394,8 +1394,8 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_ * @param TCPDF $pdf Object PDF * @param CommonObject $object Object * @param Translate $outputlangs Object lang - * @param int $posx X - * @param int $posy Y + * @param float $posx X + * @param float $posy Y * @param float $w Width of cells. If 0, they extend up to the right margin of the page. * @param float $h Cell minimum height. The cell extends automatically if needed. * @param string $align Align diff --git a/htdocs/core/tpl/extrafields_add.tpl.php b/htdocs/core/tpl/extrafields_add.tpl.php index fbd6e43df8f01..1c7fcb1889fad 100644 --- a/htdocs/core/tpl/extrafields_add.tpl.php +++ b/htdocs/core/tpl/extrafields_add.tpl.php @@ -23,6 +23,18 @@ * $parameters */ +/** + * @var CommonObject $object + * @var Conf $conf + * @var DoliDB $db + * @var ExtraFields $extrafields + * @var Translate $langs + * + * @var Societe $thirdpartytopropagateextrafieldsfrom + * @var string $action + * @var array $parameters + */ + // Protection to avoid direct call of template if (empty($conf) || !is_object($conf)) { print "Error, template page can't be called as URL"; diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php index a449b0444c343..a5f50b9132b60 100644 --- a/htdocs/core/tpl/extrafields_edit.tpl.php +++ b/htdocs/core/tpl/extrafields_edit.tpl.php @@ -23,6 +23,14 @@ * $parameters */ + /** + * @var CommonObject $object + * @var Conf $conf + * @var Translate $langs + * @var string $action + * @var array $parameters + */ + // Protection to avoid direct call of template if (empty($conf) || !is_object($conf)) { print "Error, template page can't be called as URL"; diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index ee50a6e134997..389e2d8f63ecb 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -32,7 +32,6 @@ * @var User $user * * @var string $captcha - * @var string $message * * @var int<0,1> $dol_hide_leftmenu * @var int<0,1> $dol_hide_topmenu @@ -497,6 +496,7 @@ trans('NewDictionary'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/modulebuilder/index.php?tab=dictionaries&module='.urlencode($module).'&tabdic=newdictionary'); - print_barre_liste($langs->trans("ListOfDictionariesEntries"), '', $_SERVER["PHP_SELF"], '', '', '', '', 0, '', '', 0, $newdict, '', 0, 0, 0, 1); + print_barre_liste($langs->trans("ListOfDictionariesEntries"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, '', '', 0, $newdict, '', 0, 0, 0, 1); if ($tabdic != 'newdictionary') { print ''; diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php index e5a27fd2e9e38..3f20ac9014958 100755 --- a/scripts/user/sync_groups_dolibarr2ldap.php +++ b/scripts/user/sync_groups_dolibarr2ldap.php @@ -3,6 +3,7 @@ /** * Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2006 Laurent Destailleur + * Copyright (C) 2024 Frédéric France * * 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 @@ -49,6 +50,13 @@ require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"; +/** + * @var Conf $conf + * @var DoliDB $db + * @var HookManager $hookmanager + * @var Translate $langs + */ + // Global variables $version = DOL_VERSION; $error = 0; diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php index acd9b804a892c..f6aa7a85c0778 100755 --- a/scripts/user/sync_groups_ldap2dolibarr.php +++ b/scripts/user/sync_groups_ldap2dolibarr.php @@ -4,6 +4,7 @@ * Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2006-2012 Laurent Destailleur * Copyright (C) 2013 Maxime Kohlhaas + * Copyright (C) 2024 Frédéric France * * 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 @@ -46,6 +47,13 @@ require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php"; require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"; +/** + * @var Conf $conf + * @var DoliDB $db + * @var HookManager $hookmanager + * @var Translate $langs + */ + $langs->loadLangs(array("main", "errors")); // Global variables diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php index c970cc50c1092..97dd59f311fc4 100755 --- a/scripts/user/sync_users_dolibarr2ldap.php +++ b/scripts/user/sync_users_dolibarr2ldap.php @@ -3,6 +3,7 @@ /** * Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2006 Laurent Destailleur + * Copyright (C) 2024 Frédéric France * * 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 @@ -49,6 +50,13 @@ require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php"; +/** + * @var Conf $conf + * @var DoliDB $db + * @var HookManager $hookmanager + * @var Translate $langs + */ + // Global variables $version = DOL_VERSION; $error = 0; diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php index b8afd7af582e1..b730ce45cf7bf 100755 --- a/scripts/user/sync_users_ldap2dolibarr.php +++ b/scripts/user/sync_users_ldap2dolibarr.php @@ -3,6 +3,7 @@ /** * Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2006-2012 Laurent Destailleur + * Copyright (C) 2024 Frédéric France * * 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 @@ -44,6 +45,13 @@ require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php"; +/** + * @var Conf $conf + * @var DoliDB $db + * @var HookManager $hookmanager + * @var Translate $langs + */ + $langs->loadLangs(array("main", "errors")); // Global variables @@ -231,7 +239,7 @@ $fuser->contact_id = 0; $fuser->fk_member = 0; - $fuser->statut = 1; + $fuser->status = 1; // TODO : revoir la gestion du status /* * if (isset($ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_STATUS')])) { diff --git a/scripts/website/regenerate-pages.php b/scripts/website/regenerate-pages.php index 29d58d5db71c2..c75424049fee5 100755 --- a/scripts/website/regenerate-pages.php +++ b/scripts/website/regenerate-pages.php @@ -1,6 +1,7 @@ #!/usr/bin/env php + * Copyright (C) 2024 Frédéric France * * 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 @@ -58,6 +59,11 @@ include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/website2.lib.php'; +/** + * @var DoliDB $db + * @var HookManager $hookmanager + * @var Translate $langs + */ $hookmanager->initHooks(array('cli')); diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php index 41cbada0bc79a..7395ad4fffdfe 100755 --- a/scripts/withdrawals/build_withdrawal_file.php +++ b/scripts/withdrawals/build_withdrawal_file.php @@ -2,6 +2,7 @@ * Copyright (C) 2005-2010 Laurent Destailleur + * Copyright (C) 2024 Frédéric France * * 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 @@ -43,6 +44,10 @@ require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"; +/** + * @var DoliDB $db + * @var HookManager $hookmanager + */ // Global variables $version = constant('DOL_VERSION'); From b7409ee5ca959db44611d7630121ca5808b6bef6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 17:32:37 +0100 Subject: [PATCH 13/23] Doc --- htdocs/core/tpl/extrafields_add.tpl.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/tpl/extrafields_add.tpl.php b/htdocs/core/tpl/extrafields_add.tpl.php index fbd6e43df8f01..288a5b5ae028a 100644 --- a/htdocs/core/tpl/extrafields_add.tpl.php +++ b/htdocs/core/tpl/extrafields_add.tpl.php @@ -18,9 +18,11 @@ * Need to have the following variables defined: * $object (invoice, order, ...) * $action + * $db * $conf * $langs * $parameters + * $thirdpartytopropagateextrafieldsfrom */ // Protection to avoid direct call of template From 7b3ace0c3ee77a1ff7dd63918783a93307a736b1 Mon Sep 17 00:00:00 2001 From: Alain Rihs Date: Thu, 7 Nov 2024 17:33:33 +0100 Subject: [PATCH 14/23] __MEMBER_TITLE__ insteda of __MEMBER_CIVILITY__ (#31721) For labels, __MEMBER_TITLE__ insteda of __MEMBER_CIVILITY__ Co-authored-by: Laurent Destailleur --- htdocs/adherents/cartes/carte.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index 877e763291113..c9d8f60732dfa 100644 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -205,7 +205,7 @@ // For labels if ($mode == 'label') { if (!getDolGlobalString('ADHERENT_ETIQUETTE_TEXT')) { - $conf->global->ADHERENT_ETIQUETTE_TEXT = "__MEMBER_CIVILITY__\n__MEMBER_FULLNAME__\n__MEMBER_ADDRESS__\n__MEMBER_ZIP__ __MEMBER_TOWN__\n__MEMBER_COUNTRY__"; + $conf->global->ADHERENT_ETIQUETTE_TEXT = "__MEMBER_TITLE__\n__MEMBER_FULLNAME__\n__MEMBER_ADDRESS__\n__MEMBER_ZIP__ __MEMBER_TOWN__\n__MEMBER_COUNTRY__"; } $textleft = make_substitutions(getDolGlobalString('ADHERENT_ETIQUETTE_TEXT'), $substitutionarray); $textheader = ''; From 48d5d2b83137d74bf081a80bf17b63605dda7b89 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Thu, 7 Nov 2024 18:40:58 +0100 Subject: [PATCH 15/23] NEW Accountancy - Add general account on thirdparty - Code user part (#31676) * NEW Accountancy - Add general account on thirdparty - SQL Part * NEW Accountancy - Add general account on thirdparty - Code customer part * NEW Accountancy - Add general account on thirdparty - Code customer part * NEW Accountancy - Add general account on thirdparty - Code customer part * Fix Phan * Use isModEnabled * NEW Accountancy - Add general account on thirdparty - Code supplier part * Fix phan * Fix phan * Fix phan * Use list of account instead of simple input * Use list of account instead of simple input * Tabs * NEW Accountancy - Add general account on thirdparty - Code user part * NEW Accountancy - Add general account on thirdparty - Code user part * Fix indent * Fix indent * Remove duplicate language key * Fix phan * Fix phan * Update card.php * Fix accountancy export CSV --------- Co-authored-by: Laurent Destailleur --- htdocs/accountancy/journal/bankjournal.php | 56 ++++++++-------- htdocs/langs/en_US/compta.lang | 2 + htdocs/user/bank.php | 78 ++++++++++++++++------ htdocs/user/card.php | 34 +++++----- htdocs/user/class/user.class.php | 12 ++++ 5 files changed, 118 insertions(+), 64 deletions(-) diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 96e39e06813d5..a50430b06dd83 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -158,7 +158,7 @@ $sql .= " soc.accountancy_code_supplier_general,"; $sql .= " soc.code_compta_fournisseur,"; } -$sql .= " u.accountancy_code, u.rowid as userid, u.lastname as lastname, u.firstname as firstname, u.email as useremail, u.statut as userstatus,"; +$sql .= " u.accountancy_code_user_general, u.accountancy_code, u.rowid as userid, u.lastname as lastname, u.firstname as firstname, u.email as useremail, u.statut as userstatus,"; $sql .= " bu2.type as typeop_user,"; $sql .= " bu3.type as typeop_payment, bu4.type as typeop_payment_supplier"; $sql .= " FROM ".MAIN_DB_PREFIX."bank as b"; @@ -239,6 +239,7 @@ $account_customer = 'NotDefined'; $account_supplier = 'NotDefined'; +$account_employee = 'NotDefined'; //print $sql; dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG); @@ -315,6 +316,7 @@ // Set accountancy code for user // $obj->accountancy_code is the accountancy_code of table u=user (but it is defined only if // a link with type 'user' exists and user as a subledger account) + $accountancy_code_user_general = (!empty($obj->accountancy_code_user_general)) ? $obj->accountancy_code_user_general : $account_employee; $compta_user = (!empty($obj->accountancy_code) ? $obj->accountancy_code : ''); $tabuser[$obj->rowid] = array( @@ -323,6 +325,7 @@ 'lastname' => $obj->lastname, 'firstname' => $obj->firstname, 'email' => $obj->useremail, + 'accountancy_code_general' => $accountancy_code_user_general, 'accountancy_code' => $compta_user, 'status' => $obj->userstatus ); @@ -435,6 +438,7 @@ $userstatic->firstname = $tabuser[$obj->rowid]['firstname']; $userstatic->lastname = $tabuser[$obj->rowid]['lastname']; $userstatic->status = $tabuser[$obj->rowid]['status']; + $userstatic->accountancy_code_user_general = $tabuser[$obj->rowid]['accountancy_code_general']; $userstatic->accountancy_code = $tabuser[$obj->rowid]['accountancy_code']; // For a payment of social contribution, we have a link sc + user. @@ -542,8 +546,9 @@ $tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen } - if (empty($obj->typeop_user)) { // Add test to avoid to add amount twice if a link already exists also on user. - $compta_user = $userstatic->accountancy_code; + if (empty($obj->typeop_user)) { // Add test to avoid adding amount twice if a link already exists also on user. + $accountancy_code_user_general = (!empty($obj->accountancy_code_user_general)) ? $obj->accountancy_code_user_general : $account_employee; + $compta_user = $userstatic->accountancy_code; if ($compta_user) { $tabtp[$obj->rowid][$compta_user] += $amounttouse; $tabuser[$obj->rowid] = array( @@ -552,6 +557,7 @@ 'lastname' => $userstatic->lastname, 'firstname' => $userstatic->firstname, 'email' => $userstatic->email, + 'accountancy_code_general' => $accountancy_code_user_general, 'accountancy_code' => $compta_user, 'status' => $userstatic->status ); @@ -783,13 +789,13 @@ $lettering = true; $bookkeeping->subledger_account = $k; // For payment, the subledger account is stored as $key of $tabtp $bookkeeping->subledger_label = $tabcompany[$key]['name']; // $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction - $bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'); + $bookkeeping->numero_compte = $tabcompany[$key]['accountancy_code_general']; $bookkeeping->label_compte = $accountingaccountcustomer->label; } elseif ($tabtype[$key] == 'payment_supplier') { // If payment is payment of supplier invoice, we get ref of invoice $lettering = true; $bookkeeping->subledger_account = $k; // For payment, the subledger account is stored as $key of $tabtp $bookkeeping->subledger_label = $tabcompany[$key]['name']; // $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction - $bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER'); + $bookkeeping->numero_compte = $tabcompany[$key]['accountancy_code_general']; $bookkeeping->label_compte = $accountingaccountsupplier->label; } elseif ($tabtype[$key] == 'payment_expensereport') { $bookkeeping->subledger_account = $tabuser[$key]['accountancy_code']; @@ -799,7 +805,7 @@ } elseif ($tabtype[$key] == 'payment_salary') { $bookkeeping->subledger_account = $tabuser[$key]['accountancy_code']; $bookkeeping->subledger_label = $tabuser[$key]['name']; - $bookkeeping->numero_compte = getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT'); + $bookkeeping->numero_compte = $tabuser[$key]['accountancy_code_general']; $bookkeeping->label_compte = $accountingaccountpayment->label; } elseif (in_array($tabtype[$key], array('sc', 'payment_sc'))) { // If payment is payment of social contribution $bookkeeping->subledger_account = ''; @@ -986,7 +992,6 @@ print '"'.$langs->transnoentitiesnoconv("Date").'"'.$sep; print '"'.$langs->transnoentitiesnoconv("PaymentMode").'"'.$sep; print '"'.$langs->transnoentitiesnoconv("AccountAccounting").'"'.$sep; - print '"'.$langs->transnoentitiesnoconv("LedgerAccount").'"'.$sep; print '"'.$langs->transnoentitiesnoconv("SubledgerAccount").'"'.$sep; print '"'.$langs->transnoentitiesnoconv("Label").'"'.$sep; print '"'.$langs->transnoentitiesnoconv("AccountingDebit").'"'.$sep; @@ -1016,7 +1021,6 @@ print '"'.$date.'"'.$sep; print '"'.$val["type_payment"].'"'.$sep; print '"'.length_accountg(html_entity_decode($k)).'"'.$sep; - print '"'.length_accounta(html_entity_decode($k)).'"'.$sep; print " ".$sep; print '"'.$reflabel.'"'.$sep; print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep; @@ -1044,20 +1048,20 @@ print '"'.$key.'"'.$sep; print '"'.$date.'"'.$sep; print '"'.$val["type_payment"].'"'.$sep; - print '"'.length_accountg(html_entity_decode($k)).'"'.$sep; - if ($tabtype[$key] == 'payment_supplier') { - $account_ledger = (!empty($obj->accountancy_code_supplier_general)) ? $obj->accountancy_code_supplier_general : $account_supplier; - print '"'.$account_ledger.'"'.$sep; - } elseif ($tabtype[$key] == 'payment') { - $account_ledger = (!empty($obj->accountancy_code_customer_general)) ? $obj->accountancy_code_customer_general : $account_customer; - print '"'.$account_ledger.'"'.$sep; - } elseif ($tabtype[$key] == 'payment_expensereport') { - print '"'.getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT').'"'.$sep; - } elseif ($tabtype[$key] == 'payment_salary') { - print '"'.getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT').'"'.$sep; - } else { - print '"'.length_accountg(html_entity_decode($k)).'"'.$sep; - } + if ($tabtype[$key] == 'payment_supplier') { + $account_ledger = (!empty($obj->accountancy_code_supplier_general)) ? $obj->accountancy_code_supplier_general : $account_supplier; + print '"'.length_accountg($account_ledger).'"'.$sep; + } elseif ($tabtype[$key] == 'payment') { + $account_ledger = (!empty($obj->accountancy_code_customer_general)) ? $obj->accountancy_code_customer_general : $account_customer; + print '"'.length_accountg($account_ledger).'"'.$sep; + } elseif ($tabtype[$key] == 'payment_expensereport') { + print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT')).'"'.$sep; + } elseif ($tabtype[$key] == 'payment_salary') { + $account_ledger = (!empty($obj->accountancy_code_user_general)) ? $obj->accountancy_code_user_general : $account_employee; + print '"'.length_accountg($account_ledger).'"'.$sep; + } else { + print '"'.length_accountg(html_entity_decode($k)).'"'.$sep; + } print '"'.length_accounta(html_entity_decode($k)).'"'.$sep; print '"'.$reflabel.'"'.$sep; print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep; @@ -1080,7 +1084,6 @@ print '"'.$date.'"'.$sep; print '"'.$val["type_payment"].'"'.$sep; print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE')).'"'.$sep; - print '"'.length_accounta(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE')).'"'.$sep; print $sep; print '"'.$reflabel.'"'.$sep; print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep; @@ -1332,20 +1335,21 @@ function writebookkeeping() { // Ref print "
".dol_escape_htmltag($ref)."
'; - print $form->editfieldkey("AccountancyCode", 'accountancy_code', $object->accountancy_code, $object, $user->hasRight('user', 'user', 'creer')); - print ''; - print $form->editfieldval("AccountancyCode", 'accountancy_code', $object->accountancy_code, $object, $user->hasRight('user', 'user', 'creer'), 'string', '', null, null, '', 0, ''); - print '
'; + print $form->editfieldkey("UserAccountancyCodeGeneral", 'accountancycodeusergeneral', length_accountg($object->accountancy_code_user_general), $object, $user->hasRight('user', 'user', 'creer')); + print ''; + if ($action == 'editaccountancycodeusergeneral' && $user->hasRight('user', 'user', 'creer')) { + print $formaccounting->formAccountingAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->accountancy_code_user_general, 'accountancycodeusergeneral', 0, 1, '', 1); + } else { + $accountingaccount = new AccountingAccount($db); + $accountingaccount->fetch(0, $object->accountancy_code_user_general, 1); + print $accountingaccount->getNomUrl(0, 1, 1, '', 1); + } + $accountingAccountByDefault = " (" . $langs->trans("AccountingAccountByDefaultShort") . ": " . length_accountg(getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT')) . ")"; + print (getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') ? $accountingAccountByDefault : ''); + print '
'; + print $form->editfieldkey("AccountancyCode", 'accountancy_code', $object->accountancy_code, $object, $user->hasRight('user', 'user', 'creer')); + print ''; + print $form->editfieldval("AccountancyCode", 'accountancy_code', $object->accountancy_code, $object, $user->hasRight('user', 'user', 'creer'), 'string', '', null, null, '', 0, ''); + print '
'; print '
'; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index a59f82df33d15..de1e25133f177 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1,20 +1,20 @@ - * Copyright (C) 2002-2003 Jean-Louis Bergamo - * Copyright (C) 2004-2022 Laurent Destailleur - * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2021 Regis Houssin - * Copyright (C) 2005 Lionel Cousteix - * Copyright (C) 2011 Herve Prot - * Copyright (C) 2012-2018 Juanjo Menent - * Copyright (C) 2013 Florian Henry - * Copyright (C) 2013-2016 Alexandre Spangaro - * Copyright (C) 2015-2017 Jean-François Ferry - * Copyright (C) 2015 Ari Elbaz (elarifr) - * Copyright (C) 2015-2018 Charlene Benke - * Copyright (C) 2016 Raphaël Doursenaud - * Copyright (C) 2018-2024 Frédéric France - * Copyright (C) 2018 David Beniamine +/* Copyright (C) 2002-2006 Rodolphe Quiedeville + * Copyright (C) 2002-2003 Jean-Louis Bergamo + * Copyright (C) 2004-2022 Laurent Destailleur + * Copyright (C) 2004 Eric Seigne + * Copyright (C) 2005-2021 Regis Houssin + * Copyright (C) 2005 Lionel Cousteix + * Copyright (C) 2011 Herve Prot + * Copyright (C) 2012-2018 Juanjo Menent + * Copyright (C) 2013 Florian Henry + * Copyright (C) 2013-2024 Alexandre Spangaro + * Copyright (C) 2015-2017 Jean-François Ferry + * Copyright (C) 2015 Ari Elbaz (elarifr) + * Copyright (C) 2015-2018 Charlene Benke + * Copyright (C) 2016 Raphaël Doursenaud + * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2018 David Beniamine * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -76,7 +76,7 @@ $langs->loadLangs(array('users', 'companies', 'ldap', 'admin', 'hrm', 'stocks', 'other')); $id = GETPOSTINT('id'); -$action = GETPOST('action', 'aZ09'); +$action = GETPOST('action', 'aZ09'); $mode = GETPOST('mode', 'alpha'); $confirm = GETPOST('confirm', 'alpha'); $group = GETPOSTINT("group", 3); diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index cc1263aa19b83..f708989862f77 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -390,6 +390,12 @@ class User extends CommonObject */ private $cache_childids; // Cache array of already loaded children + /** + * Accounting general account for salary + * @var string + */ + public $accountancy_code_user_general; // Accountancy code in prevision of the complete accountancy module + /** * @var string */ @@ -563,6 +569,7 @@ public function fetch($id = 0, $login = '', $sid = '', $loadpersonalconf = 0, $e $sql .= " u.dateendvalidity,"; $sql .= " u.photo as photo,"; $sql .= " u.openid as openid,"; + $sql .= " u.accountancy_code_user_general,"; $sql .= " u.accountancy_code,"; $sql .= " u.thm,"; $sql .= " u.tjm,"; @@ -692,7 +699,10 @@ public function fetch($id = 0, $login = '', $sid = '', $loadpersonalconf = 0, $e $this->openid = $obj->openid; $this->lang = $obj->lang; $this->entity = $obj->entity; + + $this->accountancy_code_user_general = $obj->accountancy_code_user_general; $this->accountancy_code = $obj->accountancy_code; + $this->thm = $obj->thm; $this->tjm = $obj->tjm; $this->salary = $obj->salary; @@ -2127,6 +2137,7 @@ public function update($user, $notrigger = 0, $nosyncmember = 0, $nosyncmemberpa $this->openid = trim((string) $this->openid); $this->admin = ($this->admin > 0 ? $this->admin : 0); + $this->accountancy_code_user_general = trim((string) $this->accountancy_code_user_general); $this->accountancy_code = trim((string) $this->accountancy_code); $this->color = trim((string) $this->color); $this->dateemployment = empty($this->dateemployment) ? '' : $this->dateemployment; @@ -2217,6 +2228,7 @@ public function update($user, $notrigger = 0, $nosyncmember = 0, $nosyncmemberpa $sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'"; $sql .= ", job = '".$this->db->escape($this->job)."'"; $sql .= ", signature = '".$this->db->escape($this->signature)."'"; + $sql .= ", accountancy_code_user_general = '".$this->db->escape($this->accountancy_code_user_general)."'"; $sql .= ", accountancy_code = '".$this->db->escape($this->accountancy_code)."'"; $sql .= ", color = '".$this->db->escape($this->color)."'"; $sql .= ", dateemployment=".(strval($this->dateemployment) != '' ? "'".$this->db->idate($this->dateemployment)."'" : 'null'); From 1b7c412787cd836f76dc8b041696399370bc7059 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 19:51:02 +0100 Subject: [PATCH 16/23] WIP generic upload files --- htdocs/core/actions_builddoc.inc.php | 8 +-- htdocs/core/actions_linkedfiles.inc.php | 2 + htdocs/core/lib/functions.lib.php | 13 +++- htdocs/core/upload_page.php | 94 ++++++++++++++++++++----- htdocs/user/class/user.class.php | 3 +- 5 files changed, 94 insertions(+), 26 deletions(-) diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php index 07816ed8b6c51..e4bc3588439cb 100644 --- a/htdocs/core/actions_builddoc.inc.php +++ b/htdocs/core/actions_builddoc.inc.php @@ -67,15 +67,13 @@ } // Special case to force bank account - //if (property_exists($object, 'fk_bank')) - //{ if (GETPOSTINT('fk_bank')) { // this field may come from an external module - $object->fk_bank = GETPOSTINT('fk_bank'); + $object->fk_bank = GETPOSTINT('fk_bank'); // For compatibility + $object->fk_account = GETPOSTINT('fk_bank'); } elseif (!empty($object->fk_account)) { - $object->fk_bank = $object->fk_account; + $object->fk_bank = $object->fk_account; // For compatibility } - //} $outputlangs = $langs; $newlang = ''; diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php index 82c1605937e01..9c24f1175919e 100644 --- a/htdocs/core/actions_linkedfiles.inc.php +++ b/htdocs/core/actions_linkedfiles.inc.php @@ -60,6 +60,8 @@ // Submit file/link if (GETPOST('sendit', 'alpha') && getDolGlobalString('MAIN_UPLOAD_DOC') && !empty($permissiontoadd)) { if (!empty($_FILES) && is_array($_FILES['userfile'])) { + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + if (is_array($_FILES['userfile']['tmp_name'])) { $userfiles = $_FILES['userfile']['tmp_name']; } else { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 01b783b615508..4b4889716038d 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -12908,7 +12908,7 @@ function getElementProperties($elementType) //$element_type='facture'; - $classfile = $classname = $classpath = $subdir = $dir_output = $parent_element = ''; + $classfile = $classname = $classpath = $subdir = $dir_output = $dir_temp = $parent_element = ''; // Parse element/subelement $module = $elementType; @@ -13267,15 +13267,25 @@ function getElementProperties($elementType) } elseif (!empty($conf->$module->dir_output)) { $dir_output = $conf->$module->dir_output; } + if (!empty($conf->$module->multidir_temp[$conf->entity])) { + $dir_temp = $conf->$module->multidir_temp[$conf->entity]; + } elseif (!empty($conf->$module->temp[$conf->entity])) { + $dir_temp = $conf->$module->temp[$conf->entity]; + } elseif (!empty($conf->$module->dir_temp)) { + $dir_temp = $conf->$module->dir_temp; + } } // Overwrite value for special cases if ($element == 'order_supplier') { $dir_output = $conf->fournisseur->commande->dir_output; + $dir_temp = $conf->fournisseur->commande->dir_temp; } elseif ($element == 'invoice_supplier') { $dir_output = $conf->fournisseur->facture->dir_output; + $dir_temp = $conf->fournisseur->facture->dir_temp; } $dir_output .= $subdir; + $dir_temp .= $subdir; $elementProperties = array( 'module' => $module, @@ -13286,6 +13296,7 @@ function getElementProperties($elementType) 'classfile' => $classfile, 'classname' => $classname, 'dir_output' => $dir_output, + 'dir_temp' => $dir_temp, 'parent_element' => $parent_element, ); diff --git a/htdocs/core/upload_page.php b/htdocs/core/upload_page.php index cd3591b6c20dc..fb571c2b99cb2 100644 --- a/htdocs/core/upload_page.php +++ b/htdocs/core/upload_page.php @@ -61,7 +61,8 @@ $langs->loadLangs(array("main", "other")); -//$action = GETPOST('action', 'aZ09'); +$action = GETPOST('action', 'aZ09'); +$modulepart = GETPOST('modulepart', 'aZ09'); /* @@ -75,6 +76,25 @@ exit(1); } +if ($action == 'uploadfile') { // Test on permission not required here. Done later + $arrayobject = getElementProperties($modulepart); + + $module = $arrayobject['module']; + $element = $arrayobject['element']; + $dir_output = $arrayobject['dir_output']; + $dir_temp = $arrayobject['dir_temp']; + + $permlevel1 = $element; + if ($module == 'fournisseur') { + $permlevel1 = 'facture'; + } + + $permissiontoadd = $user->hasRight($module, $permlevel1, 'read'); + $upload_dir = $dir_temp.'/import'; + var_dump($upload_dir); + include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; +} + /* * View @@ -117,26 +137,30 @@ $uploadform = '
'; -$langs->load("bills"); -$uploadform .= ' -
'.img_picto('', 'bill', 'class="fa-2x"').'
-
'.$langs->trans("SupplierInvoice").'

'; +if (isModEnabled('supplier_invoice')) { + $langs->load("bills"); + $uploadform .= ' +
'.img_picto('', 'bill', 'class="fa-2x"').'
+
'.$langs->trans("SupplierInvoice").'

'; -$uploadform .= img_picto('', 'company', 'class="pictofixedwidth"'); -$uploadform .= $form->select_company(GETPOSTINT('socid'), 'socid', 'statut=0', $langs->transnoentitiesnoconv("Supplier")); + $uploadform .= img_picto('', 'company', 'class="pictofixedwidth"'); + $uploadform .= $form->select_company(GETPOSTINT('socid'), 'socid', 'statut=0', $langs->transnoentitiesnoconv("Supplier")); -$uploadform .= '

-('.$langs->trans("OrClickToSelectAFile").') -
-
'; + $uploadform .= '

+ ('.$langs->trans("OrClickToSelectAFile").') +
+
'; +} -$langs->load("salaries"); -$uploadform .= ' -
'.img_picto('', 'salary', 'class="fa-2x"').'
-
'.$langs->trans("UserPaySlip").'
-('.$langs->trans("OrClickToSelectAFile").') -
-
'; +if (isModEnabled('salaries')) { + $langs->load("salaries"); + $uploadform .= ' +
'.img_picto('', 'salary', 'class="fa-2x"').'
+
'.$langs->trans("UserPaySlip").'
+ ('.$langs->trans("OrClickToSelectAFile").') +
+
'; +} $uploadform .= '
'; @@ -159,6 +183,8 @@ print ''; print ''; print ''; +print ''; +print ''; print '
'; print ''; @@ -166,13 +192,43 @@ //print ''; print $uploadform; -print ''; + +$accept = '.pdf, image'; +$disablemulti = 1; +$perm = 1; +$capture = 1; + +$maxfilesizearray = getMaxFileSizeArray(); +$max = $maxfilesizearray['max']; +$maxmin = $maxfilesizearray['maxmin']; +$maxphptoshow = $maxfilesizearray['maxphptoshow']; +$maxphptoshowparam = $maxfilesizearray['maxphptoshowparam']; +if ($maxmin > 0) { + $out .= ''; // MAX_FILE_SIZE must precede the field type=file +} +$out .= ' $(document).ready(function() { jQuery('#supplierinvoice').on('click', function(event) { console.log('Click on link to open input file'); console.log(event); + $('#modulepart').val('invoice_supplier'); + $('#fileInput').click(); + }); + + jQuery('#userpayroll').on('click', function(event) { + console.log('Click on link to open input file'); + console.log(event); + $('#modulepart').val('salary'); $('#fileInput').click(); }); diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index cc1263aa19b83..fb457dd61ddab 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -920,7 +920,8 @@ public function hasRight($module, $permlevel1, $permlevel2 = '') // In $user->rights, we have 'accounting', 'produit', 'facture', ... //var_dump($this->rights->$rightsPath); //var_dump($conf->modules); - //var_dump($module.' '.isModEnabled($module).' '.$rightsPath.' '.$permlevel1.' '.$permlevel2); + //if ($module == 'fournisseur') { var_dump($module.' '.isModEnabled($module).' '.$rightsPath.' '.$permlevel1.' '.$permlevel2); } + if (!isModEnabled($module)) { return 0; } From 9f76747aff8a7bfb20de357e4c50e395bed48b98 Mon Sep 17 00:00:00 2001 From: lvessiller-opendsi Date: Thu, 7 Nov 2024 20:55:50 +0100 Subject: [PATCH 17/23] NEW VAT by state (SQL) (#31627) * NEW VAT by state (SQL) * Revert fk_tva column in department table * NEW department in vat rates dict --- htdocs/install/mysql/migration/20.0.0-21.0.0.sql | 5 +++++ htdocs/install/mysql/tables/llx_c_tva.key.sql | 3 +++ htdocs/install/mysql/tables/llx_c_tva.sql | 1 + 3 files changed, 9 insertions(+) diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql index 598b29a5bc45f..719a824d019fc 100644 --- a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql +++ b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql @@ -310,3 +310,8 @@ ALTER TABLE llx_propaldet ADD COLUMN subprice_ttc double(24,8) DEFAULT 0 after s ALTER TABLE llx_propaldet ADD COLUMN multicurrency_subprice_ttc double(24,8) DEFAULT 0 after multicurrency_subprice; ALTER TABLE llx_supplier_proposaldet ADD COLUMN subprice_ttc double(24,8) DEFAULT 0 after subprice; ALTER TABLE llx_supplier_proposaldet ADD COLUMN multicurrency_subprice_ttc double(24,8) DEFAULT 0 after multicurrency_subprice; + +-- Add VAT by department +ALTER TABLE llx_c_tva ADD COLUMN fk_department_buyer integer DEFAULT NULL AFTER fk_pays; +ALTER TABLE llx_c_tva ADD INDEX idx_tva_fk_department_buyer (fk_department_buyer); +ALTER TABLE llx_c_tva ADD CONSTRAINT fk_tva_fk_department_buyer FOREIGN KEY (fk_department_buyer) REFERENCES llx_c_departements (rowid); diff --git a/htdocs/install/mysql/tables/llx_c_tva.key.sql b/htdocs/install/mysql/tables/llx_c_tva.key.sql index fbdd89e1b0299..dd64a5f219d7e 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.key.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.key.sql @@ -20,3 +20,6 @@ ALTER TABLE llx_c_tva ADD UNIQUE INDEX uk_c_tva_id (entity, fk_pays, code, taux, recuperableonly); -- ALTER TABLE llx_c_tva ADD UNIQUE INDEX uk_c_tva_id (fk_pays, code, recuperableonly); -- Not yet possible for compatibility reason, where old code is '' + +ALTER TABLE llx_c_tva ADD INDEX idx_tva_fk_department_buyer (fk_department_buyer); +ALTER TABLE llx_c_tva ADD CONSTRAINT fk_tva_fk_department_buyer FOREIGN KEY (fk_department_buyer) REFERENCES llx_c_departements (rowid); diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index ac10520fc0189..d4fee71c2ec77 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -23,6 +23,7 @@ create table llx_c_tva rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, entity integer DEFAULT 1 NOT NULL, fk_pays integer NOT NULL, + fk_department_buyer integer DEFAULT NULL, -- Id of department for VAT rule or NULL to keep rule on country code varchar(10) DEFAULT '', -- a key to describe vat entry, for example FR20 type_vat smallint NOT NULL DEFAULT 0, -- 0: all, 1: sell, 2: purchase taux double NOT NULL, From f72ffec342807ba3b94d7d5ce53771cd0938c216 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 7 Nov 2024 22:30:53 +0100 Subject: [PATCH 18/23] WIP Quick add page --- htdocs/core/quickadd_page.php | 121 ++++++++++++++++++++++++++++++++++ htdocs/main.inc.php | 13 ++-- 2 files changed, 130 insertions(+), 4 deletions(-) create mode 100644 htdocs/core/quickadd_page.php diff --git a/htdocs/core/quickadd_page.php b/htdocs/core/quickadd_page.php new file mode 100644 index 0000000000000..e97636e928d20 --- /dev/null +++ b/htdocs/core/quickadd_page.php @@ -0,0 +1,121 @@ + + * Copyright (C) 2024 Frédéric France + * + * This file is a modified version of datepicker.php from phpBSM to fix some + * bugs, to add new features and to dramatically increase speed. + * + * 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/core/quickadd_page.php + * \brief File to return a page with the link for a quick add + */ + +//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language +//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language +//if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); +//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations +if (!defined('NOCSRFCHECK')) { + define('NOCSRFCHECK', 1); +} +if (!defined('NOTOKENRENEWAL')) { + define('NOTOKENRENEWAL', 1); +} +//if (! defined('NOLOGIN')) define('NOLOGIN',1); // Not disabled cause need to load personalized language +if (!defined('NOREQUIREMENU')) { + define('NOREQUIREMENU', 1); +} +//if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); + +require_once '../main.inc.php'; +/** + * @var Conf $conf + * @var DoliDB $db + * @var HookManager $hookmanager + * @var Translate $langs + * @var User $user + */ + +if (GETPOST('lang', 'aZ09')) { + $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php +} + +$langs->loadLangs(array("main", "other")); + +$action = GETPOST('action', 'aZ09'); + +/*$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right'); +$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');*/ + + +/* + * Actions + */ + +// None + + +/* + * View + */ + +// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. +if (empty($dolibarr_nocache) && GETPOSTINT('cache')) { + header('Cache-Control: max-age='.GETPOSTINT('cache').', public'); + // For a .php, we must set an Expires to avoid to have it forced to an expired value by the web server + header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + GETPOSTINT('cache')).' GMT'); + // HTTP/1.0 + header('Pragma: token=public'); +} else { + // HTTP/1.0 + header('Cache-Control: no-cache'); +} + +$title = $langs->trans("QuickAdd"); + +// URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests +$head = ''."\n"; // This is used by DoliDroid to know page is a search page +$arrayofjs = array(); +$arrayofcss = array(); +top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss); + + + +print ''."\n"; +print '
'; +//print '
'; + +// Instantiate hooks of thirdparty module +$hookmanager->initHooks(array('quickaddform')); + +// Show all forms +print "\n"; +print "\n"; +print '
'; +print ''; +print '
'."\n"; + +print printDropdownQuickadd(1); + +print '
'."\n"; +print '
'; +print "\n\n"; + + +print '
'; +print ''."\n"; + +$db->close(); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 2d03f2e0889f6..f30689eccabc8 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -2940,9 +2940,10 @@ function top_menu_importfile() /** * Generate list of quickadd items * - * @return string HTML output + * @param int $mode 1=No scroll + * @return string HTML output */ -function printDropdownQuickadd() +function printDropdownQuickadd($mode = 0) { global $user, $langs, $hookmanager; @@ -3075,7 +3076,9 @@ function printDropdownQuickadd() $dropDownQuickAddHtml = ''; // Define $dropDownQuickAddHtml - $dropDownQuickAddHtml .= '
'; + if (empty($mode)) { + $dropDownQuickAddHtml .= '
'; + } $dropDownQuickAddHtml .= '
'; // Allow the $items of the menu to be manipulated by modules @@ -3110,7 +3113,9 @@ function printDropdownQuickadd() '; } - $dropDownQuickAddHtml .= '
'; + if (empty($mode)) { + $dropDownQuickAddHtml .= '
'; + } $dropDownQuickAddHtml .= '
'; return $dropDownQuickAddHtml; From 102cca707d759619514f7661138e828eaaff6635 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 8 Nov 2024 01:40:48 +0100 Subject: [PATCH 19/23] Update docker README --- build/docker/README.md | 17 +++++++++-------- build/docker/docker-run.sh | 8 ++++++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/build/docker/README.md b/build/docker/README.md index dc6147ef85533..60970c35d5e72 100644 --- a/build/docker/README.md +++ b/build/docker/README.md @@ -1,17 +1,18 @@ -# How to use it ? +# How to use run Dolibarr with docker ? -This directory is experimental. Scope of its used is not clear and not documented. -If you are looking for a process to run Dolibarr as an official Docker image, you can find it on https://hub.docker.com/r/dolibarr/dolibarr - -# For experimental dev - TO REMOVE. - -But if you want to execute the version of Dolibarr that is into this current directory as a docker process, you can do it with this commands. +## For a fast run of a demo of the local version, you can build the docker image from this current repository by running export HOST_USER_ID=$(id -u) export HOST_GROUP_ID=$(id -g) export MYSQL_ROOT_PWD=$(tr -dc A-Za-z0-9 Date: Fri, 8 Nov 2024 01:56:46 +0100 Subject: [PATCH 20/23] Update docker README --- build/docker/README.md | 7 ++++++- build/docker/docker-run.sh | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/build/docker/README.md b/build/docker/README.md index 60970c35d5e72..8fe44662bf535 100644 --- a/build/docker/README.md +++ b/build/docker/README.md @@ -3,13 +3,18 @@ ## For a fast run of a demo of the local version, you can build the docker image from this current repository by running + +sudo docker-compose build + +sudo -s + export HOST_USER_ID=$(id -u) export HOST_GROUP_ID=$(id -g) export MYSQL_ROOT_PWD=$(tr -dc A-Za-z0-9 create volume directory /var/documents ..." - mkdir -p /var/documents +if [ ! -d /var/www/documents ]; then + echo "[docker-run] => create volume directory /var/www/documents ..." + mkdir -p /var/www/documents fi -echo "[docker-run] => Set Permission to www-data for /var/documents" -chown -R www-data:www-data /var/documents +echo "[docker-run] => Set Permission to www-data for /var/www/documents" +chown -R www-data:www-data /var/www/documents echo "[docker-run] => update '${PHP_INI_DIR}/conf.d/dolibarr-php.ini'" cat < "${PHP_INI_DIR}/conf.d/dolibarr-php.ini" From 77efa1b76036b44b831b474e72e2c22747f56c33 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 8 Nov 2024 02:34:31 +0100 Subject: [PATCH 21/23] Fix phan --- htdocs/core/lib/functions.lib.php | 2 +- htdocs/core/upload_page.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 4b4889716038d..ed77ac897d1b7 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -12897,7 +12897,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u * @param string $elementType Element type (Value of $object->element or value of $object->element@$object->module). Example: * 'action', 'facture', 'project', 'project_task' or * 'myobject@mymodule' (or old syntax 'mymodule_myobject' like 'project_task') - * @return array{module:string,element:string,table_element:string,subelement:string,classpath:string,classfile:string,classname:string,dir_output:string} array('module'=>, 'classpath'=>, 'element'=>, 'subelement'=>, 'classfile'=>, 'classname'=>, 'dir_output'=>) + * @return array{module:string,element:string,table_element:string,subelement:string,classpath:string,classfile:string,classname:string,dir_output:string,dir_temp:string} array('module'=>, 'classpath'=>, 'element'=>, 'subelement'=>, 'classfile'=>, 'classname'=>, 'dir_output'=>, 'dir_temp'=>) * @see fetchObjectByElement(), getMultidirOutput() */ function getElementProperties($elementType) diff --git a/htdocs/core/upload_page.php b/htdocs/core/upload_page.php index fb571c2b99cb2..3d4e0211bd17d 100644 --- a/htdocs/core/upload_page.php +++ b/htdocs/core/upload_page.php @@ -91,7 +91,7 @@ $permissiontoadd = $user->hasRight($module, $permlevel1, 'read'); $upload_dir = $dir_temp.'/import'; - var_dump($upload_dir); + include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; } @@ -203,6 +203,7 @@ $maxmin = $maxfilesizearray['maxmin']; $maxphptoshow = $maxfilesizearray['maxphptoshow']; $maxphptoshowparam = $maxfilesizearray['maxphptoshowparam']; +$out = ''; if ($maxmin > 0) { $out .= ''; // MAX_FILE_SIZE must precede the field type=file } From 54c2335e0b89abc9e19694af1875a6154ee353d9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 8 Nov 2024 02:44:52 +0100 Subject: [PATCH 22/23] Fix phan --- htdocs/core/upload_page.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/core/upload_page.php b/htdocs/core/upload_page.php index 3d4e0211bd17d..599e275af137a 100644 --- a/htdocs/core/upload_page.php +++ b/htdocs/core/upload_page.php @@ -208,9 +208,13 @@ $out .= ''; // MAX_FILE_SIZE must precede the field type=file } $out .= ' Date: Fri, 8 Nov 2024 02:48:37 +0100 Subject: [PATCH 23/23] Fix language key (#31726) Co-authored-by: Laurent Destailleur --- htdocs/admin/modulehelp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php index 762bb707a65c7..c097fa1e84385 100644 --- a/htdocs/admin/modulehelp.php +++ b/htdocs/admin/modulehelp.php @@ -529,7 +529,7 @@ if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers']) { $yesno = 'Yes'; } else { - $yesno = 'No'; + $yesno = ''.$langs->trans("No").''; } require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php'; $interfaces = new Interfaces($db);