From a71328657985d790ba13d25cde31cead69f43c3d Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Wed, 2 Sep 2020 13:58:04 +0000 Subject: [PATCH 1/3] Fixing style errors. --- htdocs/comm/propal/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index e89f7b5540a..7845efe5823 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -526,7 +526,7 @@ if ($resql) } if ($cpt > 0) { - if($cpt==1) setEventMessage($langs->trans('Warning').', '.$cpt.' '.$langs->trans('PropNoProductOrService'), 'warnings'); + if ($cpt==1) setEventMessage($langs->trans('Warning').', '.$cpt.' '.$langs->trans('PropNoProductOrService'), 'warnings'); if ($cpt>1) setEventMessage($langs->trans('Warning').', '.$cpt.' '.$langs->trans('PropsNoProductOrService'), 'warnings'); $cpt2 = 0; foreach ($ids as $r) From ee003ed49913c0e6af687af429802664765e52b4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Sep 2020 17:57:09 +0200 Subject: [PATCH 2/3] Update list.php --- htdocs/comm/propal/list.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 7845efe5823..e3097ea67d7 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -510,12 +510,11 @@ if ($resql) $refs = array(); $ids = array(); foreach ($toselect as $checked){ - $sqlp = "SELECT ref, rowid FROM " . MAIN_DB_PREFIX . "propal WHERE rowid = " .$checked." AND rowid NOT IN"; - $sqlp .= " (SELECT fk_propal FROM " . MAIN_DB_PREFIX . "propaldet)"; + $sqlp = "SELECT ref, rowid FROM ".MAIN_DB_PREFIX."propal WHERE rowid = " .$checked; $resqlp = $db->query($sqlp); if ($resqlp){ $objp = $db->fetch_object($resqlp); - if ($db->num_rows($resqlp)){ + if ($objp) { $cpt++; $refs[] = $objp->ref; $ids[] = $objp->rowid; From d913736bd1a6850d32bfe81bd958e3e17984100e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Sep 2020 17:59:21 +0200 Subject: [PATCH 3/3] Update list.php --- htdocs/comm/propal/list.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index e3097ea67d7..511ba918a43 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -1311,10 +1311,10 @@ if ($resql) print $formfile->showdocuments('massfilesarea_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty); - if ($action == 'validate'){ - if (GETPOST('confirm') == 'yes'){ - foreach ($toselect as $checked){ - $sql = "SELECT ref, fk_statut AS statut FROM ".MAIN_DB_PREFIX."propal WHERE rowid = ".$checked; + if ($action == 'validate') { + if (GETPOST('confirm') == 'yes') { + foreach ($toselect as $checked) { + $sql = "SELECT ref, fk_statut AS status FROM ".MAIN_DB_PREFIX."propal WHERE rowid = ".$checked; $resql = $db->query($sql); if ($resql){ $obj = $db->fetch_object($resql); @@ -1327,7 +1327,7 @@ if ($resql) } else { $numref = $obj->ref; } - if ($obj->statut == 0){ + if ($obj->status == 0){ $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = 1, ref ='".$numref."' WHERE rowid = ".$checked; $resql = $db->query($sql); if ($resql){ @@ -1346,13 +1346,13 @@ if ($resql) } if ($action == "sign") { - if (GETPOST('confirm') == 'yes'){ + if (GETPOST('confirm') == 'yes') { foreach ($toselect as $checked) { - $sqlp = "SELECT ref, fk_statut AS statut FROM " . MAIN_DB_PREFIX . "propal WHERE rowid = " . $checked; + $sqlp = "SELECT ref, fk_statut AS status FROM " . MAIN_DB_PREFIX . "propal WHERE rowid = " . $checked; $resqlp = $db->query($sqlp); if ($resqlp) { $objp = $db->fetch_object($resqlp); - if ($objp->statut == 1) { + if ($objp->status == 1) { $sqlp = "UPDATE " . MAIN_DB_PREFIX . "propal SET fk_statut = 2 WHERE rowid = " . $checked; $resqlp = $db->query($sqlp); if ($resqlp) {