[Erp5-report] r6417 - /erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_ac...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Mar 31 18:52:52 CEST 2006
Author: kevin
Date: Fri Mar 31 18:52:50 2006
New Revision: 6417
URL: http://svn.erp5.org?rev=6417&view=rev
Log:
Remove suffix "transaction_" of query parameters to prepare the full migration of accouting stuff to getInventory API.
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_zGetAccountingTransactionList.xml
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml?rev=6417&r1=6416&r2=6417&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml Fri Mar 31 18:52:50 2006
@@ -106,6 +106,12 @@
</value>
</item>
<item>
+ <key> <string>section_category</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
<key> <string>selection</string> </key>
<value>
<dictionary/>
@@ -124,19 +130,7 @@
</value>
</item>
<item>
- <key> <string>to_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>transaction_section_category</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>transaction_simulation_state</string> </key>
+ <key> <string>simulation_state</string> </key>
<value>
<dictionary>
<item>
@@ -144,6 +138,12 @@
<value> <string>list</string> </value>
</item>
</dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>to_date</string> </key>
+ <value>
+ <dictionary/>
</value>
</item>
<item>
@@ -170,8 +170,8 @@
<string>from_date</string>
<string>to_date</string>
<string>at_date</string>
-<string>transaction_simulation_state</string>
-<string>transaction_section_category</string>
+<string>simulation_state</string>
+<string>section_category</string>
<string>payment_uid</string>
<string>no_payment_uid</string>
<string>mirror_section_uid</string>
@@ -215,8 +215,8 @@
from_date\r\n
to_date\r\n
at_date\r\n
-transaction_simulation_state:list\r\n
-transaction_section_category\r\n
+simulation_state:list\r\n
+section_category\r\n
payment_uid\r\n
no_payment_uid\r\n
mirror_section_uid\r\n
@@ -332,9 +332,9 @@
<dtml-if no_mirror_section_uid>\n
AND stock.mirror_section_uid IS NULL\n
</dtml-if>\n
-<dtml-if transaction_simulation_state>\n
+<dtml-if simulation_state>\n
AND (\n
- <dtml-in transaction_simulation_state>\n
+ <dtml-in simulation_state>\n
transaction.simulation_state = <dtml-sqlvar sequence-item type="string">\n
<dtml-if sequence-end><dtml-else> OR </dtml-if>\n
</dtml-in>\n
@@ -344,9 +344,9 @@
AND transaction.simulation_state != \'draft\' \n
</dtml-if>\n
AND section.uid = stock.section_uid\n
-<dtml-if transaction_section_category>\n
+<dtml-if section_category>\n
AND section_c.relative_url = <dtml-sqlvar\n
- transaction_section_category type="string">\n
+ section_category type="string">\n
</dtml-if>\n
AND section_membership.category_uid = section_c.uid\n
AND section_membership.base_category_uid = section_bc.uid\n
@@ -475,9 +475,9 @@
<dtml-if no_mirror_section_uid>\n
AND stock.mirror_section_uid IS NULL\n
</dtml-if>\n
-<dtml-if transaction_simulation_state>\n
+<dtml-if simulation_state>\n
AND (\n
- <dtml-in transaction_simulation_state>\n
+ <dtml-in simulation_state>\n
transaction.simulation_state = <dtml-sqlvar sequence-item type="string">\n
<dtml-if sequence-end><dtml-else> OR </dtml-if>\n
</dtml-in>\n
@@ -487,9 +487,9 @@
AND transaction.simulation_state != \'draft\' \n
</dtml-if>\n
AND section.uid = stock.section_uid\n
-<dtml-if transaction_section_category>\n
+<dtml-if section_category>\n
AND section_c.relative_url = <dtml-sqlvar\n
- transaction_section_category type="string">\n
+ section_category type="string">\n
</dtml-if>\n
AND section_membership.category_uid = section_c.uid\n
AND section_membership.base_category_uid = section_bc.uid\n
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_zGetAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_zGetAccountingTransactionList.xml?rev=6417&r1=6416&r2=6417&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_zGetAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_zGetAccountingTransactionList.xml Fri Mar 31 18:52:50 2006
@@ -105,19 +105,7 @@
</value>
</item>
<item>
- <key> <string>stat</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>to_date</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>transaction_simulation_state</string> </key>
+ <key> <string>simulation_state</string> </key>
<value>
<dictionary>
<item>
@@ -125,6 +113,18 @@
<value> <string>list</string> </value>
</item>
</dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>stat</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>to_date</string> </key>
+ <value>
+ <dictionary/>
</value>
</item>
</dictionary>
@@ -143,7 +143,7 @@
<string>from_date</string>
<string>at_date</string>
<string>to_date</string>
-<string>transaction_simulation_state</string>
+<string>simulation_state</string>
<string>node_uid</string>
<string>stat</string>
</list>
@@ -177,7 +177,7 @@
from_date\r\n
at_date\r\n
to_date\r\n
-transaction_simulation_state:list\r\n
+simulation_state:list\r\n
node_uid:list\r\n
stat</string> </value>
</item>
@@ -291,9 +291,9 @@
<dtml-if omit_output>\n
AND stock.quantity < 0\n
</dtml-if>\n
-<dtml-if transaction_simulation_state>\n
- AND (\n
- <dtml-in transaction_simulation_state>\n
+<dtml-if simulation_state>\n
+ AND (\n
+ <dtml-in simulation_state>\n
catalog.simulation_state = <dtml-sqlvar sequence-item type="string">\n
<dtml-unless sequence-end> OR </dtml-unless>\n
</dtml-in>\n
@@ -418,9 +418,9 @@
<dtml-if omit_output>\n
AND stock.quantity < 0\n
</dtml-if>\n
-<dtml-if transaction_simulation_state>\n
- AND (\n
- <dtml-in transaction_simulation_state>\n
+<dtml-if simulation_state>\n
+ AND (\n
+ <dtml-in simulation_state>\n
catalog.simulation_state = <dtml-sqlvar sequence-item type="string">\n
<dtml-unless sequence-end> OR </dtml-unless>\n
</dtml-in>\n
More information about the Erp5-report
mailing list