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

10
modules/purchase_trade/valuation.py
View File

@@ -116,7 +116,7 @@ class ValuationBase(ModelSQL):
'amount': amount, 'amount': amount,
'base_amount': base_amount, 'base_amount': base_amount,
'rate': rate, 'rate': rate,
'mtm': None #round(amount - (mtm * pc.ratio / 100), 2), 'mtm': None, #round(amount - (mtm * pc.ratio / 100), 2),
'unit': sale_line.unit.id if sale_line else line.unit.id, 'unit': sale_line.unit.id if sale_line else line.unit.id,
'currency': currency, 'currency': currency,
}) })
@@ -180,7 +180,7 @@ class ValuationBase(ModelSQL):
if line.mtm: if line.mtm:
for strat in line.mtm: for strat in line.mtm:
values['mtm'] = line.get_mtm(values['qty']) values['mtm'] = line.get_mtm(values['qty'])
values['strategy'] = strat.name values['strategy'] = strat
if values: if values:
price_lines.append(values) price_lines.append(values)
@@ -201,7 +201,7 @@ class ValuationBase(ModelSQL):
if line.mtm: if line.mtm:
for strat in line.mtm: for strat in line.mtm:
values['mtm'] = line.get_mtm(values['qty']) values['mtm'] = line.get_mtm(values['qty'])
values['strategy'] = strat.name values['strategy'] = strat
if values: if values:
price_lines.append(values) price_lines.append(values)
@@ -228,7 +228,7 @@ class ValuationBase(ModelSQL):
if sl_line.mtm: if sl_line.mtm:
for strat in line.mtm: for strat in line.mtm:
values['mtm'] = sl_line.get_mtm(values['qty']) values['mtm'] = sl_line.get_mtm(values['qty'])
values['strategy'] = strat.name values['strategy'] = strat
if values: if values:
price_lines.append(values) price_lines.append(values)
@@ -249,7 +249,7 @@ class ValuationBase(ModelSQL):
if sl_line.mtm: if sl_line.mtm:
for strat in sl_line.mtm: for strat in sl_line.mtm:
values['mtm'] = sl_line.get_mtm(values['qty']) values['mtm'] = sl_line.get_mtm(values['qty'])
values['strategy'] = strat.name values['strategy'] = strat
if values: if values:
price_lines.append(values) price_lines.append(values)