From bd48c12e763ea184097e4bb8efdb6a6ddb7af294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 19 May 2021 12:44:43 +0200 Subject: [PATCH] Move carrier and cost from sale_shipment_cost to stock_shipment_cost issue10375 review358031002 --- setup.py | 4 +++- tests/test_carrier_weight.py | 3 ++- tryton.cfg | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 399c40aff4..fbed39c493 100755 --- a/setup.py +++ b/setup.py @@ -65,7 +65,9 @@ requires.append(get_require_version('trytond')) tests_require = [get_require_version('proteus'), get_require_version('trytond_purchase_shipment_cost'), - get_require_version('trytond_sale_shipment_cost')] + get_require_version('trytond_sale_shipment_cost'), + get_require_version('trytond_stock_shipment_cost'), + ] dependency_links = [] if minor_version % 2: dependency_links.append( diff --git a/tests/test_carrier_weight.py b/tests/test_carrier_weight.py index c04549f04e..33277bc027 100644 --- a/tests/test_carrier_weight.py +++ b/tests/test_carrier_weight.py @@ -16,7 +16,8 @@ from trytond.modules.currency.tests import create_currency class CarrierWeightTestCase(CompanyTestMixin, ModuleTestCase): 'Test CarrierWeight module' module = 'carrier_weight' - extras = ['purchase_shipment_cost', 'sale_shipment_cost'] + extras = [ + 'purchase_shipment_cost', 'sale_shipment_cost', 'stock_shipment_cost'] @with_transaction() def test_compute_weight_price(self): diff --git a/tryton.cfg b/tryton.cfg index 34cc2f2d07..c9c6e0ca52 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -11,5 +11,6 @@ depends: extras_depend: purchase_shipment_cost sale_shipment_cost + stock_shipment_cost xml: carrier.xml