diff --git a/ChangeLog b/ChangeLog index d8efc905db7..00d936e3deb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ English Dolibarr ChangeLog For users: ---------- -NEW: Compatibility with PHP 8.3 +NEW: Compatibility with PHP 8.2 (with no need to disable warnings) ... For developers or integrators: @@ -34,6 +34,10 @@ The following changes may create regressions for some external modules, but were the deprecated field $fk_user_done in actioncomm table is removed. Please use $fk_user_action instead. * The table commande_fournisseur_dispatch has been renamed into receptiondet_batch to better match its goal and the field fk_commande and fk_commandefourndet were renamed into fk_element and fk_elementdet +* Removed trigger BILLREC_CREATEBILL. This trigger was not a CRUD event. If you used it, you can already use the trigger BILL_CREATE and + test that ($object->fac_rec > 0) to know if creation trigger is from a recurring invoice or not. Also this old trigger was never enabled + into table llx_c_action_trigger. + ***** ChangeLog for 19.0.1 compared to 19.0.0 ***** diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php index 3a31b4b232b..1767a265442 100755 --- a/dev/tools/apstats.php +++ b/dev/tools/apstats.php @@ -512,7 +512,7 @@ $html .= ''."\n"; $html .= '
'."\n"; $html .= '

Advanced Project Statistics

