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

Pnl shipment

Browse Source
This commit is contained in:
laurentbarontini
2026-06-04 19:27:50 +02:00
parent a98415fe62
commit a114c14e89
6 changed files with 106 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
modules/purchase_trade/lot.py
View File

@@ -1969,11 +1969,12 @@ class LotQt(
AvQt.as_('r_lot_quantity'),
MaQt.as_('r_lot_matched'),
Case((lp.id>0, lp.lot_product),else_=ls.lot_product).as_('r_lot_product'),
Case((lp.id>0, lp.lot_type),else_=ls.lot_type).as_('r_lot_type'),
lqt.lot_shipment_in.as_('r_lot_shipment_in'),
lqt.lot_shipment_out.as_('r_lot_shipment_out'),
lqt.lot_shipment_internal.as_('r_lot_shipment_internal'),
lqt.lot_move.as_('r_lot_move'),
Case((lp.id>0, lp.lot_type),else_=ls.lot_type).as_('r_lot_type'),
lqt.lot_shipment_in.as_('r_lot_shipment_in'),
lqt.lot_shipment_out.as_('r_lot_shipment_out'),
lqt.lot_shipment_internal.as_('r_lot_shipment_internal'),
si.vessel.as_('r_vessel'),
lqt.lot_move.as_('r_lot_move'),
lqt.lot_status.as_('r_lot_status'),
Case((lp.lot_type=='physic',lp.lot_av),else_=lqt.lot_av).as_('r_lot_av'),
Case((lp.id>0, lp.lot_premium),else_=ls.lot_premium).as_('r_lot_premium'),
@@ -2115,11 +2116,12 @@ class LotQt(
AvQt2.as_("r_lot_quantity"),
MaQt2.as_("r_lot_matched"),
lp.lot_product.as_("r_lot_product"),
lp.lot_type.as_("r_lot_type"),
lp.lot_shipment_in.as_("r_lot_shipment_in"),
lp.lot_shipment_out.as_('r_lot_shipment_out'),
lp.lot_shipment_internal.as_('r_lot_shipment_internal'),
lp.move.as_("r_lot_move"),
lp.lot_type.as_("r_lot_type"),
lp.lot_shipment_in.as_("r_lot_shipment_in"),
lp.lot_shipment_out.as_('r_lot_shipment_out'),
lp.lot_shipment_internal.as_('r_lot_shipment_internal'),
si.vessel.as_("r_vessel"),
lp.move.as_("r_lot_move"),
lp.lot_status.as_("r_lot_status"),
lp.lot_av.as_("r_lot_av"),
lp.lot_premium.as_("r_lot_premium"),
@@ -2182,12 +2184,13 @@ class LotQt(
Max(lp.lot_unit).as_("r_lot_unit"),
Sum(AvQt2).as_("r_lot_quantity"),
Sum(MaQt2).as_("r_lot_matched"),
Max(lp.lot_product).as_("r_lot_product"),
Max(lp.lot_type).as_("r_lot_type"),
lp.lot_shipment_in.as_("r_lot_shipment_in"),
lp.lot_shipment_internal.as_('r_lot_shipment_internal'),
lp.lot_shipment_out.as_('r_lot_shipment_out'),
Max(lp.move).as_("r_lot_move"),
Max(lp.lot_product).as_("r_lot_product"),
Max(lp.lot_type).as_("r_lot_type"),
lp.lot_shipment_in.as_("r_lot_shipment_in"),
lp.lot_shipment_out.as_('r_lot_shipment_out'),
lp.lot_shipment_internal.as_('r_lot_shipment_internal'),
Max(si.vessel).as_("r_vessel"),
Max(lp.move).as_("r_lot_move"),
Max(lp.lot_status).as_("r_lot_status"),
Max(lp.lot_av).as_("r_lot_av"),
Avg(lp.lot_premium).as_("r_lot_premium"),
@@ -2240,10 +2243,11 @@ class LotQt(
union.r_lot_matched.as_("r_lot_matched"),
union.r_lot_product.as_("r_lot_product"),
union.r_lot_type.as_("r_lot_type"),
union.r_lot_shipment_in.as_("r_lot_shipment_in"),
union.r_lot_shipment_out.as_('r_lot_shipment_out'),
union.r_lot_shipment_internal.as_('r_lot_shipment_internal'),
union.r_lot_move.as_("r_lot_move"),
union.r_lot_shipment_in.as_("r_lot_shipment_in"),
union.r_lot_shipment_out.as_('r_lot_shipment_out'),
union.r_lot_shipment_internal.as_('r_lot_shipment_internal'),
union.r_vessel.as_("r_vessel"),
union.r_lot_move.as_("r_lot_move"),
union.r_lot_status.as_("r_lot_status"),
union.r_lot_av.as_("r_lot_av"),
union.r_lot_premium.as_("r_lot_premium"),
@@ -2320,10 +2324,11 @@ class LotReport(
r_lot_matched = fields.Numeric("Matched Qt",digits='r_lot_unit_line')
r_lot_premium = fields.Numeric("Prem/Disc", digits='r_lot_unit_line')
r_lot_premium_sale = fields.Numeric("Prem/Disc", digits='r_lot_unit_line')
r_lot_shipment_in = fields.Many2One('stock.shipment.in', "Shipment In")
r_lot_shipment_out = fields.Many2One('stock.shipment.out', "Shipment Out")
r_lot_shipment_internal = fields.Many2One('stock.shipment.internal', "Shipment Internal")
r_lot_move = fields.Many2One('stock.move', "Move")
r_lot_shipment_in = fields.Many2One('stock.shipment.in', "Shipment In")
r_lot_shipment_out = fields.Many2One('stock.shipment.out', "Shipment Out")
r_lot_shipment_internal = fields.Many2One('stock.shipment.internal', "Shipment Internal")
r_vessel = fields.Many2One('trade.vessel', "Vessel")
r_lot_move = fields.Many2One('stock.move', "Move")
r_lot_parent = fields.Many2One('lot.lot',"Parent")
r_lot_himself = fields.Many2One('lot.lot',"Lot")
r_lot_container = fields.Char("Container")