changeset c1ee9569ceb6 in modules/account_tax_rule_country:6.0
details:
https://hg.tryton.org/modules/account_tax_rule_country?cmd=changeset&node=c1ee9569ceb6
description:
Ignore address of sale and purchase with empty warehouse
issue10401
review362021002
(grafted from 3afa6cea9ad288bffb28641744f02005b596efce)
diffstat:
account.py | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diffs (33 lines):
diff -r 54a3413dc4c5 -r c1ee9569ceb6 account.py
--- a/account.py Mon May 03 16:07:41 2021 +0200
+++ b/account.py Wed Jun 09 08:31:59 2021 +0200
@@ -121,10 +121,10 @@
if (SaleLine
and isinstance(self.origin, SaleLine)
and self.origin.id >= 0):
- warehouse_address = self.origin.warehouse.address
- if warehouse_address:
- from_country = warehouse_address.country
- from_subdivision = warehouse_address.subdivision
+ warehouse = self.origin.warehouse
+ if warehouse and warehouse.address:
+ from_country = warehouse.address.country
+ from_subdivision = warehouse.address.subdivision
shipment_address = self.origin.sale.shipment_address
to_country = shipment_address.country
to_subdivision = shipment_address.subdivision
@@ -134,10 +134,10 @@
invoice_address = self.origin.purchase.invoice_address
from_country = invoice_address.country
from_subdivision = invoice_address.subdivision
- warehouse_address = self.origin.purchase.warehouse.address
- if warehouse_address:
- to_country = warehouse_address.country
- to_subdivision = warehouse_address.subdivision
+ warehouse = self.origin.purchase.warehouse
+ if warehouse and warehouse.address:
+ to_country = warehouse.address.country
+ to_subdivision = warehouse.address.subdivision
pattern['from_country'] = from_country.id if from_country else None
pattern['from_subdivision'] = (
