diff --git a/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml b/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml index 6437bedd0405bdc93791c9e898f95cd82c4bbd32..320fe8bdb739875efa08fb4885928ad85ae587c1 100644 --- a/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml +++ b/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml @@ -173,6 +173,12 @@ <dictionary/> </value> </item> + <item> + <key> <string>isCancellationAmount</string> </key> + <value> + <dictionary/> + </value> + </item> <item> <key> <string>uid</string> </key> <value> @@ -194,6 +200,7 @@ <string>getSourceSectionUid</string> <string>getDestinationSectionUid</string> <string>isMovement</string> +<string>isCancellationAmount</string> <string>isInventoryMovement</string> <string>getSourcePaymentUid</string> <string>getDestinationPaymentUid</string> @@ -235,6 +242,7 @@ getDestinationUid\r\n getSourceSectionUid\r\n getDestinationSectionUid\r\n isMovement\r\n +isCancellationAmount\r\n isInventoryMovement\r\n getSourcePaymentUid\r\n getDestinationPaymentUid\r\n @@ -319,6 +327,7 @@ WHERE\n getSourceUid[loop_item],\n getResourceUid[loop_item],\n getInventoriatedQuantity[loop_item],\n + isCancellationAmount[loop_item],\n mov_item.getStopDate(),\n mov_item.getStartDate(),\n getDestinationInventoriatedTotalAssetPrice[loop_item],\n @@ -341,6 +350,7 @@ WHERE\n getDestinationUid[loop_item],\n getResourceUid[loop_item],\n -(getInventoriatedQuantity[loop_item] or 0),\n + isCancellationAmount[loop_item],\n mov_item.getStartDate(),\n mov_item.getStopDate(),\n getSourceInventoriatedTotalAssetPrice[loop_item],\n @@ -370,13 +380,14 @@ VALUES\n <dtml-sqlvar expr="row_item[8]" type="int" optional>,\n <dtml-sqlvar expr="row_item[9]" type="int">, \n <dtml-sqlvar expr="row_item[10]" type="float" optional>,\n - <dtml-sqlvar expr="row_item[11]" type="datetime" optional>,\n + <dtml-sqlvar expr="row_item[11]" type="int">, \n <dtml-sqlvar expr="row_item[12]" type="datetime" optional>,\n - <dtml-sqlvar expr="row_item[13]" type="float" optional>,\n - <dtml-sqlvar expr="row_item[14]" type="string" optional>,\n + <dtml-sqlvar expr="row_item[13]" type="datetime" optional>,\n + <dtml-sqlvar expr="row_item[14]" type="float" optional>,\n <dtml-sqlvar expr="row_item[15]" type="string" optional>,\n <dtml-sqlvar expr="row_item[16]" type="string" optional>,\n - <dtml-sqlvar expr="row_item[17]" type="string" optional>\n + <dtml-sqlvar expr="row_item[17]" type="string" optional>,\n + <dtml-sqlvar expr="row_item[18]" type="string" optional>\n )\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n </dtml-in>\n @@ -450,6 +461,7 @@ WHERE\n getSourceUid[loop_item],\n getResourceUid[loop_item],\n getInventoriatedQuantity[loop_item],\n + isCancellationAmount[loop_item],\n mov_item.getStopDate(),\n mov_item.getStartDate(),\n getDestinationInventoriatedTotalAssetPrice[loop_item],\n @@ -472,6 +484,7 @@ WHERE\n getDestinationUid[loop_item],\n getResourceUid[loop_item],\n -(getInventoriatedQuantity[loop_item] or 0),\n + isCancellationAmount[loop_item],\n mov_item.getStartDate(),\n mov_item.getStopDate(),\n getSourceInventoriatedTotalAssetPrice[loop_item],\n @@ -501,13 +514,14 @@ VALUES\n <dtml-sqlvar expr="row_item[8]" type="int" optional>,\n <dtml-sqlvar expr="row_item[9]" type="int">, \n <dtml-sqlvar expr="row_item[10]" type="float" optional>,\n - <dtml-sqlvar expr="row_item[11]" type="datetime" optional>,\n + <dtml-sqlvar expr="row_item[11]" type="int">, \n <dtml-sqlvar expr="row_item[12]" type="datetime" optional>,\n - <dtml-sqlvar expr="row_item[13]" type="float" optional>,\n - <dtml-sqlvar expr="row_item[14]" type="string" optional>,\n + <dtml-sqlvar expr="row_item[13]" type="datetime" optional>,\n + <dtml-sqlvar expr="row_item[14]" type="float" optional>,\n <dtml-sqlvar expr="row_item[15]" type="string" optional>,\n <dtml-sqlvar expr="row_item[16]" type="string" optional>,\n - <dtml-sqlvar expr="row_item[17]" type="string" optional>\n + <dtml-sqlvar expr="row_item[17]" type="string" optional>,\n + <dtml-sqlvar expr="row_item[18]" type="string" optional>\n )\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n </dtml-in>\n diff --git a/bt5/erp5_calendar/bt/revision b/bt5/erp5_calendar/bt/revision index b2786cdcdc01d7ec1c11b9d3bcfb793bf3a81643..52f6c1a7a0e6648b65c77f6cfff32f6b5034ee55 100644 --- a/bt5/erp5_calendar/bt/revision +++ b/bt5/erp5_calendar/bt/revision @@ -1 +1 @@ -351 \ No newline at end of file +352 \ No newline at end of file