Skip to content

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

use omit_asset_increase / omit_asset_decrease in place of omit_input /... 

use omit_asset_increase / omit_asset_decrease in place of omit_input / omit_output where we display asset price

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37347 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c7c37eee
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 54 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
View file @ 8014e67a
......@@ -173,7 +173,7 @@ def getAnalyticTitleFromUid(uid):\n
for node in getInventoryList(\n
node_category_strict_membership=account_type_to_group_by_node,\n
group_by_node=1,\n
omit_output=1,\n
omit_asset_decrease=1,\n
from_date=from_date,\n
at_date=at_date,\n
portal_type=accounting_movement_type_list,\n
......@@ -187,7 +187,7 @@ for node in getInventoryList(\n
for node in getInventoryList(\n
node_category_strict_membership=account_type_to_group_by_node,\n
group_by_node=1,\n
omit_input=1,\n
omit_asset_increase=1,\n
from_date=from_date,\n
at_date=at_date,\n
portal_type=accounting_movement_type_list,\n
......@@ -204,7 +204,7 @@ for node in getInventoryList(\n
node_category=profit_and_loss_account_type,\n
from_date=max(period_start_date, from_date),\n
group_by_node=1,\n
omit_output=1,\n
omit_asset_decrease=1,\n
at_date=at_date,\n
portal_type=accounting_movement_type_list,\n
**inventory_params):\n
......@@ -218,7 +218,7 @@ for node in getInventoryList(\n
node_category=profit_and_loss_account_type,\n
from_date=max(period_start_date, from_date),\n
group_by_node=1,\n
omit_input=1,\n
omit_asset_increase=1,\n
at_date=at_date,\n
portal_type=accounting_movement_type_list,\n
**inventory_params):\n
......@@ -236,7 +236,7 @@ if account_type_to_group_by_mirror_section:\n
account_type_to_group_by_mirror_section,\n
group_by_mirror_section=1,\n
group_by_node=1,\n
omit_output=1,\n
omit_asset_decrease=1,\n
from_date=from_date,\n
at_date=at_date,\n
portal_type=accounting_movement_type_list,\n
......@@ -254,7 +254,7 @@ if account_type_to_group_by_mirror_section:\n
account_type_to_group_by_mirror_section,\n
group_by_mirror_section=1,\n
group_by_node=1,\n
omit_input=1,\n
omit_asset_increase=1,\n
from_date=from_date,\n
at_date=at_date,\n
portal_type=accounting_movement_type_list,\n
......@@ -275,7 +275,7 @@ if account_type_to_group_by_payment:\n
account_type_to_group_by_payment,\n
group_by_payment=1,\n
group_by_node=1,\n
omit_output=1,\n
omit_asset_decrease=1,\n
from_date=from_date,\n
at_date=at_date,\n
portal_type=accounting_movement_type_list,\n
......@@ -293,7 +293,7 @@ if account_type_to_group_by_payment:\n
account_type_to_group_by_payment,\n
group_by_payment=1,\n
group_by_node=1,\n
omit_input=1,\n
omit_asset_increase=1,\n
from_date=from_date,\n
at_date=at_date,\n
portal_type=accounting_movement_type_list,\n
......@@ -387,7 +387,7 @@ for node in getInventoryList(\n
node_category_strict_membership=\n
account_type_to_group_by_node,\n
group_by_node=1,\n
omit_output=1,\n
omit_asset_decrease=1,\n
from_date=period_start_date,\n
to_date=from_date,\n
portal_type=period_movement_type_list,\n
......@@ -401,7 +401,7 @@ for node in getInventoryList(\n
node_category_strict_membership=\n
account_type_to_group_by_node,\n
group_by_node=1,\n
omit_input=1,\n
omit_asset_increase=1,\n
from_date=period_start_date,\n
to_date=from_date,\n
portal_type=period_movement_type_list,\n
......@@ -415,7 +415,7 @@ for node in getInventoryList(\n
### profit & loss accounts {{{\n
for node in getInventoryList(\n
node_category=profit_and_loss_account_type,\n
omit_output=1,\n
omit_asset_decrease=1,\n
from_date=min(period_start_date,\n
initial_balance_date),\n
at_date=initial_balance_date,\n
......@@ -429,7 +429,7 @@ for node in getInventoryList(\n
\n
for node in getInventoryList(\n
node_category=profit_and_loss_account_type,\n
omit_input=1,\n
omit_asset_increase=1,\n
from_date=min(period_start_date,\n
initial_balance_date),\n
at_date=initial_balance_date,\n
......@@ -505,7 +505,7 @@ if expand_accounts:\n
account_type_to_group_by_mirror_section,\n
group_by_mirror_section=1,\n
group_by_node=1,\n
omit_output=1,\n
omit_asset_decrease=1,\n
from_date=period_start_date,\n
to_date=from_date,\n
portal_type=period_movement_type_list,\n
......@@ -522,7 +522,7 @@ if expand_accounts:\n
account_type_to_group_by_mirror_section,\n
group_by_mirror_section=1,\n
group_by_node=1,\n
omit_input=1,\n
omit_asset_increase=1,\n
from_date=period_start_date,\n
to_date=from_date,\n
portal_type=period_movement_type_list,\n
......@@ -587,7 +587,7 @@ if account_type_to_group_by_payment:\n
account_type_to_group_by_payment,\n
group_by_payment=1,\n
group_by_node=1,\n
omit_output=1,\n
omit_asset_decrease=1,\n
from_date=period_start_date,\n
to_date=from_date,\n
portal_type=period_movement_type_list,\n
......@@ -605,7 +605,7 @@ if account_type_to_group_by_payment:\n
account_type_to_group_by_payment,\n
group_by_payment=1,\n
group_by_node=1,\n
omit_input=1,\n
omit_asset_increase=1,\n
from_date=period_start_date,\n
to_date=from_date,\n
portal_type=period_movement_type_list,\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml
View file @ 8014e67a
......@@ -55,8 +55,8 @@
<key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n
params = portal.ERP5Accounting_getParams(selection_name)\n
params[\'omit_input\'] = omit_input\n
params[\'omit_output\'] = omit_output\n
params[\'omit_asset_increase\'] = omit_asset_increase\n
params[\'omit_asset_decrease\'] = omit_asset_decrease\n
# For now, we omit simulation to be compatible with other reports.\n
params[\'omit_simulation\'] = True\n
\n
......@@ -73,7 +73,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, selection_name=None, **kw</string> </value>
<value> <string>brain=None, selection=None, omit_asset_increase=0, omit_asset_decrease=0, selection_name=None, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -101,8 +101,8 @@ return portal.portal_simulation.getInventoryAssetPrice(\n
<tuple>
<string>brain</string>
<string>selection</string>
<string>omit_input</string>
<string>omit_output</string>
<string>omit_asset_increase</string>
<string>omit_asset_decrease</string>
<string>selection_name</string>
<string>kw</string>
<string>_getattr_</string>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummary.xml
View file @ 8014e67a
......@@ -73,11 +73,11 @@ if node_category:\n
# calculated differently. As a result, the summary doesn\'t take from_date\n
# into account for income accounts.\n
return [Object(\n
debit_price=getInventoryAssetPrice(omit_output=1,\n
debit_price=getInventoryAssetPrice(omit_asset_decrease=1,\n
node_category=node_category,\n
precision=precision,\n
**inventory_kw),\n
credit_price=-getInventoryAssetPrice(omit_input=1,\n
credit_price=-getInventoryAssetPrice(omit_asset_increase=1,\n
node_category=node_category,\n
precision=precision,\n
**inventory_kw) or 0 ) ]\n
......@@ -86,24 +86,24 @@ income_node_category = [\'account_type/income\', \'account_type/expense\']\n
balance_node_category = [\'account_type/equity\', \'account_type/asset\',\n
\'account_type/liability\']\n
\n
debit = getInventoryAssetPrice(omit_output=1,\n
debit = getInventoryAssetPrice(omit_asset_decrease=1,\n
from_date=period_start_date,\n
node_category=income_node_category,\n
precision=precision,\n
**inventory_kw)\n
\n
credit = - getInventoryAssetPrice(omit_input=1,\n
credit = - getInventoryAssetPrice(omit_asset_increase=1,\n
from_date=period_start_date,\n
node_category=income_node_category,\n
precision=precision,\n
**inventory_kw) or 0\n
\n
debit += getInventoryAssetPrice(omit_output=1,\n
debit += getInventoryAssetPrice(omit_asset_decrease=1,\n
node_category=balance_node_category,\n
precision=precision,\n
**inventory_kw)\n
\n
credit -= getInventoryAssetPrice(omit_input=1,\n
credit -= getInventoryAssetPrice(omit_asset_increase=1,\n
node_category=balance_node_category,\n
precision=precision,\n
**inventory_kw) or 0\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTotalSourceCredit.xml
View file @ 8014e67a
......@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return - context.AccountModule_getBalance(brain=brain, selection=selection, omit_input=1, **kw) or 0.00\n
<value> <string>return - context.AccountModule_getBalance(brain=brain, selection=selection, omit_asset_increase=1, **kw) or 0.00\n
</string> </value>
</item>
<item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTotalSourceDebit.xml
View file @ 8014e67a
......@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return context.AccountModule_getBalance(brain, selection, omit_output=1, **kw)\n
<value> <string>return context.AccountModule_getBalance(brain, selection, omit_asset_decrease=1, **kw)\n
</string> </value>
</item>
<item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statBalance.xml
View file @ 8014e67a
......@@ -57,8 +57,8 @@
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
params[\'omit_asset_increase\'] = omit_asset_increase\n
params[\'omit_asset_decrease\'] = omit_asset_decrease\n
# For now, we omit simulation to be compatible with other reports.\n
params[\'omit_simulation\'] = True\n
\n
......@@ -94,7 +94,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, selection_name=None, **kw</string> </value>
<value> <string>brain=None, selection=None, omit_asset_increase=0, omit_asset_decrease=0, selection_name=None, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -122,8 +122,8 @@ return portal.portal_simulation.getInventoryAssetPrice( **params )\n
<tuple>
<string>brain</string>
<string>selection</string>
<string>omit_input</string>
<string>omit_output</string>
<string>omit_asset_increase</string>
<string>omit_asset_decrease</string>
<string>selection_name</string>
<string>kw</string>
<string>_getattr_</string>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statTotalSourceCredit.xml
View file @ 8014e67a
......@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return - context.AccountModule_statBalance(brain=brain, selection_name=selection_name, omit_input=1, **kw) or 0\n
<value> <string>return - context.AccountModule_statBalance(brain=brain, selection_name=selection_name, omit_asset_increase=1, **kw) or 0\n
</string> </value>
</item>
<item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statTotalSourceDebit.xml
View file @ 8014e67a
......@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return context.AccountModule_statBalance(brain=brain, selection_name=selection_name, omit_output=1, float_value=1, **kw)\n
<value> <string>return context.AccountModule_statBalance(brain=brain, selection_name=selection_name, omit_asset_decrease=1, float_value=1, **kw)\n
</string> </value>
</item>
<item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statCredit.xml
View file @ 8014e67a
......@@ -57,7 +57,7 @@
account as node\n
"""\n
kw[\'node_uid\'] = context.getUid()\n
kw[\'omit_input\'] = 1\n
kw[\'omit_asset_increase\'] = 1\n
kw.update(kw[\'selection\'].getParams())\n
\n
# here, or 0 is to prevent displaying "- 0"\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statDebit.xml
View file @ 8014e67a
......@@ -57,7 +57,7 @@
account as a node\n
"""\n
kw[\'node_uid\'] = context.getUid()\n
kw[\'omit_output\'] = 1\n
kw[\'omit_asset_decrease\'] = 1\n
kw.update(kw[\'selection\'].getParams())\n
\n
return context.Node_statAccountingBalance(**kw)\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statCredit.xml
View file @ 8014e67a
......@@ -57,7 +57,7 @@
entity as a mirror section\n
"""\n
kw[\'mirror_section_uid\'] = context.getUid()\n
kw[\'omit_input\'] = 1\n
kw[\'omit_asset_increase\'] = 1\n
kw[\'node_category_strict_membership\'] = [\'account_type/asset/receivable\',\n
\'account_type/liability/payable\']\n
# here, or 0 is to prevent displaying "- 0"\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statDebit.xml
View file @ 8014e67a
......@@ -57,7 +57,7 @@
entity as a mirror section\n
"""\n
kw[\'mirror_section_uid\'] = context.getUid()\n
kw[\'omit_output\'] = 1\n
kw[\'omit_asset_decrease\'] = 1\n
kw[\'node_category_strict_membership\'] = [\'account_type/asset/receivable\',\n
\'account_type/liability/payable\']\n
return context.Node_statAccountingBalance(**kw)\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml
View file @ 8014e67a
......@@ -158,11 +158,11 @@ if from_date or is_pl_account:\n
**get_inventory_kw)\n
\n
# then all movement between period_start_date and from_date\n
previous_total_debit = getInventoryAssetPrice(omit_output=True,\n
previous_total_debit = getInventoryAssetPrice(omit_asset_decrease=True,\n
from_date=period_start_date,\n
to_date=from_date,\n
**get_inventory_kw) + max(period_openning_balance, 0)\n
previous_total_credit = getInventoryAssetPrice(omit_input=True,\n
previous_total_credit = getInventoryAssetPrice(omit_asset_increase=True,\n
from_date=period_start_date,\n
to_date=from_date,\n
**get_inventory_kw) - max(-period_openning_balance, 0)\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_statAccountingBalance.xml
View file @ 8014e67a
......@@ -122,13 +122,13 @@ if params.get(\'period_start_date\', 0) and params.get(\'node_uid\'):\n
selection_domain=getSelectionDomainDictFor(selection_name),\n
to_date=period_start_date,\n
**params)\n
if omit_output:\n
return getInventoryAssetPrice(omit_output=1,\n
if omit_asset_decrease:\n
return getInventoryAssetPrice(omit_asset_decrease=1,\n
from_date=period_start_date,\n
at_date=at_date,\n
**params) + max(period_openning_balance, 0)\n
elif omit_input:\n
return getInventoryAssetPrice(omit_input=1,\n
elif omit_asset_increase:\n
return getInventoryAssetPrice(omit_asset_increase=1,\n
from_date=period_start_date,\n
at_date=at_date,\n
**params) - max(-period_openning_balance, 0)\n
......@@ -138,8 +138,8 @@ if params.get(\'period_start_date\', 0) and params.get(\'node_uid\'):\n
**params) - max(-period_openning_balance, 0)\n
\n
return getInventoryAssetPrice(\n
omit_input=omit_input,\n
omit_output=omit_output,\n
omit_asset_increase=omit_asset_increase,\n
omit_asset_decrease=omit_asset_decrease,\n
selection_domain=getSelectionDomainDictFor(selection_name),\n
**params)\n
</string> </value>
......@@ -152,7 +152,7 @@ return getInventoryAssetPrice(\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>selection=None, omit_input=0, omit_output=0, selection_name=None, **kw</string> </value>
<value> <string>selection=None, omit_asset_increase=0, omit_asset_decrease=0, selection_name=None, **kw</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
......@@ -187,8 +187,8 @@ return getInventoryAssetPrice(\n
<value>
<tuple>
<string>selection</string>
<string>omit_input</string>
<string>omit_output</string>
<string>omit_asset_increase</string>
<string>omit_asset_decrease</string>
<string>selection_name</string>
<string>kw</string>
<string>Products.ZSQLCatalog.SQLCatalog</string>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_statAccountingCredit.xml
View file @ 8014e67a
......@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return - context.Node_statAccountingBalance(omit_input=1, **kw) or 0.0\n
<value> <string>return - context.Node_statAccountingBalance(omit_asset_increase=1, **kw) or 0.0\n
</string> </value>
</item>
<item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_statAccountingDebit.xml
View file @ 8014e67a
......@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return context.Node_statAccountingBalance(omit_output=1, **kw) or 0.0\n
<value> <string>return context.Node_statAccountingBalance(omit_asset_decrease=1, **kw) or 0.0\n
</string> </value>
</item>
<item>
......
bt5/erp5_accounting/bt/revision
View file @ 8014e67a
1318
\ No newline at end of file
1319
\ 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