main #7

Merged
admin merged 620 commits from main into dev 2026-03-29 13:03:25 +00:00
Showing only changes of commit 91095f28e9 - Show all commits

View File

@@ -371,8 +371,10 @@ class Fee(ModelSQL,ModelView):
if self.mode == 'lumpsum': if self.mode == 'lumpsum':
if self.amount != self.purchase.lines[0].unit_price: if self.amount != self.purchase.lines[0].unit_price:
self.purchase.lines[0].unit_price = self.amount self.purchase.lines[0].unit_price = self.amount
# if self.quantity != self.purchase.lines[0].quantity: elif self.mode == 'ppack':
# self.purchase.lines[0].quantity = self.quantity if self.amount != self.purchase.lines[0].amount:
self.purchase.lines[0].unit_price = self.price
self.purchase.lines[0].quantity = self.quantity
else: else:
if self.get_price_per_qt() != self.purchase.lines[0].unit_price: if self.get_price_per_qt() != self.purchase.lines[0].unit_price:
self.purchase.lines[0].unit_price = self.get_price_per_qt() self.purchase.lines[0].unit_price = self.get_price_per_qt()