Update list.php #30254
Merged
Update list.php #30254
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added condition to include client code in the search when the global variable SOCIETE_ADD_REF_IN_LIST is set to 1. - Modified the SQL query to include 's.code_client' in the search conditions. - Added check for the global variable SOCIETE_ADD_REF_IN_LIST. - If SOCIETE_ADD_REF_IN_LIST is 1, 's.code_client' is included in the search along with 's.nom' and 's.name_alias'. - Ensured that 's.code_client' is searched separately only when SOCIETE_ADD_REF_IN_LIST is 1 and 'search_societe' is not defined.
eldy
requested changes
Jul 4, 2024
htdocs/comm/propal/list.php
Outdated
| @@ -635,16 +635,29 @@ | |||
| if ($search_availability) { | |||
| $sql .= " AND p.fk_availability IN (".$db->sanitize($db->escape($search_availability)).')'; | |||
| } | |||
| $societe_add_ref_in_list = (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST) ? $conf->global->SOCIETE_ADD_REF_IN_LIST : 0); // Récupérer la valeur de SOCIETE_ADD_REF_IN_LIST | |||
There was a problem hiding this comment.
Can you replace conf->global->xxx with getDolGlobalString('xxx
Old syntax is no more allowed.
eldy
added
the
PR to fix or conflict to solve
Refactor: Replace conf->global->SOCIETE_ADD_REF_IN_LIST with getDolGlobalString('SOCIETE_ADD_REF_IN_LIST')
frederic34
reviewed
Jul 9, 2024
htdocs/comm/propal/list.php
Outdated
| @@ -635,16 +635,29 @@ | |||
| if ($search_availability) { | |||
| $sql .= " AND p.fk_availability IN (".$db->sanitize($db->escape($search_availability)).')'; | |||
| } | |||
| $societe_add_ref_in_list = (!empty(getDolGlobalString('SOCIETE_ADD_REF_IN_LIST')) ? getDolGlobalString('SOCIETE_ADD_REF_IN_LIST') : 0); // Récupérer la valeur de SOCIETE_ADD_REF_IN_LIST | |||
There was a problem hiding this comment.
$societe_add_ref_in_list = getDolGlobalInt('SOCIETE_ADD_REF_IN_LIST'); is more simple and pass the tests
Simplified SOCIETE_ADD_REF_IN_LIST retrieval
Replaced conditional retrieval with getDolGlobalInt('SOCIETE_ADD_REF_IN_LIST') to simplify code and pass tests.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added condition to include client code in the search when the global variable SOCIETE_ADD_REF_IN_LIST is set to 1.
Instructions
This is a template to help you make good pull requests. You may use Github Markdown syntax to format your issue report.
Please:
FIX|Fix #[issue_number Short description]
[Long description]
CLOSE|Close #[issue_number Short description]
[Long description]
NEW|New [Short description]
[Long description]
PERF|Perf #[issue_number Short description]
[Long description]
QUAL|Qual #[issue_number Short description]
[Long description]