[Erp5-report] r27478 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Jun  9 16:41:44 2009
New Revision: 27478

URL: http://svn.erp5.org?rev=27478&view=rev
Log:
if no organisation mapping is defined and more than one organisation exists for the current group, use the currency from any of them, they should be consistent (otherwise, a report at this level of group will show mixed currencies anyway)

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_getCurrencyForSection.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_getCurrencyForSection.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_getCurrencyForSection.xml?rev=27478&r1=27477&r2=27478&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_getCurrencyForSection.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_getCurrencyForSection.xml [utf8] Tue Jun  9 16:41:44 2009
@@ -75,7 +75,9 @@
     mapping = section.getMappingValue(portal_type=\'Organisation\')\n
     if mapping is not None and mapping.getPriceCurrency():\n
       return mapping.getPriceCurrency()\n
-\n
+    for member in member_list:\n
+      if member.getPriceCurrency():\n
+        return member.getPriceCurrency()\n
   # nothing found ... returns the currency from preferences.\n
   return portal.portal_preferences.getPreferredAccountingTransactionCurrency()\n
 \n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=27478&r1=27477&r2=27478&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Tue Jun  9 16:41:44 2009
@@ -1,1 +1,1 @@
-938
+939