Merge lp:~openerp-dev/openobject-addons/6.1-opw-582148-acl into lp:openobject-addons/6.1

Proposed by Anaël Closson (openerp)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-582148-acl
Merge into: lp:openobject-addons/6.1
Diff against target: 43 lines (+4/-4)
2 files modified
mrp/mrp_view.xml (+2/-2)
stock/stock_view.xml (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-582148-acl
Reviewer Review Type Date Requested Status
Xavier ALT Pending
Review via email: mp+139941@code.launchpad.net

Description of the change

Adds support for automatic reloading of m2m and o2m when modifications has been done through a o2m or m2m line button.

This should be activated by using the parameter options="{'reload_on_button':1}" on the field definition.

This branch adds that parameter for
stock module : Warehouse Management / Incoming Shipments,Warehouse Management / Delivery Orders
mrp module : Manufacturing / Manufacturing Orders / (any line) / Consumed Products & Finished Products

*** Cannot work without web addon modifications from ~openerp-dev/openerp-web/6.1-opw-582148-acl ***

To post a comment you must log in.

Unmerged revisions

7102. By Anaël Closson (openerp)

[FIX] backport m2m and o2m reloading when line button has been pressed, adds option="{reload_on_button:1}" on needing fields

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mrp/mrp_view.xml'
2--- mrp/mrp_view.xml 2012-10-05 07:47:57 +0000
3+++ mrp/mrp_view.xml 2012-12-14 16:07:43 +0000
4@@ -654,7 +654,7 @@
5 <field name="location_dest_id" domain="[('usage','=','internal')]"/>
6 <separator string="" colspan="4"/>
7
8- <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
9+ <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list" options="{'reload_on_button': 1}"
10 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
11 <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
12 <field name="product_id" />
13@@ -712,7 +712,7 @@
14 </group>
15 </page>
16 <page string="Finished Products">
17- <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
18+ <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list" options="{'reload_on_button': 1}"
19 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
20 <tree string="Products to Finish">
21 <field name="product_id" />
22
23=== modified file 'stock/stock_view.xml'
24--- stock/stock_view.xml 2012-11-16 16:43:29 +0000
25+++ stock/stock_view.xml 2012-12-14 16:07:43 +0000
26@@ -901,7 +901,7 @@
27 </group>
28 <notebook colspan="4">
29 <page string="Products">
30- <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_out_id': address_id, 'picking_type': type}" >
31+ <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_out_id': address_id, 'picking_type': type}" options="{'reload_on_button': 1}">
32 <tree colors="grey:scrapped==True" string="Stock Moves">
33 <field name="product_id"/>
34 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
35@@ -1122,7 +1122,7 @@
36 </group>
37 <notebook colspan="4">
38 <page string="General Information">
39- <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': address_id, 'picking_type': type}" >
40+ <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': address_id, 'picking_type': type}" options="{'reload_on_button':1}">
41 <tree colors="grey:scrapped==True" string="Stock Moves">
42 <field name="product_id" />
43 <field name="product_qty" />