From 0d4a11cad6cd01a003d7752339526ee2bb72e12d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Fri, 16 Oct 2009 10:18:45 +0000
Subject: [PATCH] always returns the organisation if it has a mapping
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29746 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../Organisation_getMappingRelatedOrganisation.xml | 6 ++++--
bt5/erp5_accounting/bt/revision | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
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 bd76d0754b..4ac345979b 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 e37d32abba..7cebf7db5f 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
--
2.30.9