From 69b336397c96eadca0835ad3ec8243bb4e6e0e46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Fri, 1 Aug 2008 13:15:04 +0000 Subject: [PATCH] the order's trade condition git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22825 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../InvoiceTransaction_postGenerationActivity.xml | 15 ++++++++++++++- bt5/erp5_invoicing/bt/revision | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml index 9a99c58e39..aa67ba5967 100644 --- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml +++ b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml @@ -105,7 +105,14 @@ else:\n invoice.edit(\n resource=price_currency,\n price_currency=price_currency,)\n - \n +\n +\n +# copy trade condition:\n +if not context.getSpecialise():\n + related_order = related_packing_list.getDefaultCausalityValue()\n + if related_order is not None:\n + context.edit(specialise=related_order.getSpecialise())\n +\n # copy title, if not updating a new delivery\n if not invoice.getTitle():\n invoice.setTitle(related_packing_list.getTitle())\n @@ -216,6 +223,12 @@ invoice.activate(after_path_and_method_id=(related_simulation_movement_path_list <key> <string>id</string> </key> <value> <string>InvoiceTransaction_postGenerationActivity</string> </value> </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>warnings</string> </key> <value> diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision index 2702ba3d43..1bda760653 100644 --- a/bt5/erp5_invoicing/bt/revision +++ b/bt5/erp5_invoicing/bt/revision @@ -1 +1 @@ -115 \ No newline at end of file +117 \ No newline at end of file -- 2.30.9