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

Merge branch 'develop' of https://github.com/guerrierk/dolibarr into

Browse Source 
guerrierk-develop

Conflicts:
	htdocs/commande/fiche.php
This commit is contained in:
Laurent Destailleur 2014-04-13 01:59:46 +02:00
commit 31fa6c5b2b
1 changed files with 133 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
htdocs/core/lib/bank.lib.php
View File

@ -1,4 +1,5 @@
<?php <?php
/* Copyright (C) 2006-2007 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2006-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
* *
@ -29,8 +30,7 @@
* @param Object $object Object related to tabs * @param Object $object Object related to tabs
* @return array Array of tabs to shoc * @return array Array of tabs to shoc
*/ */
function bank_prepare_head($object) function bank_prepare_head($object) {
{
global $langs, $conf, $user; global $langs, $conf, $user;
$h = 0; $h = 0;
$head = array(); $head = array();
@ -40,8 +40,7 @@ function bank_prepare_head($object)
$head[$h][2] = 'bankname'; $head[$h][2] = 'bankname';
$h++; $h++;
if ($object->type == 0 || $object->type == 1) if ($object->type == 0 || $object->type == 1) {
{
$head[$h][0] = DOL_URL_ROOT . '/compta/bank/bankid_fr.php?id=' . $object->id; $head[$h][0] = DOL_URL_ROOT . '/compta/bank/bankid_fr.php?id=' . $object->id;
$head[$h][1] = $langs->trans("RIB"); $head[$h][1] = $langs->trans("RIB");
$head[$h][2] = 'bankid'; $head[$h][2] = 'bankid';
@ -71,38 +70,42 @@ function bank_prepare_head($object)
$head[$h][2] = 'graph'; $head[$h][2] = 'graph';
$h++; $h++;
if ($object->courant != 2) if ($object->courant != 2) {
{
$head[$h][0] = DOL_URL_ROOT . "/compta/bank/releve.php?account=" . $object->id; $head[$h][0] = DOL_URL_ROOT . "/compta/bank/releve.php?account=" . $object->id;
$head[$h][1] = $langs->trans("AccountStatements"); $head[$h][1] = $langs->trans("AccountStatements");
$head[$h][2] = 'statement'; $head[$h][2] = 'statement';
$h++; $h++;
} }
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank');
return $head; return $head;
} }
/** /**
* Check account number informations for a bank account * Check account number informations for a bank account
* *
* @param Account $account A bank account * @param Account $account A bank account
* @return int True if informations are valid, false otherwise * @return int True if informations are valid, false otherwise
*/ */
function checkBanForAccount($account) 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, cle_rib) // account of type CompanyBankAccount class (we use number, cle_rib)
// account of type Account class (we use num_compte, cle) // account of type Account class (we use num_compte, cle)
if (empty($account->number)) $account->number=$account->num_compte; if (empty($account->number))
if (empty($account->cle)) $account->cle=$account->cle_rib; $account->number = $account->num_compte;
if (empty($account->cle))
$account->cle = $account->cle_rib;
dol_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); dol_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
{
$coef = array(62, 34, 3); $coef = array(62, 34, 3);
// Concatenation des differents codes. // Concatenation des differents codes.
$rib = strtolower(trim($account->code_banque) . trim($account->code_guichet) . trim($account->number) . trim($account->cle)); $rib = strtolower(trim($account->code_banque) . trim($account->code_guichet) . trim($account->number) . trim($account->cle));
@ -111,54 +114,50 @@ function checkBanForAccount($account)
$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz", "12345678912345678923456789"); $rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz", "12345678912345678923456789");
// Separation du rib en 3 groupes de 7 + 1 groupe de 2. // Separation du rib en 3 groupes de 7 + 1 groupe de 2.
// Multiplication de chaque groupe par les coef du tableau // Multiplication de chaque groupe par les coef du tableau
for ($i=0, $s=0; $i<3; $i++) for ($i = 0, $s = 0; $i < 3; $i++) {
{
$code = substr($rib, 7 * $i, 7); $code = substr($rib, 7 * $i, 7);
$s += (0 + $code) * $coef[$i]; $s += (0 + $code) * $coef[$i];
} }
// 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 == $account->cle) if ($cle_rib == $account->cle) {
{
return true; return true;
} }
return false; return false;
} }
if ($country_code == 'BE') // Belgium rules if ($country_code == 'BE') { // Belgium rules
{
} }
if ($country_code == 'ES') // Spanish rules if ($country_code == 'ES') { // Spanish rules
{
$CCC = strtolower(trim($account->number)); $CCC = strtolower(trim($account->number));
$rib = strtolower(trim($account->code_banque) . trim($account->code_guichet)); $rib = strtolower(trim($account->code_banque) . trim($account->code_guichet));
$cle_rib = strtolower(checkES($rib, $CCC)); $cle_rib = strtolower(checkES($rib, $CCC));
if ($cle_rib == strtolower($account->cle)) if ($cle_rib == strtolower($account->cle)) {
{
return true; return true;
} }
return false; return false;
} }
if ($country_code == 'AU') // Australian if ($country_code == 'AU') { // Australian
{ if (strlen($account->code_banque) > 7)
if (strlen($account->code_banque) > 7) return false; // Sould be 6 but can be 123-456 return false; // Sould be 6 but can be 123-456
else if (strlen($account->code_banque) < 6) return false; // Sould be 6 else if (strlen($account->code_banque) < 6)
else return true; return false; // Sould be 6
else
return true;
} }
// No particular rule // No particular rule
// If account is CompanyBankAccount class, we use number // If account is CompanyBankAccount class, we use number
// If account is Account class, we use num_compte // If account is Account class, we use num_compte
if (empty($account->number)) if (empty($account->number)) {
{
return false; return false;
} }
return true; return true;
} }
/** /**
* Returns the key for Spanish Banks Accounts * Returns the key for Spanish Banks Accounts
* *
@ -166,10 +165,8 @@ function checkBanForAccount($account)
* @param string $InumCta InumCta * @param string $InumCta InumCta
* @return string Key * @return string Key
*/ */
function checkES($IentOfi,$InumCta) function checkES($IentOfi, $InumCta) {
{ if (empty($IentOfi) || empty($InumCta) || strlen($IentOfi) != 8 || strlen($InumCta) != 10) {
if (empty($IentOfi)||empty($InumCta)||strlen($IentOfi)!=8||strlen($InumCta)!=10)
{
$keycontrol = ""; $keycontrol = "";
return $keycontrol; return $keycontrol;
} }
@ -179,10 +176,8 @@ function checkES($IentOfi,$InumCta)
$i = 0; $i = 0;
while ($i<=strlen($ccc)-1) while ($i <= strlen($ccc) - 1) {
{ if (strpos($numbers, substr($ccc, $i, 1)) === false) {
if (strpos($numbers,substr($ccc,$i,1)) === false)
{
$keycontrol = ""; $keycontrol = "";
return $keycontrol; return $keycontrol;
} }
@ -192,31 +187,31 @@ function checkES($IentOfi,$InumCta)
$values = array(1, 2, 4, 8, 5, 10, 9, 7, 3, 6); $values = array(1, 2, 4, 8, 5, 10, 9, 7, 3, 6);
$sum = 0; $sum = 0;
for($i=2; $i<10; $i++) for ($i = 2; $i < 10; $i++) {
{
$sum += $values[$i] * substr($IentOfi, $i - 2, 1); $sum += $values[$i] * substr($IentOfi, $i - 2, 1);
} }
$key = 11 - $sum % 11; $key = 11 - $sum % 11;
if ($key==10) $key=1; if ($key == 10)
if ($key==11) $key=0; $key = 1;
if ($key == 11)
$key = 0;
$keycontrol = $key; $keycontrol = $key;
$sum = 0; $sum = 0;
for($i=0; $i<11; $i++) for ($i = 0; $i < 11; $i++) {
{
$sum += $values[$i] * substr($InumCta, $i, 1); $sum += $values[$i] * substr($InumCta, $i, 1);
} }
$key = 11 - $sum % 11; $key = 11 - $sum % 11;
if ($key==10) $key=1; if ($key == 10)
if ($key==11) $key=0; $key = 1;
if ($key == 11)
$key = 0;
$keycontrol .= $key; $keycontrol .= $key;
return $keycontrol; return $keycontrol;