From 32d9df0133979c6fc6e4bcbc3a74c6198a48dc69 Mon Sep 17 00:00:00 2001
From: Sebastien Robin <seb@nexedi.com>
Date: Wed, 1 Jun 2016 19:17:47 +0000
Subject: [PATCH] catalog/stock: avoid duplicate calls to
getInventoriatedQuantity and use better naming for variables
---
.../erp5_mysql_innodb/z_catalog_stock_list.sql | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.sql b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.sql
index f67d944688..7cc698c8b5 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.sql
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.sql
@@ -10,7 +10,8 @@ WHERE
<dtml-let row_list="[]" uid_dict="{}">
<dtml-in prefix="loop" expr="_.range(_.len(uid))">
<dtml-if "not(isInventoryMovement[loop_item]) and isMovement[loop_item] and getResourceUid[loop_item]">
- <dtml-in prefix="mov" expr="asMovementList[loop_item]" no_push_item>
+ <dtml-in prefix="movement" expr="asMovementList[loop_item]" no_push_item>
+ <dtml-let movement_item_quantity="movement_item.getInventoriatedQuantity() or 0">
<dtml-if "getDestinationUid[loop_item]">
<dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">
<dtml-call expr="row_list.append([
@@ -27,11 +28,11 @@ WHERE
getSourceSectionUid[loop_item],
getSourceUid[loop_item],
getResourceUid[loop_item],
- (mov_item.getInventoriatedQuantity() or 0),
+ movement_item_quantity,
isCancellationAmount[loop_item],
isAccountable[loop_item],
- mov_item.getStopDate(),
- mov_item.getStartDate(),
+ movement_item.getStopDate(),
+ movement_item.getStartDate(),
getDestinationInventoriatedTotalAssetPrice[loop_item],
getPortalType[loop_item],
getSimulationState[loop_item],
@@ -54,17 +55,18 @@ WHERE
getDestinationSectionUid[loop_item],
getDestinationUid[loop_item],
getResourceUid[loop_item],
- -(mov_item.getInventoriatedQuantity() or 0),
+ -movement_item_quantity,
isCancellationAmount[loop_item],
isAccountable[loop_item],
- mov_item.getStartDate(),
- mov_item.getStopDate(),
+ movement_item.getStartDate(),
+ movement_item.getStopDate(),
getSourceInventoriatedTotalAssetPrice[loop_item],
getPortalType[loop_item],
getSimulationState[loop_item],
getVariationText[loop_item],
getSubVariationText[loop_item]])">
</dtml-if>
+ </dtml-let>
</dtml-in>
</dtml-if>
</dtml-in>
--
2.30.9