From e02aa4e41b3a5c74fc0e5d60699bae5354e51229 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 May 2020 23:22:14 +0200
Subject: [PATCH] FIX Default bank account was not loaded for document
 generation.

---
 htdocs/core/class/commondocgenerator.class.php |  4 ++--
 htdocs/societe/class/societe.class.php         | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 56910b43e4a..4a8e097fd6d 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -212,8 +212,8 @@ abstract class CommonDocGenerator
             'company_idprof6'=>$object->idprof6,
             'company_note_public'=>$object->note_public,
             'company_note_private'=>$object->note_private,
-            'company_default_bank_iban'=>$object->bank_account->iban,
-            'company_default_bank_bic'=>$object->bank_account->bic
+        	'company_default_bank_iban'=>(is_object($object->bank_account) ? $object->bank_account->iban : ''),
+        	'company_default_bank_bic'=>(is_object($object->bank_account) ? $object->bank_account->bic : '')
         );
 
         // Retrieve extrafields
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9cc36dbb7b4..67bdbf5142c 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -636,6 +636,12 @@ class Societe extends CommonObject
      */
 	public $multicurrency_code;
 
+	/**
+	 * @var Account Default BAN account
+	 */
+	public $bank_account;
+
+
 	/**
 	 *    Constructor
 	 *
@@ -4155,6 +4161,17 @@ class Societe extends CommonObject
 				}
 			}
 
+			if (! isset($this->bank_account)) {
+				require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+				$bac = new CompanyBankAccount($this->db);
+				$result = $bac->fetch(0, $this->id);
+				if ($result > 0) {
+					$this->bank_account = $bac;
+				} else {
+					$this->bank_account = '';
+				}
+			}
+
 			$modelpath = "core/modules/societe/doc/";
 
 			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);