Unifield Server

Merge lp:~mallorymarcot/unifield-server/us-4087 into lp:unifield-server

  1. us-4087
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4897
Proposed branch: lp:~mallorymarcot/unifield-server/us-4087
Merge into: lp:unifield-server
Diff against target: 29 lines (+5/-5)
1 file modified
bin/addons/stock/physical_inventory_view.xml (+5/-5)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-4087
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+343387@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/physical_inventory_view.xml'
2--- bin/addons/stock/physical_inventory_view.xml 2018-02-23 09:06:25 +0000
3+++ bin/addons/stock/physical_inventory_view.xml 2018-04-17 09:11:51 +0000
4@@ -62,7 +62,7 @@
5 </group>
6 <field colspan="4" name="counting_line_ids" nolabel="1" widget="one2many_list"
7 attrs="{'readonly': ['|', ('state', 'not in', ['counting', 'counted']), ('discrepancies_generated', '=', True)]}">
8- <tree string="Counting lines" editable="bottom">
9+ <tree string="Counting lines" editable="bottom" hide_delete_button="1">
10 <field name="line_no"/>
11 <field name="product_id" on_change="on_change_product_id(product_id,product_uom)"/>
12 <field name="product_uom_id" domain="[('uom_by_stock_product', '=', product_id)]"/>
13@@ -117,12 +117,12 @@
14 <field name="discrepancy_lines_percent_absvalue" nolabel="1" />
15 </group>
16 </group>
17- <group col="4" colspan="4" attrs="{'invisible': [('state', 'not in', ['counted', 'validated'])]}">
18+ <group col="4" colspan="4">
19 <button name="export_xls_discrepancy_report" string="Export XLS discrepancy report"
20- type="object" icon="gtk-print" colspan="4"/>
21- <field name="file_to_import2" colspan="2"/>
22+ type="object" icon="gtk-print" colspan="4" attrs="{'invisible': [('state', 'not in', ['counted', 'validated', 'confirmed', 'closed'])]}"/>
23+ <field name="file_to_import2" colspan="2" attrs="{'invisible': [('state', 'not in', ['counted', 'validated'])]}"/>
24 <button name="import_xls_discrepancy_report" string="Import XLS discrepancy report"
25- type="object" icon="gtk-save" colspan="2"/>
26+ attrs="{'invisible': [('state', 'not in', ['counted', 'validated'])]}" type="object" icon="gtk-save" colspan="2"/>
27 </group>
28 <field colspan="4" name="discrepancy_line_ids" nolabel="1" widget="one2many_list"
29 attrs="{ 'readonly': [('state', 'not in', ['counted', 'validated'])]}"

Subscribers

People subscribed via source and target branches