Merge pull request #1455 from marcosgdf/bug-loadban

Corrected bug when creating document from ODT template
This commit is contained in:
Laurent Destailleur 2014-03-06 18:38:56 +01:00
commit 15aebfb7a3

View File

@ -133,7 +133,7 @@ abstract class CommonDocGenerator
function get_substitutionarray_thirdparty($object,$outputlangs)
{
global $conf;
if (empty($object->country) && ! empty($object->country_code))
{
$object->country=$outputlangs->transnoentitiesnoconv("Country".$object->country_code);
@ -143,8 +143,6 @@ abstract class CommonDocGenerator
$object->state=getState($object->state_code,0);
}
$object->load_ban();
$array_thirdparty = array(
'company_name'=>$object->name,
'company_email'=>$object->email,