diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createRelatedPaymentTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createRelatedPaymentTransactionList.xml index e98005050592b2272175bc5b205d5122f26f03c4..07cc099d997945a6748932843a52a6de81839925 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createRelatedPaymentTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createRelatedPaymentTransactionList.xml @@ -81,12 +81,6 @@ selected_uids = stool.updateSelectionCheckedUidList(\n \n object_list = stool.callSelectionFor(selection_name)\n \n -# update selection params, because it\'ll be used in the selection dialog.\n -stool.setSelectionParamsFor(\'accounting_selection\',\n - params=dict(node_for_related_payment=node,\n - payment_mode_for_related_payment=payment_mode,\n - payment_for_related_payment=payment))\n -\n # XXX prevent to call this on the whole module:\n if len(object_list) > 100:\n return context.REQUEST.RESPONSE.redirect(\n @@ -173,7 +167,6 @@ return context.REQUEST.RESPONSE.redirect(\n <string>N_</string> <string>selected_uids</string> <string>object_list</string> - <string>dict</string> <string>len</string> <string>_getiter_</string> <string>obj</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_createRelatedPaymentTransaction.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_createRelatedPaymentTransaction.xml index a63427ad8037ded79d1402a500d94bf370e8215c..f4532759a801c2887bec5d85469981d8dc10f2b6 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_createRelatedPaymentTransaction.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_createRelatedPaymentTransaction.xml @@ -80,6 +80,12 @@ payment_dict = {}\n is_source = context.AccountingTransaction_isSourceView()\n line_portal_type = \'Accounting Transaction Line\'\n \n +# update selection params, because it\'ll be used in the selection dialog.\n +portal.portal_selections.setSelectionParamsFor(\'accounting_selection\',\n + params=dict(node_for_related_payment=node,\n + payment_mode_for_related_payment=payment_mode,\n + payment_for_related_payment=payment))\n +\n related_payement = portal.accounting_module.newContent(\n portal_type="Payment Transaction",\n title = str(N_("Payment of ${invoice_title}",\n @@ -198,8 +204,8 @@ if not batch_mode:\n <string>payment_dict</string> <string>is_source</string> <string>line_portal_type</string> - <string>str</string> <string>dict</string> + <string>str</string> <string>unicode</string> <string>related_payement</string> <string>bank</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_node.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_node.xml index fdff3ed48abe3f1f6059175720738420fbc95754..5f98161868b162dd0443d9a7b4fb86b3fcbda8cb 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_node.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_node.xml @@ -124,7 +124,9 @@ </item> <item> <key> <string>default</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>description</string> </key> @@ -161,7 +163,7 @@ <item> <key> <string>items</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> @@ -268,6 +270,25 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python:here.portal_selections.getSelectionParamsFor(\'accounting_selection\').get(\'node_for_related_payment\')</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_payment.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_payment.xml index 74a612a2b90fb4431427cdd0884f80a26e66b633..7570a9f32dade29b2ad8a07f10a83e3bf96a40fe 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_payment.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_payment.xml @@ -124,7 +124,9 @@ </item> <item> <key> <string>default</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>description</string> </key> @@ -161,7 +163,7 @@ <item> <key> <string>items</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> @@ -268,6 +270,25 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python:here.portal_selections.getSelectionParamsFor(\'accounting_selection\').get(\'payment_for_related_payment\')</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_payment_mode.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_payment_mode.xml index d2393a4e5b6420d0fe610f6c48bd0d6db17b1555..fabeab74e9e761e3ec53364d393b7dcaf044eba9 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_payment_mode.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_viewCreateRelatedPaymentTransactionDialog/your_payment_mode.xml @@ -124,7 +124,9 @@ </item> <item> <key> <string>default</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>description</string> </key> @@ -161,7 +163,7 @@ <item> <key> <string>items</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> @@ -268,6 +270,25 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python:here.portal_selections.getSelectionParamsFor(\'accounting_selection\').get(\'payment_mode_for_related_payment\')</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 9f728587959d189de8b5dcadab2b3aec1276a169..0fa6a7b088051e48b8dc94d598b7e324e6f691c9 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -88 \ No newline at end of file +90 \ No newline at end of file