Merge pull request #24697 from NextGestion/dolibarr_fixbugs

FIX | Prevent adding Free line when "MAIN_DISABLE_FREE_LINES" activated
This commit is contained in:
Laurent Destailleur 2023-05-08 18:45:45 +02:00 committed by GitHub
commit a900a6c968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 0 deletions

View File

@ -976,6 +976,11 @@ if (empty($reshook)) {
$idprod = 0; $idprod = 0;
} else { } else {
$idprod = GETPOST('idprod', 'int'); $idprod = GETPOST('idprod', 'int');
if (!empty($conf->global->MAIN_DISABLE_FREE_LINES) && $idprod <= 0) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
$error++;
}
} }
$tva_tx = GETPOST('tva_tx', 'alpha'); $tva_tx = GETPOST('tva_tx', 'alpha');

View File

@ -686,6 +686,11 @@ if (empty($reshook)) {
$idprod = 0; $idprod = 0;
} else { } else {
$idprod = GETPOST('idprod', 'int'); $idprod = GETPOST('idprod', 'int');
if (!empty($conf->global->MAIN_DISABLE_FREE_LINES) && $idprod <= 0) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
$error++;
}
} }
$tva_tx = GETPOST('tva_tx', 'alpha'); $tva_tx = GETPOST('tva_tx', 'alpha');

View File

@ -433,6 +433,11 @@ if (empty($reshook)) {
} else { } else {
$idprod = GETPOST('idprod', 'int'); $idprod = GETPOST('idprod', 'int');
$tva_tx = ''; $tva_tx = '';
if (!empty($conf->global->MAIN_DISABLE_FREE_LINES) && $idprod <= 0) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
$error++;
}
} }
$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS', 2); $qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS', 2);

View File

@ -2042,6 +2042,11 @@ if (empty($reshook)) {
$idprod = 0; $idprod = 0;
} else { } else {
$idprod = GETPOST('idprod', 'int'); $idprod = GETPOST('idprod', 'int');
if (!empty($conf->global->MAIN_DISABLE_FREE_LINES) && $idprod <= 0) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
$error++;
}
} }
$tva_tx = GETPOST('tva_tx', 'alpha'); $tva_tx = GETPOST('tva_tx', 'alpha');

View File

@ -441,6 +441,11 @@ if (empty($reshook)) {
$idprod = 0; $idprod = 0;
} else { } else {
$idprod = GETPOST('idprod', 'int'); $idprod = GETPOST('idprod', 'int');
if (!empty($conf->global->MAIN_DISABLE_FREE_LINES) && $idprod <= 0) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
$error++;
}
} }
$tva_tx = GETPOST('tva_tx', 'alpha'); $tva_tx = GETPOST('tva_tx', 'alpha');