Skip to content

erp5
erp5
Commit 5d6c8b60 authored by Nicolas Delaby's avatar Nicolas Delaby
Browse files
Options

Update z_catalog_stock_list to follow last updates from erp5_innodb_catalog 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19563 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4b8a92b3
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 162 deletions
bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml
View file @ 5d6c8b60
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="SQL" module="Products.ZSQLMethods.SQL"/>
<string>Products.ZSQLMethods.SQL</string> <tuple/>
<string>SQL</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -32,12 +29,6 @@ ...@@ -32,12 +29,6 @@
<key> <string>_data</string> </key> <key> <string>_data</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>asMovementList</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>getDestinationFunctionUid</string> </key> <key> <string>getDestinationFunctionUid</string> </key>
<value> <value>
...@@ -213,7 +204,6 @@ ...@@ -213,7 +204,6 @@
<string>getPortalType</string> <string>getPortalType</string>
<string>getVariationText</string> <string>getVariationText</string>
<string>getSubVariationText</string> <string>getSubVariationText</string>
<string>asMovementList</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -230,31 +220,30 @@ ...@@ -230,31 +220,30 @@
</item> </item>
<item> <item>
<key> <string>arguments_src</string> </key> <key> <string>arguments_src</string> </key>
<value> <string>uid\r\n <value> <string>uid\n
getResourceUid\r\n getResourceUid\n
getInventoriatedQuantity\r\n getInventoriatedQuantity\n
getSourceUid\r\n getSourceUid\n
getDestinationUid\r\n getDestinationUid\n
getSourceSectionUid\r\n getSourceSectionUid\n
getDestinationSectionUid\r\n getDestinationSectionUid\n
isMovement\r\n isMovement\n
isInventoryMovement\r\n isInventoryMovement\n
getSourcePaymentUid\r\n getSourcePaymentUid\n
getDestinationPaymentUid\r\n getDestinationPaymentUid\n
getSourceFunctionUid\r\n getSourceFunctionUid\n
getDestinationFunctionUid\r\n getDestinationFunctionUid\n
getSourceProjectUid\r\n getSourceProjectUid\n
getDestinationProjectUid\r\n getDestinationProjectUid\n
getSimulationState\r\n getSimulationState\n
getSourceInventoriatedTotalAssetPrice\r\n getSourceInventoriatedTotalAssetPrice\n
getDestinationInventoriatedTotalAssetPrice\r\n getDestinationInventoriatedTotalAssetPrice\n
getStartDate\r\n getStartDate\n
getStopDate\r\n getStopDate\n
isAccountable\r\n isAccountable\n
getPortalType\r\n getPortalType\n
getVariationText\r\n getVariationText\n
getSubVariationText\r\n getSubVariationText</string> </value>
asMovementList</string> </value>
</item> </item>
<item> <item>
<key> <string>cache_time_</string> </key> <key> <string>cache_time_</string> </key>
...@@ -304,61 +293,58 @@ WHERE\n ...@@ -304,61 +293,58 @@ WHERE\n
\n \n
<dtml-var "\'\\0\'">\n <dtml-var "\'\\0\'">\n
\n \n
<dtml-let row_list="[]">\n <dtml-let row_list="[]" uid_dict="{}">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
<dtml-if "isMovement[loop_item]">\n <dtml-if "not(isInventoryMovement[loop_item]) and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n
<dtml-if "not isInventoryMovement[loop_item]">\n <dtml-in prefix="mov" expr="asMovementList[loop_item]" no_push_item>\n
<dtml-if "isAccountable[loop_item]">\n <dtml-if "getDestinationUid[loop_item]">\n
<dtml-if "getResourceUid[loop_item]">\n <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
<dtml-in prefix="mov" expr="asMovementList[loop_item]" no_push_item>\n <dtml-call expr="row_list.append([\n
<dtml-if "getDestinationUid[loop_item]">\n uid[loop_item],\n
<dtml-call expr="row_list.append([\n uid_dict[uid[loop_item]],\n
uid[loop_item], \n getDestinationUid[loop_item],\n
getDestinationUid[loop_item],\n getDestinationSectionUid[loop_item],\n
getDestinationSectionUid[loop_item],\n getDestinationPaymentUid[loop_item],\n
getDestinationPaymentUid[loop_item],\n getDestinationFunctionUid[loop_item],\n
getDestinationFunctionUid[loop_item],\n getDestinationProjectUid[loop_item],\n
getDestinationProjectUid[loop_item], \n getSourceSectionUid[loop_item],\n
getSourceSectionUid[loop_item], \n getSourceUid[loop_item],\n
getSourceUid[loop_item], \n getResourceUid[loop_item],\n
getResourceUid[loop_item],\n getInventoriatedQuantity[loop_item],\n
getInventoriatedQuantity[loop_item],\n mov_item.getStopDate(),\n
mov_item.getStopDate(), \n mov_item.getStartDate(),\n
mov_item.getStartDate(), \n getDestinationInventoriatedTotalAssetPrice[loop_item],\n
getDestinationInventoriatedTotalAssetPrice[loop_item], \n getPortalType[loop_item],\n
getPortalType[loop_item], \n getSimulationState[loop_item],\n
getSimulationState[loop_item], \n getVariationText[loop_item],\n
getVariationText[loop_item],\n getSubVariationText[loop_item]])">\n
getSubVariationText[loop_item]])">\n </dtml-if>\n
</dtml-if>\n <dtml-if "getSourceUid[loop_item]">\n
<dtml-if "getSourceUid[loop_item]">\n <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
<dtml-call expr="row_list.append([\n <dtml-call expr="row_list.append([\n
uid[loop_item], \n uid[loop_item],\n
getSourceUid[loop_item],\n uid_dict[uid[loop_item]],\n
getSourceSectionUid[loop_item],\n getSourceUid[loop_item],\n
getSourcePaymentUid[loop_item],\n getSourceSectionUid[loop_item],\n
getSourceFunctionUid[loop_item],\n getSourcePaymentUid[loop_item],\n
getSourceProjectUid[loop_item], \n getSourceFunctionUid[loop_item],\n
getDestinationSectionUid[loop_item], \n getSourceProjectUid[loop_item],\n
getDestinationUid[loop_item], \n getDestinationSectionUid[loop_item],\n
getResourceUid[loop_item],\n getDestinationUid[loop_item],\n
-(getInventoriatedQuantity[loop_item] or 0), \n getResourceUid[loop_item],\n
mov_item.getStartDate(), \n -(getInventoriatedQuantity[loop_item] or 0),\n
mov_item.getStopDate(), \n mov_item.getStopDate(),\n
getSourceInventoriatedTotalAssetPrice[loop_item], \n mov_item.getStartDate(),\n
getPortalType[loop_item], \n getSourceInventoriatedTotalAssetPrice[loop_item],\n
getSimulationState[loop_item], \n getPortalType[loop_item],\n
getVariationText[loop_item],\n getSimulationState[loop_item],\n
getSubVariationText[loop_item]])">\n getVariationText[loop_item],\n
</dtml-if>\n getSubVariationText[loop_item]])">\n
</dtml-in>\n
\n
</dtml-if>\n </dtml-if>\n
</dtml-if>\n </dtml-in>\n
</dtml-if>\n
</dtml-if>\n </dtml-if>\n
</dtml-in> \n </dtml-in>\n
\n \n
<dtml-if "row_list">\n <dtml-if "row_list">\n
INSERT INTO\n INSERT INTO\n
stock\n stock\n
...@@ -366,22 +352,23 @@ VALUES\n ...@@ -366,22 +352,23 @@ VALUES\n
<dtml-in prefix="row" expr="row_list">\n <dtml-in prefix="row" expr="row_list">\n
(\n (\n
<dtml-sqlvar expr="row_item[0]" type="int">,\n <dtml-sqlvar expr="row_item[0]" type="int">,\n
<dtml-sqlvar expr="row_item[1]" type="int">, \n <dtml-sqlvar expr="row_item[1]" type="int">,\n
<dtml-sqlvar expr="row_item[2]" type="int" optional>, \n <dtml-sqlvar expr="row_item[2]" type="int">, \n
<dtml-sqlvar expr="row_item[3]" type="int" optional>, \n <dtml-sqlvar expr="row_item[3]" type="int" optional>, \n
<dtml-sqlvar expr="row_item[4]" type="int" optional>,\n <dtml-sqlvar expr="row_item[4]" type="int" optional>, \n
<dtml-sqlvar expr="row_item[5]" type="int" optional>,\n <dtml-sqlvar expr="row_item[5]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[6]" type="int" optional>,\n <dtml-sqlvar expr="row_item[6]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[7]" type="int" optional>,\n <dtml-sqlvar expr="row_item[7]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[8]" type="int">, \n <dtml-sqlvar expr="row_item[8]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[9]" type="float" optional>,\n <dtml-sqlvar expr="row_item[9]" type="int">, \n
<dtml-sqlvar expr="row_item[10]" type="datetime" optional>,\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="datetime" optional>,\n
<dtml-sqlvar expr="row_item[12]" type="float" optional>,\n <dtml-sqlvar expr="row_item[12]" type="datetime" optional>,\n
<dtml-sqlvar expr="row_item[13]" type="string" 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[14]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[15]" type="string" 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[16]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[17]" type="string" optional>\n
)\n )\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n </dtml-in>\n
...@@ -396,9 +383,11 @@ VALUES\n ...@@ -396,9 +383,11 @@ VALUES\n
<value> <value>
<object> <object>
<klass> <klass>
<global name="SQL" module="Shared.DC.ZRDB.DA"/> <global name="__newobj__" module="copy_reg"/>
</klass> </klass>
<none/> <tuple>
<global name="SQL" module="Shared.DC.ZRDB.DA"/>
</tuple>
<state> <state>
<dictionary> <dictionary>
<item> <item>
...@@ -435,61 +424,58 @@ WHERE\n ...@@ -435,61 +424,58 @@ WHERE\n
\n \n
<dtml-var "\'\\0\'">\n <dtml-var "\'\\0\'">\n
\n \n
<dtml-let row_list="[]">\n <dtml-let row_list="[]" uid_dict="{}">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
<dtml-if "isMovement[loop_item]">\n <dtml-if "not(isInventoryMovement[loop_item]) and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n
<dtml-if "not isInventoryMovement[loop_item]">\n <dtml-in prefix="mov" expr="asMovementList[loop_item]" no_push_item>\n
<dtml-if "isAccountable[loop_item]">\n <dtml-if "getDestinationUid[loop_item]">\n
<dtml-if "getResourceUid[loop_item]">\n <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
<dtml-in prefix="mov" expr="asMovementList[loop_item]" no_push_item>\n <dtml-call expr="row_list.append([\n
<dtml-if "getDestinationUid[loop_item]">\n uid[loop_item],\n
<dtml-call expr="row_list.append([\n uid_dict[uid[loop_item]],\n
uid[loop_item], \n getDestinationUid[loop_item],\n
getDestinationUid[loop_item],\n getDestinationSectionUid[loop_item],\n
getDestinationSectionUid[loop_item],\n getDestinationPaymentUid[loop_item],\n
getDestinationPaymentUid[loop_item],\n getDestinationFunctionUid[loop_item],\n
getDestinationFunctionUid[loop_item],\n getDestinationProjectUid[loop_item],\n
getDestinationProjectUid[loop_item], \n getSourceSectionUid[loop_item],\n
getSourceSectionUid[loop_item], \n getSourceUid[loop_item],\n
getSourceUid[loop_item], \n getResourceUid[loop_item],\n
getResourceUid[loop_item],\n getInventoriatedQuantity[loop_item],\n
getInventoriatedQuantity[loop_item],\n mov_item.getStopDate(),\n
mov_item.getStopDate(), \n mov_item.getStartDate(),\n
mov_item.getStartDate(), \n getDestinationInventoriatedTotalAssetPrice[loop_item],\n
getDestinationInventoriatedTotalAssetPrice[loop_item], \n getPortalType[loop_item],\n
getPortalType[loop_item], \n getSimulationState[loop_item],\n
getSimulationState[loop_item], \n getVariationText[loop_item],\n
getVariationText[loop_item],\n getSubVariationText[loop_item]])">\n
getSubVariationText[loop_item]])">\n </dtml-if>\n
</dtml-if>\n <dtml-if "getSourceUid[loop_item]">\n
<dtml-if "getSourceUid[loop_item]">\n <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
<dtml-call expr="row_list.append([\n <dtml-call expr="row_list.append([\n
uid[loop_item], \n uid[loop_item],\n
getSourceUid[loop_item],\n uid_dict[uid[loop_item]],\n
getSourceSectionUid[loop_item],\n getSourceUid[loop_item],\n
getSourcePaymentUid[loop_item],\n getSourceSectionUid[loop_item],\n
getSourceFunctionUid[loop_item],\n getSourcePaymentUid[loop_item],\n
getSourceProjectUid[loop_item], \n getSourceFunctionUid[loop_item],\n
getDestinationSectionUid[loop_item], \n getSourceProjectUid[loop_item],\n
getDestinationUid[loop_item], \n getDestinationSectionUid[loop_item],\n
getResourceUid[loop_item],\n getDestinationUid[loop_item],\n
-(getInventoriatedQuantity[loop_item] or 0), \n getResourceUid[loop_item],\n
mov_item.getStartDate(), \n -(getInventoriatedQuantity[loop_item] or 0),\n
mov_item.getStopDate(), \n mov_item.getStopDate(),\n
getSourceInventoriatedTotalAssetPrice[loop_item], \n mov_item.getStartDate(),\n
getPortalType[loop_item], \n getSourceInventoriatedTotalAssetPrice[loop_item],\n
getSimulationState[loop_item], \n getPortalType[loop_item],\n
getVariationText[loop_item],\n getSimulationState[loop_item],\n
getSubVariationText[loop_item]])">\n getVariationText[loop_item],\n
</dtml-if>\n getSubVariationText[loop_item]])">\n
</dtml-in>\n
\n
</dtml-if>\n </dtml-if>\n
</dtml-if>\n </dtml-in>\n
</dtml-if>\n
</dtml-if>\n </dtml-if>\n
</dtml-in> \n </dtml-in>\n
\n \n
<dtml-if "row_list">\n <dtml-if "row_list">\n
INSERT INTO\n INSERT INTO\n
stock\n stock\n
...@@ -497,22 +483,23 @@ VALUES\n ...@@ -497,22 +483,23 @@ VALUES\n
<dtml-in prefix="row" expr="row_list">\n <dtml-in prefix="row" expr="row_list">\n
(\n (\n
<dtml-sqlvar expr="row_item[0]" type="int">,\n <dtml-sqlvar expr="row_item[0]" type="int">,\n
<dtml-sqlvar expr="row_item[1]" type="int">, \n <dtml-sqlvar expr="row_item[1]" type="int">,\n
<dtml-sqlvar expr="row_item[2]" type="int" optional>, \n <dtml-sqlvar expr="row_item[2]" type="int">, \n
<dtml-sqlvar expr="row_item[3]" type="int" optional>, \n <dtml-sqlvar expr="row_item[3]" type="int" optional>, \n
<dtml-sqlvar expr="row_item[4]" type="int" optional>,\n <dtml-sqlvar expr="row_item[4]" type="int" optional>, \n
<dtml-sqlvar expr="row_item[5]" type="int" optional>,\n <dtml-sqlvar expr="row_item[5]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[6]" type="int" optional>,\n <dtml-sqlvar expr="row_item[6]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[7]" type="int" optional>,\n <dtml-sqlvar expr="row_item[7]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[8]" type="int">, \n <dtml-sqlvar expr="row_item[8]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[9]" type="float" optional>,\n <dtml-sqlvar expr="row_item[9]" type="int">, \n
<dtml-sqlvar expr="row_item[10]" type="datetime" optional>,\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="datetime" optional>,\n
<dtml-sqlvar expr="row_item[12]" type="float" optional>,\n <dtml-sqlvar expr="row_item[12]" type="datetime" optional>,\n
<dtml-sqlvar expr="row_item[13]" type="string" 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[14]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[15]" type="string" 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[16]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[17]" type="string" optional>\n
)\n )\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n </dtml-in>\n
......
bt5/erp5_calendar/bt/revision
View file @ 5d6c8b60
308 309
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7