OrganisationConfiguratorItem: get organisation id from user input

bt5/erp5_configurator/DocumentTemplateItem/portal_components/document.erp5.OrganisationConfiguratorItem.py

@@ -61,8 +61,8 @@ class OrganisationConfiguratorItem(ConfiguratorItemMixin, XMLObject):
     """ Setup organisation. """
     if fixit:
       portal = self.getPortalObject()
-      organisation = portal.organisation_module.newContent(portal_type="Organisation")
-
+      organisation = portal.organisation_module[self.getId()]
+      if organisation is not None:
         org_dict = {'price_currency': 'currency_module/%s' % self.getPriceCurrency(),
                     'group': self.getGroup(),
                     'title': self.getTitle(),
@@ -73,7 +73,6 @@ class OrganisationConfiguratorItem(ConfiguratorItemMixin, XMLObject):
                     'default_address_zip_code': self.getDefaultAddressZipCode(),
                     'default_address_region': self.getDefaultAddressRegion(),
                     'default_address_street_address': self.getDefaultAddressStreetAddress(),
-                  'site':'main', # First customer's organisation is always main site.
                    }
         organisation.edit(**org_dict)