Unifield Server

Merge lp:~unifield-team/unifield-server/us-961 into lp:unifield-server

  1. us-961
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3637
Proposed branch: lp:~unifield-team/unifield-server/us-961
Merge into: lp:unifield-server
Diff against target: 26 lines (+3/-2)
2 files modified
bin/addons/msf_order_date/order_dates_view.xml (+2/-2)
bin/addons/procurement_request/procurement_request.py (+1/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-961
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+288903@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/msf_order_date/order_dates_view.xml'
2--- bin/addons/msf_order_date/order_dates_view.xml 2016-02-04 16:43:13 +0000
3+++ bin/addons/msf_order_date/order_dates_view.xml 2016-03-14 09:50:08 +0000
4@@ -114,8 +114,8 @@
5 </xpath>
6
7 <xpath expr="/form/group/field[@name='date_order']" position="replace">
8- <field name="date_order"
9- on_change="onchange_date_order(partner_id,date_order,est_transport_lead_time,context)" />
10+ <field name="date_order" attrs="{'readonly': [('state_hidden_sale_order', 'not in', ['draft'])]}"
11+ on_change="onchange_date_order(partner_id,date_order,est_transport_lead_time,context)"/>
12 </xpath>
13
14 <!-- Add dates on 'Other Information' tab -->
15
16=== modified file 'bin/addons/procurement_request/procurement_request.py'
17--- bin/addons/procurement_request/procurement_request.py 2016-01-04 13:16:43 +0000
18+++ bin/addons/procurement_request/procurement_request.py 2016-03-14 09:50:08 +0000
19@@ -252,6 +252,7 @@
20 #@@@end override
21
22 _columns = {
23+ 'date_order': fields.date('Ordered Date', required=True, readonly=False, select=True, states={}),
24 'location_requestor_id': fields.many2one('stock.location', string='Location Requestor', ondelete="cascade",
25 domain=[('location_category', '!=', 'transition'), '|', ('usage', '=', 'internal'), '&', ('usage', '=', 'customer'), ('location_category', '=', 'consumption_unit')], help='You can only select an internal location'),
26 'requestor': fields.char(size=128, string='Requestor', states={'draft': [('readonly', False)]}, readonly=True),

Subscribers

People subscribed via source and target branches

to all changes: