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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2022-04-11 17:34:40 +02:00
commit 770a0fbe8d
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/commonobject.class.php
View File

@ -5397,16 +5397,20 @@ abstract class CommonObject
return 1;
} else {
$outputlangs->charset_output = $sav_charset_output;
dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
$this->error = $obj->error;
$this->errors = $obj->errors;
dol_syslog("Error generating document for ".__CLASS__.". Error: ".$obj->error, LOG_ERR);
return -1;
}
} else {
if (!$filefound) {
$this->error = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelspath.' - modele='.$modele;
dol_print_error('', $this->error);
$this->errors[] = $this->error;
dol_syslog($this->error, LOG_ERR);
} else {
$this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $filefound);
dol_print_error('', $this->error);
$this->errors[] = $this->error;
dol_syslog($this->error, LOG_ERR);
}
return -1;
}

30
htdocs/expedition/list.php
View File

@ -211,6 +211,34 @@ if (empty($reshook)) {
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
}
// If massaction is close
if ($massaction == 'classifyclose') {
$error=0;
$selectids = GETPOST('toselect', 'array');
foreach ($selectids as $selectid) {
// $object->fetch($selectid);
$object->fetch($selectid);
$result = $object->setClosed();
}
$massaction = $action = 'classifyclose';
if ($result < 0) {
$error++;
}
if (!$error) {
$db->commit();
setEventMessage($langs->trans("Close Done"));
header('Location: '.$_SERVER["PHP_SELF"]);
exit;
} else {
$db->rollback();
exit;
}
}
/*
* View
@ -489,7 +517,7 @@ $param .= $hookmanager->resPrint;
$arrayofmassactions = array(
'builddoc' => img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
//'classifyclose'=>$langs->trans("Close"), TODO massive close shipment ie: when truck is charged
'classifyclose'=>$langs->trans("Close"),
'presend' => img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
);
if (in_array($massaction, array('presend'))) {