Skip to content

erp5
erp5
Commit 17c8cdee authored by Kevin Deldycke's avatar Kevin Deldycke
Browse files
Options

Remove suffix "transaction_" of query parameters to prepare the full migration... 

Remove suffix "transaction_" of query parameters to prepare the full migration of accouting stuff to getInventory API.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6417 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e6895ad2
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml
View file @ 17c8cdee
...@@ -106,37 +106,31 @@ ...@@ -106,37 +106,31 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>selection</string> </key> <key> <string>section_category</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>selection_domain</string> </key> <key> <string>selection</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>selection_report</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>to_date</string> </key> <key> <string>selection_domain</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>transaction_section_category</string> </key> <key> <string>selection_report</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>transaction_simulation_state</string> </key> <key> <string>simulation_state</string> </key>
<value> <value>
<dictionary> <dictionary>
<item> <item>
...@@ -146,6 +140,12 @@ ...@@ -146,6 +140,12 @@
</dictionary> </dictionary>
</value> </value>
</item> </item>
<item>
<key> <string>to_date</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>where_expression</string> </key> <key> <string>where_expression</string> </key>
<value> <value>
...@@ -170,8 +170,8 @@ ...@@ -170,8 +170,8 @@
<string>from_date</string> <string>from_date</string>
<string>to_date</string> <string>to_date</string>
<string>at_date</string> <string>at_date</string>
<string>transaction_simulation_state</string> <string>simulation_state</string>
<string>transaction_section_category</string> <string>section_category</string>
<string>payment_uid</string> <string>payment_uid</string>
<string>no_payment_uid</string> <string>no_payment_uid</string>
<string>mirror_section_uid</string> <string>mirror_section_uid</string>
...@@ -215,8 +215,8 @@ resource_uid:list\r\n ...@@ -215,8 +215,8 @@ resource_uid:list\r\n
from_date\r\n from_date\r\n
to_date\r\n to_date\r\n
at_date\r\n at_date\r\n
transaction_simulation_state:list\r\n simulation_state:list\r\n
transaction_section_category\r\n section_category\r\n
payment_uid\r\n payment_uid\r\n
no_payment_uid\r\n no_payment_uid\r\n
mirror_section_uid\r\n mirror_section_uid\r\n
...@@ -332,9 +332,9 @@ WHERE stock.node_uid = <dtml-var getUid>\n ...@@ -332,9 +332,9 @@ WHERE stock.node_uid = <dtml-var getUid>\n
<dtml-if no_mirror_section_uid>\n <dtml-if no_mirror_section_uid>\n
AND stock.mirror_section_uid IS NULL\n AND stock.mirror_section_uid IS NULL\n
</dtml-if>\n </dtml-if>\n
<dtml-if transaction_simulation_state>\n <dtml-if simulation_state>\n
AND (\n AND (\n
<dtml-in transaction_simulation_state>\n <dtml-in simulation_state>\n
transaction.simulation_state = <dtml-sqlvar sequence-item type="string">\n transaction.simulation_state = <dtml-sqlvar sequence-item type="string">\n
<dtml-if sequence-end><dtml-else> OR </dtml-if>\n <dtml-if sequence-end><dtml-else> OR </dtml-if>\n
</dtml-in>\n </dtml-in>\n
...@@ -344,9 +344,9 @@ WHERE stock.node_uid = <dtml-var getUid>\n ...@@ -344,9 +344,9 @@ WHERE stock.node_uid = <dtml-var getUid>\n
AND transaction.simulation_state != \'draft\' \n AND transaction.simulation_state != \'draft\' \n
</dtml-if>\n </dtml-if>\n
AND section.uid = stock.section_uid\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 AND section_c.relative_url = <dtml-sqlvar\n
transaction_section_category type="string">\n section_category type="string">\n
</dtml-if>\n </dtml-if>\n
AND section_membership.category_uid = section_c.uid\n AND section_membership.category_uid = section_c.uid\n
AND section_membership.base_category_uid = section_bc.uid\n AND section_membership.base_category_uid = section_bc.uid\n
...@@ -475,9 +475,9 @@ WHERE stock.node_uid = <dtml-var getUid>\n ...@@ -475,9 +475,9 @@ WHERE stock.node_uid = <dtml-var getUid>\n
<dtml-if no_mirror_section_uid>\n <dtml-if no_mirror_section_uid>\n
AND stock.mirror_section_uid IS NULL\n AND stock.mirror_section_uid IS NULL\n
</dtml-if>\n </dtml-if>\n
<dtml-if transaction_simulation_state>\n <dtml-if simulation_state>\n
AND (\n AND (\n
<dtml-in transaction_simulation_state>\n <dtml-in simulation_state>\n
transaction.simulation_state = <dtml-sqlvar sequence-item type="string">\n transaction.simulation_state = <dtml-sqlvar sequence-item type="string">\n
<dtml-if sequence-end><dtml-else> OR </dtml-if>\n <dtml-if sequence-end><dtml-else> OR </dtml-if>\n
</dtml-in>\n </dtml-in>\n
...@@ -487,9 +487,9 @@ WHERE stock.node_uid = <dtml-var getUid>\n ...@@ -487,9 +487,9 @@ WHERE stock.node_uid = <dtml-var getUid>\n
AND transaction.simulation_state != \'draft\' \n AND transaction.simulation_state != \'draft\' \n
</dtml-if>\n </dtml-if>\n
AND section.uid = stock.section_uid\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 AND section_c.relative_url = <dtml-sqlvar\n
transaction_section_category type="string">\n section_category type="string">\n
</dtml-if>\n </dtml-if>\n
AND section_membership.category_uid = section_c.uid\n AND section_membership.category_uid = section_c.uid\n
AND section_membership.base_category_uid = section_bc.uid\n AND section_membership.base_category_uid = section_bc.uid\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_zGetAccountingTransactionList.xml
View file @ 17c8cdee
...@@ -105,26 +105,26 @@ ...@@ -105,26 +105,26 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>stat</string> </key> <key> <string>simulation_state</string> </key>
<value> <value>
<dictionary/> <dictionary>
<item>
<key> <string>type</string> </key>
<value> <string>list</string> </value>
</item>
</dictionary>
</value> </value>
</item> </item>
<item> <item>
<key> <string>to_date</string> </key> <key> <string>stat</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>transaction_simulation_state</string> </key> <key> <string>to_date</string> </key>
<value> <value>
<dictionary> <dictionary/>
<item>
<key> <string>type</string> </key>
<value> <string>list</string> </value>
</item>
</dictionary>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<string>from_date</string> <string>from_date</string>
<string>at_date</string> <string>at_date</string>
<string>to_date</string> <string>to_date</string>
<string>transaction_simulation_state</string> <string>simulation_state</string>
<string>node_uid</string> <string>node_uid</string>
<string>stat</string> <string>stat</string>
</list> </list>
...@@ -177,7 +177,7 @@ resource_uid:list\r\n ...@@ -177,7 +177,7 @@ resource_uid:list\r\n
from_date\r\n from_date\r\n
at_date\r\n at_date\r\n
to_date\r\n to_date\r\n
transaction_simulation_state:list\r\n simulation_state:list\r\n
node_uid:list\r\n node_uid:list\r\n
stat</string> </value> stat</string> </value>
</item> </item>
...@@ -291,9 +291,9 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n ...@@ -291,9 +291,9 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n
<dtml-if omit_output>\n <dtml-if omit_output>\n
AND stock.quantity < 0\n AND stock.quantity < 0\n
</dtml-if>\n </dtml-if>\n
<dtml-if transaction_simulation_state>\n <dtml-if simulation_state>\n
AND (\n AND (\n
<dtml-in transaction_simulation_state>\n <dtml-in simulation_state>\n
catalog.simulation_state = <dtml-sqlvar sequence-item type="string">\n catalog.simulation_state = <dtml-sqlvar sequence-item type="string">\n
<dtml-unless sequence-end> OR </dtml-unless>\n <dtml-unless sequence-end> OR </dtml-unless>\n
</dtml-in>\n </dtml-in>\n
...@@ -418,9 +418,9 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n ...@@ -418,9 +418,9 @@ WHERE stock.section_uid = <dtml-var getParentUid>\n
<dtml-if omit_output>\n <dtml-if omit_output>\n
AND stock.quantity < 0\n AND stock.quantity < 0\n
</dtml-if>\n </dtml-if>\n
<dtml-if transaction_simulation_state>\n <dtml-if simulation_state>\n
AND (\n AND (\n
<dtml-in transaction_simulation_state>\n <dtml-in simulation_state>\n
catalog.simulation_state = <dtml-sqlvar sequence-item type="string">\n catalog.simulation_state = <dtml-sqlvar sequence-item type="string">\n
<dtml-unless sequence-end> OR </dtml-unless>\n <dtml-unless sequence-end> OR </dtml-unless>\n
</dtml-in>\n </dtml-in>\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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7