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

Fix: Rule to check bank account

Browse Source
This commit is contained in:
Laurent Destailleur 2008-12-01 22:14:01 +00:00
parent b82638c0f0
commit 10ec99bb4a
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/companybankaccount.class.php
View File

@ -190,7 +190,7 @@ class CompanyBankAccount
require_once DOL_DOCUMENT_ROOT . '/lib/bank.lib.php'; require_once DOL_DOCUMENT_ROOT . '/lib/bank.lib.php';
// Call function to check BAN // Call function to check BAN
if (! verif_rib($this)) if (! checkBanForAccount($this))
{ {
$this->error_number = 12; $this->error_number = 12;
$this->error_message = 'RIBControlError'; $this->error_message = 'RIBControlError';

16
htdocs/compta/bank/account.class.php
View File

@ -262,7 +262,7 @@ class Account extends CommonObject
} }
} }
/* /**
* \brief Creation du compte bancaire en base * \brief Creation du compte bancaire en base
* \return int < 0 si erreur, > 0 si ok * \return int < 0 si erreur, > 0 si ok
*/ */
@ -270,19 +270,13 @@ class Account extends CommonObject
{ {
global $langs; global $langs;
// Verification parametres // Check parameters
if (! $this->min_allowed) $this->min_allowed=0; if (! $this->min_allowed) $this->min_allowed=0;
if (! $this->min_desired) $this->min_desired=0; if (! $this->min_desired) $this->min_desired=0;
// Chargement librairie pour acces fonction controle RIB // Chargement librairie pour acces fonction controle RIB
require_once DOL_DOCUMENT_ROOT.'/lib/bank.lib.php'; require_once DOL_DOCUMENT_ROOT.'/lib/bank.lib.php';
if (! verif_rib($this))
{
$this->error='RIBControlError';
return -1;
}
if (! $this->ref) if (! $this->ref)
{ {
$this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")); $this->error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref"));
@ -332,7 +326,7 @@ class Account extends CommonObject
} }
} }
/* /**
* \brief Mise a jour compte, partie generale * \brief Mise a jour compte, partie generale
* \param user Object utilisateur qui modifie * \param user Object utilisateur qui modifie
* \return int <0 si ko, >0 si ok * \return int <0 si ko, >0 si ok
@ -341,7 +335,9 @@ class Account extends CommonObject
{ {
global $langs; global $langs;
dolibarr_syslog("Account::update"); // Check parameters
if (! $this->min_allowed) $this->min_allowed=0;
if (! $this->min_desired) $this->min_desired=0;
if (! $this->ref) if (! $this->ref)
{ {

11
htdocs/lib/bank.lib.php
View File

@ -94,11 +94,12 @@ function checkBanForAccount($account)
$country_code=$account->getCountryCode(); $country_code=$account->getCountryCode();
// For compatibility between // For compatibility between
// account of type CompanyBankAccount class (we use number) // account of type CompanyBankAccount class (we use number, cle_rib)
// account of type Account class (we use num_compte) // account of type Account class (we use num_compte, cle)
if (empty($account->number)) $account->number=$account->num_compte; if (empty($account->number)) $account->number=$account->num_compte;
if (empty($account->cle)) $account->cle=$account->cle_rib;
dolibarr_syslog("Bank.lib::checkBanForAccount account->iban=".$account->iban." country_code=".$country_code, LOG_DEBUG); dolibarr_syslog("Bank.lib::checkBanForAccount account->code_banque=".$account->code_banque." account->code_guichet=".$account->code_guichet." account->number=".$account->number." account->cle=".$account->cle." account->iban=".$account->iban." country_code=".$country_code, LOG_DEBUG);
if ($country_code == 'FR') // France rules if ($country_code == 'FR') // France rules
{ {
@ -117,7 +118,7 @@ function checkBanForAccount($account)
} }
// Soustraction du modulo 97 de $s a 97 pour obtenir la cle // Soustraction du modulo 97 de $s a 97 pour obtenir la cle
$cle_rib = 97 - ($s % 97) ; $cle_rib = 97 - ($s % 97) ;
if ($cle_rib == $cle) if ($cle_rib == $account->cle)
{ {
return true; return true;
} }
@ -136,7 +137,7 @@ function checkBanForAccount($account)
$cle_rib=strtolower(CheckES($rib,$CCC)); $cle_rib=strtolower(CheckES($rib,$CCC));
if ($cle_rib == strtolower($account->cle_rib)) if ($cle_rib == strtolower($account->cle))
{ {
return true; return true;
} }