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

Merge branch 'NEW_propal_massAction_validate_sign' of https://github.com/atm-adrien/dolibarr into NEW_propal_massAction_validate_sign

Browse Source
This commit is contained in:
Adrien Raze 2020-09-03 10:06:13 +02:00
commit 0898a1e28a
1 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
htdocs/comm/propal/list.php
View File

@ -510,12 +510,11 @@ if ($resql)
$refs = array(); $refs = array();
$ids = array(); $ids = array();
foreach ($toselect as $checked){ foreach ($toselect as $checked){
$sqlp = "SELECT ref, rowid FROM " . MAIN_DB_PREFIX . "propal WHERE rowid = " .$checked." AND rowid NOT IN"; $sqlp = "SELECT ref, rowid FROM ".MAIN_DB_PREFIX."propal WHERE rowid = " .$checked;
$sqlp .= " (SELECT fk_propal FROM " . MAIN_DB_PREFIX . "propaldet)";
$resqlp = $db->query($sqlp); $resqlp = $db->query($sqlp);
if ($resqlp){ if ($resqlp){
$objp = $db->fetch_object($resqlp); $objp = $db->fetch_object($resqlp);
if ($db->num_rows($resqlp)){ if ($objp) {
$cpt++; $cpt++;
$refs[] = $objp->ref; $refs[] = $objp->ref;
$ids[] = $objp->rowid; $ids[] = $objp->rowid;
@ -526,7 +525,7 @@ if ($resql)
} }
if ($cpt > 0) 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'); if ($cpt>1) setEventMessage($langs->trans('Warning').', '.$cpt.' '.$langs->trans('PropsNoProductOrService'), 'warnings');
$cpt2 = 0; $cpt2 = 0;
foreach ($ids as $r) foreach ($ids as $r)
@ -1314,6 +1313,7 @@ if ($resql)
if ($action == 'validate') { if ($action == 'validate') {
if (GETPOST('confirm') == 'yes') { if (GETPOST('confirm') == 'yes') {
<<<<<<< HEAD
$tmpproposal = new Propal($db); $tmpproposal = new Propal($db);
foreach ($toselect as $checked) { foreach ($toselect as $checked) {
$tmpproposal->fetch($checked); $tmpproposal->fetch($checked);
@ -1323,6 +1323,32 @@ if ($resql)
setEventMessage($tmpproposal->ref . " " . $langs->trans('PassedInOpenStatus'), 'mesgs'); setEventMessage($tmpproposal->ref . " " . $langs->trans('PassedInOpenStatus'), 'mesgs');
} else { } else {
setEventMessage($tmpproposal->ref . " " . $langs->trans('IsNotADraft'), 'errors'); setEventMessage($tmpproposal->ref . " " . $langs->trans('IsNotADraft'), 'errors');
=======
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);
$ref = substr($obj->ref, 1, 4);
if ($ref == 'PROV') {
$numref = $object->getNextNumRef($soc);
if (empty($numref)) {
setEventMessages($object->error, $object->errors, 'errors');
}
} else {
$numref = $obj->ref;
}
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){
setEventMessage($numref." ".$langs->trans('PassedInOpenStatus'), 'mesgs');
} else {
dol_print_error($db);
}
}else {
setEventMessage($numref." ".$langs->trans('IsNotADraft'), 'errors');
>>>>>>> d913736bd1a6850d32bfe81bd958e3e17984100e
} }
} else { } else {
dol_print_error($db); dol_print_error($db);
@ -1333,11 +1359,20 @@ if ($resql)
if ($action == "sign") { if ($action == "sign") {
if (GETPOST('confirm') == 'yes') { if (GETPOST('confirm') == 'yes') {
<<<<<<< HEAD
$tmpproposal = new Propal($db); $tmpproposal = new Propal($db);
foreach ($toselect as $checked) { foreach ($toselect as $checked) {
$tmpproposal->fetch($checked); $tmpproposal->fetch($checked);
if ($tmpproposal->fetch($checked)) { if ($tmpproposal->fetch($checked)) {
if ($tmpproposal->statut == 1) { if ($tmpproposal->statut == 1) {
=======
foreach ($toselect as $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->status == 1) {
>>>>>>> d913736bd1a6850d32bfe81bd958e3e17984100e
$sqlp = "UPDATE " . MAIN_DB_PREFIX . "propal SET fk_statut = 2 WHERE rowid = " . $checked; $sqlp = "UPDATE " . MAIN_DB_PREFIX . "propal SET fk_statut = 2 WHERE rowid = " . $checked;
$resqlp = $db->query($sqlp); $resqlp = $db->query($sqlp);
if ($resqlp) { if ($resqlp) {