Skip to content

erp5
erp5
Commit 3bb7cfc7 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@6389 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 83c8771d
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 38 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_zGetAccountingTransactionList.xml
View file @ 3bb7cfc7
...@@ -92,6 +92,17 @@ ...@@ -92,6 +92,17 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>portal_type</string> </key>
<value>
<dictionary>
<item>
<key> <string>type</string> </key>
<value> <string>list</string> </value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>query</string> </key> <key> <string>query</string> </key>
<value> <value>
...@@ -110,19 +121,13 @@ ...@@ -110,19 +121,13 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>stat</string> </key> <key> <string>section_category</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>to_date</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>transaction_portal_type</string> </key> <key> <string>simulation_state</string> </key>
<value> <value>
<dictionary> <dictionary>
<item> <item>
...@@ -133,20 +138,15 @@ ...@@ -133,20 +138,15 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>transaction_section_category</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>
...@@ -164,9 +164,9 @@ ...@@ -164,9 +164,9 @@
<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>transaction_section_category</string> <string>section_category</string>
<string>transaction_portal_type</string> <string>portal_type</string>
<string>node_uid</string> <string>node_uid</string>
<string>hide_grouping</string> <string>hide_grouping</string>
<string>resource_uid</string> <string>resource_uid</string>
...@@ -201,9 +201,9 @@ resource_uid:list\r\n ...@@ -201,9 +201,9 @@ 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
transaction_section_category\r\n section_category\r\n
transaction_portal_type:list\r\n portal_type:list\r\n
node_uid:list\r\n node_uid:list\r\n
hide_grouping=""\r\n hide_grouping=""\r\n
resource_uid=""\r\n resource_uid=""\r\n
...@@ -304,9 +304,9 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n ...@@ -304,9 +304,9 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n
expr="getPortalObject().portal_categories.account_type.liability.payable.getUid()">\n expr="getPortalObject().portal_categories.account_type.liability.payable.getUid()">\n
)\n )\n
AND node_category.category_strict_membership = 1\n AND node_category.category_strict_membership = 1\n
<dtml-if transaction_portal_type>\n <dtml-if portal_type>\n
AND (\n AND (\n
<dtml-in transaction_portal_type>\n <dtml-in portal_type>\n
catalog.portal_type = <dtml-sqlvar sequence-item type="string">\n catalog.portal_type = <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
...@@ -345,17 +345,17 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n ...@@ -345,17 +345,17 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n
AND stock.total_price < 0\n AND stock.total_price < 0\n
</dtml-if>\n </dtml-if>\n
AND stock.total_price != 0\n AND stock.total_price != 0\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
)\n )\n
</dtml-if>\n </dtml-if>\n
<dtml-if transaction_section_category>\n <dtml-if section_category>\n
AND section_category.category_uid =\n AND section_category.category_uid =\n
<dtml-var expr="portal_categories.resolveCategory(transaction_section_category).getUid()">\n <dtml-var expr="portal_categories.resolveCategory(section_category).getUid()">\n
<dtml-else>\n <dtml-else>\n
AND section_category.category_strict_membership = 1\n AND section_category.category_strict_membership = 1\n
</dtml-if>\n </dtml-if>\n
...@@ -370,8 +370,7 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n ...@@ -370,8 +370,7 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n
GROUP BY catalog.uid, stock.node_uid\n GROUP BY catalog.uid, stock.node_uid\n
</dtml-unless>\n </dtml-unless>\n
ORDER BY stock.date, child.uid\n ORDER BY stock.date, child.uid\n
</dtml-if>\n </dtml-if>
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -466,9 +465,9 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n ...@@ -466,9 +465,9 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n
expr="getPortalObject().portal_categories.account_type.liability.payable.getUid()">\n expr="getPortalObject().portal_categories.account_type.liability.payable.getUid()">\n
)\n )\n
AND node_category.category_strict_membership = 1\n AND node_category.category_strict_membership = 1\n
<dtml-if transaction_portal_type>\n <dtml-if portal_type>\n
AND (\n AND (\n
<dtml-in transaction_portal_type>\n <dtml-in portal_type>\n
catalog.portal_type = <dtml-sqlvar sequence-item type="string">\n catalog.portal_type = <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
...@@ -507,17 +506,17 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n ...@@ -507,17 +506,17 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n
AND stock.total_price < 0\n AND stock.total_price < 0\n
</dtml-if>\n </dtml-if>\n
AND stock.total_price != 0\n AND stock.total_price != 0\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
)\n )\n
</dtml-if>\n </dtml-if>\n
<dtml-if transaction_section_category>\n <dtml-if section_category>\n
AND section_category.category_uid =\n AND section_category.category_uid =\n
<dtml-var expr="portal_categories.resolveCategory(transaction_section_category).getUid()">\n <dtml-var expr="portal_categories.resolveCategory(section_category).getUid()">\n
<dtml-else>\n <dtml-else>\n
AND section_category.category_strict_membership = 1\n AND section_category.category_strict_membership = 1\n
</dtml-if>\n </dtml-if>\n
...@@ -532,8 +531,7 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n ...@@ -532,8 +531,7 @@ WHERE stock.mirror_section_uid = <dtml-var getUid>\n
GROUP BY catalog.uid, stock.node_uid\n GROUP BY catalog.uid, stock.node_uid\n
</dtml-unless>\n </dtml-unless>\n
ORDER BY stock.date, child.uid\n ORDER BY stock.date, child.uid\n
</dtml-if>\n </dtml-if>
]]></string> </value> ]]></string> </value>
</item> </item>
......
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