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

Merge pull request #18261 from fmarcet/14.0

Browse Source 
Fix: Price level on company list not filtering
This commit is contained in:
Laurent Destailleur 2021-07-28 15:29:15 +02:00 committed by GitHub
commit 7c86a4766e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/product/stock/productlot_list.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2007-2016 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2007-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2018-2021 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -299,7 +299,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) { if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$id = $obj->rowid; $id = $obj->rowid;
header("Location: ".dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.$id); header("Location: ".DOL_URL_ROOT.'/product/stock/productlot_card.php?id='.$id);
exit; exit;
} }

14
htdocs/societe/list.php
View File

@ -94,7 +94,7 @@ $search_categ_cus = trim(GETPOST("search_categ_cus", 'int'));
$search_categ_sup = trim(GETPOST("search_categ_sup", 'int')); $search_categ_sup = trim(GETPOST("search_categ_sup", 'int'));
$search_country = GETPOST("search_country", 'intcomma'); $search_country = GETPOST("search_country", 'intcomma');
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int'); $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
$search_price_level = GETPOST('search_prive_level', 'int'); $search_price_level = GETPOST('search_price_level', 'int');
$search_staff = GETPOST("search_staff", 'int'); $search_staff = GETPOST("search_staff", 'int');
$search_status = GETPOST("search_status", 'int'); $search_status = GETPOST("search_status", 'int');
$search_type = GETPOST('search_type', 'alpha'); $search_type = GETPOST('search_type', 'alpha');
@ -356,7 +356,7 @@ if (empty($reshook)) {
$search_idprof6 = ''; $search_idprof6 = '';
$search_vat = ''; $search_vat = '';
$search_type = ''; $search_type = '';
$search_prive_level = ''; $search_price_level = '';
$search_type_thirdparty = ''; $search_type_thirdparty = '';
$search_staff = ''; $search_staff = '';
$search_status = -1; $search_status = -1;
@ -639,8 +639,8 @@ if ($search_status != '' && $search_status >= 0) {
if (!empty($conf->barcode->enabled) && $search_barcode) { if (!empty($conf->barcode->enabled) && $search_barcode) {
$sql .= natural_search("s.barcode", $search_barcode); $sql .= natural_search("s.barcode", $search_barcode);
} }
if ($search_prive_level && $search_prive_level != '-1') { if ($search_price_level && $search_price_level != '-1') {
$sql .= natural_search("s.price_level", $search_prive_level, 2); $sql .= natural_search("s.price_level", $search_price_level, 2);
} }
if ($search_type_thirdparty && $search_type_thirdparty > 0) { if ($search_type_thirdparty && $search_type_thirdparty > 0) {
$sql .= natural_search("s.fk_typent", $search_type_thirdparty, 2); $sql .= natural_search("s.fk_typent", $search_type_thirdparty, 2);
@ -813,8 +813,8 @@ if ($search_idprof6 != '') {
if ($search_vat != '') { if ($search_vat != '') {
$param .= '&search_vat='.urlencode($search_vat); $param .= '&search_vat='.urlencode($search_vat);
} }
if ($search_prive_level != '') { if ($search_price_level != '') {
$param .= '&search_prive_level='.urlencode($search_prive_level); $param .= '&search_price_level='.urlencode($search_price_level);
} }
if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) { if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty); $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
@ -1094,7 +1094,7 @@ if (!empty($arrayfields['typent.code']['checked'])) {
// Multiprice level // Multiprice level
if (!empty($arrayfields['s.price_level']['checked'])) { if (!empty($arrayfields['s.price_level']['checked'])) {
print '<td class="liste_titre">'; print '<td class="liste_titre">';
print '<input class="flat searchstring maxwidth50imp" type="text" name="search_prive_level" value="'.dol_escape_htmltag($search_prive_level).'">'; print '<input class="flat searchstring maxwidth50imp" type="text" name="search_price_level" value="'.dol_escape_htmltag($search_price_level).'">';
print '</td>'; print '</td>';
} }
// Staff // Staff