Skip to content

erp5
erp5
Commit d240d593 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

fix field group namings in AccountingPeriod_view 

minor optimisation on AccountingTransactionModule_zGetAccountingTransactionList
Prevent IndexError in AccountingTransactionModule_getSourceDebit/Credit



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9194 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 635b1d45
Show whitespace changes
Inline Side-by-side
Showing with 221 additions and 168 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingPeriod_view.xml
View file @ d240d593
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<key> <string>group_list</string> </key> <key> <string>group_list</string> </key>
<value> <value>
<list> <list>
<string>Default</string> <string>left</string>
<string>right</string> <string>right</string>
<string>center</string> <string>center</string>
</list> </list>
...@@ -72,20 +72,20 @@ ...@@ -72,20 +72,20 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>Default</string> </key> <key> <string>center</string> </key>
<value> <value>
<list> <list>
<string>my_title</string> <string>my_description</string>
<string>my_start_date</string>
<string>my_stop_date</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>center</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>my_description</string> <string>my_title</string>
<string>my_start_date</string>
<string>my_stop_date</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceCredit.xml
View file @ d240d593
...@@ -69,18 +69,21 @@ ...@@ -69,18 +69,21 @@
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>if selection is not None:\n <value> <string>if selection is not None:\n
params = selection.getParams()\n params.update(selection.getParams())\n
else:\n
params = {}\n
kw = {}\n kw = {}\n
kw[\'section_category\'] = params.get(\'section_category\')\n kw[\'section_category\'] = params.get(\'section_category\')\n
kw[\'stat\'] = 1\n kw[\'stat\'] = 1\n
kw[\'omit_input\'] = 1\n kw[\'omit_input\'] = 1\n
kw[\'transaction\'] = context.getUid()\n kw[\'transaction_uid\'] = context.getUid()\n
\n \n
result = context.AccountingTransactionModule_zGetAccountingTransactionList(selection=selection, selection_params=kw, **kw)\n result = context.AccountingTransactionModule_zGetAccountingTransactionList(\n
row = result[0]\n selection=selection, selection_params=kw, **kw)\n
return float(\'%.02f\' % (row.total_price and - row.total_price or 0.0))\n \n
if result:\n
row = result[0]\n
# FIXME: No rounding should be done here\n
return float(\'%.02f\' % (row.total_price and - row.total_price or 0.0))\n
return 0.\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -103,7 +106,7 @@ return float(\'%.02f\' % (row.total_price and - row.total_price or 0.0))\n ...@@ -103,7 +106,7 @@ return float(\'%.02f\' % (row.total_price and - row.total_price or 0.0))\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>brain=None, selection=None, **kw</string> </value> <value> <string>brain=None, selection=None, **params</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -131,10 +134,10 @@ return float(\'%.02f\' % (row.total_price and - row.total_price or 0.0))\n ...@@ -131,10 +134,10 @@ return float(\'%.02f\' % (row.total_price and - row.total_price or 0.0))\n
<tuple> <tuple>
<string>brain</string> <string>brain</string>
<string>selection</string> <string>selection</string>
<string>kw</string> <string>params</string>
<string>None</string> <string>None</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>params</string> <string>kw</string>
<string>_write_</string> <string>_write_</string>
<string>context</string> <string>context</string>
<string>_apply_</string> <string>_apply_</string>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceDebit.xml
View file @ d240d593
...@@ -69,18 +69,20 @@ ...@@ -69,18 +69,20 @@
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>if selection is not None:\n <value> <string>if selection is not None:\n
params = selection.getParams()\n params.update(selection.getParams())\n
else:\n kw = {}\n
params = {}\n
kw = {} \n
kw[\'section_category\'] = params.get(\'section_category\')\n kw[\'section_category\'] = params.get(\'section_category\')\n
kw[\'stat\'] = 1\n kw[\'stat\'] = 1\n
kw[\'omit_output\'] = 1\n kw[\'omit_output\'] = 1\n
kw[\'transaction\'] = context.getUid()\n kw[\'transaction_uid\'] = context.getUid()\n
\n \n
result = context.AccountingTransactionModule_zGetAccountingTransactionList(selection=selection, **kw)\n result = context.AccountingTransactionModule_zGetAccountingTransactionList(\n
row = result[0]\n selection=selection, selection_params=kw, **kw)\n
return float(\'%.02f\' % (row.total_price or 0.0))\n if result:\n
row = result[0]\n
# FIXME: No rounding should be done here\n
return float(\'%.02f\' % (row.total_price or 0.0))\n
return 0.\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -103,7 +105,7 @@ return float(\'%.02f\' % (row.total_price or 0.0))\n ...@@ -103,7 +105,7 @@ return float(\'%.02f\' % (row.total_price or 0.0))\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>brain=None, selection=None, **kw</string> </value> <value> <string>brain=None, selection=None, **params</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -131,10 +133,10 @@ return float(\'%.02f\' % (row.total_price or 0.0))\n ...@@ -131,10 +133,10 @@ return float(\'%.02f\' % (row.total_price or 0.0))\n
<tuple> <tuple>
<string>brain</string> <string>brain</string>
<string>selection</string> <string>selection</string>
<string>kw</string> <string>params</string>
<string>None</string> <string>None</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>params</string> <string>kw</string>
<string>_write_</string> <string>_write_</string>
<string>context</string> <string>context</string>
<string>_apply_</string> <string>_apply_</string>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml
View file @ d240d593
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>transaction</string> </key> <key> <string>transaction_uid</string> </key>
<value> <value>
<dictionary> <dictionary>
<item> <item>
...@@ -281,30 +281,30 @@ ...@@ -281,30 +281,30 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>selection</string> <string>selection</string>
<string>selection_domain</string> <string>selection_domain</string>
<string>selection_report</string> <string>selection_report</string>
<string>selection_params</string> <string>selection_params</string>
<string>selection_sort_on</string> <string>selection_sort_on</string>
<string>select_expression</string> <string>select_expression</string>
<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>node</string> <string>node</string>
<string>resource</string> <string>resource</string>
<string>entity</string> <string>entity</string>
<string>stat</string> <string>stat</string>
<string>omit_input</string> <string>omit_input</string>
<string>omit_output</string> <string>omit_output</string>
<string>amount</string> <string>amount</string>
<string>amount_range_min</string> <string>amount_range_min</string>
<string>amount_range_max</string> <string>amount_range_max</string>
<string>creation_date_range_min</string> <string>creation_date_range_min</string>
<string>creation_date_range_max</string> <string>creation_date_range_max</string>
<string>section_category</string> <string>section_category</string>
<string>count</string> <string>count</string>
<string>transaction</string> <string>transaction_uid</string>
<string>specific_reference</string> <string>specific_reference</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -349,7 +349,7 @@ creation_date_range_min=""\r\n ...@@ -349,7 +349,7 @@ creation_date_range_min=""\r\n
creation_date_range_max=""\r\n creation_date_range_max=""\r\n
section_category=""\r\n section_category=""\r\n
count=""\r\n count=""\r\n
transaction=""\r\n transaction_uid=""\r\n
specific_reference</string> </value> specific_reference</string> </value>
</item> </item>
<item> <item>
...@@ -390,12 +390,12 @@ specific_reference</string> </value> ...@@ -390,12 +390,12 @@ specific_reference</string> </value>
<key> <string>src</string> </key> <key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<dtml-let params="selection and selection.getParams() or selection_params">\n <dtml-let allowed_roles_and_users="portal_catalog.getAllowedRolesAndUsers(**selection_params)">\n
<dtml-let allowed_roles_and_users="portal_catalog.getAllowedRolesAndUsers(**params)">\n
<dtml-comment>do something to have a query without RolesAndUsers security for global stats</dtml-comment>\n <dtml-comment>do something to have a query without RolesAndUsers security for global stats</dtml-comment>\n
<dtml-let query="(stat) and portal_catalog.buildSQLQuery(**params) or portal_catalog.buildSQLQuery(allowedRolesAndUsers=allowed_roles_and_users, **params)">\n <dtml-let query="(stat) and portal_catalog.buildSQLQuery(**selection_params) or\n
portal_catalog.buildSQLQuery(allowedRolesAndUsers=allowed_roles_and_users, **selection_params)">\n
\n \n
<dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max or section_category or entity">\n <dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max">\n
\n \n
SELECT\n SELECT\n
<dtml-if stat>\n <dtml-if stat>\n
...@@ -404,15 +404,11 @@ SELECT\n ...@@ -404,15 +404,11 @@ SELECT\n
COUNT(DISTINCT catalog.uid) AS count\n COUNT(DISTINCT catalog.uid) AS count\n
<dtml-else>\n <dtml-else>\n
DISTINCT\n DISTINCT\n
<dtml-if section_category>\n <dtml-in "portal_catalog.getCatalogSearchResultKeys()">\n
IF(category.uid = delivery.source_section_uid,\n <dtml-unless sequence-start>,</dtml-unless>\n
catalog.source_reference,\n <dtml-var sequence-item>\n
catalog.destination_reference) AS specific_reference,\n </dtml-in>\n
<dtml-else>\n <dtml-if select_expression><dtml-var select_expression> </dtml-if>\n
\'???\' AS specific_reference,\n
</dtml-if>\n
<dtml-in "portal_catalog.getCatalogSearchResultKeys()"> <dtml-var sequence-item> <dtml-unless sequence-end>,</dtml-unless> </dtml-in>\n
<dtml-if select_expression>, <dtml-var select_expression> </dtml-if>\n
</dtml-if>\n </dtml-if>\n
\n \n
FROM\n FROM\n
...@@ -421,14 +417,18 @@ FROM\n ...@@ -421,14 +417,18 @@ FROM\n
<dtml-var table_item> AS <dtml-var table_key>,\n <dtml-var table_item> AS <dtml-var table_key>,\n
</dtml-if>\n </dtml-if>\n
</dtml-in>\n </dtml-in>\n
<dtml-if selection_domain><dtml-var "selection_domain.asSqlJoinExpression()">,</dtml-if>\n <dtml-if selection_domain>\n
<dtml-if selection_report><dtml-var "selection_report.asSqlJoinExpression()">, </dtml-if>\n <dtml-var "selection_domain.asSqlJoinExpression()">,\n
</dtml-if>\n
<dtml-if selection_report>\n
<dtml-var "selection_report.asSqlJoinExpression()">,\n
</dtml-if>\n
<dtml-if use_movement_table> movement, </dtml-if>\n <dtml-if use_movement_table> movement, </dtml-if>\n
<dtml-if "stat or omit_input or omit_output or node">\n <dtml-if "stat or omit_input or omit_output or node">\n
stock, catalog as child, </dtml-if>\n stock, catalog as child, </dtml-if>\n
<dtml-if "section_category">category, </dtml-if>\n <dtml-if "section_category">category, </dtml-if>\n
delivery,\n catalog,\n
catalog\n delivery\n
\n \n
WHERE\n WHERE\n
delivery.uid = catalog.uid\n delivery.uid = catalog.uid\n
...@@ -441,36 +441,61 @@ WHERE\n ...@@ -441,36 +441,61 @@ WHERE\n
<dtml-if selection_report>\n <dtml-if selection_report>\n
AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n
</dtml-if>\n </dtml-if>\n
\n
<dtml-if specific_reference> AND (\n <dtml-if specific_reference> AND (\n
catalog.source_reference LIKE <dtml-sqlvar specific_reference type="string">\n catalog.source_reference LIKE\n
OR catalog.destination_reference LIKE <dtml-sqlvar specific_reference type="string"> )</dtml-if>\n <dtml-sqlvar specific_reference type="string">\n
<dtml-if transaction> AND catalog.uid = <dtml-var transaction> </dtml-if>\n OR catalog.destination_reference LIKE\n
<dtml-if amount> AND ABS(movement.quantity) = <dtml-sqlvar amount type="float"> </dtml-if>\n <dtml-sqlvar specific_reference type="string"> )</dtml-if>\n
<dtml-if amount_range_min> AND ABS(movement.quantity) >= <dtml-sqlvar amount_range_min type="float"> </dtml-if>\n <dtml-if transaction_uid>\n
<dtml-if amount_range_max> AND ABS(movement.quantity) < <dtml-sqlvar amount_range_max type="float"> </dtml-if>\n AND catalog.uid = <dtml-var transaction_uid> </dtml-if>\n
<dtml-if creation_date_range_min> AND catalog.creation_date >= <dtml-sqlvar creation_date_range_min type="datetime"> </dtml-if>\n <dtml-if amount>\n
<dtml-if creation_date_range_max> AND catalog.creation_date < <dtml-sqlvar "creation_date_range_max+1" type="datetime"> </dtml-if>\n AND ABS(movement.quantity) = <dtml-sqlvar amount type="float">\n
<dtml-if use_movement_table> AND movement.explanation_uid = catalog.uid </dtml-if>\n </dtml-if>\n
<dtml-if amount_range_min>\n
AND ABS(movement.quantity) >= <dtml-sqlvar amount_range_min type="float">\n
</dtml-if>\n
<dtml-if amount_range_max>\n
AND ABS(movement.quantity) < <dtml-sqlvar amount_range_max type="float">\n
</dtml-if>\n
<dtml-if creation_date_range_min>\n
AND catalog.creation_date >=\n
<dtml-sqlvar creation_date_range_min type="datetime"> </dtml-if>\n
<dtml-if creation_date_range_max>\n
AND catalog.creation_date <\n
<dtml-sqlvar "creation_date_range_max+1" type="datetime"> </dtml-if>\n
<dtml-if use_movement_table>\n
AND movement.explanation_uid = catalog.uid </dtml-if>\n
<dtml-if resource> AND movement.resource_uid =\n <dtml-if resource> AND movement.resource_uid =\n
<dtml-var "restrictedTraverse(resource).getUid()"> </dtml-if>\n <dtml-var "restrictedTraverse(resource).getUid()"> </dtml-if>\n
<dtml-if entity> AND ( delivery.destination_section_uid =\n <dtml-if entity> AND (\n
delivery.destination_section_uid =\n
<dtml-var "restrictedTraverse(entity).getUid()">\n <dtml-var "restrictedTraverse(entity).getUid()">\n
OR delivery.source_section_uid =\n OR delivery.source_section_uid =\n
<dtml-var "restrictedTraverse(entity).getUid()">\n <dtml-var "restrictedTraverse(entity).getUid()">\n
) </dtml-if>\n )</dtml-if>\n
<dtml-if section_category> AND (\n <dtml-if section_category> AND (\n
category.uid = delivery.destination_section_uid\n ( category.uid = delivery.destination_section_uid\n
OR category.uid = delivery.source_section_uid)\n ) OR ( category.uid = delivery.source_section_uid\n
AND category.category_uid = <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n )\n
)\n
AND category.category_uid =\n
<dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
</dtml-if>\n </dtml-if>\n
\n \n
<dtml-comment>\n
-- FIXME: we want stop date when we are destination_section and start_date when\n -- FIXME: we want stop date when we are destination_section and start_date when\n
-- we are source_section (one solution is to read in stock.date, but we try\n -- we are source_section (one solution is to read in stock.date, but we try\n
-- to avoid the use of stock table here)\n -- to avoid the use of stock table here)\n
<dtml-if from_date> AND movement.start_date >= <dtml-sqlvar from_date type="datetime"> </dtml-if>\n </dtml-comment>\n
<dtml-if to_date> AND movement.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime"> </dtml-if>\n <dtml-if from_date>\n
<dtml-if at_date> AND movement.start_date < <dtml-sqlvar at_date type="datetime"> </dtml-if>\n AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n
</dtml-if>\n
<dtml-if to_date>\n
AND movement.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n
</dtml-if>\n
<dtml-if at_date>\n
AND movement.start_date < <dtml-sqlvar at_date type="datetime">\n
</dtml-if>\n
\n \n
<dtml-if node>\n <dtml-if node>\n
AND category.uid = stock.section_uid\n AND category.uid = stock.section_uid\n
...@@ -479,10 +504,11 @@ WHERE\n ...@@ -479,10 +504,11 @@ WHERE\n
AND (\n AND (\n
<dtml-in node>\n <dtml-in node>\n
<dtml-unless sequence-start>OR</dtml-unless>\n <dtml-unless sequence-start>OR</dtml-unless>\n
stock.node_uid = <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n stock.node_uid =\n
<dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n
</dtml-in> )\n </dtml-in> )\n
</dtml-if>\n </dtml-if>\n
<dtml-if stat> AND movement.is_accountable = 1\n <dtml-if stat>\n
AND category.uid = stock.section_uid\n AND category.uid = stock.section_uid\n
AND child.uid = stock.uid\n AND child.uid = stock.uid\n
AND child.parent_uid = catalog.uid\n AND child.parent_uid = catalog.uid\n
...@@ -502,21 +528,19 @@ WHERE\n ...@@ -502,21 +528,19 @@ WHERE\n
</dtml-if>\n </dtml-if>\n
\n \n
<dtml-unless count>\n <dtml-unless count>\n
GROUP BY catalog.uid\n <dtml-if "query[\'order_by_expression\']">\n
<dtml-if "query[\'order_by_expression\']">\n
ORDER BY <dtml-var "query[\'order_by_expression\']">\n ORDER BY <dtml-var "query[\'order_by_expression\']">\n
</dtml-if>\n </dtml-if>\n
<dtml-if "query[\'limit_expression\']">\n <dtml-if "query[\'limit_expression\']">\n
LIMIT <dtml-var "query[\'limit_expression\']">\n LIMIT <dtml-var "query[\'limit_expression\']">\n
<dtml-else>\n <dtml-else>\n
LIMIT 1000\n LIMIT 1000\n
</dtml-if>\n </dtml-if>\n
</dtml-unless>\n </dtml-unless>\n
\n </dtml-let></dtml-let></dtml-let>\n
</dtml-let>\n <dtml-comment> vim: syntax=dtml\n
</dtml-let>\n </dtml-comment>\n
</dtml-let>\n
</dtml-let>
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -554,12 +578,12 @@ WHERE\n ...@@ -554,12 +578,12 @@ WHERE\n
<key> <string>raw</string> </key> <key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<dtml-let params="selection and selection.getParams() or selection_params">\n <dtml-let allowed_roles_and_users="portal_catalog.getAllowedRolesAndUsers(**selection_params)">\n
<dtml-let allowed_roles_and_users="portal_catalog.getAllowedRolesAndUsers(**params)">\n
<dtml-comment>do something to have a query without RolesAndUsers security for global stats</dtml-comment>\n <dtml-comment>do something to have a query without RolesAndUsers security for global stats</dtml-comment>\n
<dtml-let query="(stat) and portal_catalog.buildSQLQuery(**params) or portal_catalog.buildSQLQuery(allowedRolesAndUsers=allowed_roles_and_users, **params)">\n <dtml-let query="(stat) and portal_catalog.buildSQLQuery(**selection_params) or\n
portal_catalog.buildSQLQuery(allowedRolesAndUsers=allowed_roles_and_users, **selection_params)">\n
\n \n
<dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max or section_category or entity">\n <dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max">\n
\n \n
SELECT\n SELECT\n
<dtml-if stat>\n <dtml-if stat>\n
...@@ -568,15 +592,11 @@ SELECT\n ...@@ -568,15 +592,11 @@ SELECT\n
COUNT(DISTINCT catalog.uid) AS count\n COUNT(DISTINCT catalog.uid) AS count\n
<dtml-else>\n <dtml-else>\n
DISTINCT\n DISTINCT\n
<dtml-if section_category>\n <dtml-in "portal_catalog.getCatalogSearchResultKeys()">\n
IF(category.uid = delivery.source_section_uid,\n <dtml-unless sequence-start>,</dtml-unless>\n
catalog.source_reference,\n <dtml-var sequence-item>\n
catalog.destination_reference) AS specific_reference,\n </dtml-in>\n
<dtml-else>\n <dtml-if select_expression><dtml-var select_expression> </dtml-if>\n
\'???\' AS specific_reference,\n
</dtml-if>\n
<dtml-in "portal_catalog.getCatalogSearchResultKeys()"> <dtml-var sequence-item> <dtml-unless sequence-end>,</dtml-unless> </dtml-in>\n
<dtml-if select_expression>, <dtml-var select_expression> </dtml-if>\n
</dtml-if>\n </dtml-if>\n
\n \n
FROM\n FROM\n
...@@ -585,14 +605,18 @@ FROM\n ...@@ -585,14 +605,18 @@ FROM\n
<dtml-var table_item> AS <dtml-var table_key>,\n <dtml-var table_item> AS <dtml-var table_key>,\n
</dtml-if>\n </dtml-if>\n
</dtml-in>\n </dtml-in>\n
<dtml-if selection_domain><dtml-var "selection_domain.asSqlJoinExpression()">,</dtml-if>\n <dtml-if selection_domain>\n
<dtml-if selection_report><dtml-var "selection_report.asSqlJoinExpression()">, </dtml-if>\n <dtml-var "selection_domain.asSqlJoinExpression()">,\n
</dtml-if>\n
<dtml-if selection_report>\n
<dtml-var "selection_report.asSqlJoinExpression()">,\n
</dtml-if>\n
<dtml-if use_movement_table> movement, </dtml-if>\n <dtml-if use_movement_table> movement, </dtml-if>\n
<dtml-if "stat or omit_input or omit_output or node">\n <dtml-if "stat or omit_input or omit_output or node">\n
stock, catalog as child, </dtml-if>\n stock, catalog as child, </dtml-if>\n
<dtml-if "section_category">category, </dtml-if>\n <dtml-if "section_category">category, </dtml-if>\n
delivery,\n catalog,\n
catalog\n delivery\n
\n \n
WHERE\n WHERE\n
delivery.uid = catalog.uid\n delivery.uid = catalog.uid\n
...@@ -605,36 +629,61 @@ WHERE\n ...@@ -605,36 +629,61 @@ WHERE\n
<dtml-if selection_report>\n <dtml-if selection_report>\n
AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">\n
</dtml-if>\n </dtml-if>\n
\n
<dtml-if specific_reference> AND (\n <dtml-if specific_reference> AND (\n
catalog.source_reference LIKE <dtml-sqlvar specific_reference type="string">\n catalog.source_reference LIKE\n
OR catalog.destination_reference LIKE <dtml-sqlvar specific_reference type="string"> )</dtml-if>\n <dtml-sqlvar specific_reference type="string">\n
<dtml-if transaction> AND catalog.uid = <dtml-var transaction> </dtml-if>\n OR catalog.destination_reference LIKE\n
<dtml-if amount> AND ABS(movement.quantity) = <dtml-sqlvar amount type="float"> </dtml-if>\n <dtml-sqlvar specific_reference type="string"> )</dtml-if>\n
<dtml-if amount_range_min> AND ABS(movement.quantity) >= <dtml-sqlvar amount_range_min type="float"> </dtml-if>\n <dtml-if transaction_uid>\n
<dtml-if amount_range_max> AND ABS(movement.quantity) < <dtml-sqlvar amount_range_max type="float"> </dtml-if>\n AND catalog.uid = <dtml-var transaction_uid> </dtml-if>\n
<dtml-if creation_date_range_min> AND catalog.creation_date >= <dtml-sqlvar creation_date_range_min type="datetime"> </dtml-if>\n <dtml-if amount>\n
<dtml-if creation_date_range_max> AND catalog.creation_date < <dtml-sqlvar "creation_date_range_max+1" type="datetime"> </dtml-if>\n AND ABS(movement.quantity) = <dtml-sqlvar amount type="float">\n
<dtml-if use_movement_table> AND movement.explanation_uid = catalog.uid </dtml-if>\n </dtml-if>\n
<dtml-if amount_range_min>\n
AND ABS(movement.quantity) >= <dtml-sqlvar amount_range_min type="float">\n
</dtml-if>\n
<dtml-if amount_range_max>\n
AND ABS(movement.quantity) < <dtml-sqlvar amount_range_max type="float">\n
</dtml-if>\n
<dtml-if creation_date_range_min>\n
AND catalog.creation_date >=\n
<dtml-sqlvar creation_date_range_min type="datetime"> </dtml-if>\n
<dtml-if creation_date_range_max>\n
AND catalog.creation_date <\n
<dtml-sqlvar "creation_date_range_max+1" type="datetime"> </dtml-if>\n
<dtml-if use_movement_table>\n
AND movement.explanation_uid = catalog.uid </dtml-if>\n
<dtml-if resource> AND movement.resource_uid =\n <dtml-if resource> AND movement.resource_uid =\n
<dtml-var "restrictedTraverse(resource).getUid()"> </dtml-if>\n <dtml-var "restrictedTraverse(resource).getUid()"> </dtml-if>\n
<dtml-if entity> AND ( delivery.destination_section_uid =\n <dtml-if entity> AND (\n
delivery.destination_section_uid =\n
<dtml-var "restrictedTraverse(entity).getUid()">\n <dtml-var "restrictedTraverse(entity).getUid()">\n
OR delivery.source_section_uid =\n OR delivery.source_section_uid =\n
<dtml-var "restrictedTraverse(entity).getUid()">\n <dtml-var "restrictedTraverse(entity).getUid()">\n
) </dtml-if>\n )</dtml-if>\n
<dtml-if section_category> AND (\n <dtml-if section_category> AND (\n
category.uid = delivery.destination_section_uid\n ( category.uid = delivery.destination_section_uid\n
OR category.uid = delivery.source_section_uid)\n ) OR ( category.uid = delivery.source_section_uid\n
AND category.category_uid = <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n )\n
)\n
AND category.category_uid =\n
<dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n
</dtml-if>\n </dtml-if>\n
\n \n
<dtml-comment>\n
-- FIXME: we want stop date when we are destination_section and start_date when\n -- FIXME: we want stop date when we are destination_section and start_date when\n
-- we are source_section (one solution is to read in stock.date, but we try\n -- we are source_section (one solution is to read in stock.date, but we try\n
-- to avoid the use of stock table here)\n -- to avoid the use of stock table here)\n
<dtml-if from_date> AND movement.start_date >= <dtml-sqlvar from_date type="datetime"> </dtml-if>\n </dtml-comment>\n
<dtml-if to_date> AND movement.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime"> </dtml-if>\n <dtml-if from_date>\n
<dtml-if at_date> AND movement.start_date < <dtml-sqlvar at_date type="datetime"> </dtml-if>\n AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n
</dtml-if>\n
<dtml-if to_date>\n
AND movement.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n
</dtml-if>\n
<dtml-if at_date>\n
AND movement.start_date < <dtml-sqlvar at_date type="datetime">\n
</dtml-if>\n
\n \n
<dtml-if node>\n <dtml-if node>\n
AND category.uid = stock.section_uid\n AND category.uid = stock.section_uid\n
...@@ -643,10 +692,11 @@ WHERE\n ...@@ -643,10 +692,11 @@ WHERE\n
AND (\n AND (\n
<dtml-in node>\n <dtml-in node>\n
<dtml-unless sequence-start>OR</dtml-unless>\n <dtml-unless sequence-start>OR</dtml-unless>\n
stock.node_uid = <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n stock.node_uid =\n
<dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n
</dtml-in> )\n </dtml-in> )\n
</dtml-if>\n </dtml-if>\n
<dtml-if stat> AND movement.is_accountable = 1\n <dtml-if stat>\n
AND category.uid = stock.section_uid\n AND category.uid = stock.section_uid\n
AND child.uid = stock.uid\n AND child.uid = stock.uid\n
AND child.parent_uid = catalog.uid\n AND child.parent_uid = catalog.uid\n
...@@ -666,21 +716,19 @@ WHERE\n ...@@ -666,21 +716,19 @@ WHERE\n
</dtml-if>\n </dtml-if>\n
\n \n
<dtml-unless count>\n <dtml-unless count>\n
GROUP BY catalog.uid\n <dtml-if "query[\'order_by_expression\']">\n
<dtml-if "query[\'order_by_expression\']">\n
ORDER BY <dtml-var "query[\'order_by_expression\']">\n ORDER BY <dtml-var "query[\'order_by_expression\']">\n
</dtml-if>\n </dtml-if>\n
<dtml-if "query[\'limit_expression\']">\n <dtml-if "query[\'limit_expression\']">\n
LIMIT <dtml-var "query[\'limit_expression\']">\n LIMIT <dtml-var "query[\'limit_expression\']">\n
<dtml-else>\n <dtml-else>\n
LIMIT 1000\n LIMIT 1000\n
</dtml-if>\n </dtml-if>\n
</dtml-unless>\n </dtml-unless>\n
\n </dtml-let></dtml-let></dtml-let>\n
</dtml-let>\n <dtml-comment> vim: syntax=dtml\n
</dtml-let>\n </dtml-comment>\n
</dtml-let>\n
</dtml-let>
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_accounting/bt/revision
View file @ d240d593
1 15
\ No newline at end of file \ No newline at end of file
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