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

FIX #6255

Browse Source
This commit is contained in:
Laurent Destailleur 2017-01-16 12:35:19 +01:00
parent 43cb9c30b2
commit c1d6ad90b3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/prelevement/create.php
View File

@ -60,7 +60,6 @@ if ($action == 'modify')
} }
if ($action == 'create') if ($action == 'create')
{ {
// $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty // $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty
$bprev = new BonPrelevement($db); $bprev = new BonPrelevement($db);
$result=$bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET); $result=$bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET);
@ -73,6 +72,7 @@ if ($action == 'create')
$mesg=''; $mesg='';
$mesg=$langs->trans("NoInvoiceCouldBeWithdrawed"); $mesg=$langs->trans("NoInvoiceCouldBeWithdrawed");
setEventMessages($mesg, null, 'errors'); setEventMessages($mesg, null, 'errors');
$mesg.='<br>'."\n";
foreach($bprev->invoice_in_error as $key => $val) foreach($bprev->invoice_in_error as $key => $val)
{ {
$mesg.=$val."<br>\n"; $mesg.=$val."<br>\n";

4
htdocs/societe/rib.php
View File

@ -376,7 +376,7 @@ if ($socid && $action != 'edit' && $action != "create")
$content = $account->code_guichet; $content = $account->code_guichet;
} elseif ($val == 'BankAccountNumber') { } elseif ($val == 'BankAccountNumber') {
$content = $account->number; $content = $account->number;
if (! empty($account->label)) { if (! empty($account->label) && $account->number) {
if (! checkBanForAccount($account)) { if (! checkBanForAccount($account)) {
$content.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning'); $content.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
} else { } else {
@ -482,7 +482,7 @@ if ($socid && $action != 'edit' && $action != "create")
$string .= $rib->iban.' ';*/ $string .= $rib->iban.' ';*/
} }
} }
if (! empty($rib->label)) { if (! empty($rib->label) && $rib->number) {
if (! checkBanForAccount($rib)) { if (! checkBanForAccount($rib)) {
$string.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning'); $string.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
} else { } else {