Commit d08c3380 authored by Jérome Perrin's avatar Jérome Perrin

make sure we do not get movement multiple times when section category is not defined (from seb)


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5916 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent cd9f48d6
...@@ -156,21 +156,21 @@ ...@@ -156,21 +156,21 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>getUid</string> <string>getUid</string>
<string>query</string> <string>query</string>
<string>omit_input</string> <string>omit_input</string>
<string>omit_output</string> <string>omit_output</string>
<string>resource_uid</string>
<string>from_date</string>
<string>at_date</string>
<string>to_date</string>
<string>transaction_simulation_state</string>
<string>transaction_section_category</string>
<string>transaction_portal_type</string>
<string>node_uid</string>
<string>hide_grouping</string>
<string>resource_uid</string> <string>resource_uid</string>
<string>from_date</string> <string>stat</string>
<string>at_date</string>
<string>to_date</string>
<string>transaction_simulation_state</string>
<string>transaction_section_category</string>
<string>transaction_portal_type</string>
<string>node_uid</string>
<string>hide_grouping</string>
<string>resource_uid</string>
<string>stat</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -206,7 +206,7 @@ transaction_section_category\r\n ...@@ -206,7 +206,7 @@ transaction_section_category\r\n
transaction_portal_type:list\r\n transaction_portal_type:list\r\n
node_uid:list\r\n node_uid:list\r\n
hide_grouping=""\r\n hide_grouping=""\r\n
resource_uid=""\n resource_uid=""\r\n
stat</string> </value> stat</string> </value>
</item> </item>
<item> <item>
...@@ -356,6 +356,8 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n ...@@ -356,6 +356,8 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n
<dtml-if transaction_section_category>\n <dtml-if transaction_section_category>\n
AND section_category.category_uid =\n AND section_category.category_uid =\n
<dtml-var expr="portal_categories.resolveCategory(transaction_section_category).getUid()">\n <dtml-var expr="portal_categories.resolveCategory(transaction_section_category).getUid()">\n
<dtml-else>\n
AND section_category.category_strict_membership = 1\n
</dtml-if>\n </dtml-if>\n
<dtml-if hide_grouping>\n <dtml-if hide_grouping>\n
AND (child.grouping_reference IS NULL or child.grouping_reference = "")\n AND (child.grouping_reference IS NULL or child.grouping_reference = "")\n
...@@ -516,6 +518,8 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n ...@@ -516,6 +518,8 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n
<dtml-if transaction_section_category>\n <dtml-if transaction_section_category>\n
AND section_category.category_uid =\n AND section_category.category_uid =\n
<dtml-var expr="portal_categories.resolveCategory(transaction_section_category).getUid()">\n <dtml-var expr="portal_categories.resolveCategory(transaction_section_category).getUid()">\n
<dtml-else>\n
AND section_category.category_strict_membership = 1\n
</dtml-if>\n </dtml-if>\n
<dtml-if hide_grouping>\n <dtml-if hide_grouping>\n
AND (child.grouping_reference IS NULL or child.grouping_reference = "")\n AND (child.grouping_reference IS NULL or child.grouping_reference = "")\n
......
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