This commit is contained in:
Laurent Destailleur 2022-05-18 23:27:26 +02:00
parent c1e864f4e2
commit 25e70bead8
4 changed files with 9 additions and 7 deletions

View File

@ -408,7 +408,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
print '<br><br>';
print_fiche_titre($langs->trans("Emails"));
print load_fiche_titre($langs->trans("Emails"));
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';

View File

@ -377,14 +377,14 @@ if ($action == 'validate' && $permissiontovalidate) {
if ($tmpproposal->fetch($checked) > 0) {
if ($tmpproposal->statut == $tmpproposal::STATUS_DRAFT) {
if ($tmpproposal->valid($user) > 0) {
setEventMessage($langs->trans('hasBeenValidated', $tmpproposal->ref), 'mesgs');
setEventMessages($langs->trans('hasBeenValidated', $tmpproposal->ref), null, 'mesgs');
} else {
setEventMessage($tmpproposal->error, $tmpproposal->errors, 'errors');
setEventMessages($tmpproposal->error, $tmpproposal->errors, 'errors');
$error++;
}
} else {
$langs->load("errors");
setEventMessage($langs->trans('ErrorIsNotADraft', $tmpproposal->ref), 'errors');
setEventMessages($langs->trans('ErrorIsNotADraft', $tmpproposal->ref), null, 'errors');
$error++;
}
} else {
@ -410,7 +410,7 @@ if ($action == "sign" && $permissiontoclose) {
if ($tmpproposal->statut == $tmpproposal::STATUS_VALIDATED) {
$tmpproposal->statut = $tmpproposal::STATUS_SIGNED;
if ($tmpproposal->closeProposal($user, $tmpproposal::STATUS_SIGNED) >= 0) {
setEventMessage($tmpproposal->ref." ".$langs->trans('Signed'), 'mesgs');
setEventMessages($tmpproposal->ref." ".$langs->trans('Signed'), null, 'mesgs');
} else {
setEventMessages($tmpproposal->error, $tmpproposal->errors, 'errors');
$error++;

View File

@ -38,7 +38,10 @@ class DoliDBSqlite3 extends DoliDB
const LABEL = 'Sqlite3';
//! Version min database
const VERSIONMIN = '3.0.0';
/** @var SQLite3Result Resultset of last query */
/**
* @var SQLite3Result|boolean Resultset of last query
*/
private $_results;
const WEEK_MONDAY_FIRST = 1;

View File

@ -169,7 +169,6 @@ class ProductCombination
}
if (empty($combination_price_levels)) {
/**
* for auto retrocompatibility with last behavior
*/