Skip to content

erp5
erp5
Commit 6b207e42 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
1 Browse files
Options

use selection_name instead of selection in ERP5Accounting_getParams(). 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13534 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 084a9864
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 43 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountList.xml
View file @ 6b207e42
......@@ -83,7 +83,7 @@ if not id:\n
kwd[\'select_expression\'] = "\'%s\' AS accounting_transaction_line_currency" % id\n
\n
# precision for editable fields\n
params = context.ERP5Accounting_getParams(selection)\n
params = context.ERP5Accounting_getParams(selection_name)\n
if params.get(\'precision\', None) is not None:\n
context.REQUEST.set(\'precision\', params[\'precision\'])\n
\n
......@@ -117,7 +117,7 @@ return context.portal_catalog(sort_on=new_sort_on, **kwd)\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>sort_on=None, selection=None, **kwd</string> </value>
<value> <string>sort_on=None, selection=None, selection_name=None, **kwd</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -137,7 +137,7 @@ return context.portal_catalog(sort_on=new_sort_on, **kwd)\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>2</int> </value>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -145,6 +145,7 @@ return context.portal_catalog(sort_on=new_sort_on, **kwd)\n
<tuple>
<string>sort_on</string>
<string>selection</string>
<string>selection_name</string>
<string>kwd</string>
<string>_getitem_</string>
<string>currency</string>
......@@ -173,6 +174,7 @@ return context.portal_catalog(sort_on=new_sort_on, **kwd)\n
<tuple>
<none/>
<none/>
<none/>
</tuple>
</value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountingTransactionCount.xml
View file @ 6b207e42
......@@ -68,22 +68,24 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>kwd = context.ERP5Accounting_getParams(selection)\n
<value> <string>kwd = context.ERP5Accounting_getParams(selection_name)\n
\n
# XXX missing :(\n
# this may fail if we have movements on something else than accounts\n
#kwd[\'where_expression\'] = \'node.parent_uid = %s\' context.account_module.getUid()\n
\n
if kw.get(\'stat\'):\n
selection_params = selection.getParams()\n
if selection.getDomain():\n
kwd[\'selection_domain\'] = selection.getDomain()\n
if selection.getReport():\n
kwd[\'selection_report\'] = selection.getReport()\n
selection_params = context.portal_selections.getSelectionParamsFor(selection_name)\n
selection_domain = context.portal_selections.getSelectionDomainDictFor(selection_name)\n
selection_report = context.portal_selections.getSelectionReportDictFor(selection_name)\n
if selection_domain:\n
kwd[\'selection_domain\'] = selection_domain\n
if selection_report:\n
kwd[\'selection_report\'] = selection_report\n
if selection_params.get(\'closed_summary\'):\n
kwd[\'closed_summary\'] = selection_params[\'closed_summary\']\n
if selection.isInvertMode():\n
kwd[\'stock.node_uid\'] = selection.getInvertModeUidList()\n
if context.portal_selections.getSelectionInvertModeFor(selection_name):\n
kwd[\'stock.node_uid\'] = context.portal_selections.getSelectionInvertModeUidListFor(selection_name)\n
# is list filtered ?\n
elif \'title\' in selection_params or \\\n
\'preferred_gap_id\' in selection_params or\\\n
......@@ -91,7 +93,7 @@ if kw.get(\'stat\'):\n
\'transalated_validation_state_title\' in selection_params:\n
# if yes, apply the same filter here\n
kwd[\'stock.node_uid\'] = [x.uid for x in\n
context.portal_catalog(**selection.getParams())]\n
context.portal_catalog(**selection_params)]\n
return context.portal_simulation.getInventoryStat( **kwd )[0][\'stock_uid\']\n
\n
kwd[\'stock.node_uid\'] = brain.uid\n
......@@ -113,7 +115,7 @@ return context.portal_simulation.getInventoryStat( **kwd )[0][\'stock_uid\']\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>selection, brain, **kw</string> </value>
<value> <string>selection=None, brain=None, selection_name=None, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -133,7 +135,7 @@ return context.portal_simulation.getInventoryStat( **kwd )[0][\'stock_uid\']\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>2</int> </value>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -141,11 +143,14 @@ return context.portal_simulation.getInventoryStat( **kwd )[0][\'stock_uid\']\n
<tuple>
<string>selection</string>
<string>brain</string>
<string>selection_name</string>
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
<string>kwd</string>
<string>selection_params</string>
<string>selection_domain</string>
<string>selection_report</string>
<string>_write_</string>
<string>_getitem_</string>
<string>append</string>
......@@ -164,7 +169,11 @@ return context.portal_simulation.getInventoryStat( **kwd )[0][\'stock_uid\']\n
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
<tuple>
<none/>
<none/>
<none/>
</tuple>
</value>
</item>
<item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml
View file @ 6b207e42
......@@ -69,7 +69,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n
params = portal.ERP5Accounting_getParams(selection)\n
params = portal.ERP5Accounting_getParams(selection_name)\n
params[\'omit_input\'] = omit_input\n
params[\'omit_output\'] = omit_output\n
\n
......@@ -95,7 +95,7 @@ return portal.portal_simulation.getInventoryAssetPrice(\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>brain=None, selection=None, omit_input=0, omit_output=0, **kw</string> </value>
<value> <string>brain=None, selection=None, omit_input=0, omit_output=0, selection_name=None, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -115,7 +115,7 @@ return portal.portal_simulation.getInventoryAssetPrice(\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>4</int> </value>
<value> <int>5</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -125,6 +125,7 @@ return portal.portal_simulation.getInventoryAssetPrice(\n
<string>selection</string>
<string>omit_input</string>
<string>omit_output</string>
<string>selection_name</string>
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
......@@ -148,6 +149,7 @@ return portal.portal_simulation.getInventoryAssetPrice(\n
<none/>
<int>0</int>
<int>0</int>
<none/>
</tuple>
</value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statBalance.xml
View file @ 6b207e42
......@@ -69,20 +69,22 @@
<item>
<key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n
params = portal.ERP5Accounting_getParams(selection)\n
selection_params = selection.getParams()\n
params = portal.ERP5Accounting_getParams(selection_name)\n
selection_params = context.portal_selections.getSelectionParamsFor(selection_name)\n
\n
params[\'omit_input\'] = omit_input\n
params[\'omit_output\'] = omit_output\n
\n
if selection.getDomain() :\n
params[\'selection_domain\'] = selection.getDomain()\n
if selection.getReport() :\n
params[\'selection_report\'] = selection.getReport()\n
selection_domain = context.portal_selections.getSelectionDomainDictFor(selection_name)\n
selection_report = context.portal_selections.getSelectionReportDictFor(selection_name)\n
if selection_domain:\n
params[\'selection_domain\'] = selection_domain\n
if selection_report:\n
params[\'selection_report\'] = selection_report\n
if kw.get(\'closed_summary\'):\n
params[\'closed_summary\'] = kw[\'closed_summary\']\n
if selection.isInvertMode() :\n
params[\'node_uid\'] = selection.getInvertModeUidList()\n
if context.portal_selections.getSelectionInvertModeFor(selection_name):\n
params[\'node_uid\'] = context.portal_selections.getSelectionInvertModeUidListFor(selection_name)\n
elif \'title\' in selection_params or \\\n
\'preferred_gap_id\' in selection_params or \\\n
\'id\' in selection_params or \\\n
......@@ -114,7 +116,7 @@ return portal.portal_simulation.getInventoryAssetPrice( **params )\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>brain=None, selection=None, omit_input=0, omit_output=0, **kw</string> </value>
<value> <string>brain=None, selection=None, omit_input=0, omit_output=0, selection_name=None, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -134,7 +136,7 @@ return portal.portal_simulation.getInventoryAssetPrice( **params )\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>4</int> </value>
<value> <int>5</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -144,6 +146,7 @@ return portal.portal_simulation.getInventoryAssetPrice( **params )\n
<string>selection</string>
<string>omit_input</string>
<string>omit_output</string>
<string>selection_name</string>
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
......@@ -151,6 +154,8 @@ return portal.portal_simulation.getInventoryAssetPrice( **params )\n
<string>params</string>
<string>selection_params</string>
<string>_write_</string>
<string>selection_domain</string>
<string>selection_report</string>
<string>_getitem_</string>
<string>append</string>
<string>$append0</string>
......@@ -173,6 +178,7 @@ return portal.portal_simulation.getInventoryAssetPrice( **params )\n
<none/>
<int>0</int>
<int>0</int>
<none/>
</tuple>
</value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/ERP5Accounting_getParams.xml
View file @ 6b207e42
......@@ -89,7 +89,14 @@ if not ignore_cache:\n
\n
params = {}\n
selection_params = {}\n
if selection is not None:\n
if selection_name is not None:\n
# check if first parameter is used for selection instance\n
if not isinstance(selection_name, str):\n
context.log(\'Using selection parameter is deprecated. Please use selection_name instead.\')\n
selection_name = selection_name.getName()\n
selection_params = context.portal_selections.getSelectionParamsFor(selection_name)\n
elif selection is not None:\n
context.log(\'Using selection parameter is deprecated. Please use selection_name instead.\')\n
selection_params = selection.getParams()\n
preference = context.getPortalObject().portal_preferences\n
\n
......@@ -161,7 +168,7 @@ return dict(params)\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>selection=None, wants_from_date=0, ignore_cache=0</string> </value>
<value> <string>selection_name=None, wants_from_date=0, ignore_cache=0, selection=None</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -181,15 +188,16 @@ return dict(params)\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>3</int> </value>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>selection</string>
<string>selection_name</string>
<string>wants_from_date</string>
<string>ignore_cache</string>
<string>selection</string>
<string>_getattr_</string>
<string>context</string>
<string>None</string>
......@@ -197,6 +205,8 @@ return dict(params)\n
<string>dict</string>
<string>params</string>
<string>selection_params</string>
<string>isinstance</string>
<string>str</string>
<string>preference</string>
<string>from_date</string>
<string>_write_</string>
......@@ -224,6 +234,7 @@ return dict(params)\n
<none/>
<int>0</int>
<int>0</int>
<none/>
</tuple>
</value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml
View file @ 6b207e42
......@@ -72,7 +72,7 @@
from Products.ERP5Type.Message import Message\n
portal = context.getPortalObject()\n
params = portal.ERP5Accounting_getParams(selection)\n
params = portal.ERP5Accounting_getParams(selection_name)\n
N_ = lambda msg: Message(\'erp5_ui\', msg)\n
\n
if params.get(\'precision\', None) is not None:\n
......@@ -151,20 +151,20 @@ if from_date:\n
previous_balance.edit(Movement_getExplanationTitle=\'\')\n
\n
new_result = [previous_balance]\n
if selection.getParams().get(\'hide_grouping\'):\n
if context.portal_selections.getSelectionParamsFor(selection_name).get(\'hide_grouping\'):\n
params[\'where_expression\'] = \'catalog.grouping_reference is NULL\'\n
new_result.extend(\n
portal.portal_simulation.getMovementHistoryList(\n
from_date=from_date,\n
initial_running_total_price=net_balance,\n
# initial_running_quantity=net_balance, TODO\n
selection_domain=selection.getDomain(),\n
selection_domain=context.portal_selections.getSelectionDomainDictFor(selection_name),\n
selection_domain_join_column=\'section_uid\',\n
sort_on=sort_on,\n
**params))\n
return new_result\n
\n
if selection.getParams().get(\'hide_grouping\'):\n
if context.portal_selections.getSelectionParamsFor(selection_name).get(\'hide_grouping\'):\n
params[\'where_expression\'] = \'catalog.grouping_reference is NULL\'\n
\n
# We try not to convert to a list, hence the copy & paste\n
......@@ -172,7 +172,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
from_date=from_date,\n
initial_running_total_price=net_balance,\n
# initial_running_quantity=net_balance, TODO\n
selection_domain=selection.getDomain(),\n
selection_domain=context.portal_selections.getSelectionDomainDictFor(selection_name),\n
selection_domain_join_column=\'section_uid\',\n
sort_on=sort_on,\n
**params)\n
......@@ -194,7 +194,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>selection=None, sort_on=[], node_category=None, node_category_strict_membership=None, from_date=None, **kw</string> </value>
<value> <string>selection=None, sort_on=[], node_category=None, node_category_strict_membership=None, from_date=None, selection_name=None, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -214,7 +214,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>5</int> </value>
<value> <int>6</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -225,6 +225,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
<string>node_category</string>
<string>node_category_strict_membership</string>
<string>from_date</string>
<string>selection_name</string>
<string>kw</string>
<string>Products.ERP5Type.Message</string>
<string>Message</string>
......@@ -264,6 +265,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
<none/>
<none/>
<none/>
<none/>
</tuple>
</value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_statAccountingBalance.xml
View file @ 6b207e42
......@@ -69,7 +69,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n
params = portal.ERP5Accounting_getParams(selection)\n
params = portal.ERP5Accounting_getParams(selection_name)\n
\n
if kw.get(\'node_uid\'):\n
params[\'node_uid\'] = kw[\'node_uid\']\n
......@@ -99,7 +99,7 @@ if kw.get(\'from_date_summary\', 0) and params.has_key(\'from_date\'):\n
return portal.portal_simulation.getInventoryAssetPrice(\n
omit_input=omit_input,\n
omit_output=omit_output,\n
selection_domain=selection.getDomain(),\n
selection_domain=context.portal_selections.getSelectionDomainDictFor(selection_name),\n
**params)\n
</string> </value>
</item>
......@@ -117,7 +117,7 @@ return portal.portal_simulation.getInventoryAssetPrice(\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>selection, omit_input=0, omit_output=0, **kw</string> </value>
<value> <string>selection=None, omit_input=0, omit_output=0, selection_name=None, **kw</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
......@@ -145,7 +145,7 @@ return portal.portal_simulation.getInventoryAssetPrice(\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>3</int> </value>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -154,6 +154,7 @@ return portal.portal_simulation.getInventoryAssetPrice(\n
<string>selection</string>
<string>omit_input</string>
<string>omit_output</string>
<string>selection_name</string>
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
......@@ -174,8 +175,10 @@ return portal.portal_simulation.getInventoryAssetPrice(\n
<key> <string>func_defaults</string> </key>
<value>
<tuple>
<none/>
<int>0</int>
<int>0</int>
<none/>
</tuple>
</value>
</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