NaNtic
/
trytond-patches
mirror of https://github.com/NaN-tic/trytond-patches.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
trytond-patches/issue8252.diff

183 lines
8.8 KiB
Diff
Raw Permalink Blame History

diff -r e699606e11cb trytond/trytond/modules/account_tax_rule_country/account.py
--- a/trytond/trytond/modules/account_tax_rule_country/account.py Mon May 06 14:59:51 2019 +0200
+++ b/trytond/trytond/modules/account_tax_rule_country/account.py Wed Jun 12 11:14:02 2019 +0200
@@ -13,6 +13,10 @@
ondelete='RESTRICT')
to_country = fields.Many2One('country.country', 'To Country',
ondelete='RESTRICT')
+ from_subdivision = fields.Many2One('country.subdivision', 'From Subdivision',
+ ondelete='RESTRICT')
+ to_subdivision = fields.Many2One('country.subdivision', 'To Subdivision',
+ ondelete='RESTRICT')
def _get_tax_rule_line_value(self, rule_line=None):
value = super(TaxRuleLineTemplate, self)._get_tax_rule_line_value(
@@ -32,6 +36,10 @@
ondelete='RESTRICT')
to_country = fields.Many2One('country.country', 'To Country',
ondelete='RESTRICT')
+ from_subdivision = fields.Many2One('country.subdivision', 'From Subdivision',
+ ondelete='RESTRICT')
+ to_subdivision = fields.Many2One('country.subdivision', 'To Subdivision',
+ ondelete='RESTRICT')
class InvoiceLine(metaclass=PoolMeta):
@@ -46,15 +54,22 @@
pattern = super(InvoiceLine, self)._get_tax_rule_pattern()
from_country, to_country = None, None
+ from_subdivision, to_subdivision = None, None
if isinstance(self.origin, SaleLine):
if self.origin.warehouse.address:
from_country = self.origin.warehouse.address.country
+ from_subdivision = self.origin.warehouse.address.subdivision
to_country = self.origin.sale.shipment_address.country
+ to_subdivision = self.origin.sale.shipment_address.subdivision
elif isinstance(self.origin, PurchaseLine):
from_country = self.origin.purchase.invoice_address.country
+ from_subdivision = self.origin.purchase.invoice_address.subdivision
if self.origin.purchase.warehouse.address:
to_country = self.origin.purchase.warehouse.address.country
+ to_subdivision = self.origin.purchase.warehouse.address.subdivision
pattern['from_country'] = from_country.id if from_country else None
pattern['to_country'] = to_country.id if to_country else None
+ pattern['from_subdivision'] = from_subdivision.id if from_subdivision else None
+ pattern['to_subdivision'] = to_subdivision.id if to_subdivision else None
return pattern
diff -r e699606e11cb trytond/trytond/modules/account_tax_rule_country/doc/index.rst
--- a/trytond/trytond/modules/account_tax_rule_country/doc/index.rst Mon May 06 14:59:51 2019 +0200
+++ b/trytond/trytond/modules/account_tax_rule_country/doc/index.rst Wed Jun 12 11:14:02 2019 +0200
@@ -2,27 +2,29 @@
########################
The account_tax_rule module extends the tax rule to add origin and destination
-countries as criteria.
+countries and subdivision as criteria.
Tax Rule Line
*************
-Two criteria fields are added:
+Four criteria fields are added:
- From Country: The country of origin
- To Country: The country of destination
+- From Subdivision: The subdivision of origin
+- To Subdivision: The subdivision of origin
The countries are picked from the origin document:
- Sale:
- - The origin country comes from the address of the warehouse.
- - The destination country comes from the shipping address.
+ - The origin country and subdivision comes from the address of the warehouse.
+ - The destination country and subdivision comes from the shipping address.
- Purchase:
- - The origin country comes from the invoice address.
- - The destination country comes from the address of the warehouse.
+ - The origin country and subdivision comes from the invoice address.
+ - The destination country and subdivision comes from the address of the warehouse.
- Stock Consignment:
diff -r e699606e11cb trytond/trytond/modules/account_tax_rule_country/purchase.py
--- a/trytond/trytond/modules/account_tax_rule_country/purchase.py Mon May 06 14:59:51 2019 +0200
+++ b/trytond/trytond/modules/account_tax_rule_country/purchase.py Wed Jun 12 11:14:02 2019 +0200
@@ -29,13 +29,18 @@
pattern = super(PurchaseLine, self)._get_tax_rule_pattern()
from_country, to_country = None, None
+ from_subdivision, to_subdivision = None, None
if self.purchase:
if self.purchase.invoice_address:
from_country = self.purchase.invoice_address.country
+ from_subdivision = self.purchase.invoice_address.subdivision
warehouse = self.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['to_country'] = to_country.id if to_country else None
+ pattern['from_subdivision'] = from_subdivision.id if from_subdivision else None
+ pattern['to_subdivision'] = to_subdivision.id if to_subdivision else None
return pattern
diff -r e699606e11cb trytond/trytond/modules/account_tax_rule_country/sale.py
--- a/trytond/trytond/modules/account_tax_rule_country/sale.py Mon May 06 14:59:51 2019 +0200
+++ b/trytond/trytond/modules/account_tax_rule_country/sale.py Wed Jun 12 11:14:02 2019 +0200
@@ -32,6 +32,7 @@
pattern = super(SaleLine, self)._get_tax_rule_pattern()
from_country, to_country = None, None
+ from_subdivision, to_subdivision = None, None
if self.id is None or self.id < 0:
warehouse = self.get_warehouse('warehouse')
if warehouse:
@@ -40,9 +41,13 @@
warehouse = self.warehouse
if warehouse and warehouse.address:
from_country = warehouse.address.country
+ from_subdivision = warehouse.address.subdivision
if self.sale and self.sale.shipment_address:
to_country = self.sale.shipment_address.country
+ to_subdivision = self.sale.shipment_address.subdivision
pattern['from_country'] = from_country.id if from_country else None
pattern['to_country'] = to_country.id if to_country else None
+ pattern['from_subdivision'] = from_subdivision.id if from_subdivision else None
+ pattern['to_subdivision'] = to_subdivision.id if to_subdivision else None
return pattern
diff -r e699606e11cb trytond/trytond/modules/account_tax_rule_country/view/tax_rule_line_form.xml
--- a/trytond/trytond/modules/account_tax_rule_country/view/tax_rule_line_form.xml Mon May 06 14:59:51 2019 +0200
+++ b/trytond/trytond/modules/account_tax_rule_country/view/tax_rule_line_form.xml Wed Jun 12 11:14:02 2019 +0200
@@ -7,5 +7,9 @@
<field name="from_country"/>
<label name="to_country"/>
<field name="to_country"/>
+ <label name="from_subdivision"/>
+ <field name="from_subdivision"/>
+ <label name="to_subdivision"/>
+ <field name="to_subdivision"/>
</xpath>
</data>
diff -r e699606e11cb trytond/trytond/modules/account_tax_rule_country/view/tax_rule_line_template_form.xml
--- a/trytond/trytond/modules/account_tax_rule_country/view/tax_rule_line_template_form.xml Mon May 06 14:59:51 2019 +0200
+++ b/trytond/trytond/modules/account_tax_rule_country/view/tax_rule_line_template_form.xml Wed Jun 12 11:14:02 2019 +0200
@@ -7,5 +7,9 @@
<field name="from_country"/>
<label name="to_country"/>
<field name="to_country"/>
+ <label name="from_subdivision"/>
+ <field name="from_subdivision"/>
+ <label name="to_subdivision"/>
+ <field name="to_subdivision"/>
</xpath>
</data>
diff -r e699606e11cb trytond/trytond/modules/account_tax_rule_country/view/tax_rule_line_tree.xml
--- a/trytond/trytond/modules/account_tax_rule_country/view/tax_rule_line_tree.xml Mon May 06 14:59:51 2019 +0200
+++ b/trytond/trytond/modules/account_tax_rule_country/view/tax_rule_line_tree.xml Wed Jun 12 11:14:02 2019 +0200
@@ -5,5 +5,7 @@
<xpath expr="/tree/field[@name='origin_tax']" position="after">
<field name="from_country"/>
<field name="to_country"/>
+ <field name="from_subdivision"/>
+ <field name="to_subdivision"/>
</xpath>
</data>
diff -r e699606e11cb trytond/trytond/modules/account_tax_rule_country/view/tax_rule_line_tree_sequence.xml
--- a/trytond/trytond/modules/account_tax_rule_country/view/tax_rule_line_tree_sequence.xml Mon May 06 14:59:51 2019 +0200
+++ b/trytond/trytond/modules/account_tax_rule_country/view/tax_rule_line_tree_sequence.xml Wed Jun 12 11:14:02 2019 +0200
@@ -5,5 +5,7 @@
<xpath expr="/tree/field[@name='origin_tax']" position="after">
<field name="from_country"/>
<field name="to_country"/>
+ <field name="from_subdivision"/>
+ <field name="to_subdivision"/>
</xpath>
</data>
Reference in New Issue View Git Blame Copy Permalink