'."\n"; $currentDate = date("Y-m-d H:i:s"); // Format: Year-Month-Day Hour:Minute:Second -$html .= 'Generated on '.$currentDate.' in '.($timeend - $timestart).' seconds'."\n"; +$html .= 'Generated on '.$currentDate.' in '.($timeend - $timestart).' seconds by apstats'."\n"; $html .= '
'."\n"; diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst index 4e58e862175..1f6bbe80e59 100644 --- a/dev/translation/ignore_translation_keys.lst +++ b/dev/translation/ignore_translation_keys.lst @@ -404,11 +404,6 @@ EventFee EventIntoASerie EventOrganizationArea EventParticipant -ExampleOnlyForATBEDEITNLESCustomers -ExampleOnlyForBECustomers -ExampleOnlyForDECustomers -ExampleOnlyForKlarnaCustomers -ExampleOnlyForNLCustomers Expedition Experimental Expired @@ -519,7 +514,6 @@ MO MRP MYDATA_AADE_KEY MYDATA_AADE_USER -Mailman MainAccountForRevenueStampSaleNotDefined Manual Map @@ -755,18 +749,11 @@ Roles Rowid RulesPurchaseTurnoverCollectedOfExpenseAccounts SID -SOAPError -SPIP SQL SQLSort STATE_ STATE_IPP_ STRIPE_APPLICATION_FEE_PLATFORM -STRIPE_BANCONTACT -STRIPE_GIROPAY -STRIPE_IDEAL -STRIPE_KLARNA -STRIPE_SOFORT ST_ SaveFailed Saved diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php index 3ee0106e7d6..afcd0d04668 100644 --- a/htdocs/accountancy/customer/lines.php +++ b/htdocs/accountancy/customer/lines.php @@ -61,7 +61,7 @@ $search_date_endmonth = GETPOSTINT('search_date_endmonth'); $search_date_endyear = GETPOSTINT('search_date_endyear'); $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); -$search_country = GETPOST('search_country', 'alpha'); +$search_country = GETPOST('search_country', 'aZ09'); $search_tvaintra = GETPOST('search_tvaintra', 'alpha'); // Load variable for pagination diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 0581675d33f..abd14d4bb47 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -71,7 +71,7 @@ $search_date_endmonth = GETPOSTINT('search_date_endmonth'); $search_date_endyear = GETPOSTINT('search_date_endyear'); $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); -$search_country = GETPOST('search_country', 'alpha'); +$search_country = GETPOST('search_country', 'aZ09'); $search_tvaintra = GETPOST('search_tvaintra', 'alpha'); // Define begin binding date diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php index 894c594f2a1..b11028c08f3 100644 --- a/htdocs/accountancy/supplier/lines.php +++ b/htdocs/accountancy/supplier/lines.php @@ -63,7 +63,7 @@ $search_date_endmonth = GETPOSTINT('search_date_endmonth'); $search_date_endyear = GETPOSTINT('search_date_endyear'); $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); -$search_country = GETPOST('search_country', 'alpha'); +$search_country = GETPOST('search_country', 'aZ09'); $search_tvaintra = GETPOST('search_tvaintra', 'alpha'); // Load variable for pagination diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index ed41745fac0..983b92d8092 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -73,7 +73,7 @@ $search_date_endmonth = GETPOSTINT('search_date_endmonth'); $search_date_endyear = GETPOSTINT('search_date_endyear'); $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); -$search_country = GETPOST('search_country', 'alpha'); +$search_country = GETPOST('search_country', 'aZ09'); $search_tvaintra = GETPOST('search_tvaintra', 'alpha'); // Load variable for pagination diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 0a4dd01d914..24dc394d0f8 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -361,13 +361,17 @@ llxHeader('', $langs->trans("Setup"), $help_url, '', '', '', $morejs, $morecss, // Search modules dirs $modulesdir = dolGetModulesDirs(); -$arrayofnatures = array('core' => $langs->transnoentitiesnoconv("NativeModules"), 'external' => $langs->transnoentitiesnoconv("External").' - ['.$langs->trans("AllPublishers").']'); +$arrayofnatures = array( + 'core' => array('label' => $langs->transnoentitiesnoconv("NativeModules")), + 'external' => array('label' => $langs->transnoentitiesnoconv("External").' - ['.$langs->trans("AllPublishers").']') +); $arrayofwarnings = array(); // Array of warning each module want to show when activated $arrayofwarningsext = array(); // Array of warning each module want to show when we activate an external module $filename = array(); $modules = array(); $orders = array(); $categ = array(); +$publisherlogoarray = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. @@ -427,9 +431,16 @@ foreach ($modulesdir as $dir) { $external = ($objMod->isCoreOrExternalModule() == 'external'); if ($external) { if ($publisher) { - $arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher; + // Check if there is a logo forpublisher + /* Do not show the company logo in combo. Make combo list dirty. + if (!empty($objMod->editor_squarred_logo)) { + $publisherlogoarray['external_'.$publisher] = img_picto('', $objMod->editor_squarred_logo, 'class="publisherlogoinline"'); + } + $publisherlogo = empty($publisherlogoarray['external_'.$publisher]) ? '' : $publisherlogoarray['external_'.$publisher]; + */ + $arrayofnatures['external_'.$publisher] = array('label' => $langs->trans("External").' - '.$publisher, 'data-html' => $langs->trans("External").' - '.$publisher.''); } else { - $arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers"); + $arrayofnatures['external_'] = array('label' => $langs->trans("External").' - ['.$langs->trans("UnknownPublishers").']'); } } ksort($arrayofnatures); @@ -641,7 +652,7 @@ if ($mode == 'common' || $mode == 'commonkanban') { $moreforfilter .= ''; $moreforfilter .= ' '; $moreforfilter .= '
'; - $moreforfilter .= ''; + $moreforfilter .= ''; if ($search_keyword || ($search_nature && $search_nature != '-1') || ($search_version && $search_version != '-1') || ($search_status && $search_status != '-1')) { $moreforfilter .= ' '; $moreforfilter .= ''; diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php index cf927bc763c..f76695eb2c1 100644 --- a/htdocs/bom/tpl/objectline_create.tpl.php +++ b/htdocs/bom/tpl/objectline_create.tpl.php @@ -196,11 +196,11 @@ if ($filtertype != 1) { print ''; } - $coldisplay += $colspan; - print ''; - print ''; - print ''; - print ''; +$coldisplay += $colspan; +print ''; +print ''; +print ''; +print ''; ?> diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php index 6489f833759..463a92d4ee8 100644 --- a/htdocs/bom/tpl/objectline_view.tpl.php +++ b/htdocs/bom/tpl/objectline_view.tpl.php @@ -351,11 +351,12 @@ if ($resql) { print ''.price(price2num($sub_bom_product->pmp * $sub_bom_line->qty * (float) $line->qty, 'MT')).''; $total_cost .= $sub_bom_product->pmp * $sub_bom_line->qty * (float) $line->qty; } else { // Minimum purchase price if cost price and PMP aren't defined - $sql_supplier_price = 'SELECT MIN(price) AS min_price, quantity AS qty FROM '.MAIN_DB_PREFIX.'product_fournisseur_price'; - $sql_supplier_price .= ' WHERE fk_product = '. (int) $sub_bom_product->id; + $sql_supplier_price = "SELECT MIN(price) AS min_price, quantity AS qty FROM ".MAIN_DB_PREFIX."product_fournisseur_price"; + $sql_supplier_price .= " WHERE fk_product = ". (int) $sub_bom_product->id; + $sql_supplier_price .= " GROUP BY quantity ORDER BY quantity ASC"; $resql_supplier_price = $object->db->query($sql_supplier_price); if ($resql_supplier_price) { - $obj = $object->db->fetch_object($resql_supplier_price); + $obj = $object->db->fetch_object($resql_supplier_price); // Take first value so the ref with the smaller minimum quantity if (!empty($obj->qty) && !empty($sub_bom_line->qty) && !empty($line->qty)) { $line_cost = $obj->min_price / $obj->qty * $sub_bom_line->qty * (float) $line->qty; } else { diff --git a/htdocs/bookcal/bookcalindex.php b/htdocs/bookcal/bookcalindex.php index c54181584d0..8248ca44308 100644 --- a/htdocs/bookcal/bookcalindex.php +++ b/htdocs/bookcal/bookcalindex.php @@ -44,8 +44,9 @@ if (isset($user->socid) && $user->socid > 0) { $socid = $user->socid; } -$max = 5; $now = dol_now(); +$NBMAX = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT'); +$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5); /* @@ -137,9 +138,6 @@ if ($user->hasRight('bookcal', 'availabilities', 'read') && isModEnabled('bookca print '
'; -$NBMAX = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT'); -$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT'); - /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT // Last modified myobject if (isModEnabled('bookcal')) { diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index d1bd15fdc55..6ddef2ba301 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -489,9 +489,6 @@ if ($optioncss != '') { print ''; print ''; -//print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action'); -//print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup, '', $resourceid); -//print dol_get_fiche_end(); $viewmode = '