[Erp5-report] r27704 - in /erp5/trunk/bt5/erp5_calendar: CatalogMethodTemplateItem/portal_c...
nobody at svn.erp5.org
nobody at svn.erp5.org
Sat Jun 20 23:58:47 CEST 2009
Author: kazuhiko
Date: Sat Jun 20 23:58:46 2009
New Revision: 27704
URL: http://svn.erp5.org?rev=27704&view=rev
Log:
same as r.27694 (more support for isCancellationAmount).
Modified:
erp5/trunk/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml
erp5/trunk/bt5/erp5_calendar/bt/revision
Modified: erp5/trunk/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml?rev=27704&r1=27703&r2=27704&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_calendar/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.xml [utf8] Sat Jun 20 23:58:46 2009
@@ -169,6 +169,12 @@
</item>
<item>
<key> <string>isMovement</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>isCancellationAmount</string> </key>
<value>
<dictionary/>
</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 @@
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 @@
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 @@
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 @@
<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 @@
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 @@
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 @@
<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
Modified: erp5/trunk/bt5/erp5_calendar/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_calendar/bt/revision?rev=27704&r1=27703&r2=27704&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_calendar/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_calendar/bt/revision [utf8] Sat Jun 20 23:58:46 2009
@@ -1,1 +1,1 @@
-351
+352
More information about the Erp5-report
mailing list