From 376195607f2417234023aeeb8dd53a97a8f3ae93 Mon Sep 17 00:00:00 2001 From: Mame Coumba Sall <mame@nexedi.com> Date: Tue, 9 Sep 2008 13:21:51 +0000 Subject: [PATCH] 2008-09-09 mame * add form_id as a parameter in the script so that dialog always returns to the previous page git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23517 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...AccountingTransaction_convertDestinationPrice.xml | 12 +++++++----- .../AccountingTransaction_convertSourcePrice.xml | 12 +++++++----- bt5/erp5_accounting/bt/revision | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertDestinationPrice.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertDestinationPrice.xml index b1ce6bc660..67a4f8315f 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertDestinationPrice.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertDestinationPrice.xml @@ -100,7 +100,7 @@ for line in line_list:\n line.setDestinationTotalAssetPrice(\n round(exchange_ratio*(line.getQuantity())),precision)\n \n -form_id=\'PurchaseInvoiceTransaction_viewAccounting\'\n +\n msg = context.Base_translateString(\'Amount converted.\')\n \n # return to the feature module\n @@ -122,7 +122,7 @@ return context.Base_redirect(form_id,\n </item> <item> <key> <string>_params</string> </key> - <value> <string></string> </value> + <value> <string>form_id=\'view\'</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -142,12 +142,13 @@ return context.Base_redirect(form_id,\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>form_id</string> <string>Products.ERP5.Document.Document</string> <string>ConversionError</string> <string>_getattr_</string> @@ -162,7 +163,6 @@ return context.Base_redirect(form_id,\n <string>currency</string> <string>exchange_ratio</string> <string>round</string> - <string>form_id</string> <string>msg</string> <string>dict</string> </tuple> @@ -176,7 +176,9 @@ return context.Base_redirect(form_id,\n <item> <key> <string>func_defaults</string> </key> <value> - <none/> + <tuple> + <string>view</string> + </tuple> </value> </item> <item> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertSourcePrice.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertSourcePrice.xml index 92e5c0a0fa..6587111ffb 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertSourcePrice.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertSourcePrice.xml @@ -100,7 +100,7 @@ for line in line_list:\n line.setSourceTotalAssetPrice(\n round(exchange_ratio*(line.getQuantity())),precision)\n \n -form_id=\'PurchaseInvoiceTransaction_viewAccounting\'\n +\n msg = context.Base_translateString(\'Amount converted.\')\n \n # return to the feature module\n @@ -122,7 +122,7 @@ return context.Base_redirect(form_id,\n </item> <item> <key> <string>_params</string> </key> - <value> <string></string> </value> + <value> <string>form_id=\'view\'</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -142,12 +142,13 @@ return context.Base_redirect(form_id,\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>form_id</string> <string>Products.ERP5.Document.Document</string> <string>ConversionError</string> <string>_getattr_</string> @@ -162,7 +163,6 @@ return context.Base_redirect(form_id,\n <string>currency</string> <string>exchange_ratio</string> <string>round</string> - <string>form_id</string> <string>msg</string> <string>dict</string> </tuple> @@ -176,7 +176,9 @@ return context.Base_redirect(form_id,\n <item> <key> <string>func_defaults</string> </key> <value> - <none/> + <tuple> + <string>view</string> + </tuple> </value> </item> <item> diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 4f1a32f190..96e4f13f48 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -765 \ No newline at end of file +766 \ No newline at end of file -- 2.30.9