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

30.01.26

Browse Source
This commit is contained in:
laurentbarontini
2026-01-30 06:31:16 +01:00
parent b51ee12331
commit 3eedc0b30e
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/purchase/purchase.py
View File

@@ -1920,13 +1920,14 @@ class Line(sequence_ordered(), ModelSQL, ModelView):
invoice_line.lot = l.id invoice_line.lot = l.id
if self.product.type == 'service': if self.product.type == 'service':
invoice_line.unit_price = self.unit_price invoice_line.unit_price = self.unit_price
invoice_line.quantity = 1
invoice_line.product = self.product invoice_line.product = self.product
invoice_line.stock_moves = [] invoice_line.stock_moves = []
Fee = Pool().get('fee.fee') Fee = Pool().get('fee.fee')
fee = Fee.search(['purchase','=',self.purchase.id]) fee = Fee.search(['purchase','=',self.purchase.id])
if fee: if fee:
invoice_line.fee = fee[0] invoice_line.fee = fee[0]
if fee[0].mode == 'lumpsum':
invoice_line.quantity = 1
lines.append(invoice_line) lines.append(invoice_line)
logger.info("GETINVLINE:%s",self.product.type) logger.info("GETINVLINE:%s",self.product.type)
logger.info("GETINVLINE2:%s",l.invoice_line_prov) logger.info("GETINVLINE2:%s",l.invoice_line_prov)

28
modules/purchase_trade/fee.py
View File

@@ -278,10 +278,16 @@ class Fee(ModelSQL,ModelView):
logger.info("ADJUST_PURCHASE_VALUES:%s",self) logger.info("ADJUST_PURCHASE_VALUES:%s",self)
if self.type == 'ordered' and self.state == 'not invoiced' and self.purchase: if self.type == 'ordered' and self.state == 'not invoiced' and self.purchase:
logger.info("ADJUST_PURCHASE_VALUES_QT:%s",self.purchase.lines[0].quantity) logger.info("ADJUST_PURCHASE_VALUES_QT:%s",self.purchase.lines[0].quantity)
if self.amount != self.purchase.lines[0].unit_price: if self.mode == 'lumpsum':
self.purchase.lines[0].unit_price = self.amount if self.amount != self.purchase.lines[0].unit_price:
# if self.quantity != self.purchase.lines[0].quantity: self.purchase.lines[0].unit_price = self.amount
# self.purchase.lines[0].quantity = self.quantity # if self.quantity != self.purchase.lines[0].quantity:
# self.purchase.lines[0].quantity = self.quantity
else:
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.product != self.purchase.lines[0].product: if self.product != self.purchase.lines[0].product:
self.purchase.lines[0].product = self.product self.purchase.lines[0].product = self.product
PurchaseLine.save([self.purchase.lines[0]]) PurchaseLine.save([self.purchase.lines[0]])
@@ -352,18 +358,20 @@ class Fee(ModelSQL,ModelView):
PurchaseLine = Pool().get('purchase.line') PurchaseLine = Pool().get('purchase.line')
pl = PurchaseLine() pl = PurchaseLine()
pl.product = fee.product pl.product = fee.product
# if fee.line or fee.sale_line: if fee.line or fee.sale_line:
# pl.quantity = round(qt_line,5) pl.quantity = round(qt_line,5)
# if fee.shipment_in: if fee.shipment_in:
# pl.quantity = round(qt_sh,5) pl.quantity = round(qt_sh,5)
pl.quantity = 1
logger.info("CREATE_PURHCASE_FOR_FEE_QT:%s",pl.quantity) logger.info("CREATE_PURHCASE_FOR_FEE_QT:%s",pl.quantity)
pl.unit = unit pl.unit = unit
pl.fee_ = fee.id pl.fee_ = fee.id
if fee.price: if fee.price:
fee_price = fee.get_price_per_qt() fee_price = fee.get_price_per_qt()
logger.info("GET_FEE_PRICE_PER_QT:%s",fee_price) logger.info("GET_FEE_PRICE_PER_QT:%s",fee_price)
pl.unit_price = round(Decimal(fee.amount),4) pl.unit_price = round(Decimal(fee_price),4)
if fee.mode == 'lumpsum':
pl.quantity = 1
pl.unit_price = round(Decimal(fee.amount),4)
p = Purchase() p = Purchase()
p.lines = [pl] p.lines = [pl]
p.party = fee.supplier p.party = fee.supplier