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 e5dc82ad058aa47e0971adf7fa2186938d890a67..bd76d0754b198a786fbd29b5edeee32ee259aa85 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,7 +84,8 @@ group_chain.reverse()\n
 \n
 for group in group_chain:\n
   organisation = getOrganisationForSectionCategory(group)\n
-  if organisation is not None:\n
+  if organisation is not None and \\\n
+      len(organisation.contentValues(filter=dict(portal_type=\'Accounting Period\'))):\n
     return organisation\n
 \n
 return context\n
@@ -132,6 +133,8 @@ return context\n
                             <string>group_chain</string>
                             <string>_getiter_</string>
                             <string>organisation</string>
+                            <string>len</string>
+                            <string>dict</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision
index c9ebe1509d764f5826e3d2f71253550491a7f224..6fb439a5f682018b93ee936334b8d34dede88f95 100644
--- a/bt5/erp5_accounting/bt/revision
+++ b/bt5/erp5_accounting/bt/revision
@@ -1 +1 @@
-978
\ No newline at end of file
+979
\ No newline at end of file