tzaustria
/
odoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new functionality for tzm.at

develop
Andreas Osim 2021-04-13 13:56:40 +02:00
parent 39f6d87ce7
commit ddbcb2bd08
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/custom-addons/tz_dealer_discount/models/invoice.py
View File

@ -60,7 +60,14 @@ class Invoice(models.Model):
amount = invoice.dealer_discount_amount amount = invoice.dealer_discount_amount
else: else:
sep = "; " 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 = "" discount_pos = ""
n=0 n=0
nd=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)]) 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', last_inv_line = self.env['account.invoice.line'].search([('invoice_id', '=', invoice.id)], order='sequence desc',
limit=1) limit=1)
last_sequence = last_inv_line.sequence + 1 if last_inv_line else 99999 last_sequence = last_inv_line.sequence + 1 if last_inv_line else 99999

9
ext/custom-addons/tz_dealer_discount/models/sale.py
View File

@ -52,7 +52,12 @@ class SaleOrder(models.Model):
amount = order.dealer_discount_amount amount = order.dealer_discount_amount
else: else:
sep = "; " 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 = "" discount_pos = ""
n=0 n=0
nd=0 nd=0
@ -69,7 +74,7 @@ class SaleOrder(models.Model):
discount_text = discount_text + discount_pos.rstrip(sep) 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', last_so_line = self.env['sale.order.line'].search([('order_id', '=', order.id)], order='sequence desc',
limit=1) limit=1)
last_sequence = last_so_line.sequence + 1 if last_so_line else 99999 last_sequence = last_so_line.sequence + 1 if last_so_line else 99999