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

Proposed by jftempo
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 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
=== modified file 'bin/addons/stock_override/report/report_stock_move_view.xml'
--- bin/addons/stock_override/report/report_stock_move_view.xml 2019-06-04 19:13:17 +0000
+++ bin/addons/stock_override/report/report_stock_move_view.xml 2019-07-15 07:18:54 +0000
@@ -147,16 +147,16 @@
147 <field name="model">export.report.stock.move</field>147 <field name="model">export.report.stock.move</field>
148 <field name="type">form</field>148 <field name="type">form</field>
149 <field name="arch" type="xml">149 <field name="arch" type="xml">
150 <form string="IN &amp; OUT Report">150 <form string="IN &amp; OUT Report" noteditable="state!='draft'">
151 <separator colspan="4" string="Request information" />151 <separator colspan="4" string="Request information" />
152 <group colspan="4" attrs="{'readonly': [('state', '!=', 'draft')]}">152 <group colspan="4">
153 <field name="name" />153 <field name="name" />
154 <field name="company_id" />154 <field name="company_id" />
155 <separator colspan="4" string="Report parameters" />155 <separator colspan="4" string="Report parameters" />
156 <field name="date_from" attrs="{'readonly': [('state', '!=', 'draft')]}" />156 <field name="date_from" />
157 <field name="date_to" attrs="{'readonly': [('state', '!=', 'draft')]}" />157 <field name="date_to" />
158 <separator colspan="4" string="Advanced filters" />158 <separator colspan="4" string="Advanced filters" />
159 <field name="partner_id" attrs="{'readonly': [('state', '!=', 'draft')]}" />159 <field name="partner_id" />
160 <field name="product_id" attrs="{'readonly': ['|', '|', ('prodlot_id', '!=', False), ('state', '!=', 'draft'), ('product_list_id', '!=', False)]}" />160 <field name="product_id" attrs="{'readonly': ['|', '|', ('prodlot_id', '!=', False), ('state', '!=', 'draft'), ('product_list_id', '!=', False)]}" />
161 <field name="product_list_id" attrs="{'readonly': ['|', '|', ('state', '!=', 'draft'), ('prodlot_id', '!=', False), ('product_id', '!=', False)]}" />161 <field name="product_list_id" attrs="{'readonly': ['|', '|', ('state', '!=', 'draft'), ('prodlot_id', '!=', False), ('product_id', '!=', False)]}" />
162 <newline/>162 <newline/>
@@ -165,7 +165,7 @@
165 <field name="expiry_date" attrs="{'readonly': ['|', ('prodlot_id', '!=', False), ('state', '!=', 'draft')]}" />165 <field name="expiry_date" attrs="{'readonly': ['|', ('prodlot_id', '!=', False), ('state', '!=', 'draft')]}" />
166 <field name="has_locations" invisible="1" />166 <field name="has_locations" invisible="1" />
167 <field name="only_standard_loc" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('has_locations', '=', True)]}" />167 <field name="only_standard_loc" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('has_locations', '=', True)]}" />
168 <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}">168 <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}">
169 <tree noteditable="True" string="Location(s)">169 <tree noteditable="True" string="Location(s)">
170 <field name="name" />170 <field name="name" />
171 <field name="active" />171 <field name="active" />

Subscribers

People subscribed via source and target branches