2005-12-08 yo

* Fix the LEFT JOIN syntax in PaymentTransaction_zSelectMovement and SaleInvoiceTransaction_zSelectMovemen.

2005-12-06 yo
* Remove Resource_zGetInventory_old.
* Fix the LEFT JOIN in Account_zGetAccountingTransactionList.


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

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml

@@ -239,7 +239,11 @@ SELECT\n
   stock.quantity AS source_balance\n
 FROM\n
   movement,\n
-  stock,\n
+  stock\n
+  LEFT JOIN catalog AS destination_section \n
+      ON destination_section.uid = stock.mirror_section_uid\n
+        AND stock.node_uid = <dtml-var getUid>,\n
+\n
   catalog,\n
   catalog  AS transaction_line,\n
   catalog  AS transaction,\n
@@ -250,10 +254,6 @@ FROM\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
   <dtml-if where_expression>, category </dtml-if>\n
-\n
-  LEFT JOIN catalog AS destination_section \n
-      ON destination_section.uid = stock.mirror_section_uid\n
-        AND stock.node_uid = <dtml-var getUid>\n
 \n
 WHERE stock.node_uid = <dtml-var getUid>\n
   AND transaction_line.uid = stock.uid \n
@@ -362,7 +362,11 @@ SELECT\n
   stock.quantity AS source_balance\n
 FROM\n
   movement,\n
-  stock,\n
+  stock\n
+  LEFT JOIN catalog AS destination_section \n
+      ON destination_section.uid = stock.mirror_section_uid\n
+        AND stock.node_uid = <dtml-var getUid>,\n
+\n
   catalog,\n
   catalog  AS transaction_line,\n
   catalog  AS transaction,\n
@@ -373,10 +377,6 @@ FROM\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
   <dtml-if where_expression>, category </dtml-if>\n
-\n
-  LEFT JOIN catalog AS destination_section \n
-      ON destination_section.uid = stock.mirror_section_uid\n
-        AND stock.node_uid = <dtml-var getUid>\n
 \n
 WHERE stock.node_uid = <dtml-var getUid>\n
   AND transaction_line.uid = stock.uid \n

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml

@@ -149,17 +149,15 @@ FROM\n
   , catalog as grandparent\n
   , catalog as grandgrandparent\n
   , catalog as grandgrandgrandparent\n
-<dtml-in from_table_list> \n
-  , <dtml-var sequence-item> AS <dtml-var sequence-key>\n
+<dtml-in prefix="table" expr="from_table_list"> \n
+  <dtml-if expr="table_key != \'catalog\'">\n
+  , <dtml-var table_item> AS <dtml-var table_key>\n
+  </dtml-if>\n
 </dtml-in>\n
-   \n
-LEFT JOIN catalog AS base_category \n
-     ON base_category.relative_url = "delivery"\n
-     AND base_category.portal_type = "Base Category"\n
-LEFT JOIN category \n
-     ON catalog.uid=category.uid\n
-     AND base_category.uid=category.base_category_uid\n
-\n
+  , catalog\n
+  LEFT JOIN category \n
+    ON (catalog.uid = category.uid\n
+        AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
 WHERE\n
   1=1\n
   <dtml-if where_expression>\n
@@ -229,17 +227,15 @@ FROM\n
   , catalog as grandparent\n
   , catalog as grandgrandparent\n
   , catalog as grandgrandgrandparent\n
-<dtml-in from_table_list> \n
-  , <dtml-var sequence-item> AS <dtml-var sequence-key>\n
+<dtml-in prefix="table" expr="from_table_list"> \n
+  <dtml-if expr="table_key != \'catalog\'">\n
+  , <dtml-var table_item> AS <dtml-var table_key>\n
+  </dtml-if>\n
 </dtml-in>\n
-   \n
-LEFT JOIN catalog AS base_category \n
-     ON base_category.relative_url = "delivery"\n
-     AND base_category.portal_type = "Base Category"\n
-LEFT JOIN category \n
-     ON catalog.uid=category.uid\n
-     AND base_category.uid=category.base_category_uid\n
-\n
+  , catalog\n
+  LEFT JOIN category \n
+    ON (catalog.uid = category.uid\n
+        AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
 WHERE\n
   1=1\n
   <dtml-if where_expression>\n

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_zSelectMovement.xml

@@ -145,17 +145,15 @@ SELECT\n
 \n
 FROM\n
     movement\n
-<dtml-in from_table_list> \n
-  , <dtml-var sequence-item> AS <dtml-var sequence-key>\n
+<dtml-in prefix="table" expr="from_table_list"> \n
+  <dtml-if expr="table_key != \'catalog\'">\n
+  , <dtml-var table_item> AS <dtml-var table_key>\n
+  </dtml-if>\n
 </dtml-in>\n
-   \n
-LEFT JOIN catalog AS base_category \n
-     ON base_category.relative_url = "delivery"\n
-     AND base_category.portal_type = "Base Category"\n
-LEFT JOIN category \n
-     ON catalog.uid=category.uid\n
-     AND base_category.uid=category.base_category_uid\n
-\n
+  , catalog\n
+  LEFT JOIN category \n
+    ON (catalog.uid = category.uid\n
+        AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
 WHERE\n
   1=1\n
   <dtml-if where_expression>\n
@@ -217,17 +215,15 @@ SELECT\n
 \n
 FROM\n
     movement\n
-<dtml-in from_table_list> \n
-  , <dtml-var sequence-item> AS <dtml-var sequence-key>\n
+<dtml-in prefix="table" expr="from_table_list"> \n
+  <dtml-if expr="table_key != \'catalog\'">\n
+  , <dtml-var table_item> AS <dtml-var table_key>\n
+  </dtml-if>\n
 </dtml-in>\n
-   \n
-LEFT JOIN catalog AS base_category \n
-     ON base_category.relative_url = "delivery"\n
-     AND base_category.portal_type = "Base Category"\n
-LEFT JOIN category \n
-     ON catalog.uid=category.uid\n
-     AND base_category.uid=category.base_category_uid\n
-\n
+  , catalog\n
+  LEFT JOIN category \n
+    ON (catalog.uid = category.uid\n
+        AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n
 WHERE\n
   1=1\n
   <dtml-if where_expression>\n

bt5/erp5_accounting/bt/change_log

+2005-12-08 yo
+* Fix the LEFT JOIN syntax in PaymentTransaction_zSelectMovement and SaleInvoiceTransaction_zSelectMovemen.
+
+2005-12-06 yo
+* Remove Resource_zGetInventory_old.
+* Fix the LEFT JOIN in Account_zGetAccountingTransactionList.
+
 2005-11-30 yo
 * Use portal_preferences.getPreferredAccountingTransactionGap instead of getGap.