Unifield Server

Merge lp:~jfb-tempo-consulting/unifield-server/us-3839 into lp:unifield-server

  1. us-3839
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4651
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/us-3839
Merge into: lp:unifield-server
Diff against target: 155 lines (+18/-18)
6 files modified
bin/addons/procurement_request/procurement_request_view.xml (+2/-2)
bin/addons/purchase/purchase_view.xml (+1/-1)
bin/addons/sale/sale_view.xml (+1/-1)
bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in FO.meta_feature (+4/-4)
bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in IR.meta_feature (+8/-8)
bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in PO.meta_feature (+2/-2)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/us-3839
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+335167@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/procurement_request/procurement_request_view.xml'
2--- bin/addons/procurement_request/procurement_request_view.xml 2017-12-01 09:14:43 +0000
3+++ bin/addons/procurement_request/procurement_request_view.xml 2017-12-13 16:51:33 +0000
4@@ -20,9 +20,9 @@
5 <group col="6" colspan="4" name="header">
6 <field name="name" />
7 <field name="date_order" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}" />
8- <field name="warehouse_id" widget="selection" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}" />
9+ <field name="warehouse_id" widget="selection" attrs="{'readonly': [('state', '!=', 'draft')]}" />
10 <field name="requestor" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}" />
11- <field name="location_requestor_id" required="1" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}" />
12+ <field name="location_requestor_id" required="1" attrs="{'readonly': [('state', '!=', 'draft')]}" />
13 <field name="delivery_requested_date" required="1" string="Requested date" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}" />
14 <field name="origin" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}" />
15 <field name="functional_currency_id" />
16
17=== modified file 'bin/addons/purchase/purchase_view.xml'
18--- bin/addons/purchase/purchase_view.xml 2017-11-30 15:15:16 +0000
19+++ bin/addons/purchase/purchase_view.xml 2017-12-13 16:51:33 +0000
20@@ -143,7 +143,7 @@
21 <field name="shipped_rate" invisible="True"/>
22 <field name="push_fo" invisible="1"/>
23 <field name="is_a_counterpart" invisible="1"/>
24- <field name="order_type" on_change="onchange_internal_type(order_type, partner_id, categ, dest_partner_id, warehouse_id, delivery_requested_date)" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p'])]}"/>
25+ <field name="order_type" on_change="onchange_internal_type(order_type, partner_id, categ, dest_partner_id, warehouse_id, delivery_requested_date)" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
26 <field name="priority" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
27 <newline/>
28 <field name="categ" on_change="onchange_categ(categ, warehouse_id, cross_docking_ok, location_id)" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
29
30=== modified file 'bin/addons/sale/sale_view.xml'
31--- bin/addons/sale/sale_view.xml 2017-12-01 09:08:44 +0000
32+++ bin/addons/sale/sale_view.xml 2017-12-13 16:51:33 +0000
33@@ -117,7 +117,7 @@
34 <field name="picked_rate" invisible="1"/>
35 <field name="is_a_counterpart" invisible="1"/>
36 <field name="fo_created_by_po_sync" invisible="1"/>
37- <field name="order_type" attrs="{'readonly': ['|', ('fo_created_by_po_sync', '=', True), ('state', 'in', ['done', 'cancel'])]}" on_change="onchange_order_type(order_type, partner_id)"/>
38+ <field name="order_type" attrs="{'readonly': ['|', ('fo_created_by_po_sync', '=', True), ('state', '!=', 'draft')]}" on_change="onchange_order_type(order_type, partner_id)"/>
39 <field name="sourcing_trace_ok" invisible="1"/>
40 <field name="priority" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
41 <field name="categ" on_change="onchange_categ(categ)"/> <!-- RO state!=draft set on _column, same on IR -->
42
43=== modified file 'bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in FO.meta_feature'
44--- bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in FO.meta_feature 2017-12-04 08:05:49 +0000
45+++ bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in FO.meta_feature 2017-12-13 16:51:33 +0000
46@@ -68,7 +68,7 @@
47 I should see "Warehouse" as readonly
48 I should see "Order category" as readonly
49 # Order type editable.. not sure if really the expected behavior
50- I should see "Order Type" as editable
51+ I should see "Order Type" as readonly
52
53 # Check that we can see the details for a line by clicking on it
54 I click on line and open the window:
55@@ -84,7 +84,7 @@
56 I should see "Customer" as readonly
57 I should see "Warehouse" as readonly
58 I should see "Order category" as readonly
59- I should see "Order Type" as editable
60+ I should see "Order Type" as readonly
61
62 I click "Validate" on line:
63 | Product Code |
64@@ -97,7 +97,7 @@
65 I should see "Warehouse" as readonly
66 I should see "Order category" as readonly
67 # Order type editable.. not sure if really the expected behavior
68- I should see "Order Type" as editable
69+ I should see "Order Type" as readonly
70
71 I click on "Save & Edit"
72
73@@ -107,7 +107,7 @@
74 I should see "Customer" as readonly
75 I should see "Warehouse" as readonly
76 I should see "Order category" as readonly
77- I should see "Order Type" as editable
78+ I should see "Order Type" as readonly
79
80 # Check that we can see the details for a line by clicking on it
81 I click on line and open the window:
82
83=== modified file 'bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in IR.meta_feature'
84--- bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in IR.meta_feature 2017-12-01 10:18:41 +0000
85+++ bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in IR.meta_feature 2017-12-13 16:51:33 +0000
86@@ -55,9 +55,9 @@
87 I should see "Draft-p" in "Order State"
88 I should see "Order Reference" as readonly
89 I should see "Ordered Date" as editable
90- I should see "Warehouse" as editable
91+ I should see "Warehouse" as readonly
92 I should see "Requestor" as editable
93- I should see "Location Requestor" as editable
94+ I should see "Location Requestor" as readonly
95 I should see "Requested Date" as editable
96 I should see "Origin" as editable
97 I should see "Functional Currency" as readonly
98@@ -71,9 +71,9 @@
99 I should see "Draft-p" in "Order State"
100 I should see "Order Reference" as readonly
101 I should see "Ordered Date" as editable
102- I should see "Warehouse" as editable
103+ I should see "Warehouse" as readonly
104 I should see "Requestor" as editable
105- I should see "Location Requestor" as editable
106+ I should see "Location Requestor" as readonly
107 I should see "Requested Date" as editable
108 I should see "Origin" as editable
109 I should see "Functional Currency" as readonly
110@@ -96,9 +96,9 @@
111 I should see "Validated" in "Order State"
112 I should see "Order Reference" as readonly
113 I should see "Ordered Date" as editable
114- I should see "Warehouse" as editable
115+ I should see "Warehouse" as readonly
116 I should see "Requestor" as editable
117- I should see "Location Requestor" as editable
118+ I should see "Location Requestor" as readonly
119 I should see "Requested Date" as editable
120 I should see "Origin" as editable
121 I should see "Functional Currency" as readonly
122@@ -111,9 +111,9 @@
123 I should see "Validated" in "Order State"
124 I should see "Order Reference" as readonly
125 I should see "Ordered Date" as editable
126- I should see "Warehouse" as editable
127+ I should see "Warehouse" as readonly
128 I should see "Requestor" as editable
129- I should see "Location Requestor" as editable
130+ I should see "Location Requestor" as readonly
131 I should see "Requested Date" as editable
132 I should see "Origin" as editable
133 I should see "Functional Currency" as readonly
134
135=== modified file 'bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in PO.meta_feature'
136--- bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in PO.meta_feature 2017-12-04 08:05:49 +0000
137+++ bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in PO.meta_feature 2017-12-13 16:51:33 +0000
138@@ -93,7 +93,7 @@
139 I should see "Creation Date" as readonly
140 I should see "Supplier" as readonly
141 I should see "Warehouse" as readonly
142- I should see "Order Type" as editable
143+ I should see "Order Type" as readonly
144 I should see "Order category" as readonly
145
146 # Check that we can see the details for a line by clicking on it
147@@ -108,7 +108,7 @@
148 I should see "Creation Date" as readonly
149 I should see "Supplier" as readonly
150 I should see "Warehouse" as readonly
151- I should see "Order Type" as editable
152+ I should see "Order Type" as readonly
153 I should see "Order category" as readonly
154
155 I click on "Save"

Subscribers

People subscribed via source and target branches