diff --git a/modules/stock_lot/CHANGELOG b/modules/stock_lot/CHANGELOG index 22f949a95b..bf3b1d5e1b 100644 --- a/modules/stock_lot/CHANGELOG +++ b/modules/stock_lot/CHANGELOG @@ -1,3 +1,4 @@ +* Display quantity when searching lot for move Version 7.4.0 - 2024-11-04 -------------------------- diff --git a/modules/stock_lot/stock.py b/modules/stock_lot/stock.py index e3517a49b6..3c594a85ae 100644 --- a/modules/stock_lot/stock.py +++ b/modules/stock_lot/stock.py @@ -18,7 +18,7 @@ from trytond.model.exceptions import ( from trytond.modules.stock import StockMixin from trytond.modules.stock.exceptions import ShipmentCheckQuantityWarning from trytond.pool import Pool, PoolMeta -from trytond.pyson import Bool, Eval, Len +from trytond.pyson import Bool, Eval, If, Len from trytond.tools import grouped_slice from trytond.transaction import Transaction from trytond.wizard import Button, StateTransition, StateView, Wizard @@ -426,6 +426,14 @@ class Move(metaclass=PoolMeta): ], states={ 'readonly': Eval('state').in_(['cancelled', 'done']), + }, + search_context={ + 'locations': If(Eval('from_location'), + [Eval('from_location', -1)], []), + 'stock_date_end': ( + If(Eval('effective_date'), + Eval('effective_date', None), + Eval('planned_date', None))), }) @classmethod diff --git a/modules/stock_lot/stock.xml b/modules/stock_lot/stock.xml index 269b1587f8..2366fc38a9 100644 --- a/modules/stock_lot/stock.xml +++ b/modules/stock_lot/stock.xml @@ -15,6 +15,13 @@ this repository contains the full copyright notices and license terms. --> lot_tree + + stock.lot + tree + + lot_list_stock_move + + Lots stock.lot diff --git a/modules/stock_lot/view/lot_list_stock_move.xml b/modules/stock_lot/view/lot_list_stock_move.xml new file mode 100644 index 0000000000..a57a86a1bb --- /dev/null +++ b/modules/stock_lot/view/lot_list_stock_move.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/modules/stock_lot/view/move_form.xml b/modules/stock_lot/view/move_form.xml index 0e1169dea6..869e74368e 100644 --- a/modules/stock_lot/view/move_form.xml +++ b/modules/stock_lot/view/move_form.xml @@ -4,7 +4,7 @@ this repository contains the full copyright notices and license terms. -->