diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 9a7380dd6e74d76d77289410e812cfa28ded59e8..fd744a221a84a14fc2162741504f80111a8fa9ae 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -978,16 +978,16 @@ class Account extends CommonObject * Return if a bank account is defined with detailed information (bank code, desk code, number and key). * More information on codes used by countries on page http://en.wikipedia.org/wiki/Bank_code * - * @return int 0=Use only an account number - * 1=Need Bank, Desk, Number and Key (France, Spain, ...) - * 2=Neek Bank only (Sort code for Great Britain, BSB for Australia) + * @return int 0=No bank code need + Account number is enough + * 1=Need 2 fields for bank code: Bank, Desk (France, Spain, ...) + Account number and key + * 2=Neek 1 field for bank code: Bank only (Sort code for Great Britain, BSB for Australia) + Account number */ function useDetailedBBAN() { $country_code=$this->getCountryCode(); - if (in_array($country_code,array('FR','ES','GA'))) return 1; // France, Spain, Gabon - if (in_array($country_code,array('AU','GB'))) return 2; // Australia, Great Britain + if (in_array($country_code,array('CH','DE','FR','ES','GA','IT'))) return 1; // France, Spain, Gabon + if (in_array($country_code,array('AU','BE','CA','DK','GR','GB','ID','IE','IR','KR','NL','NZ','US'))) return 2; // Australia, Great Britain... return 0; } diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index baabf172c46045342f9b1331a460eac7f400197a..98f7ccf1b16fa141af69fbe733acfa1b9e42485b 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -120,7 +120,7 @@ insert into llx_c_pays (rowid,code,libelle) values (85, 'EG', 'Egypte' ) insert into llx_c_pays (rowid,code,libelle) values (86, 'SV', 'Salvador' ); insert into llx_c_pays (rowid,code,libelle) values (87, 'GQ', 'Guinée Equatoriale'); insert into llx_c_pays (rowid,code,libelle) values (88, 'ER', 'Erythrée' ); -insert into llx_c_pays (rowid,code,libelle) values (89, 'EE', 'Estonie' ); +insert into llx_c_pays (rowid,code,libelle) values (89, 'EE', 'Estonia' ); insert into llx_c_pays (rowid,code,libelle) values (90, 'ET', 'Ethiopie' ); insert into llx_c_pays (rowid,code,libelle) values (91, 'FK', 'Iles Falkland' ); insert into llx_c_pays (rowid,code,libelle) values (92, 'FO', 'Iles Féroé' ); @@ -130,17 +130,17 @@ insert into llx_c_pays (rowid,code,libelle) values (95, 'GF', 'Guyane française insert into llx_c_pays (rowid,code,libelle) values (96, 'PF', 'Polynésie française'); insert into llx_c_pays (rowid,code,libelle) values (97, 'TF', 'Terres australes françaises'); insert into llx_c_pays (rowid,code,libelle) values (98, 'GM', 'Gambie' ); -insert into llx_c_pays (rowid,code,libelle) values (99, 'GE', 'Géorgie' ); +insert into llx_c_pays (rowid,code,libelle) values (99, 'GE', 'Georgia' ); insert into llx_c_pays (rowid,code,libelle) values (100, 'GH', 'Ghana' ); insert into llx_c_pays (rowid,code,libelle) values (101, 'GI', 'Gibraltar' ); -insert into llx_c_pays (rowid,code,libelle) values (102, 'GR', 'Grèce' ); +insert into llx_c_pays (rowid,code,libelle) values (102, 'GR', 'Greece' ); insert into llx_c_pays (rowid,code,libelle) values (103, 'GL', 'Groenland' ); insert into llx_c_pays (rowid,code,libelle) values (104, 'GD', 'Grenade' ); --insert into llx_c_pays (rowid,code,libelle) values (105, 'GP', 'Guadeloupe' ); insert into llx_c_pays (rowid,code,libelle) values (106, 'GU', 'Guam' ); insert into llx_c_pays (rowid,code,libelle) values (107, 'GT', 'Guatemala' ); -insert into llx_c_pays (rowid,code,libelle) values (108, 'GN', 'Guinée' ); -insert into llx_c_pays (rowid,code,libelle) values (109, 'GW', 'Guinée-Bissao' ); +insert into llx_c_pays (rowid,code,libelle) values (108, 'GN', 'Guinea' ); +insert into llx_c_pays (rowid,code,libelle) values (109, 'GW', 'Guinea-Bissao' ); --insert into llx_c_pays (rowid,code,libelle) values (110, 'GY', 'Guyana' ); insert into llx_c_pays (rowid,code,libelle) values (111, 'HT', 'Haiti' ); insert into llx_c_pays (rowid,code,libelle) values (112, 'HM', 'Iles Heard et McDonald'); @@ -159,8 +159,8 @@ insert into llx_c_pays (rowid,code,libelle) values (124, 'JO', 'Jordanie' ) insert into llx_c_pays (rowid,code,libelle) values (125, 'KZ', 'Kazakhstan' ); insert into llx_c_pays (rowid,code,libelle) values (126, 'KE', 'Kenya' ); insert into llx_c_pays (rowid,code,libelle) values (127, 'KI', 'Kiribati' ); -insert into llx_c_pays (rowid,code,libelle) values (128, 'KP', 'Corée du Nord' ); -insert into llx_c_pays (rowid,code,libelle) values (129, 'KR', 'Corée du Sud' ); +insert into llx_c_pays (rowid,code,libelle) values (128, 'KP', 'North Corea' ); +insert into llx_c_pays (rowid,code,libelle) values (129, 'KR', 'South Corea' ); insert into llx_c_pays (rowid,code,libelle) values (130, 'KW', 'Koweït' ); insert into llx_c_pays (rowid,code,libelle) values (131, 'KG', 'Kirghizistan' ); insert into llx_c_pays (rowid,code,libelle) values (132, 'LA', 'Laos' );