admin/tradon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

09.03.26

Browse Source
This commit is contained in:
laurentbarontini
2026-03-09 16:52:19 +01:00
parent dd06fc523c
commit 96aab15a7a
3 changed files with 79 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/purchase_trade/purchase.py
View File

@@ -309,7 +309,7 @@ class Purchase(metaclass=PoolMeta):
@property
def report_price(self):
if self.lines:
if self.lines[0].price_type == 'fixed':
if self.lines[0].price_type == 'priced':
return amount_to_currency_words(self.lines[0].unit_price)
elif self.lines[0].price_type == 'basis':
return amount_to_currency_words(self.lines[0].unit_price) + ' ' + self.lines[0].get_pricing_text()
@@ -319,8 +319,6 @@ class Purchase(metaclass=PoolMeta):
@property
def report_delivery(self):
del_date = 'PROMPT'
if self.lc_date:
return format_date_en(self.lc_date)
if self.lines:
if self.lines[0].estimated_date:
delivery_date = [dd.estimated_date for dd in self.lines[0].estimated_date if dd.trigger=='deldate']
@@ -333,6 +331,8 @@ class Purchase(metaclass=PoolMeta):
@property
def report_payment_date(self):
if self.lines:
if self.lc_date:
return format_date_en(self.lc_date)
Date = Pool().get('ir.date')
payment_date = self.lines[0].sale.payment_term.lines[0].get_date(Date.today(),self.lines[0])
if payment_date:

6
modules/purchase_trade/sale.py
View File

@@ -281,7 +281,7 @@ class Sale(metaclass=PoolMeta):
@property
def report_price(self):
if self.lines:
if self.lines[0].price_type == 'fixed':
if self.lines[0].price_type == 'priced':
return amount_to_currency_words(self.lines[0].unit_price)
elif self.lines[0].price_type == 'basis':
return amount_to_currency_words(self.lines[0].unit_price) + ' ' + self.lines[0].get_pricing_text()
@@ -291,8 +291,6 @@ class Sale(metaclass=PoolMeta):
@property
def report_delivery(self):
del_date = 'PROMPT'
if self.lc_date:
return format_date_en(self.lc_date)
if self.lines:
if self.lines[0].estimated_date:
delivery_date = [dd.estimated_date for dd in self.lines[0].estimated_date if dd.trigger=='deldate']
@@ -305,6 +303,8 @@ class Sale(metaclass=PoolMeta):
@property
def report_payment_date(self):
if self.lines:
if self.lc_date:
return format_date_en(self.lc_date)
Date = Pool().get('ir.date')
payment_date = self.lines[0].sale.payment_term.lines[0].get_date(Date.today(),self.lines[0])
if payment_date: