lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0

Browse Source 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/societe/list.php
This commit is contained in:
Laurent Destailleur 2021-07-31 16:32:24 +02:00
commit f73394435e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/accountancy/admin/index.php
View File

@ -91,7 +91,6 @@ if ($action == 'update') {
if (!$error) { if (!$error) {
foreach ($list as $constname) { foreach ($list as $constname) {
$constvalue = GETPOST($constname, 'alpha'); $constvalue = GETPOST($constname, 'alpha');
var_dump($constname);
if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) { if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
$error++; $error++;
} }

6
htdocs/societe/list.php
View File

@ -654,8 +654,8 @@ if ($search_level) {
if ($search_parent_name) { if ($search_parent_name) {
$sql .= natural_search("s2.nom", $search_parent_name); $sql .= natural_search("s2.nom", $search_parent_name);
} }
if ($search_stcomm != '' && $search_stcomm != -2) { if ($search_stcomm != '' && $search_stcomm != '-2') { // -2 is not filter
$sql .= natural_search("s.fk_stcomm", $search_stcomm, 2); $sql .= natural_search("s.fk_stcomm", $search_stcomm, 1);
} }
if ($search_import_key) { if ($search_import_key) {
$sql .= natural_search("s.import_key", $search_import_key); $sql .= natural_search("s.import_key", $search_import_key);
@ -830,7 +830,7 @@ if (is_array($search_level) && count($search_level)) {
if ($search_status != '') { if ($search_status != '') {
$param .= '&search_status='.urlencode($search_status); $param .= '&search_status='.urlencode($search_status);
} }
if ($search_stcomm != '') { if ($search_stcomm != '' && $search_stcomm != '-2') { // -2 is no filter
$param .= '&search_stcomm='.urlencode($search_stcomm); $param .= '&search_stcomm='.urlencode($search_stcomm);
} }
if ($search_parent_name != '') { if ($search_parent_name != '') {