From d20e6aa7e6999cf57799a6448cbe4a7b15ef0ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Thu, 22 Aug 2013 11:58:33 +0200 Subject: [PATCH] declare conflict with lp:account-payment/account_payment_exention --- account_banking_payment_export/__openerp__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/account_banking_payment_export/__openerp__.py b/account_banking_payment_export/__openerp__.py index 0788b65b1..9d16b90a2 100644 --- a/account_banking_payment_export/__openerp__.py +++ b/account_banking_payment_export/__openerp__.py @@ -33,6 +33,16 @@ 'depends': [ 'account_payment', ], + 'conflicts': [ + # lp:account-payment/account_payment_extension also adds + # a type field to payment.mode, with a very similar purpose. + # We can't add a dependency on account_payment_extension here + # because account_payment_extension adds many other features + # that probably conflict with other parts of lp:banking-addons. + # Proposal to resolve: make account_payment_extension depend + # on the present account_banking_payment_export module. + 'account_payment_extension', + ], 'data': [ 'view/account_payment.xml', 'view/bank_payment_manual.xml',