From 29d34e0250dcbfa81958f12539616a7909ab6072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Thu, 25 Oct 2007 08:39:04 +0000 Subject: [PATCH] Workaround for the case of we have accounting transactions with employees git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17181 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...onModule_zGetAccountingTransactionList.xml | 33 +++++++++---------- bt5/erp5_accounting/bt/revision | 2 +- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml index 11b1152a5d..56b411a14a 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml @@ -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 @@ FROM\n <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 @@ WHERE\n <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 @@ WHERE\n <value> <object> <klass> - <global name="SQL" module="Shared.DC.ZRDB.DA"/> + <global name="__newobj__" module="copy_reg"/> </klass> - <none/> + <tuple> + <global name="SQL" module="Shared.DC.ZRDB.DA"/> + </tuple> <state> <dictionary> <item> @@ -628,7 +627,7 @@ FROM\n <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 @@ WHERE\n <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 diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index cb856a47cb..3b7560b755 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -444 \ No newline at end of file +445 \ No newline at end of file -- 2.30.9