Unifield Server

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

  1. us-2288
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4197
Proposed branch: lp:~unifield-team/unifield-server/us-2288
Merge into: lp:unifield-server
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/tender_flow/tender_flow_view.xml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-2288
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+316871@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/tender_flow/tender_flow_view.xml'
2--- bin/addons/tender_flow/tender_flow_view.xml 2017-01-16 14:20:41 +0000
3+++ bin/addons/tender_flow/tender_flow_view.xml 2017-02-09 16:28:02 +0000
4@@ -210,7 +210,7 @@
5 <data>
6 <field name="details" position="after">
7 <newline />
8- <field name="valid_till" attrs="{'invisible': [('rfq_ok', '=', False)],'readonly': [('state', 'in', ['sourced', 'split', 'rfq_updated', 'draft', 'done', 'cancel', 'confirmed', 'approved', 'except_picking', 'except_invoice'])]}" />
9+ <field name="valid_till" attrs="{'invisible': [('rfq_ok', '=', False)],'readonly': [('state', 'in', ['sourced', 'split', 'rfq_updated', 'draft', 'done', 'cancel', 'confirmed', 'confirmed_wait', 'approved', 'except_picking', 'except_invoice'])]}" />
10 <field name="tender_id" attrs="{'invisible': [('rfq_ok', '=', False)],'readonly': [('state', 'in', ['sourced', 'split', 'rfq_updated', 'done', 'cancel', 'confirmed', 'approved', 'except_picking', 'except_invoice'])]}" />
11 <field name="rfq_ok" invisible="1" />
12 <field

Subscribers

People subscribed via source and target branches

to all changes: