Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Research for the public note field in propals #29703

Merged
merged 14 commits into from
Jun 5, 2024
Merged

Research for the public note field in propals #29703

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fd3fce1
Research for the public note field in propals
zephyriony May 16, 2024
3d64a5c
Update list.php
zephyriony May 23, 2024
362b251
Update list.php
zephyriony May 23, 2024
8042405
Update list.php
zephyriony May 23, 2024
a41856d
Update list.php
zephyriony May 23, 2024
fc58af7
Update list.php
zephyriony May 23, 2024
c6a2725
Merge branch 'Dolibarr:develop' into patch-9
zephyriony May 23, 2024
d8385e7
Update list.php
eldy May 25, 2024
03cefcd
Merge branch 'develop' into patch-9
eldy May 25, 2024
1c52f94
Merge branch 'Dolibarr:develop' into patch-9
zephyriony May 25, 2024
14cbcff
Merge branch 'develop' into patch-9
eldy May 31, 2024
7d1e4ae
Merge branch 'develop' into patch-9
eldy Jun 3, 2024
e33e4b9
Merge branch 'Dolibarr:develop' into patch-9
zephyriony Jun 4, 2024
8400c44
Merge branch 'Dolibarr:develop' into patch-9
zephyriony Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions htdocs/comm/propal/list.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
$search_date_signature_start = dol_mktime(0, 0, 0, $search_date_signature_startmonth, $search_date_signature_startday, $search_date_signature_startyear);
$search_date_signature_end = dol_mktime(23, 59, 59, $search_date_signature_endmonth, $search_date_signature_endday, $search_date_signature_endyear);
$search_status = GETPOST('search_status', 'alpha');
$search_note_public = GETPOST('search_note_public', 'alpha');

// Pagination
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
Expand Down Expand Up @@ -718,6 +719,9 @@
if ($search_date_signature_end) {
$sql .= " AND p.date_signature <= '".$db->idate($search_date_signature_end)."'";
}
if ($search_note_public) {
$sql .= " AND p.note_public LIKE '%".$db->escape($db->escapeforlike($search_note_public))."%'";
}
// Search on user
if ($search_user > 0) {
$sql .= " AND EXISTS (";
Expand Down Expand Up @@ -1452,6 +1456,7 @@
if (!empty($arrayfields['p.note_public']['checked'])) {
// Note public
print '<td class="liste_titre">';
print '<input class="flat maxwidth75" type="text" name="search_note_public" value="'.dol_escape_htmltag($search_note_public).'">';
print '</td>';
}
if (!empty($arrayfields['p.note_private']['checked'])) {
Expand Down
Loading