Commit 29d34e02 authored by Jérome Perrin's avatar Jérome Perrin

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
parent 756beabf
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="SQL" module="Products.ZSQLMethods.SQL"/>
<string>Products.ZSQLMethods.SQL</string> <tuple/>
<string>SQL</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -443,7 +440,7 @@ FROM\n ...@@ -443,7 +440,7 @@ FROM\n
<dtml-if use_movement_table> movement, </dtml-if>\n <dtml-if use_movement_table> movement, </dtml-if>\n
<dtml-if "stat or omit_input or omit_output or node">\n <dtml-if "stat or omit_input or omit_output or node">\n
stock, catalog as child, </dtml-if>\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 catalog,\n
delivery\n delivery\n
\n \n
...@@ -492,9 +489,9 @@ WHERE\n ...@@ -492,9 +489,9 @@ WHERE\n
)</dtml-if>\n )</dtml-if>\n
<dtml-if section_category> AND (\n <dtml-if section_category> AND (\n
( category.uid = delivery.destination_section_uid\n ( category.uid = delivery.destination_section_uid\n
) OR ( category.uid = delivery.source_section_uid\n ) OR ( category.uid = delivery.source_section_uid ) )\n
)\n AND section.portal_type = "Organisation"\n
)\n AND section.uid = category.uid\n
AND category.category_uid =\n AND category.category_uid =\n
<dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
</dtml-if>\n </dtml-if>\n
...@@ -566,9 +563,11 @@ WHERE\n ...@@ -566,9 +563,11 @@ WHERE\n
<value> <value>
<object> <object>
<klass> <klass>
<global name="SQL" module="Shared.DC.ZRDB.DA"/> <global name="__newobj__" module="copy_reg"/>
</klass> </klass>
<none/> <tuple>
<global name="SQL" module="Shared.DC.ZRDB.DA"/>
</tuple>
<state> <state>
<dictionary> <dictionary>
<item> <item>
...@@ -628,7 +627,7 @@ FROM\n ...@@ -628,7 +627,7 @@ FROM\n
<dtml-if use_movement_table> movement, </dtml-if>\n <dtml-if use_movement_table> movement, </dtml-if>\n
<dtml-if "stat or omit_input or omit_output or node">\n <dtml-if "stat or omit_input or omit_output or node">\n
stock, catalog as child, </dtml-if>\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 catalog,\n
delivery\n delivery\n
\n \n
...@@ -677,9 +676,9 @@ WHERE\n ...@@ -677,9 +676,9 @@ WHERE\n
)</dtml-if>\n )</dtml-if>\n
<dtml-if section_category> AND (\n <dtml-if section_category> AND (\n
( category.uid = delivery.destination_section_uid\n ( category.uid = delivery.destination_section_uid\n
) OR ( category.uid = delivery.source_section_uid\n ) OR ( category.uid = delivery.source_section_uid ) )\n
)\n AND section.portal_type = "Organisation"\n
)\n AND section.uid = category.uid\n
AND category.category_uid =\n AND category.category_uid =\n
<dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
</dtml-if>\n </dtml-if>\n
......
444 445
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment