[Erp5-report] r29095 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Sep 17 15:49:15 CEST 2009
Author: jerome
Date: Thu Sep 17 15:49:15 2009
New Revision: 29095
URL: http://svn.erp5.org?rev=29095&view=rev
Log:
* Base_zGetNotGroupedMovementList:
- support portal_type parameter
- node_uid must now be passed as a list. This is incompatible API change
* Account_getNotGroupedAccountingTransactionList:
- update for new Base_zGetNotGroupedMovementList API (and remove no longer applicable XXXs)
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml?rev=29095&r1=29094&r2=29095&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml [utf8] Thu Sep 17 15:49:15 2009
@@ -80,11 +80,7 @@
for brain in portal.Base_zGetNotGroupedMovementList(\n
at_date=from_date - 1, # this is not to_date\n
simulation_state=params[\'simulation_state\'],\n
- # XXX this adds a need for account\n
- # ie. impossible to produce this report only\n
- # for a mirror section and any nodes\n
- node_uid=kw[\'node_uid\'],\n
- # XXX must be a list in current Z SQL Method\n
+ node_uid=[kw[\'node_uid\']],\n
section_uid=params[\'section_uid\']):\n
\n
# manually filter out not interesting lines\n
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml?rev=29095&r1=29094&r2=29095&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml [utf8] Thu Sep 17 15:49:15 2009
@@ -40,12 +40,6 @@
<item>
<key> <string>node_uid</string> </key>
<value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>section_uid</string> </key>
- <value>
<dictionary>
<item>
<key> <string>type</string> </key>
@@ -55,7 +49,7 @@
</value>
</item>
<item>
- <key> <string>simulation_state</string> </key>
+ <key> <string>portal_type</string> </key>
<value>
<dictionary>
<item>
@@ -65,6 +59,28 @@
</dictionary>
</value>
</item>
+ <item>
+ <key> <string>section_uid</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>list</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>simulation_state</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>list</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
</dictionary>
</value>
</item>
@@ -75,6 +91,7 @@
<string>node_uid</string>
<string>section_uid</string>
<string>simulation_state</string>
+ <string>portal_type</string>
<string>at_date</string>
</list>
</value>
@@ -92,9 +109,10 @@
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>node_uid\r\n
+ <value> <string>node_uid:list\r\n
section_uid:list\r\n
simulation_state:list\r\n
+portal_type:list\r\n
at_date</string> </value>
</item>
<item>
@@ -156,11 +174,17 @@
FROM catalog, stock LEFT JOIN catalog AS mirror_section on \n
( stock.mirror_section_uid = mirror_section.uid )\n
\n
- WHERE stock.node_uid=<dtml-var node_uid> and\n
+ WHERE stock.node_uid in (<dtml-in node_uid><dtml-var sequence-item>\n
+ <dtml-unless sequence-end>, </dtml-unless></dtml-in>) and\n
<dtml-if simulation_state>\n
stock.simulation_state in (<dtml-in simulation_state>\n
<dtml-sqlvar sequence-item type="string">\n
<dtml-unless sequence-end>, </dtml-unless> </dtml-in simulation_state> ) and\n
+ </dtml-if>\n
+ <dtml-if portal_type>\n
+ stock.portal_type in (<dtml-in portal_type>\n
+ <dtml-sqlvar sequence-item type="string">\n
+ <dtml-unless sequence-end>, </dtml-unless> </dtml-in portal_type> ) and\n
</dtml-if>\n
<dtml-if section_uid>\n
stock.section_uid in (<dtml-in section_uid><dtml-var sequence-item>\n
@@ -182,11 +206,17 @@
catalog AS catalog, stock AS stock LEFT JOIN catalog AS mirror_section\n
ON ( stock.mirror_section_uid = mirror_section.uid )\n
\n
- WHERE stock.node_uid=<dtml-var node_uid> and\n
+ WHERE stock.node_uid in (<dtml-in node_uid><dtml-var sequence-item>\n
+ <dtml-unless sequence-end>, </dtml-unless></dtml-in>) and\n
<dtml-if simulation_state>\n
stock.simulation_state in (<dtml-in simulation_state>\n
<dtml-sqlvar sequence-item type="string">\n
<dtml-unless sequence-end>, </dtml-unless> </dtml-in simulation_state> ) and\n
+ </dtml-if>\n
+ <dtml-if portal_type>\n
+ stock.portal_type in (<dtml-in portal_type>\n
+ <dtml-sqlvar sequence-item type="string">\n
+ <dtml-unless sequence-end>, </dtml-unless> </dtml-in portal_type> ) and\n
</dtml-if>\n
<dtml-if section_uid>\n
stock.section_uid in (<dtml-in section_uid><dtml-var sequence-item>\n
@@ -268,11 +298,17 @@
FROM catalog, stock LEFT JOIN catalog AS mirror_section on \n
( stock.mirror_section_uid = mirror_section.uid )\n
\n
- WHERE stock.node_uid=<dtml-var node_uid> and\n
+ WHERE stock.node_uid in (<dtml-in node_uid><dtml-var sequence-item>\n
+ <dtml-unless sequence-end>, </dtml-unless></dtml-in>) and\n
<dtml-if simulation_state>\n
stock.simulation_state in (<dtml-in simulation_state>\n
<dtml-sqlvar sequence-item type="string">\n
<dtml-unless sequence-end>, </dtml-unless> </dtml-in simulation_state> ) and\n
+ </dtml-if>\n
+ <dtml-if portal_type>\n
+ stock.portal_type in (<dtml-in portal_type>\n
+ <dtml-sqlvar sequence-item type="string">\n
+ <dtml-unless sequence-end>, </dtml-unless> </dtml-in portal_type> ) and\n
</dtml-if>\n
<dtml-if section_uid>\n
stock.section_uid in (<dtml-in section_uid><dtml-var sequence-item>\n
@@ -294,11 +330,17 @@
catalog AS catalog, stock AS stock LEFT JOIN catalog AS mirror_section\n
ON ( stock.mirror_section_uid = mirror_section.uid )\n
\n
- WHERE stock.node_uid=<dtml-var node_uid> and\n
+ WHERE stock.node_uid in (<dtml-in node_uid><dtml-var sequence-item>\n
+ <dtml-unless sequence-end>, </dtml-unless></dtml-in>) and\n
<dtml-if simulation_state>\n
stock.simulation_state in (<dtml-in simulation_state>\n
<dtml-sqlvar sequence-item type="string">\n
<dtml-unless sequence-end>, </dtml-unless> </dtml-in simulation_state> ) and\n
+ </dtml-if>\n
+ <dtml-if portal_type>\n
+ stock.portal_type in (<dtml-in portal_type>\n
+ <dtml-sqlvar sequence-item type="string">\n
+ <dtml-unless sequence-end>, </dtml-unless> </dtml-in portal_type> ) and\n
</dtml-if>\n
<dtml-if section_uid>\n
stock.section_uid in (<dtml-in section_uid><dtml-var sequence-item>\n
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=29095&r1=29094&r2=29095&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Thu Sep 17 15:49:15 2009
@@ -1,1 +1,1 @@
-966
+967
More information about the Erp5-report
mailing list