2005-12-08 yo

* Fix the LEFT JOIN syntax in Resource_zGetInventory and Resource_zGetInventoryList.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4566 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml

@@ -198,11 +198,16 @@ SELECT\n
   MAX(stock.date) AS date\n
 \n
 FROM\n
-  <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
+  stock\n
+  LEFT JOIN catalog AS section ON (section.uid = stock.section_uid)\n
+<dtml-in prefix="table" expr="from_table_list"> \n
+  <dtml-if expr="table_key != \'stock\'">\n
+  , <dtml-var table_item> AS <dtml-var table_key>\n
+  </dtml-if>\n
+</dtml-in>\n
   <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
   , catalog as node, catalog as resource, movement as inventory_movement\n
-  LEFT JOIN catalog AS section ON (section.uid = stock.section_uid)\n
 \n
 WHERE\n
   1 = 1\n
@@ -332,11 +337,16 @@ SELECT\n
   MAX(stock.date) AS date\n
 \n
 FROM\n
-  <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
+  stock\n
+  LEFT JOIN catalog AS section ON (section.uid = stock.section_uid)\n
+<dtml-in prefix="table" expr="from_table_list"> \n
+  <dtml-if expr="table_key != \'stock\'">\n
+  , <dtml-var table_item> AS <dtml-var table_key>\n
+  </dtml-if>\n
+</dtml-in>\n
   <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
   , catalog as node, catalog as resource, movement as inventory_movement\n
-  LEFT JOIN catalog AS section ON (section.uid = stock.section_uid)\n
 \n
 WHERE\n
   1 = 1\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml

@@ -238,13 +238,16 @@ SELECT\n
   catalog.path as path\n
 \n
 FROM\n
-  <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key>\n
-     <dtml-if sequence-end><dtml-else>,</dtml-if>\n
-  </dtml-in>\n
+  stock\n
+  LEFT JOIN catalog AS section ON (section.uid = stock.section_uid)\n
+<dtml-in prefix="table" expr="from_table_list"> \n
+  <dtml-if expr="table_key != \'stock\'">\n
+  , <dtml-var table_item> AS <dtml-var table_key>\n
+  </dtml-if>\n
+</dtml-in>\n
   <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
   , catalog as node, catalog as resource, movement as inventory_movement\n
-  LEFT JOIN catalog AS section ON (section.uid = stock.section_uid)\n
 \n
 WHERE\n
   1 = 1\n
@@ -375,13 +378,16 @@ SELECT\n
   catalog.path as path\n
 \n
 FROM\n
-  <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key>\n
-     <dtml-if sequence-end><dtml-else>,</dtml-if>\n
-  </dtml-in>\n
+  stock\n
+  LEFT JOIN catalog AS section ON (section.uid = stock.section_uid)\n
+<dtml-in prefix="table" expr="from_table_list"> \n
+  <dtml-if expr="table_key != \'stock\'">\n
+  , <dtml-var table_item> AS <dtml-var table_key>\n
+  </dtml-if>\n
+</dtml-in>\n
   <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
   , catalog as node, catalog as resource, movement as inventory_movement\n
-  LEFT JOIN catalog AS section ON (section.uid = stock.section_uid)\n
 \n
 WHERE\n
   1 = 1\n

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml

@@ -104,23 +104,23 @@ cwYAAABvYmplY3RzCQAAAGdldFBvcnRhbGMBAAAAAwAAAAMAAAADAAAAcxoAAAB0AACIAABkAQCD
 AgBkAgCIAAAWfAAAgwIAUygDAAAATnMDAAAAbG9nczAAAABQcmVmZXJlbmNlV29ya2Zsb3cuZGlz
 YWJsZU90aGVyUHJlZmVyZW5jZXMgb24gJXMoAwAAAHMJAAAAX2dldGF0dHJfcwQAAABwcmVmcwMA
 AABtc2coAwAAAHMDAAAAbXNncwkAAABfZ2V0YXR0cl9zBAAAAHByZWYoAQAAAHMEAAAAcHJlZigA
-AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCgAAADxsYW1iZGEuMT4FAAAAcwAAAABzEgAAAHBvcnRh
-bF9wcmVmZXJlbmNlc3MMAAAAc2VhcmNoRm9sZGVycwQAAABzcGVjcw8AAABFUlA1IFByZWZlcmVu
-Y2VzCQAAAGdldE9iamVjdHMRAAAAcG9ydGFsX21lbWJlcnNoaXBzFgAAAGdldEF1dGhlbnRpY2F0
-ZWRNZW1iZXJzBwAAAGFsbG93ZWRzBQAAAE93bmVycwgAAABBc3NpZ25vcnMSAAAAZ2V0UHJlZmVy
-ZW5jZVN0YXRlcwcAAABlbmFibGVkcwsAAABnZXRQcmlvcml0eXMPAAAAcG9ydGFsX3dvcmtmbG93
-cwsAAABkb0FjdGlvbkZvcnMOAAAAZGlzYWJsZV9hY3Rpb25zBQAAAHdmX2lkcxMAAABwcmVmZXJl
-bmNlX3dvcmtmbG93cw4AAABEZWFjdGl2YXRlZCAlc3MMAAAAVW5hdXRob3JpemVkcx8AAABub3Qg
-YXV0aG9yaXplZCB0byBkZWFjdGl2YXRlICVzKAoAAABzHgAAAFByb2R1Y3RzLkRDV29ya2Zsb3cu
-RENXb3JrZmxvd3MQAAAAVmFsaWRhdGlvbkZhaWxlZHMJAAAAX2dldGF0dHJfcwMAAABzY2lzBAAA
-AHByZWZzBgAAAHBvcnRhbHMDAAAATE9HcwkAAABfZ2V0aXRlcl9zAQAAAHBzAQAAAGEoCgAAAHMD
-AAAAc2Npcx4AAABQcm9kdWN0cy5EQ1dvcmtmbG93LkRDV29ya2Zsb3dzEAAAAFZhbGlkYXRpb25G
-YWlsZWRzCQAAAF9nZXRhdHRyX3MEAAAAcHJlZnMGAAAAcG9ydGFscwMAAABMT0dzCQAAAF9nZXRp
-dGVyX3MBAAAAcHMBAAAAYSgAAAAAKAEAAABzBAAAAHByZWZzDwAAAFNjcmlwdCAoUHl0aG9uKXMX
-AAAAZGlzYWJsZU90aGVyUHJlZmVyZW5jZXMBAAAAcx4AAAANAg8BEgEMAysABgESAQwBKwEQARkB
-KAEfAxoBEAEoAQAAAHMXAAAAZGlzYWJsZU90aGVyUHJlZmVyZW5jZXMoAQAAAHMXAAAAZGlzYWJs
-ZU90aGVyUHJlZmVyZW5jZXMoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1
-bGU+AQAAAHMAAAAA</string> </value>
+AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCwAAADxsYW1iZGEuNzI+BQAAAHMAAAAAcxIAAABwb3J0
+YWxfcHJlZmVyZW5jZXNzDAAAAHNlYXJjaEZvbGRlcnMEAAAAc3BlY3MPAAAARVJQNSBQcmVmZXJl
+bmNlcwkAAABnZXRPYmplY3RzEQAAAHBvcnRhbF9tZW1iZXJzaGlwcxYAAABnZXRBdXRoZW50aWNh
+dGVkTWVtYmVycwcAAABhbGxvd2VkcwUAAABPd25lcnMIAAAAQXNzaWdub3JzEgAAAGdldFByZWZl
+cmVuY2VTdGF0ZXMHAAAAZW5hYmxlZHMLAAAAZ2V0UHJpb3JpdHlzDwAAAHBvcnRhbF93b3JrZmxv
+d3MLAAAAZG9BY3Rpb25Gb3JzDgAAAGRpc2FibGVfYWN0aW9ucwUAAAB3Zl9pZHMTAAAAcHJlZmVy
+ZW5jZV93b3JrZmxvd3MOAAAARGVhY3RpdmF0ZWQgJXNzDAAAAFVuYXV0aG9yaXplZHMfAAAAbm90
+IGF1dGhvcml6ZWQgdG8gZGVhY3RpdmF0ZSAlcygKAAAAcx4AAABQcm9kdWN0cy5EQ1dvcmtmbG93
+LkRDV29ya2Zsb3dzEAAAAFZhbGlkYXRpb25GYWlsZWRzCQAAAF9nZXRhdHRyX3MDAAAAc2NpcwQA
+AABwcmVmcwYAAABwb3J0YWxzAwAAAExPR3MJAAAAX2dldGl0ZXJfcwEAAABwcwEAAABhKAoAAABz
+AwAAAHNjaXMeAAAAUHJvZHVjdHMuRENXb3JrZmxvdy5EQ1dvcmtmbG93cxAAAABWYWxpZGF0aW9u
+RmFpbGVkcwkAAABfZ2V0YXR0cl9zBAAAAHByZWZzBgAAAHBvcnRhbHMDAAAATE9HcwkAAABfZ2V0
+aXRlcl9zAQAAAHBzAQAAAGEoAAAAACgBAAAAcwQAAABwcmVmcw8AAABTY3JpcHQgKFB5dGhvbilz
+FwAAAGRpc2FibGVPdGhlclByZWZlcmVuY2VzAQAAAHMeAAAADQIPARIBDAMrAAYBEgEMASsBEAEZ
+ASgBHwMaARABKAEAAABzFwAAAGRpc2FibGVPdGhlclByZWZlcmVuY2VzKAEAAABzFwAAAGRpc2Fi
+bGVPdGhlclByZWZlcmVuY2VzKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9k
+dWxlPgEAAABzAAAAAA==</string> </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>

product/ERP5/bootstrap/erp5_core/bt/change_log

+2005-12-08 yo
+* Fix the LEFT JOIN syntax in Resource_zGetInventory and Resource_zGetInventoryList.
+
 2005-12-08 Kevin
 * Transform tuple to list to let ERP5Type_asSecurityGroupId do a sort.