diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Organisation_getMappingRelatedOrganisation.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Organisation_getMappingRelatedOrganisation.xml
index bd76d0754b198a786fbd29b5edeee32ee259aa85..4ac345979b62a5d6756f5a02957d57fb0ee17e77 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Organisation_getMappingRelatedOrganisation.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Organisation_getMappingRelatedOrganisation.xml
@@ -84,8 +84,10 @@ group_chain.reverse()\n
 \n
 for group in group_chain:\n
   organisation = getOrganisationForSectionCategory(group)\n
-  if organisation is not None and \\\n
-      len(organisation.contentValues(filter=dict(portal_type=\'Accounting Period\'))):\n
+  if organisation is not None and (\n
+      len(organisation.contentValues(\n
+              filter=dict(portal_type=\'Accounting Period\'))) or \n
+      organisation.getMapping()):\n
     return organisation\n
 \n
 return context\n
diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision
index e37d32abba426c06b752a5e53f48c595c84e9270..7cebf7db5f216cc18b9025d6c549b82d6fb63021 100644
--- a/bt5/erp5_accounting/bt/revision
+++ b/bt5/erp5_accounting/bt/revision
@@ -1 +1 @@
-1000
\ No newline at end of file
+1001
\ No newline at end of file