diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 342c6494863..581ce0e7114 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -174,8 +174,8 @@ abstract class CommonDocGenerator 'company_idprof6'=>$object->idprof6, 'company_note_public'=>$object->note_public, 'company_note_private'=>$object->note_private, - 'company_iban'=>$object->bank_account->iban, - 'company_bic'=>$object->bank_account->bic + 'company_default_bank_iban'=>$object->bank_account->iban, + 'company_default_bank_bic'=>$object->bank_account->bic ); // Retrieve extrafields diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 37fc7043252..e40eff745e6 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -278,3 +278,4 @@ insert into llx_c_pays (rowid,code,libelle) values (243, 'JE', 'Jersey' ) insert into llx_c_pays (rowid,code,libelle) values (244, 'ME', 'Monténégro' ); insert into llx_c_pays (rowid,code,libelle) values (245, 'BL', 'Saint-Barthélemy'); insert into llx_c_pays (rowid,code,libelle) values (246, 'MF', 'Saint-Martin' ); +insert into llx_c_pays (rowid,code,libelle) values (247, 'BU', 'Burundi' ); diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 064cfcc9f24..262deffa65b 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -8,7 +8,7 @@ * Copyright (C) 2011 Herve Prot * Copyright (C) 2012 Juanjo Menent * Copyright (C) 2013 Florian Henry - * Copyright (C) 2013 Alexandre Spangaro + * Copyright (C) 2013-2014 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1075,6 +1075,7 @@ else if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $rowspan++; if (! empty($conf->societe->enabled)) $rowspan++; if (! empty($conf->adherent->enabled)) $rowspan++; + if (! empty($conf->skype->enabled)) $rowspan++; // Lastname print ''.$langs->trans("Lastname").'';