Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

NEW #22848 Fix CI

Browse Source
This commit is contained in:
Florent Poinsaut
2024-08-26 15:45:38 +02:00
parent 05a11b7cef
commit c8cc7884e4
6 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/categories/viewcat.php
View File

@@ -1460,6 +1460,7 @@ if ($type == Categorie::TYPE_ORDER) {
print '<br>';
$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($objects); $nbtotalofrecords = ''; $newcardbutton = '';
// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
print_barre_liste($langs->trans("Orders"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bill', 0, $newcardbutton, '', $limit);
print "<table class='noborder' width='100%'>\n";

6
htdocs/commande/card.php
View File

@@ -565,7 +565,7 @@ if (empty($reshook)) {
$action = '';
}
if (isModEnabled('categorie')) {
if (isModEnabled('category')) {
$categories = GETPOST('categories', 'array');
if (method_exists($object, 'setCategories')) {
$object->setCategories($categories);
@@ -698,7 +698,7 @@ if (empty($reshook)) {
// $result = $object->setDiscount($user, price2num(GETPOST('remise_percent'), '', 2));
//} elseif ($action == 'setremiseabsolue' && $usercancreate) {
// $result = $object->set_remise_absolue($user, price2num(GETPOST('remise_absolue'), 'MU', 2));
} elseif ($action == 'settags' && isModEnabled('categorie') && $usercancreate) {
} elseif ($action == 'settags' && isModEnabled('category') && $usercancreate) {
$result = $object->setCategories(GETPOST('categories', 'array'));
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
@@ -2864,7 +2864,7 @@ if ($action == 'create' && $usercancreate) {
}
// Tags-Categories
if (isModEnabled('categorie')) {
if (isModEnabled('category')) {
print '<tr><td>';
print '<table class="nobordernopadding centpercent"><tr><td>';
print $langs->trans("Categories");

9
htdocs/commande/class/commande.class.php
View File

@@ -854,14 +854,15 @@ class Commande extends CommonOrder
}
/**
* Sets object to supplied categories.
* Sets object to given categories.
*
* Deletes object from existing categories not supplied.
* Adds it to non existing supplied categories.
* Deletes object from existing categories not supplied.
* Existing categories are left untouch.
*
* @param int[]|int $categories Category or categories IDs
* @return void
* @param int[]|int $categories Category ID or array of Categories IDs
*
* @return int Return integer <0 if KO, >0 if OK
*/
public function setCategories($categories)
{

25
htdocs/core/class/html.form.class.php
View File

@@ -11281,18 +11281,19 @@ class Form
/**
* Output a combo list with orders qualified for a third party
* Output a combo list with orders qualified for a third party
*
* @param int $selected Id order preselected
* @param string $htmlname Name of HTML select
* @param int $maxlength Maximum length of label
* @param int $option_only Return only html options lines without the select tag
* @param string $show_empty Add an empty line ('1' or string to show for empty line)
* @param int $discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
* @param int $forcefocus Force focus on field (works with javascript only)
* @param int $disabled Disabled
* @param string $morecss More css added to the select component
* @return int Nbr of project if OK, <0 if KO
* @param string $selected Id order preselected
* @param string $htmlname Name of HTML select
* @param int $maxlength Maximum length of label
* @param int $option_only Return only html options lines without the select tag
* @param string $show_empty Add an empty line ('1' or string to show for empty line)
* @param int $discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
* @param int $forcefocus Force focus on field (works with javascript only)
* @param int $disabled Disabled
* @param string $morecss More css added to the select component
*
* @return int Nbr of project if OK, <0 if KO
*/
public function selectOrder($selected = '', $htmlname = 'orderid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500')
{
@@ -11315,7 +11316,7 @@ class Form
// Use select2 selector
if (!empty($conf->use_javascript_ajax)) {
include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
$comboenhancement = ajax_combobox($htmlname, array(), 0, $forcefocus);
$out .= $comboenhancement;
$morecss = 'minwidth200imp maxwidth500';
}

2
htdocs/core/menus/standard/eldy.lib.php
View File

@@ -1400,7 +1400,7 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
}
// Categories
if (isModEnabled('categorie')) {
if (isModEnabled('category')) {
$langs->load("categories");
$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=16", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
}

4
htdocs/core/modules/modCategorie.class.php
View File

@@ -669,7 +669,7 @@ class modCategorie extends DolibarrModules
* @param int $cat_id Categorie id
* @param string $class Class of the linked object
* @param string $enabled Condition to enable this export
* @param string $permission Permission to export the linked object
* @param array $permission Permission to export the linked object
* @param array $fields_list Additional fields of the linked object to export
*
* @return void
@@ -757,7 +757,7 @@ class modCategorie extends DolibarrModules
int $cat_id,
string $class_file,
string $class,
string $element,
string $element
) {
$cat_type = Categorie::$MAP_ID_TO_CODE[$cat_id];