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

4
modules/purchase_trade/purchase.py
View File

@@ -1346,6 +1346,8 @@ class Line(metaclass=PoolMeta):
if assay.type == state:
for line in assay.lines:
if line.element == element:
if line.unit.symbol == 'g/t':
return line.value / Decimal(1000)
return line.value
def check_pricing(self):
@@ -1366,7 +1368,7 @@ class Line(metaclass=PoolMeta):
price = Decimal(cp.get_last_price())
logger.info("PRICE:%s",price)
if t.payable_rule:
payable_price = t.payable_rule.compute_payable_quantity(grade) * ((Decimal(100) / Decimal(grade)) * price) / Decimal(100)
payable_price = t.payable_rule.compute_payable_quantity(grade) * price / Decimal(100)
t.manual_price = round(payable_price - penalty_price,2)
t.currency = self.purchase.currency