Skip to content

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

Delete aggregation per regional zone (export/local) feature because it's not... 

Delete aggregation per regional zone (export/local) feature because it's not enough flexible (for example, if you fix the region of a third party, you need to regenerate the Closing Balance).

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7631 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 8bc73db2
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 182 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createClosingTransaction.xml
View file @ a0545f30
...@@ -96,8 +96,6 @@ section_value = portal.restrictedTraverse(section)\n ...@@ -96,8 +96,6 @@ section_value = portal.restrictedTraverse(section)\n
section_uid = section_value.getUid()\n section_uid = section_value.getUid()\n
section_region = section_value.getRegion()\n section_region = section_value.getRegion()\n
resource = section_value.getPriceCurrency()\n resource = section_value.getPriceCurrency()\n
currency = context.restrictedTraverse(resource)\n
precision = currency.getQuantityPrecision()\n
\n \n
# Create the transaction that will balance all accounts for the given date\n # Create the transaction that will balance all accounts for the given date\n
closing_transaction = accounting_module.newContent( portal_type = \'Closing Transaction\'\n closing_transaction = accounting_module.newContent( portal_type = \'Closing Transaction\'\n
...@@ -114,19 +112,12 @@ result_balance = 0.0\n ...@@ -114,19 +112,12 @@ result_balance = 0.0\n
\n \n
# Get The list of Account objects defined as income or expense type\n # Get The list of Account objects defined as income or expense type\n
ac_type_cat = portal.portal_categories.account_type\n ac_type_cat = portal.portal_categories.account_type\n
account_type_list = { \'income\' : ac_type_cat.income\n account_type_list = [ ac_type_cat.income\n
, \'expense\': ac_type_cat.expense\n , ac_type_cat.expense\n
}\n ]\n
account_dict = {}\n account_list = []\n
for (ac_type, ac_cat) in account_type_list.items():\n for ac_cat in account_type_list:\n
account_dict[ac_type] = ac_cat.getAccountTypeRelatedValueList(portal_type=\'Account\')\n account_list += ac_cat.getAccountTypeRelatedValueList(portal_type=\'Account\')\n
\n
# List of generic third party to apply on transaction lines to "link" a line with a region\n
generic_3rd_party_dict = { \'local-income\' : \'organisation_module/202\' # Clients divers\n
, \'local-expense\' : \'organisation_module/213\' # Fournisseurs Divers France\n
, \'export-income\' : \'organisation_module/596\' # Client a Recevoir Export\n
, \'export-expense\': \'organisation_module/595\' # Fournisseurs Divers Export\n
}\n
\n \n
# \'getInventory\' common parameters\n # \'getInventory\' common parameters\n
params = { \'omit_simulation\' : True\n params = { \'omit_simulation\' : True\n
...@@ -137,85 +128,16 @@ params = { \'omit_simulation\' : True\n ...@@ -137,85 +128,16 @@ params = { \'omit_simulation\' : True\n
}\n }\n
\n \n
# Get the balance of each account and create transaction lines\n # Get the balance of each account and create transaction lines\n
for (account_type, account_list) in account_dict.items():\n for account in account_list:\n
for account in account_list:\n
\n \n
# Update parameter for current account\n # Update parameter for current account\n
params[\'node_uid\'] = account.getUid()\n params[\'node_uid\'] = account.getUid()\n
\n \n
# Get account full balance\n # Get account full balance\n
account_balance = r_(sim_tool.getInventoryAssetPrice(**params)) or 0.0\n account_balance = r_(sim_tool.getInventoryAssetPrice(**params)) or 0.0\n
\n
# Use section\'s region membership to decide if a transaction\n
# belong to export zone or local zone\n
if transaction_details_level == \'zone\':\n
transaction_list = sim_tool.getInventoryList(**params) or []\n
\n
# Split the balance to export and local balance\n
export_balance = 0.0\n
local_balance = 0.0\n
\n
# Test each transaction\'s third party region against section\'s region\n
for transaction in transaction_list:\n
transaction_line_path = transaction.path\n
line = context.restrictedTraverse(transaction_line_path)\n
\n
# Get the transaction\'s balance\n
transaction_balance = r_(transaction.total_price) or 0.0\n
\n
# Get the third party\n
third_party = line.getDestinationSectionValue()\n
if third_party in (None, \'\'):\n
# TODO: is this log should be replaced by \'raise\' ?\n
context.log( \'ClosingTransactionCreationError\'\n
, "\'%s\' need a third party." % (transaction_line_path)\n
)\n
# Count Transaction without third party as local\n
local_balance = r_(local_balance + transaction_balance)\n
# Skip current transaction\n
continue\n
\n
# Get the third party region\n
region = third_party.getRegion()\n
if region in (None, \'\'):\n
# TODO: is this log should be replaced by \'raise\' ?\n
context.log( \'ClosingTransactionCreationError\'\n
, "\'%s\' third party (aka \'%s\') need a region." % ( transaction_line_path\n
, third_party.getPath()\n
)\n
)\n
# Count Transaction without third party as local\n
local_balance = r_(local_balance + transaction_balance)\n
# Skip current transaction\n
continue\n
\n
# Save transaction\'s balance as export or local balance\n
if transaction_balance != 0.0:\n
if not region.startswith(section_region):\n
export_balance = r_(export_balance + transaction_balance)\n
else:\n
local_balance = r_(local_balance + transaction_balance)\n
\n
# Check splitting consistency\n
if r_(export_balance + local_balance) != account_balance:\n
raise \'ClosingTransactionCreationError\', "%s balance splitting inconsistency: %s (export) + %s (import) != %s (account)" % (repr(account), export_balance, local_balance, account_balance)\n
\n
# Create two Transaction line, one for each region zone\n
if export_balance != 0.0:\n
closing_transaction.newContent( portal_type = \'Accounting Transaction Line\'\n
, source_value = account\n
, quantity = export_balance\n
, destination_section = generic_3rd_party_dict[\'export-\'+account_type]\n
)\n
if local_balance != 0.0:\n
closing_transaction.newContent( portal_type = \'Accounting Transaction Line\'\n
, source_value = account\n
, quantity = local_balance\n
, destination_section = generic_3rd_party_dict[\'local-\'+account_type]\n
)\n
\n \n
# Split transactions by third party\n # Split transactions by third party\n
elif transaction_details_level == \'third_party\':\n if transaction_details_level == \'third_party\':\n
\n \n
# Get all entities that are destination section of this account\n # Get all entities that are destination section of this account\n
third_party_list = [o.getObject() for o in context.Account_zDistinctSectionList(**params)]\n third_party_list = [o.getObject() for o in context.Account_zDistinctSectionList(**params)]\n
...@@ -318,7 +240,7 @@ context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" % (\n ...@@ -318,7 +240,7 @@ context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" % (\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>section, at_date, transaction_details_level=\'details\'</string> </value> <value> <string>section, at_date, transaction_details_level=\'third_party\'</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -363,35 +285,19 @@ context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" % (\n ...@@ -363,35 +285,19 @@ context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" % (\n
<string>section_uid</string> <string>section_uid</string>
<string>section_region</string> <string>section_region</string>
<string>resource</string> <string>resource</string>
<string>currency</string>
<string>closing_transaction</string> <string>closing_transaction</string>
<string>result_balance</string> <string>result_balance</string>
<string>ac_type_cat</string> <string>ac_type_cat</string>
<string>account_type_list</string> <string>account_type_list</string>
<string>account_dict</string> <string>account_list</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>ac_type</string>
<string>ac_cat</string> <string>ac_cat</string>
<string>_write_</string>
<string>generic_3rd_party_dict</string>
<string>True</string> <string>True</string>
<string>params</string> <string>params</string>
<string>account_type</string>
<string>account_list</string>
<string>account</string> <string>account</string>
<string>_write_</string>
<string>_apply_</string> <string>_apply_</string>
<string>account_balance</string> <string>account_balance</string>
<string>transaction_list</string>
<string>export_balance</string>
<string>local_balance</string>
<string>transaction</string>
<string>transaction_line_path</string>
<string>line</string>
<string>transaction_balance</string>
<string>third_party</string>
<string>region</string>
<string>repr</string>
<string>_getitem_</string>
<string>append</string> <string>append</string>
<string>$append0</string> <string>$append0</string>
<string>o</string> <string>o</string>
...@@ -400,6 +306,13 @@ context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" % (\n ...@@ -400,6 +306,13 @@ context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" % (\n
<string>no_third_parties_balance</string> <string>no_third_parties_balance</string>
<string>tp</string> <string>tp</string>
<string>tp_balance</string> <string>tp_balance</string>
<string>transaction_list</string>
<string>transaction</string>
<string>transaction_line_path</string>
<string>line</string>
<string>transaction_balance</string>
<string>third_party</string>
<string>repr</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -412,7 +325,7 @@ context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" % (\n ...@@ -412,7 +325,7 @@ context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" % (\n
<key> <string>func_defaults</string> </key> <key> <string>func_defaults</string> </key>
<value> <value>
<tuple> <tuple>
<string>details</string> <string>third_party</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewCreateClosingTransactionDialog/my_transaction_details_level.xml
View file @ a0545f30
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string>default</string> </value> <value> <string>third_party</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -226,21 +226,13 @@ ...@@ -226,21 +226,13 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>Account - Aggregate Lines by Account (default)</string> <string>Account - Aggregate Lines by Account</string>
<string>default</string> <string>account</string>
</tuple> </tuple>
<tuple> <tuple>
<string encoding="cdata"><![CDATA[ <string encoding="cdata"><![CDATA[
Account > Zone - Aggregate Lines by Accounts, then Zone (Export / Local Region) Account > Third Party - Aggregate Lines by Accounts, then Third Party (default)
]]></string>
<string>zone</string>
</tuple>
<tuple>
<string encoding="cdata"><![CDATA[
Account > Third Party - Aggregate Lines by Accounts, then Third Party
]]></string> ]]></string>
<string>third_party</string> <string>third_party</string>
......
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