Merge lp:~dorian-kemps/unifield-server/US-6146 into lp:unifield-server

Proposed by jftempo on 2019-07-15
Status: Merged
Merged at revision: 5407
Proposed branch: lp:~dorian-kemps/unifield-server/US-6146
Merge into: lp:unifield-server
Diff against target: 34 lines (+6/-6)
1 file modified
bin/addons/stock_override/report/report_stock_move_view.xml (+6/-6)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-6146
Reviewer Review Type Date Requested Status
UniField Reviewer Team 2019-07-15 Pending
Review via email: mp+370098@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/stock_override/report/report_stock_move_view.xml'
2--- bin/addons/stock_override/report/report_stock_move_view.xml 2019-06-04 19:13:17 +0000
3+++ bin/addons/stock_override/report/report_stock_move_view.xml 2019-07-15 07:18:54 +0000
4@@ -147,16 +147,16 @@
5 <field name="model">export.report.stock.move</field>
6 <field name="type">form</field>
7 <field name="arch" type="xml">
8- <form string="IN &amp; OUT Report">
9+ <form string="IN &amp; OUT Report" noteditable="state!='draft'">
10 <separator colspan="4" string="Request information" />
11- <group colspan="4" attrs="{'readonly': [('state', '!=', 'draft')]}">
12+ <group colspan="4">
13 <field name="name" />
14 <field name="company_id" />
15 <separator colspan="4" string="Report parameters" />
16- <field name="date_from" attrs="{'readonly': [('state', '!=', 'draft')]}" />
17- <field name="date_to" attrs="{'readonly': [('state', '!=', 'draft')]}" />
18+ <field name="date_from" />
19+ <field name="date_to" />
20 <separator colspan="4" string="Advanced filters" />
21- <field name="partner_id" attrs="{'readonly': [('state', '!=', 'draft')]}" />
22+ <field name="partner_id" />
23 <field name="product_id" attrs="{'readonly': ['|', '|', ('prodlot_id', '!=', False), ('state', '!=', 'draft'), ('product_list_id', '!=', False)]}" />
24 <field name="product_list_id" attrs="{'readonly': ['|', '|', ('state', '!=', 'draft'), ('prodlot_id', '!=', False), ('product_id', '!=', False)]}" />
25 <newline/>
26@@ -165,7 +165,7 @@
27 <field name="expiry_date" attrs="{'readonly': ['|', ('prodlot_id', '!=', False), ('state', '!=', 'draft')]}" />
28 <field name="has_locations" invisible="1" />
29 <field name="only_standard_loc" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('has_locations', '=', True)]}" />
30- <field name="location_ids" on_change="onchange_location_ids(location_ids)" colspan="4" mode="tree" attrs="{'readonly': [('state', '!=', 'draft')]}" domain="[('usage', '!=', 'view'), ('active', 'in', ['t', 'f'])]" context="{'display_active': 1}">
31+ <field name="location_ids" on_change="onchange_location_ids(location_ids)" colspan="4" mode="tree" domain="[('usage', '!=', 'view'), ('active', 'in', ['t', 'f'])]" context="{'display_active': 1}">
32 <tree noteditable="True" string="Location(s)">
33 <field name="name" />
34 <field name="active" />

Subscribers

People subscribed via source and target branches