changeset ea20d9854687 in modules/carrier_subdivision:default
details:
https://hg.tryton.org/modules/carrier_subdivision?cmd=changeset&node=ea20d9854687
description:
Add carrier_carriage module
issue11623
review443451003
diffstat:
__init__.py | 4 ++++
sale.py | 21 +++++++++++++++++++++
setup.py | 1 +
tests/test_module.py | 2 +-
tryton.cfg | 1 +
5 files changed, 28 insertions(+), 1 deletions(-)
diffs (73 lines):
diff -r c7bbdf354612 -r ea20d9854687 __init__.py
--- a/__init__.py Mon Aug 01 10:57:41 2022 +0200
+++ b/__init__.py Sat Sep 10 17:35:38 2022 +0200
@@ -16,3 +16,7 @@
sale.Sale,
module='carrier_subdivision', type_='model',
depends=['sale_shipment_cost'])
+ Pool.register(
+ sale.Carriage,
+ module='carrier_subdivision', type_='model',
+ depends=['carrier_carriage', 'sale_shipment_cost'])
diff -r c7bbdf354612 -r ea20d9854687 sale.py
--- a/sale.py Mon Aug 01 10:57:41 2022 +0200
+++ b/sale.py Sat Sep 10 17:35:38 2022 +0200
@@ -26,3 +26,24 @@
if address.postal_code:
pattern['to_postal_code'] = address.postal_code
return pattern
+
+
+class Carriage(metaclass=PoolMeta):
+ __name__ = 'sale.carriage'
+
+ @fields.depends('from_', 'to')
+ def _get_carrier_selection_pattern(self):
+ pattern = super()._get_carrier_selection_pattern()
+ pattern['from_subdivision'] = None
+ if self.from_:
+ if self.from_.subdivision:
+ pattern['from_subdivision'] = self.from_.subdivision.id
+ if self.from_.postal_code:
+ pattern['from_postal_code'] = self.from_.postal_code
+ pattern['to_subdivision'] = None
+ if self.to:
+ if self.to.subdivision:
+ pattern['to_subdivision'] = self.to.subdivision.id
+ if self.to.postal_code:
+ pattern['to_postal_code'] = self.to.postal_code
+ return pattern
diff -r c7bbdf354612 -r ea20d9854687 setup.py
--- a/setup.py Mon Aug 01 10:57:41 2022 +0200
+++ b/setup.py Sat Sep 10 17:35:38 2022 +0200
@@ -70,6 +70,7 @@
tests_require = [
get_require_version('proteus'),
get_require_version('trytond_sale_shipment_cost'),
+ get_require_version('trytond_carrier_carriage'),
]
dependency_links = []
if minor_version % 2:
diff -r c7bbdf354612 -r ea20d9854687 tests/test_module.py
--- a/tests/test_module.py Mon Aug 01 10:57:41 2022 +0200
+++ b/tests/test_module.py Sat Sep 10 17:35:38 2022 +0200
@@ -7,7 +7,7 @@
class CarrierSubdivisionTestCase(ModuleTestCase):
"Test Carrier Subdivision module"
module = 'carrier_subdivision'
- extras = ['sale_shipment_cost']
+ extras = ['carrier_carriage', 'sale_shipment_cost']
del ModuleTestCase
diff -r c7bbdf354612 -r ea20d9854687 tryton.cfg
--- a/tryton.cfg Mon Aug 01 10:57:41 2022 +0200
+++ b/tryton.cfg Sat Sep 10 17:35:38 2022 +0200
@@ -4,6 +4,7 @@
ir
carrier
extras_depend:
+ carrier_carriage
sale_shipment_cost
xml:
carrier.xml
