[Erp5-report] r37121 nicolas.dumazet - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/porta...

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Thu Jul 15 10:17:02 2010
New Revision: 37121

URL: http://svn.erp5.org?rev=37121&view=rev
Log:
Of course, JOIN on delivery should be a LEFT JOIN.

Thanks to tatuya for noticing!

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BusinessPath_zSelectBuildableMovementList.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BusinessPath_zSelectBuildableMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BusinessPath_zSelectBuildableMovementList.xml?rev=37121&r1=37120&r2=37121&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BusinessPath_zSelectBuildableMovementList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BusinessPath_zSelectBuildableMovementList.xml [utf8] Thu Jul 15 10:17:02 2010
@@ -86,7 +86,11 @@ SELECT\n
 FROM\n
     movement\n
   , catalog\n
-  , category as delivery\n
+  , LEFT JOIN category as delivery\n
+    ON (\n
+      catalog.uid = delivery.uid\n
+      AND <dtml-sqltest "portal_categories.delivery.getUid()" column="delivery.base_category_uid" type="int">\n
+    )\n
   , category as causality\n
 <dtml-in prefix="table" expr="from_table_list">\n
   <dtml-if expr="table_key not in (\'catalog\', \'movement\')">\n
@@ -95,9 +99,7 @@ FROM\n
 </dtml-in>\n
 \n
 WHERE\n
-  catalog.uid = delivery.uid\n
-  AND <dtml-sqltest "portal_categories.delivery.getUid()" column="delivery.base_category_uid" type="int">\n
-  AND delivery.category_uid is NULL\n
+  delivery.category_uid is NULL\n
 \n
   AND catalog.uid = causality.uid\n
   AND <dtml-sqltest "portal_categories.causality.getUid()" column="causality.base_category_uid" type="int">\n
@@ -106,8 +108,7 @@ WHERE\n
   AND catalog.uid = movement.uid\n
   AND movement.resource_uid is not NULL\n
 \n
-  <dtml-if where_expression>AND <dtml-var where_expression></dtml-if>\n
-
+  <dtml-if where_expression>AND <dtml-var where_expression></dtml-if>
 
 ]]></string> </value>
         </item>
@@ -156,7 +157,11 @@ SELECT\n
 FROM\n
     movement\n
   , catalog\n
-  , category as delivery\n
+  , LEFT JOIN category as delivery\n
+    ON (\n
+      catalog.uid = delivery.uid\n
+      AND <dtml-sqltest "portal_categories.delivery.getUid()" column="delivery.base_category_uid" type="int">\n
+    )\n
   , category as causality\n
 <dtml-in prefix="table" expr="from_table_list">\n
   <dtml-if expr="table_key not in (\'catalog\', \'movement\')">\n
@@ -165,9 +170,7 @@ FROM\n
 </dtml-in>\n
 \n
 WHERE\n
-  catalog.uid = delivery.uid\n
-  AND <dtml-sqltest "portal_categories.delivery.getUid()" column="delivery.base_category_uid" type="int">\n
-  AND delivery.category_uid is NULL\n
+  delivery.category_uid is NULL\n
 \n
   AND catalog.uid = causality.uid\n
   AND <dtml-sqltest "portal_categories.causality.getUid()" column="causality.base_category_uid" type="int">\n
@@ -176,8 +179,7 @@ WHERE\n
   AND catalog.uid = movement.uid\n
   AND movement.resource_uid is not NULL\n
 \n
-  <dtml-if where_expression>AND <dtml-var where_expression></dtml-if>\n
-
+  <dtml-if where_expression>AND <dtml-var where_expression></dtml-if>
 
 ]]></string> </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=37121&r1=37120&r2=37121&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Thu Jul 15 10:17:02 2010
@@ -1 +1 @@
-806
\ No newline at end of file
+807
\ No newline at end of file