From dbdb8de79d7bb97cbb95d1a488c5b7f96147806a Mon Sep 17 00:00:00 2001
From: syrus34 <pascal@rullier.net>
Date: Fri, 28 Feb 2014 07:06:38 +0100
Subject: [PATCH 1/3] Update commondocgenerator.class.php

With version 3.5, a company can have several bank account
---
 htdocs/core/class/commondocgenerator.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From cd910b30c995a755b416a7998c647be49cb09327 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Fri, 28 Feb 2014 07:20:15 +0100
Subject: [PATCH 2/3] Problem of presentation when skype module is enabled

---
 htdocs/user/fiche.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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           <herve.prot@symeos.com>
  * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013      Alexandre Spangaro   <alexandre.spangaro@gmail.com> 
+ * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com> 
  *
  * 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 '<tr><td valign="top">'.$langs->trans("Lastname").'</td>';

From e5e7b4ce6acf59137699c3a52be7f8cc95fb4535 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sat, 1 Mar 2014 12:30:39 +0100
Subject: [PATCH 3/3] Update llx_00_c_pays.sql

adding burundi in pays database
---
 htdocs/install/mysql/data/llx_00_c_pays.sql | 1 +
 1 file changed, 1 insertion(+)

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'  );