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

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Oct 25 10:39:04 2007
New Revision: 17181

URL: http://svn.erp5.org?rev=17181&view=rev
Log:
Workaround for the case of we have accounting transactions with employees

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

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml?rev=17181&r1=17180&r2=17181&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml Thu Oct 25 10:39:04 2007
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -443,7 +440,7 @@
   <dtml-if use_movement_table> movement,  </dtml-if>\n
   <dtml-if "stat or omit_input or omit_output or node">\n
       stock, catalog as child, </dtml-if>\n
-  <dtml-if "section_category">category, </dtml-if>\n
+  <dtml-if "section_category">category, catalog as section, </dtml-if>\n
   catalog,\n
   delivery\n
 \n
@@ -491,10 +488,10 @@
                   <dtml-var "restrictedTraverse(entity).getUid()">\n
      )</dtml-if>\n
   <dtml-if section_category> AND (\n
-         (  category.uid = delivery.destination_section_uid\n
-           )  OR ( category.uid = delivery.source_section_uid\n
-         )\n
-       )\n
+      (  category.uid = delivery.destination_section_uid\n
+           )  OR ( category.uid = delivery.source_section_uid ) )\n
+    AND section.portal_type = "Organisation"\n
+    AND section.uid = category.uid\n
     AND category.category_uid =\n
     <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
   </dtml-if>\n
@@ -566,9 +563,11 @@
             <value>
               <object>
                 <klass>
+                  <global name="__newobj__" module="copy_reg"/>
+                </klass>
+                <tuple>
                   <global name="SQL" module="Shared.DC.ZRDB.DA"/>
-                </klass>
-                <none/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
@@ -628,7 +627,7 @@
   <dtml-if use_movement_table> movement,  </dtml-if>\n
   <dtml-if "stat or omit_input or omit_output or node">\n
       stock, catalog as child, </dtml-if>\n
-  <dtml-if "section_category">category, </dtml-if>\n
+  <dtml-if "section_category">category, catalog as section, </dtml-if>\n
   catalog,\n
   delivery\n
 \n
@@ -676,10 +675,10 @@
                   <dtml-var "restrictedTraverse(entity).getUid()">\n
      )</dtml-if>\n
   <dtml-if section_category> AND (\n
-         (  category.uid = delivery.destination_section_uid\n
-           )  OR ( category.uid = delivery.source_section_uid\n
-         )\n
-       )\n
+      (  category.uid = delivery.destination_section_uid\n
+           )  OR ( category.uid = delivery.source_section_uid ) )\n
+    AND section.portal_type = "Organisation"\n
+    AND section.uid = category.uid\n
     AND category.category_uid =\n
     <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
   </dtml-if>\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=17181&r1=17180&r2=17181&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Thu Oct 25 10:39:04 2007
@@ -1,1 +1,1 @@
-444
+445