changeset d1ec80663205 in modules/sale:default
details: https://hg.tryton.org/modules/sale?cmd=changeset;node=d1ec80663205
description:
        Add TaxableMixin to sale line

        issue9776
        review326791003
diffstat:

 CHANGELOG |   2 ++
 sale.py   |  30 +++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diffs (64 lines):

diff -r 16e80912ad8c -r d1ec80663205 CHANGELOG
--- a/CHANGELOG Sat Dec 19 17:08:46 2020 +0100
+++ b/CHANGELOG Tue Dec 22 00:21:36 2020 +0100
@@ -1,3 +1,5 @@
+* Add TaxableMixin to sale line
+
 Version 5.8.0 - 2020-11-02
 * Bug fixes (see mercurial logs for details)
 * Remove support for Python 3.5
diff -r 16e80912ad8c -r d1ec80663205 sale.py
--- a/sale.py   Sat Dec 19 17:08:46 2020 +0100
+++ b/sale.py   Tue Dec 22 00:21:36 2020 +0100
@@ -484,17 +484,8 @@
     @property
     def taxable_lines(self):
         taxable_lines = []
-        # In case we're called from an on_change we have to use some sensible
-        # defaults
         for line in self.lines:
-            if getattr(line, 'type', None) != 'line':
-                continue
-            taxable_lines.append((
-                    getattr(line, 'taxes', None) or [],
-                    getattr(line, 'unit_price', None) or Decimal(0),
-                    getattr(line, 'quantity', None) or 0,
-                    None,
-                    ))
+            taxable_lines.extend(line.taxable_lines)
         return taxable_lines
 
     @fields.depends(methods=['_get_taxes'])
@@ -1028,7 +1019,7 @@
             ondelete='RESTRICT', select=True, required=True)
 
 
-class SaleLine(sequence_ordered(), ModelSQL, ModelView):
+class SaleLine(TaxableMixin, sequence_ordered(), ModelSQL, ModelView):
     'Sale Line'
     __name__ = 'sale.line'
     sale = fields.Many2One('sale.sale', 'Sale', ondelete='CASCADE',
@@ -1222,6 +1213,23 @@
                 return True
         return False
 
+    @property
+    def taxable_lines(self):
+        # In case we're called from an on_change
+        # we have to use some sensible defaults
+        if getattr(self, 'type', None) == 'line':
+            return [(
+                    getattr(self, 'taxes', None) or [],
+                    getattr(self, 'unit_price', None) or Decimal(0),
+                    getattr(self, 'quantity', None) or 0,
+                    None,
+                    )]
+        else:
+            return []
+
+    def _get_tax_context(self):
+        return self.sale._get_tax_context()
+
     def _get_tax_rule_pattern(self):
         '''
         Get tax rule pattern

Reply via email to