Commit 701c496e authored by Vincent Pelletier's avatar Vincent Pelletier

erp5_free_subscription: Fix related key section order.

Sections must be in table order: table_0 and table_1 in first section, then
table_3, then table_4 and query_table must be in last query section.
parent e27fece4
...@@ -3,20 +3,20 @@ AND <dtml-var table_1>.uid = <dtml-var table_0>.uid ...@@ -3,20 +3,20 @@ AND <dtml-var table_1>.uid = <dtml-var table_0>.uid
AND <dtml-var table_1>.portal_type = 'Free Subscription' AND <dtml-var table_1>.portal_type = 'Free Subscription'
AND <dtml-var table_1>.validation_state = 'validated' AND <dtml-var table_1>.validation_state = 'validated'
<dtml-var RELATED_QUERY_SEPARATOR>
<dtml-var table_0>.category_uid = <dtml-var query_table>.uid
<dtml-var RELATED_QUERY_SEPARATOR> <dtml-var RELATED_QUERY_SEPARATOR>
<dtml-var table_0>.uid = <dtml-var table_2>.uid <dtml-var table_0>.uid = <dtml-var table_2>.uid
AND <dtml-var table_2>.base_category_uid = <dtml-var "portal_categories.resource.getUid()"> AND <dtml-var table_2>.base_category_uid = <dtml-var "portal_categories.resource.getUid()">
<dtml-var RELATED_QUERY_SEPARATOR>
<dtml-var table_2>.category_uid = <dtml-var table_4>.uid
AND <dtml-var table_4>.portal_type = 'Service'
<dtml-var RELATED_QUERY_SEPARATOR> <dtml-var RELATED_QUERY_SEPARATOR>
<dtml-var table_3>.uid = <dtml-var table_1>.uid <dtml-var table_3>.uid = <dtml-var table_1>.uid
<dtml-let now="DateTime()"> <dtml-let now="DateTime()">
AND ( <dtml-var table_3>.effective_date is NULL OR <dtml-var table_3>.effective_date <= <dtml-sqlvar now type="datetime"> ) AND ( <dtml-var table_3>.effective_date is NULL OR <dtml-var table_3>.effective_date <= <dtml-sqlvar now type="datetime"> )
AND ( <dtml-var table_3>.expiration_date is NULL OR <dtml-var table_3>.expiration_date >= <dtml-sqlvar now type="datetime"> ) AND ( <dtml-var table_3>.expiration_date is NULL OR <dtml-var table_3>.expiration_date >= <dtml-sqlvar now type="datetime"> )
</dtml-let> </dtml-let>
<dtml-var RELATED_QUERY_SEPARATOR>
<dtml-var table_2>.category_uid = <dtml-var table_4>.uid
AND <dtml-var table_4>.portal_type = 'Service'
<dtml-var RELATED_QUERY_SEPARATOR>
<dtml-var table_0>.category_uid = <dtml-var query_table>.uid
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