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

29.01.26

Browse Source
This commit is contained in:
laurentbarontini
2026-01-29 13:17:11 +01:00
parent 94f15d66da
commit 2b3cf5c095
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/purchase/purchase.py
View File

@@ -1892,7 +1892,7 @@ class Line(sequence_ordered(), ModelSQL, ModelView):
invoice_line.invoice_type = 'in'
if self.product:
if self.product.type == 'service' and not self.product.landed_cost:
invoice_line.account = self.product.account_expense_used
invoice_line.account = self.product.account_stock_in_used
else:
invoice_line.account = self.product.account_stock_in_used
if not invoice_line.account:

8
modules/purchase_trade/fee.py
View File

@@ -278,10 +278,10 @@ class Fee(ModelSQL,ModelView):
logger.info("ADJUST_PURCHASE_VALUES:%s",self)
if self.type == 'ordered' and self.state == 'not invoiced' and self.purchase:
logger.info("ADJUST_PURCHASE_VALUES_QT:%s",self.purchase.lines[0].quantity)
if self.get_price_per_qt() != self.purchase.lines[0].unit_price:
self.purchase.lines[0].unit_price = self.get_price_per_qt()
if self.quantity != self.purchase.lines[0].quantity:
self.purchase.lines[0].quantity = self.quantity
if self.amount != self.purchase.lines[0].unit_price:
self.purchase.lines[0].unit_price = self.amount
# if self.quantity != self.purchase.lines[0].quantity:
# self.purchase.lines[0].quantity = self.quantity
if self.product != self.purchase.lines[0].product:
self.purchase.lines[0].product = self.product
PurchaseLine.save([self.purchase.lines[0]])