[Erp5-report] r38093 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Sep  1 10:39:04 2010
New Revision: 38093

URL: http://svn.erp5.org?rev=38093&view=rev
Log:
take into account section category strict to know if a transaction is source or destination

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

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationView.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationView.xml?rev=38093&r1=38092&r2=38093&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationView.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationView.xml [utf8] Wed Sep  1 10:39:04 2010
@@ -56,13 +56,17 @@
             <value> <string>destination = context.getDestinationSectionValue()\n
 section_category = context.portal_preferences\\\n
          .getPreferredAccountingTransactionSectionCategory()\n
+section_category_strict = context.portal_preferences\\\n
+         .getPreferredAccountingSectionCategoryStrict()\n
+\n
 \n
 # If the destination is an organisation member of the preferred section category,\n
 # then we\'ll show destination view\n
 if destination is not None and section_category:\n
   if destination.getPortalType() == \'Person\':\n
     return False\n
-  if destination.isMemberOf(section_category):\n
+  if destination.isMemberOf(section_category,\n
+                            strict_membership=section_category_strict):\n
     return True\n
 \n
 # If the source is an organisation member of the preferred section category,\n
@@ -71,7 +75,8 @@ source = context.getSourceSectionValue()
 if source is not None and section_category:\n
   if source.getPortalType() == \'Person\':\n
     return True\n
-  if source.isMemberOf(section_category):\n
+  if source.isMemberOf(section_category,\n
+                       strict_membership=section_category_strict):\n
     return False\n
 \n
 # If we reach this point, none of the sections are member of the preferred section\n
@@ -117,6 +122,7 @@ return True\n
                             <string>context</string>
                             <string>destination</string>
                             <string>section_category</string>
+                            <string>section_category_strict</string>
                             <string>None</string>
                             <string>False</string>
                             <string>True</string>

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isSourceView.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isSourceView.xml?rev=38093&r1=38092&r2=38093&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isSourceView.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isSourceView.xml [utf8] Wed Sep  1 10:39:04 2010
@@ -56,13 +56,16 @@
             <value> <string>source = context.getSourceSectionValue()\n
 section_category = context.portal_preferences\\\n
          .getPreferredAccountingTransactionSectionCategory()\n
+section_category_strict = context.portal_preferences\\\n
+         .getPreferredAccountingSectionCategoryStrict()\n
 \n
 # If the source is an organisation member of the preferred section category,\n
 # then we\'ll show the source view\n
 if source is not None and section_category:\n
   if source.getPortalType() == \'Person\':\n
     return False\n
-  if source.isMemberOf(section_category):\n
+  if source.isMemberOf(section_category,\n
+                       strict_membership=section_category_strict):\n
     return True\n
 \n
 # Else, if the destination is an organisation member of the preferred section category,\n
@@ -71,7 +74,8 @@ destination = context.getDestinationSect
 if destination is not None and section_category:\n
   if destination.getPortalType() == \'Person\':\n
     return True\n
-  if destination.isMemberOf(section_category):\n
+  if destination.isMemberOf(section_category,\n
+                            strict_membership=section_category_strict):\n
     return False\n
 \n
 # If we reach this point, none of the sections are member of the preferred section\n
@@ -117,6 +121,7 @@ return True\n
                             <string>context</string>
                             <string>source</string>
                             <string>section_category</string>
+                            <string>section_category_strict</string>
                             <string>None</string>
                             <string>False</string>
                             <string>True</string>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=38093&r1=38092&r2=38093&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Wed Sep  1 10:39:04 2010
@@ -1 +1 @@
-1341
\ No newline at end of file
+1342
\ No newline at end of file