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

main #7

Merged
admin merged 620 commits from main into dev 2026-03-29 13:03:25 +00:00
Conversation 0 Commits 620 Files Changed 155 +2 -1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b94d6e911d - Show all commits

3
modules/purchase_trade/fee.py
View File

@@ -335,6 +335,7 @@ class Fee(ModelSQL,ModelView):
if self.sale_line.sale.payment_term: if self.sale_line.sale.payment_term:
beg_date = self.fee_date if self.fee_date else Date.today() beg_date = self.fee_date if self.fee_date else Date.today()
est_date = self.sale_line.sale.payment_term.lines[0].get_date(beg_date) est_date = self.sale_line.sale.payment_term.lines[0].get_date(beg_date)
logger.info("EST_DATE:%s",est_date)
if est_date and beg_date: if est_date and beg_date:
factor = InterestCalculator.calculate( factor = InterestCalculator.calculate(
start_date=beg_date, start_date=beg_date,
@@ -344,7 +345,7 @@ class Fee(ModelSQL,ModelView):
convention='ACT/360', convention='ACT/360',
compounding='simple' compounding='simple'
) )
logger.info("FACTOR:%s",factor)
return round(factor * self.sale_line.unit_price * (self.quantity if self.quantity else 0) * sign,2) return round(factor * self.sale_line.unit_price * (self.quantity if self.quantity else 0) * sign,2)
elif self.mode == 'perqt': elif self.mode == 'perqt':