From ddbcb2bd083fef0ff4d9518392d36238ad7018db Mon Sep 17 00:00:00 2001 From: Andreas Osim Date: Tue, 13 Apr 2021 13:56:40 +0200 Subject: [PATCH] new functionality for tzm.at --- .../tz_dealer_discount/models/invoice.py | 11 +++++++++-- ext/custom-addons/tz_dealer_discount/models/sale.py | 9 +++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ext/custom-addons/tz_dealer_discount/models/invoice.py b/ext/custom-addons/tz_dealer_discount/models/invoice.py index be4ff272..4d830f04 100644 --- a/ext/custom-addons/tz_dealer_discount/models/invoice.py +++ b/ext/custom-addons/tz_dealer_discount/models/invoice.py @@ -60,7 +60,14 @@ class Invoice(models.Model): amount = invoice.dealer_discount_amount else: sep = "; " - discount_text = "-" + str(invoice.dealer_discount_percentage) + "% " + discount_text + ", " + # discount_text = "-" + str(invoice.dealer_discount_percentage) + "% " + discount_text + ", " + + discount_text = str(abs(invoice.dealer_discount_percentage)) + "% " + discount_text + ", " + if invoice.dealer_discount_percentage < 0: + discount_text = "+" + discount_text + else: + discount_text = "-" + discount_text + discount_pos = "" n=0 nd=0 @@ -85,7 +92,7 @@ class Invoice(models.Model): layout_category_id = self.env['sale.layout_category'].search([('name', '=', discount_product_id.manufacturing_number)]) - if amount > 0: + if amount != 0: last_inv_line = self.env['account.invoice.line'].search([('invoice_id', '=', invoice.id)], order='sequence desc', limit=1) last_sequence = last_inv_line.sequence + 1 if last_inv_line else 99999 diff --git a/ext/custom-addons/tz_dealer_discount/models/sale.py b/ext/custom-addons/tz_dealer_discount/models/sale.py index b3e273be..f9773f8d 100644 --- a/ext/custom-addons/tz_dealer_discount/models/sale.py +++ b/ext/custom-addons/tz_dealer_discount/models/sale.py @@ -52,7 +52,12 @@ class SaleOrder(models.Model): amount = order.dealer_discount_amount else: sep = "; " - discount_text = "-" + str(order.dealer_discount_percentage) + "% " + discount_text + ", " + discount_text = str(abs(order.dealer_discount_percentage)) + "% " + discount_text + ", " + if order.dealer_discount_percentage < 0: + discount_text = "+" + discount_text + else: + discount_text = "-" + discount_text + discount_pos = "" n=0 nd=0 @@ -69,7 +74,7 @@ class SaleOrder(models.Model): discount_text = discount_text + discount_pos.rstrip(sep) - if amount > 0: + if amount != 0: last_so_line = self.env['sale.order.line'].search([('order_id', '=', order.id)], order='sequence desc', limit=1) last_sequence = last_so_line.sequence + 1 if last_so_line else 99999