18.02.26
This commit is contained in:
@@ -2677,7 +2677,7 @@ class LotInvoice(Wizard):
|
|||||||
val['lot_diff_quantity'] = val['lot_quantity'] - Decimal(lot.invoice_line_prov.quantity)
|
val['lot_diff_quantity'] = val['lot_quantity'] - Decimal(lot.invoice_line_prov.quantity)
|
||||||
val['lot_diff_price'] = val['lot_price'] - Decimal(lot.invoice_line_prov.unit_price)
|
val['lot_diff_price'] = val['lot_price'] - Decimal(lot.invoice_line_prov.unit_price)
|
||||||
val['lot_diff_amount'] = val['lot_amount'] - Decimal(lot.invoice_line_prov.amount)
|
val['lot_diff_amount'] = val['lot_amount'] - Decimal(lot.invoice_line_prov.amount)
|
||||||
val['lot_unit'] = lot.lot_unit_line.id
|
val['lot_unit'] = line.unit.id #lot.lot_unit_line.id
|
||||||
unit = val['lot_unit']
|
unit = val['lot_unit']
|
||||||
val['lot_currency'] = lot.lot_price_ct_symbol
|
val['lot_currency'] = lot.lot_price_ct_symbol
|
||||||
lot_p.append(val)
|
lot_p.append(val)
|
||||||
@@ -2693,6 +2693,7 @@ class LotInvoice(Wizard):
|
|||||||
val_s['lot_diff_price'] = val_s['lot_price'] - Decimal(lot.sale_invoice_line_prov.unit_price)
|
val_s['lot_diff_price'] = val_s['lot_price'] - Decimal(lot.sale_invoice_line_prov.unit_price)
|
||||||
val_s['lot_diff_amount'] = val_s['lot_amount'] - Decimal(lot.sale_invoice_line_prov.amount)
|
val_s['lot_diff_amount'] = val_s['lot_amount'] - Decimal(lot.sale_invoice_line_prov.amount)
|
||||||
val_s['lot_currency'] = lot.lot_price_ct_symbol_sale
|
val_s['lot_currency'] = lot.lot_price_ct_symbol_sale
|
||||||
|
val_s['lot_unit'] = sale_line.unit if sale_line else None
|
||||||
lot_s.append(val_s)
|
lot_s.append(val_s)
|
||||||
if line:
|
if line:
|
||||||
if line.fees:
|
if line.fees:
|
||||||
|
|||||||
Reference in New Issue
Block a user