From 605a7247811a9d851dbdd4b843702e6720c26c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Fri, 26 Oct 2007 12:15:55 +0000 Subject: [PATCH] revert 17187 for now, it seems to have bad side effects. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17204 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Invoice_getRemainingTotalPayablePrice.xml | 13 +++++++------ bt5/erp5_accounting/bt/revision | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_getRemainingTotalPayablePrice.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_getRemainingTotalPayablePrice.xml index af0a2d9c4f..59c1253e21 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_getRemainingTotalPayablePrice.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_getRemainingTotalPayablePrice.xml @@ -3,8 +3,11 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> + <tuple> + <string>Products.PythonScripts.PythonScript</string> + <string>PythonScript</string> + </tuple> + <none/> </tuple> </pickle> <pickle> @@ -147,9 +150,8 @@ for is_source, line in getIsSourceMovementItemList(context):\n if at_date is None and line.getGroupingReference():\n continue\n \n - if node_value is not None and (\n - node_value.getAccountTypeId() in (\'payable\', \'receivable\')\n - or (account_id is not None and node_value.getId() in account_id)):\n + if node_value is not None and \\\n + node_value.getAccountTypeId() in (\'payable\', \'receivable\'):\n if account_id is not None and node_value.getId() not in account_id:\n continue\n key = (node_value.getRelativeUrl(), mirror_section)\n @@ -316,7 +318,6 @@ else:\n <string>date</string> <string>total_amount</string> <string>node</string> - <string>_inplacevar_</string> <string>sum</string> </tuple> </value> diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 95bae2dc25..3b7560b755 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -446 \ No newline at end of file +445 \ No newline at end of file -- 2.30.9