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-06-07 09:51:32 +02:00
commit 3e859eb5e6
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/takepos/index.php
View File

@ -1136,7 +1136,7 @@ if (isset($_SESSION["takeposterminal"]) && $_SESSION["takeposterminal"]) {
} }
} }
if (empty($paiementsModes)) { if (empty($paiementsModes) && !empty($conf->banque->enabled)) {
$langs->load('errors'); $langs->load('errors');
setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("TakePOS")), null, 'errors'); setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("TakePOS")), null, 'errors');
setEventMessages($langs->trans("ProblemIsInSetupOfTerminal", $_SESSION["takeposterminal"]), null, 'errors'); setEventMessages($langs->trans("ProblemIsInSetupOfTerminal", $_SESSION["takeposterminal"]), null, 'errors');

2
htdocs/takepos/invoice.php
View File

@ -204,7 +204,7 @@ if (empty($reshook)) {
} }
} }
if ($bankaccount <= 0 && $pay != "delayed") { if ($bankaccount <= 0 && $pay != "delayed" && !empty($conf->banque->enabled)) {
$errormsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")); $errormsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount"));
$error++; $error++;
} }

3
htdocs/takepos/pay.php
View File

@ -111,6 +111,9 @@ if ($resql) {
$arrayOfValidBankAccount[$conf->global->$accountname] = $conf->global->$accountname; $arrayOfValidBankAccount[$conf->global->$accountname] = $conf->global->$accountname;
$arrayOfValidPaymentModes[] = $obj; $arrayOfValidPaymentModes[] = $obj;
} }
if (empty($conf->banque->enabled)) {
if ($paycode == 'CASH' || $paycode == 'CB') $arrayOfValidPaymentModes[] = $obj;
}
} }
} }
?> ?>