Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/6.1-opw-591727-msh into lp:openobject-addons/6.1

  1. 6.1-opw-591727-msh
  2. Merge into 6.1
Proposed by Mohammed Shekha(Open ERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-591727-msh
Merge into: lp:openobject-addons/6.1
Diff against target: 70 lines (+7/-7)
2 files modified
mrp/mrp_view.xml (+4/-4)
stock/stock_view.xml (+3/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-591727-msh
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+160552@code.launchpad.net

Description of the change

Hello,

Fixed the issue of reload on button for one2many, added options wherever one2many new record created from button.

Go through description of lp:~openerp-dev/openerp-web/6.1-opw-591727-msh, I already described the issue and steps to reproduce.

Thanks.

To post a comment you must log in.

Unmerged revisions

7203. By Mohammed Shekha<email address hidden>

[FIX]Fixed the issue of reload on button for one2many, added options wherever one2many new record created from button.

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 2013-04-24 06:28:26 +0000
4@@ -655,7 +655,7 @@
5 <separator string="" colspan="4"/>
6
7 <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
8- mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
9+ mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" options='{"reload_on_button": true}'>
10 <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
11 <field name="product_id" />
12 <field name="product_qty" string="Qty"/>
13@@ -680,7 +680,7 @@
14 </field>
15
16 <field colspan="2" name="move_lines2" nolabel="1" domain="[('state','in', ('done', 'cancel'))]"
17- widget="one2many_list" mode="tree,form" height="275">
18+ widget="one2many_list" mode="tree,form" height="275" options='{"reload_on_button": true}'>
19 <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
20 <field name="product_id" readonly="1"/>
21 <field name="product_qty" readonly="1" string="Qty"/>
22@@ -713,7 +713,7 @@
23 </page>
24 <page string="Finished Products">
25 <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
26- mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
27+ mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" options='{"reload_on_button": true}'>
28 <tree string="Products to Finish">
29 <field name="product_id" />
30 <field name="product_qty" string="Qty"/>
31@@ -731,7 +731,7 @@
32 </field>
33
34 <field colspan="2" name="move_created_ids2" nolabel="1" domain="[('state','in', ('done', 'cancel'))]"
35- widget="one2many_list" mode="tree,form" height="275">
36+ widget="one2many_list" mode="tree,form" height="275" options='{"reload_on_button": true}'>
37 <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
38 <field name="product_id" readonly="1"/>
39 <field name="product_qty" readonly="1" string="Qty"/>
40
41=== modified file 'stock/stock_view.xml'
42--- stock/stock_view.xml 2013-02-27 12:59:20 +0000
43+++ stock/stock_view.xml 2013-04-24 06:28:26 +0000
44@@ -708,7 +708,7 @@
45 </group>
46 <notebook colspan="4">
47 <page string="Products">
48- <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': address_id}">
49+ <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': address_id}" options='{"reload_on_button": true}'>
50 <tree colors="grey:scrapped == True" string="Stock Moves">
51 <field name="product_id"/>
52 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
53@@ -901,7 +901,7 @@
54 </group>
55 <notebook colspan="4">
56 <page string="Products">
57- <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_out_id': address_id, 'picking_type': type}" >
58+ <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_out_id': address_id, 'picking_type': type}" options='{"reload_on_button": true}'>
59 <tree colors="grey:scrapped==True" string="Stock Moves">
60 <field name="product_id"/>
61 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
62@@ -1122,7 +1122,7 @@
63 </group>
64 <notebook colspan="4">
65 <page string="General Information">
66- <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': address_id, 'picking_type': type}" >
67+ <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': address_id, 'picking_type': type}" options='{"reload_on_button": true}'>
68 <tree colors="grey:scrapped==True" string="Stock Moves">
69 <field name="product_id" />
70 <field name="product_qty" />