Commit 6422aaa8 authored by Aurel's avatar Aurel

update catalog method to take getBaobabDestination/SourceVaraitionTExt into account

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7187 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c208a638
...@@ -62,6 +62,12 @@ ...@@ -62,6 +62,12 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>getBaobabDestinationVariationText</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>getBaobabSourceFunctionUid</string> </key> <key> <string>getBaobabSourceFunctionUid</string> </key>
<value> <value>
...@@ -92,6 +98,12 @@ ...@@ -92,6 +98,12 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>getBaobabSourceVariationText</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>getDestinationInventoriatedTotalAssetPrice</string> </key> <key> <string>getDestinationInventoriatedTotalAssetPrice</string> </key>
<value> <value>
...@@ -146,12 +158,6 @@ ...@@ -146,12 +158,6 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>getVariationText</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>isAccountable</string> </key> <key> <string>isAccountable</string> </key>
<value> <value>
...@@ -198,7 +204,8 @@ ...@@ -198,7 +204,8 @@
<string>getStopDate</string> <string>getStopDate</string>
<string>isAccountable</string> <string>isAccountable</string>
<string>getPortalType</string> <string>getPortalType</string>
<string>getVariationText</string> <string>getBaobabDestinationVariationText</string>
<string>getBaobabSourceVariationText</string>
<string>getSubVariationText</string> <string>getSubVariationText</string>
</list> </list>
</value> </value>
...@@ -237,7 +244,8 @@ getStartDate\r\n ...@@ -237,7 +244,8 @@ getStartDate\r\n
getStopDate\r\n getStopDate\r\n
isAccountable\r\n isAccountable\r\n
getPortalType\r\n getPortalType\r\n
getVariationText\r\n getBaobabDestinationVariationText\r\n
getBaobabSourceVariationText\r\n
getSubVariationText</string> </value> getSubVariationText</string> </value>
</item> </item>
<item> <item>
...@@ -294,10 +302,10 @@ WHERE\n ...@@ -294,10 +302,10 @@ WHERE\n
<dtml-if "isAccountable[loop_item]">\n <dtml-if "isAccountable[loop_item]">\n
<dtml-if "getResourceUid[loop_item]">\n <dtml-if "getResourceUid[loop_item]">\n
<dtml-if "getBaobabDestinationUid[loop_item]">\n <dtml-if "getBaobabDestinationUid[loop_item]">\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabDestinationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationPaymentUid[loop_item], getBaobabDestinationFunctionUid[loop_item], getBaobabDestinationProjectUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourceUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStopDate[loop_item], getDestinationInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item],getSubVariationText[loop_item]])">\n <dtml-call expr="row_list.append([uid[loop_item], getBaobabDestinationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationPaymentUid[loop_item], getBaobabDestinationFunctionUid[loop_item], getBaobabDestinationProjectUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourceUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStopDate[loop_item], getDestinationInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabDestinationVariationText[loop_item],getSubVariationText[loop_item]])">\n
</dtml-if>\n </dtml-if>\n
<dtml-if "getBaobabSourceUid[loop_item]">\n <dtml-if "getBaobabSourceUid[loop_item]">\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourcePaymentUid[loop_item], getBaobabSourceFunctionUid[loop_item], getBaobabSourceProjectUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationUid[loop_item], getResourceUid[loop_item], -(getInventoriatedQuantity[loop_item] or 0), getStartDate[loop_item], getSourceInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item], getSubVariationText[loop_item]])">\n <dtml-call expr="row_list.append([uid[loop_item], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourcePaymentUid[loop_item], getBaobabSourceFunctionUid[loop_item], getBaobabSourceProjectUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationUid[loop_item], getResourceUid[loop_item], -(getInventoriatedQuantity[loop_item] or 0), getStartDate[loop_item], getSourceInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabSourceVariationText[loop_item], getSubVariationText[loop_item]])">\n
</dtml-if>\n </dtml-if>\n
</dtml-if>\n </dtml-if>\n
</dtml-if>\n </dtml-if>\n
...@@ -385,10 +393,10 @@ WHERE\n ...@@ -385,10 +393,10 @@ WHERE\n
<dtml-if "isAccountable[loop_item]">\n <dtml-if "isAccountable[loop_item]">\n
<dtml-if "getResourceUid[loop_item]">\n <dtml-if "getResourceUid[loop_item]">\n
<dtml-if "getBaobabDestinationUid[loop_item]">\n <dtml-if "getBaobabDestinationUid[loop_item]">\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabDestinationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationPaymentUid[loop_item], getBaobabDestinationFunctionUid[loop_item], getBaobabDestinationProjectUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourceUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStopDate[loop_item], getDestinationInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item],getSubVariationText[loop_item]])">\n <dtml-call expr="row_list.append([uid[loop_item], getBaobabDestinationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationPaymentUid[loop_item], getBaobabDestinationFunctionUid[loop_item], getBaobabDestinationProjectUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourceUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStopDate[loop_item], getDestinationInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabDestinationVariationText[loop_item],getSubVariationText[loop_item]])">\n
</dtml-if>\n </dtml-if>\n
<dtml-if "getBaobabSourceUid[loop_item]">\n <dtml-if "getBaobabSourceUid[loop_item]">\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourcePaymentUid[loop_item], getBaobabSourceFunctionUid[loop_item], getBaobabSourceProjectUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationUid[loop_item], getResourceUid[loop_item], -(getInventoriatedQuantity[loop_item] or 0), getStartDate[loop_item], getSourceInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item], getSubVariationText[loop_item]])">\n <dtml-call expr="row_list.append([uid[loop_item], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourcePaymentUid[loop_item], getBaobabSourceFunctionUid[loop_item], getBaobabSourceProjectUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationUid[loop_item], getResourceUid[loop_item], -(getInventoriatedQuantity[loop_item] or 0), getStartDate[loop_item], getSourceInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabSourceVariationText[loop_item], getSubVariationText[loop_item]])">\n
</dtml-if>\n </dtml-if>\n
</dtml-if>\n </dtml-if>\n
</dtml-if>\n </dtml-if>\n
......
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