From 15369bb08b2c36505d01b9b44ebe9134965adefc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Thu, 6 Apr 2006 08:21:21 +0000 Subject: [PATCH] typo in getInventory variable name, (+ big mistake in copy/paste, BankAccount_getAccountingTransactionList was commited with the content of Entity_getAccountingTransactionList) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6478 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...nkAccount_getAccountingTransactionList.xml | 78 +++++++++---------- .../Entity_getAccountingTransactionList.xml | 5 +- 2 files changed, 38 insertions(+), 45 deletions(-) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_getAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_getAccountingTransactionList.xml index bccd36ba0a..72005bf90d 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_getAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_getAccountingTransactionList.xml @@ -97,18 +97,17 @@ if from_date is not None :\n # Create a new parameter list to get the previous balance\n get_inventory_kw = params.copy()\n get_inventory_kw.update({ \'omit_simulation\' : 1\n + , \'payment_uid\' : context.getUid()\n , \'to_date\' : from_date\n - , \'mirror_section_uid\' : context.getUid()\n , \'section_portal_type_list\': [\'Organisation\']\n + , \'stat\' : 1\n })\n - getInventory = context.getPortalObject()\\\n - .portal_simulation.getInventoryAssetPrice\n +\n + getInventory = context.getPortalObject().portal_simulation.getInventory\n # Get previous debit and credit\n - previous_total_debit = r_(getInventoryAssetPrice(omit_output=1,\n - **get_inventory_kw))\n - previous_total_credit = r_(getInventoryAssetPrice(omit_input =1,\n - **get_inventory_kw))\n - if previous_total_credit != 0 :\n + previous_total_debit = r_(getInventory(omit_output=1, **get_inventory_kw))\n + previous_total_credit = r_(getInventory(omit_input =1, **get_inventory_kw))\n + if previous_total_credit != 0:\n previous_total_credit = - previous_total_credit\n \n # Show the previous balance if not empty\n @@ -122,20 +121,15 @@ if from_date is not None :\n previous_balance.setUid(\'new_000\')\n \n previous_balance.edit( \\\n - parent_title = context.Base_translateString("Previous Balance")\n - , section_title = ""\n - , date = from_date - 1\n - , portal_type = ""\n - , account_uid = None\n - , parent_reference = None\n - , parent_specific_reference = None\n - , translated_simulation_state_title = None\n - , debit = previous_total_debit\n - , credit = previous_total_credit\n - , grouping_reference = None\n - , balance = net_balance\n - , net_balance = net_balance\n - , is_previous_balance = True\n + title = context.Base_translateString("Previous Balance")\n + , date = from_date - 1\n + , portal_type = ""\n + , simulation_state_title = ""\n + , debit = previous_total_debit\n + , credit = previous_total_credit\n + , balance = net_balance\n + , net_balance = net_balance\n + , is_previous_balance = True\n )\n new_result.append(previous_balance)\n \n @@ -143,12 +137,19 @@ if from_date is not None :\n # Show / Hide grouping if needed\n if kw.has_key(\'hide_grouping\'): params[\'hide_grouping\'] = kw[\'hide_grouping\']\n \n -# FIXME: same problem as in BankAccount_getAccountingTransactionList\n -result = context.Entity_zGetAccountingTransactionList( from_date = from_date\n - , at_date = at_date\n - , src__ = src__\n - , **params\n - )\n +# FIXME:\n +# using listbox current page number * number of line per listbox page, you can call a\n +# ZSQL Method to initialize net_balance and calculate this only for this page.\n +#\n +# But this is just temporary because some day, erp5_accounting will be rewritten using\n +# only portal_catalog and getInventory. The Iventory API should provide a way to implement\n +# such a net_balance column (in one instruction, so that we do not need to write a wrapping\n +# list method like this one)\n +result = context.BankAccount_zGetAccountingTransactionList( from_date = from_date\n + , at_date = at_date\n + , src__ = src__\n + , **params\n + )\n if src__:\n return result\n \n @@ -157,19 +158,13 @@ for l in result:\n o = l.getObject()\n net_balance += l.balance or 0.0\n if o is not None:\n - c = o.asContext( net_balance = net_balance\n - , balance = l.balance\n - , credit = l.credit\n - , debit = l.debit\n - , date = l.date\n - , section_title = l.section_title\n - , parent_reference = l.parent_reference\n - , parent_specific_reference = l.parent_specific_reference\n - , translated_simulation_state_title = o.getTranslatedSimulationStateTitle()\n - # FIXME: overriding \'portal_type\' in asContext is clearly a bad idea, as many methods are storred on the portal type\n - # (hence the translated_simulation_state_title hack) -j\xc3\xa9rome\n - , portal_type = l.portal_type\n - , account_uid = l.account_uid\n + c = o.asContext( net_balance = net_balance\n + , balance = l.balance\n + , credit = l.credit\n + , debit = l.debit\n + , date = l.date\n + , section_title = l.section_title\n + , specific_reference = l.specific_reference\n )\n new_result.append(c)\n \n @@ -240,7 +235,6 @@ return new_result\n <string>get_inventory_kw</string> <string>getInventory</string> <string>_apply_</string> - <string>getInventoryAssetPrice</string> <string>previous_total_debit</string> <string>previous_total_credit</string> <string>Products.ERP5Type.Document</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_getAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_getAccountingTransactionList.xml index 5055454057..87c7b32af8 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_getAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_getAccountingTransactionList.xml @@ -104,9 +104,9 @@ if from_date is not None :\n getInventory = context.getPortalObject()\\\n .portal_simulation.getInventoryAssetPrice\n # Get previous debit and credit\n - previous_total_debit = r_(getInventoryAssetPrice(omit_output=1,\n + previous_total_debit = r_(getInventory(omit_output=1,\n **get_inventory_kw))\n - previous_total_credit = r_(getInventoryAssetPrice(omit_input =1,\n + previous_total_credit = r_(getInventory(omit_input =1,\n **get_inventory_kw))\n if previous_total_credit != 0 :\n previous_total_credit = - previous_total_credit\n @@ -240,7 +240,6 @@ return new_result\n <string>get_inventory_kw</string> <string>getInventory</string> <string>_apply_</string> - <string>getInventoryAssetPrice</string> <string>previous_total_debit</string> <string>previous_total_credit</string> <string>Products.ERP5Type.Document</string> -- 2.30.9