Unifield Server

Merge lp:~jfb-tempo-consulting/unifield-server/US-4613 into lp:unifield-server

  1. US-4613
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5272
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-4613
Merge into: lp:unifield-server
Diff against target: 26 lines (+4/-1)
2 files modified
bin/addons/product_attributes/product_attributes_view.xml (+1/-1)
bin/addons/stock/product.py (+3/-0)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-4613
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+362786@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
2--- bin/addons/product_attributes/product_attributes_view.xml 2019-01-30 10:46:44 +0000
3+++ bin/addons/product_attributes/product_attributes_view.xml 2019-02-06 10:28:16 +0000
4@@ -487,7 +487,7 @@
5 <field name="inherit_id" ref="product.product_search_form_view"/>
6 <field name="arch" type="xml">
7 <field name="list_ids" position="before">
8- <field name="location_id" context="{'location': self or context.get('location')}"/>
9+ <field name="location_id" context="{'search_location': self}"/>
10 <separator orientation="vertical"/>
11 </field>
12 </field>
13
14=== modified file 'bin/addons/stock/product.py'
15--- bin/addons/stock/product.py 2018-09-17 16:14:57 +0000
16+++ bin/addons/stock/product.py 2019-02-06 10:28:16 +0000
17@@ -201,6 +201,9 @@
18 if warehouse_id:
19 context['warehouse'] = warehouse_id[0]
20
21+ if context.get('search_location'):
22+ context['location'] = context.get('search_location')
23+
24 if context.get('warehouse', False):
25 lot_stock_id = stock_warehouse_obj.read(cr, uid, int(context['warehouse']),
26 ['lot_stock_id'], context=context)['lot_stock_id']

Subscribers

People subscribed via source and target branches