From 5ae77b41432ea9be2eac5212ac6ed0f09b07ecd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 16 Sep 2013 16:31:40 +0200 Subject: [PATCH] Those builders should not create new deliveries trade model and invoice transaction line should be in same invoice --- .../purchase_invoice_transaction_builder.xml | 4 ++++ .../purchase_invoice_transaction_trade_model_builder.xml | 4 ++++ .../portal_deliveries/sale_invoice_transaction_builder.xml | 4 ++++ .../sale_invoice_transaction_trade_model_builder.xml | 4 ++++ bt5/erp5_configurator_standard_invoicing_template/bt/revision | 2 +- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml b/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml index 8961857b0e..586a3ed28d 100644 --- a/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml +++ b/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder.xml @@ -97,6 +97,10 @@ </tuple> </value> </item> + <item> + <key> <string>delivery_creatable</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>delivery_line_collect_order</string> </key> <value> diff --git a/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml b/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml index ebc1493d7e..9d931cc288 100644 --- a/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml +++ b/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_trade_model_builder.xml @@ -85,6 +85,10 @@ </tuple> </value> </item> + <item> + <key> <string>delivery_creatable</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>delivery_line_collect_order</string> </key> <value> diff --git a/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml b/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml index 36d0a6c8fa..42221f8b0b 100644 --- a/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml +++ b/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml @@ -97,6 +97,10 @@ </tuple> </value> </item> + <item> + <key> <string>delivery_creatable</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>delivery_line_collect_order</string> </key> <value> diff --git a/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml b/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml index bc050873ab..c229e991c6 100644 --- a/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml +++ b/bt5/erp5_configurator_standard_invoicing_template/PathTemplateItem/portal_deliveries/sale_invoice_transaction_trade_model_builder.xml @@ -85,6 +85,10 @@ </tuple> </value> </item> + <item> + <key> <string>delivery_creatable</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>delivery_line_collect_order</string> </key> <value> diff --git a/bt5/erp5_configurator_standard_invoicing_template/bt/revision b/bt5/erp5_configurator_standard_invoicing_template/bt/revision index d8263ee986..e440e5c842 100644 --- a/bt5/erp5_configurator_standard_invoicing_template/bt/revision +++ b/bt5/erp5_configurator_standard_invoicing_template/bt/revision @@ -1 +1 @@ -2 \ No newline at end of file +3 \ No newline at end of file -- 2.30.9