ERP5Configurator get organisaiton_id in Configurator Item if not given

product/ERP5Configurator/Document/BankAccountConfiguratorItem.py

@@ -94,7 +94,6 @@ class BankAccountConfiguratorItem(ConfiguratorItemMixin, XMLObject):
                   }
           bank_account.edit(**bank_dict)
 
-          business_configuration = self.getBusinessConfigurationValue()
           # store globally bank_account_id
           business_configuration.setGlobalConfigurationAttr(bank_account_id=bank_account.getId())
 

product/ERP5Configurator/Document/PersonConfiguratorItem.py

@@ -72,9 +72,14 @@ class PersonConfiguratorItem(XMLObject, ConfiguratorItemMixin):
         group_id = getattr(aq_base(self), 'group_id', None)
         site_id = getattr(aq_base(self), 'site_id', None)
 
-        if getattr(aq_base(self), 'organisation_id', None) is not None:
+        business_configuration = self.getBusinessConfigurationValue()
+        organisation_id = getattr(aq_base(self), 'organisation_id', None)
+        if organisation_id is None:
+          organisation_id = business_configuration.\
+                              getGlobalConfigurationAttr('organisation_id')
+        if organisation_id is not None:
           person.setCareerSubordination('organisation_module/%s' % \
-                                        self.organisation_id)
+                                         organisation_id)
 
         # save
         person.edit(**{'default_email_text': self.getDefaultEmailText(),