Add issue11574.diff missing warehouse in stock.shipment.in.return. Since Support warehouse pickup add warehouse
#162150
This commit is contained in:
parent
b2307e7197
commit
e84ef8fccd
|
@ -0,0 +1,25 @@
|
|||
diff --git a/tryton/modules/stock/shipment.py b/tryton/modules/stock/shipment.py
|
||||
index 422e94aa10..e89a68a54e 100644
|
||||
--- a/tryton/modules/stock/shipment.py
|
||||
+++ b/tryton/modules/stock/shipment.py
|
||||
@@ -625,6 +625,9 @@ class ShipmentInReturn(ShipmentAssignMixin, Workflow, ModelSQL, ModelView):
|
||||
'readonly': (Eval('state') != 'draft') | Eval('moves', [0]),
|
||||
}, domain=[('type', '=', 'supplier')],
|
||||
help="Where the stock is moved to.")
|
||||
+ warehouse = fields.Function(
|
||||
+ fields.Many2One('stock.location', "Warehouse"),
|
||||
+ 'on_change_with_warehouse')
|
||||
moves = fields.One2Many('stock.move', 'shipment', 'Moves',
|
||||
states={
|
||||
'readonly': (((Eval('state') != 'draft') | ~Eval('from_location'))
|
||||
@@ -744,6 +747,10 @@ class ShipmentInReturn(ShipmentAssignMixin, Workflow, ModelSQL, ModelView):
|
||||
self.delivery_address = self.supplier.address_get('delivery')
|
||||
self.to_location = self.supplier.supplier_location
|
||||
|
||||
+ @fields.depends('from_location')
|
||||
+ def on_change_with_warehouse(self, name=None):
|
||||
+ return self.from_location.warehouse if self.from_location else None
|
||||
+
|
||||
@property
|
||||
def _move_planned_date(self):
|
||||
'''
|
2
series
2
series
|
@ -107,3 +107,5 @@ merge_request775.diff # [sao] Set visibility of active button when screen is dis
|
|||
issue12583.diff # [stock_lot] Missing search function in default_uom field in stock.lot model
|
||||
|
||||
issue12109.diff # [sale] [purchase] [sale_product_customer] Replace _parent_ expression with direct field on sale and purchase line
|
||||
|
||||
issue11574.diff # [stock] #162150 missing warehouse in stock.shipment.in.return. Since Support warehouse pickup add warehouse
|
||||
|
|
Loading…
Reference in New Issue