[Erp5-report] r9163 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/erp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Aug 11 19:33:04 CEST 2006
Author: jerome
Date: Fri Aug 11 19:32:57 2006
New Revision: 9163
URL: http://svn.erp5.org?rev=9163&view=rev
Log:
remove InvoiceTransactionLine_getDestinationItemList and InvoiceTransactionLine_getSourceItemList in favor of AccountingTransactionLine_getNodeItemList, which fixes source/destination inversion on lines ids for Purchase Invoice Transactions.
Added:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getNodeItemList.xml
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountStatementReportDialog/my_account.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination/listbox_destination.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewSource/listbox_source.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewSearchDialog/my_node.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_view/listbox_source.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDestinationAsset/listbox_destination.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDetails/listbox_destination.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDetails/listbox_source.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewSourceAsset/listbox_source.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_view/listbox_source.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionLine_getDestinationItemList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionLine_getSourceItemList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_view/listbox_source.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_viewDetails/listbox_destination.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_viewDetails/listbox_source.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_init.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewAccounting/listbox_destination.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_destination.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_source.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewAccounting/listbox_destination.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewAccounting/listbox_source.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails/listbox_destination.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails/listbox_source.xml
erp5/trunk/bt5/erp5_accounting/bt/change_log
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountStatementReportDialog/my_account.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountStatementReportDialog/my_account.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountStatementReportDialog/my_account.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountStatementReportDialog/my_account.xml Fri Aug 11 19:32:57 2006
@@ -302,7 +302,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:here.InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>python:here.AccountingTranscationLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination/listbox_destination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination/listbox_destination.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination/listbox_destination.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination/listbox_destination.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList(mirror=1)</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewSource/listbox_source.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewSource/listbox_source.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewSource/listbox_source.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewSource/listbox_source.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
Added: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getNodeItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getNodeItemList.xml?rev=9163&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getNodeItemList.xml (added)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getNodeItemList.xml Fri Aug 11 19:32:57 2006
@@ -1,0 +1,260 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.PythonScripts.PythonScript</string>
+ <string>PythonScript</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>"""Return item list of accounts that can be used as node for this accounting\n
+transaction line.\n
+The id of the line is used to filter the list. If `mirror` is set to a true\n
+value, the list will be filtered for the mirror node.\n
+"""\n
+from Products.ERP5Type.Cache import CachingMethod\n
+\n
+if not mirror:\n
+ category_dict = {\n
+ \'income\': \'account_type/income\',\n
+ \'expense\': \'account_type/expense\',\n
+ \'payable\': \'account_type/liability/payable\',\n
+ \'receivable\': \'account_type/asset/receivable\',\n
+ \'collected_vat\': \'account_type/liability/payable/collected_vat\',\n
+ \'refundable_vat\': \'account_type/asset/receivable/refundable_vat\',\n
+ \'bank\': \'account_type/asset/cash\',\n
+ \'cash\': \'account_type/asset/cash\', }\n
+else:\n
+ category_dict = {\n
+ \'income\': \'account_type/expense\',\n
+ \'expense\': \'account_type/income\',\n
+ \'payable\': \'account_type/asset/receivable\',\n
+ \'receivable\': \'account_type/liability/payable\',\n
+ \'collected_vat\': \'account_type/asset/receivable/refundable_vat\',\n
+ \'refundable_vat\': \'account_type/liability/payable/collected_vat\',\n
+ \'bank\': \'account_type/asset/cash\',\n
+ \'cash\': \'account_type/asset/cash\', }\n
+\n
+category = category_dict.get(context.getId(), \'account_type\')\n
+\n
+display_cache = {}\n
+display_funct = context.Account_getFormattedTitle\n
+\n
+def display(x):\n
+ if x not in display_cache:\n
+ display_cache[x] = display_funct(x)\n
+ return display_cache[x]\n
+\n
+def sort(x,y):\n
+ return cmp(display(x), display(y))\n
+\n
+def getItemList(category=None, portal_path=None, mirror=0,\n
+ user_name=None, simulation_state=None):\n
+ """Returns a list of Account path items. """\n
+ cat = context.portal_categories.resolveCategory(category)\n
+ filter_dict = {}\n
+\n
+ # we don\'t filter in existing transactions or report / search dialogs\n
+ if simulation_state not in (\'delivered\', \'cancelled\', \'no_simulation_state\'):\n
+ filter_dict[\'validation_state\'] = (\'draft\', \'validated\')\n
+ \n
+ item_list = cat.getCategoryMemberItemList(\n
+ portal_type=\'Account\',\n
+ base=0,\n
+ display_method=display,\n
+ sort_method=sort,\n
+ strict_membership=1,\n
+ filter=filter_dict)\n
+ return item_list\n
+\n
+# wrap the previous method in a cache\n
+getItemList = CachingMethod(getItemList,\n
+ id=\'AccountingTransactionLine_getNodeItemList\')\n
+\n
+# the cache vary with the simulation state of the current transaction,\n
+# to display all accounts when the transaction is already delivered.\n
+return getItemList( category=category,\n
+ portal_path=context.getPortalObject().getPhysicalPath(),\n
+ mirror=mirror,\n
+ user_name=context.REQUEST.AUTHENTICATED_USER,\n
+ simulation_state=context.getProperty(\n
+ \'simulation_state\', \'no_simulation_state\') )\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_dav_writelocks</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>mirror=0</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>mirror</string>
+ <string>Products.ERP5Type.Cache</string>
+ <string>CachingMethod</string>
+ <string>category_dict</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>category</string>
+ <string>display_cache</string>
+ <string>display_funct</string>
+ <string>display</string>
+ <string>sort</string>
+ <string>None</string>
+ <string>getItemList</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <tuple>
+ <int>0</int>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>AccountingTransactionLine_getNodeItemList</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Persistence</string>
+ <string>PersistentMapping</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_container</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewSearchDialog/my_node.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewSearchDialog/my_node.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewSearchDialog/my_node.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewSearchDialog/my_node.xml Fri Aug 11 19:32:57 2006
@@ -275,7 +275,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>here/AccountingTransactionLine_getNodeItemList</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_view/listbox_source.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_view/listbox_source.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_view/listbox_source.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_view/listbox_source.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDestinationAsset/listbox_destination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDestinationAsset/listbox_destination.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDestinationAsset/listbox_destination.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDestinationAsset/listbox_destination.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList(mirror=1)</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDetails/listbox_destination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDetails/listbox_destination.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDetails/listbox_destination.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDetails/listbox_destination.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList(mirror=1)</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDetails/listbox_source.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDetails/listbox_source.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDetails/listbox_source.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDetails/listbox_source.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewSourceAsset/listbox_source.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewSourceAsset/listbox_source.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewSourceAsset/listbox_source.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewSourceAsset/listbox_source.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_view/listbox_source.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_view/listbox_source.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_view/listbox_source.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_view/listbox_source.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionLine_getDestinationItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionLine_getDestinationItemList.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionLine_getDestinationItemList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionLine_getDestinationItemList.xml Fri Aug 11 19:32:57 2006
@@ -68,20 +68,10 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>category_dict = {\n
- \'income\': \'account_type/expense\',\n
- \'expense\': \'account_type/income\',\n
- \'payable\': \'account_type/asset/receivable\',\n
- \'receivable\': \'account_type/liability/payable\',\n
- \'collected_vat\': \'account_type/asset/receivable/refundable_vat\',\n
- \'refundable_vat\': \'account_type/liability/payable/collected_vat\',\n
- \'bank\': \'account_type/asset/cash\',\n
- \'cash\': \'account_type/asset/cash\',\n
-}\n
-\n
-return context.InvoiceTransactionLine_getSourceItemList(\n
- category_dict=category_dict,\n
- caching_method_id=\'InvoiceTransactionLine_getDestinationItemList\' )\n
+ <value> <string>context.log(\'erp5_accounting\',\n
+ \'InvoiceTransactionLine_getDestinationItemList is a deprecated compatibility\'\n
+ \' alias to AccountingTransactionLine_getNodeItemList(mirror=1)\')\n
+return context.AccountingTransactionLine_getNodeItemList(mirror=1)\n
</string> </value>
</item>
<item>
@@ -130,7 +120,6 @@
<key> <string>co_varnames</string> </key>
<value>
<tuple>
- <string>category_dict</string>
<string>_getattr_</string>
<string>context</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionLine_getSourceItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionLine_getSourceItemList.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionLine_getSourceItemList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionLine_getSourceItemList.xml Fri Aug 11 19:32:57 2006
@@ -68,57 +68,10 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>from Products.ERP5Type.Cache import CachingMethod\n
-\n
-if category_dict is None:\n
- # this code is shared by InvoiceTransactionLine_getSourceItemList, \n
- # which provides it\'s own dict\n
- category_dict = {\n
- \'income\': \'account_type/income\',\n
- \'expense\': \'account_type/expense\',\n
- \'payable\': \'account_type/liability/payable\',\n
- \'receivable\': \'account_type/asset/receivable\',\n
- \'collected_vat\': \'account_type/liability/payable/collected_vat\',\n
- \'refundable_vat\': \'account_type/asset/receivable/refundable_vat\',\n
- \'bank\': \'account_type/asset/cash\',\n
- }\n
-category = category_dict.get(context.getId(), \'account_type\')\n
-\n
-\n
-display_cache = {}\n
-display_funct = context.Account_getFormattedTitle\n
-\n
-def display(x):\n
- if x not in display_cache:\n
- display_cache[x] = display_funct(x)\n
- return display_cache[x]\n
-\n
-def sort(x,y):\n
- return cmp(display(x), display(y))\n
-\n
-def getItemList(category=None, portal_path=None, user_name=None, simulation_state=None):\n
- """Returns a list of Account path items. """\n
- cat = context.portal_categories.resolveCategory(category)\n
- filter_dict = {}\n
-\n
- # we don\'t filter in existing transactions or report / search dialogs\n
- if simulation_state not in (\'delivered\', \'cancelled\', \'no_simulation_state\') :\n
- filter_dict[\'validation_state\'] = (\'draft\', \'validated\')\n
- \n
- item_list = cat.getCategoryMemberItemList(portal_type=\'Account\', base=0,\n
- display_method=display, sort_method=sort, filter=filter_dict)\n
- return item_list\n
-\n
-# wrap the previous method in a cache\n
-getItemList = CachingMethod(getItemList, id=caching_method_id)\n
-\n
-# the cache vary with the simulation state of the current transaction,\n
-# to display all accounts when the transaction is already delivered.\n
-return getItemList( category=category,\n
- portal_path=context.getPortalObject().getPhysicalPath(), \n
- user_name=context.REQUEST.AUTHENTICATED_USER,\n
- simulation_state=context.getProperty(\n
- \'simulation_state\', \'no_simulation_state\') )\n
+ <value> <string>context.log(\'erp5_accounting\',\n
+ \'InvoiceTransactionLine_getSourceItemList is a deprecated compatibility\'\n
+ \' alias to AccountingTransactionLine_getNodeItemList()\')\n
+return context.AccountingTransactionLine_getNodeItemList()\n
</string> </value>
</item>
<item>
@@ -169,17 +122,8 @@
<tuple>
<string>category_dict</string>
<string>caching_method_id</string>
- <string>Products.ERP5Type.Cache</string>
- <string>CachingMethod</string>
- <string>None</string>
<string>_getattr_</string>
<string>context</string>
- <string>category</string>
- <string>display_cache</string>
- <string>display_funct</string>
- <string>display</string>
- <string>sort</string>
- <string>getItemList</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_view/listbox_source.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_view/listbox_source.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_view/listbox_source.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_view/listbox_source.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_viewDetails/listbox_destination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_viewDetails/listbox_destination.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_viewDetails/listbox_destination.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_viewDetails/listbox_destination.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList(mirror=1)</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_viewDetails/listbox_source.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_viewDetails/listbox_source.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_viewDetails/listbox_source.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_viewDetails/listbox_source.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_init.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_init.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_init.xml Fri Aug 11 19:32:57 2006
@@ -82,11 +82,11 @@
resource = preference_tool.getPreferredAccountingTransactionCurrency())\n
\n
transaction.newContent(portal_type=\'Purchase Invoice Transaction Line\',\n
- id=\'income\', )\n
+ id=\'expense\', )\n
transaction.newContent(portal_type=\'Purchase Invoice Transaction Line\',\n
- id=\'receivable\', )\n
+ id=\'payable\', )\n
transaction.newContent(portal_type=\'Purchase Invoice Transaction Line\',\n
- id=\'collected_vat\', )\n
+ id=\'refundable_vat\', )\n
</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewAccounting/listbox_destination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewAccounting/listbox_destination.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewAccounting/listbox_destination.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewAccounting/listbox_destination.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_destination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_destination.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_destination.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_destination.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_source.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_source.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_source.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_source.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList(mirror=1)</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewAccounting/listbox_destination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewAccounting/listbox_destination.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewAccounting/listbox_destination.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewAccounting/listbox_destination.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList(mirror=1)</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewAccounting/listbox_source.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewAccounting/listbox_source.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewAccounting/listbox_source.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewAccounting/listbox_source.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails/listbox_destination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails/listbox_destination.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails/listbox_destination.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails/listbox_destination.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList(mirror=1)</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails/listbox_source.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails/listbox_source.xml?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails/listbox_source.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails/listbox_source.xml Fri Aug 11 19:32:57 2006
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/change_log?rev=9163&r1=9162&r2=9163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/change_log Fri Aug 11 19:32:57 2006
@@ -1,3 +1,6 @@
+2006-08-11 jerome
+* remove InvoiceTransactionLine_getDestinationItemList and InvoiceTransactionLine_getSourceItemList in favor of AccountingTransactionLine_getNodeItemList, which fixes source/destination inversion on lines ids for Purchase Invoice Transactions.
+
2006-07-03 Kevin
* Move Base_importGapFile script from gap_importer business template.
More information about the Erp5-report
mailing list