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 +5 -3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d1d37ee4b3 - Show all commits

4
modules/account_invoice/payment_term.py
View File

@@ -13,8 +13,10 @@ from trytond.pool import Pool
from trytond.pyson import Eval
from trytond.transaction import Transaction
from trytond.wizard import Button, StateView, Wizard
from .exceptions import PaymentTermComputeError, PaymentTermValidationError
import logging
logger = logging.getLogger(__name__)
class PaymentTerm(DeactivableMixin, ModelSQL, ModelView):

4
modules/purchase_trade/fee.py
View File

@@ -324,7 +324,7 @@ class Fee(ModelSQL,ModelView):
factor = InterestCalculator.calculate(
start_date=beg_date,
end_date=est_date,
rate=self.price,
rate=self.price/100,
rate_type='annual',
convention='ACT/360',
compounding='simple'
@@ -340,7 +340,7 @@ class Fee(ModelSQL,ModelView):
factor = InterestCalculator.calculate(
start_date=beg_date,
end_date=est_date,
rate=self.price,
rate=self.price/100,
rate_type='annual',
convention='ACT/360',
compounding='simple'