From 566d8809c170c2048c5c71bc03e146aa7d1bef69 Mon Sep 17 00:00:00 2001 From: "Carlos R. Silveira" Date: Fri, 19 Oct 2018 09:07:01 -0300 Subject: [PATCH] alterado para integrar o desconto do br_sale --- sale_discount_total/__manifest__.py | 2 +- sale_discount_total/models/sale_order.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sale_discount_total/__manifest__.py b/sale_discount_total/__manifest__.py index 3a544936..a4add519 100644 --- a/sale_discount_total/__manifest__.py +++ b/sale_discount_total/__manifest__.py @@ -20,7 +20,7 @@ 'version': '11.0.1.0.0', 'license': 'AGPL-3', 'contributors': [], - 'depends': ['sale'], + 'depends': ['br_sale'], 'data': [ 'views/sale_order_view.xml' ], diff --git a/sale_discount_total/models/sale_order.py b/sale_discount_total/models/sale_order.py index ba01ceea..cf34344d 100644 --- a/sale_discount_total/models/sale_order.py +++ b/sale_discount_total/models/sale_order.py @@ -56,6 +56,9 @@ def update_discount_lines(self): amount = 0 for line in item.order_line: if line == balance_line: + if item.discount_type == 'percent': + amount = round(discount_percent / 100 * line.valor_bruto, + precision_money) continue line.discount = discount_percent amount += round(discount_percent / 100 * line.valor_bruto, @@ -63,5 +66,8 @@ def update_discount_lines(self): if item.discount_type == 'amount': balance_line.discount = (item.discount_value - amount) /\ balance_line.valor_bruto * 100 + vlr_desc = item.discount_value else: balance_line.discount = discount_percent + vlr_desc = amount + balance_line.valor_desconto = vlr_desc