diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 245f90edf72..97a573ce86f 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1185,9 +1185,9 @@ if ($action == 'create') {
print '
| '.$langs->trans("Project").' | ';
print img_picto('', 'project', 'class="pictofixedwidth"');
- print $formproject->select_projects((!empty($societe->id) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+ print $formproject->select_projects((empty($societe->id) ? '' : $societe->id), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
- print ' ';
+ print ' ';
print '';
$urloption = '?action=create&donotclearsession=1';
$url = dol_buildpath('comm/action/card.php', 2).$urloption;
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 9fac243ac86..cba52bf2384 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -59,6 +59,8 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
$filtert = $user->id;
}
+$newparam = '';
+
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 5a93f3fde33..d4ab03b9800 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -292,6 +292,11 @@ if ($socid > 0) {
$sql .= " AND s.rowid = ".((int) $socid);
}
+$filter_dateouvertureprevue = '';
+$filter_date1 = '';
+$filter_date2 = '';
+$filter_opcloture = '';
+
$filter_dateouvertureprevue_start = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
$filter_dateouvertureprevue_end = dol_mktime(23, 59, 59, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
if ($filter_dateouvertureprevue_start != '' && $filter_opouvertureprevue == -1) {
@@ -425,6 +430,7 @@ if ($filter_date2_start != '') {
if ($filter_datecloture_start != '') {
$param .= '&opclotureday='.$op2day.'&opcloturemonth='.$op2month.'&opclotureyear='.$op2year;
}
+
if ($optioncss != '') {
$param .= '&optioncss='.$optioncss;
}
@@ -468,7 +474,7 @@ if ($mode == "5") {
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contract', 0, '', '', $limit);
-if ($sall) {
+if (!empty($sall)) {
foreach ($fieldstosearchall as $key => $val) {
$fieldstosearchall[$key] = $langs->trans($val);
}
@@ -476,6 +482,7 @@ if ($sall) {
}
$morefilter = '';
+$moreforfilter = '';
// If the user can view categories of products
if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire)) {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index e3ada0c6c59..30b92cd82fd 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2016,24 +2016,24 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
$dropdownBody .= '';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index cdbacd5ffca..160440c2394 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -672,7 +672,7 @@ if (empty($reshook)) {
}
$sql .= $hookmanager->resPrint;
// Add GroupBy from hooks
-$parameters = array('all' => $all, 'fieldstosearchall' => $fieldstosearchall);
+$parameters = array('fieldstosearchall' => $fieldstosearchall);
$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 4a4698fdd07..196f3cd629f 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -213,6 +213,8 @@ if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
}
+$search_product_category = 0;
+
include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
// Do we click on purge search criteria ?
|