Merge lp:~openerp-dev/openobject-server/trunk-x2many-action-field-sgo into lp:openobject-server

Proposed by Sanjay Gohel (Open ERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-x2many-action-field-sgo
Merge into: lp:openobject-server
Diff against target: 41 lines (+4/-3)
3 files modified
openerp/addons/base/ir/ir_actions.xml (+2/-2)
openerp/addons/base/res/res_company_view.xml (+1/-1)
openerp/addons/base/res/res_partner_view.xml (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-x2many-action-field-sgo
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+198031@code.launchpad.net

Description of the change

Hello,
    Change in button behaviour which lies in button_box class set oe_link and also set x2many widget where is needed on one2many field. If one2many field is not found for x2many widget than add new one2many field For looks like in kanban view. And set all action button on top and all fields below action button.

Thank You.
Sanjay Gohel

To post a comment you must log in.
5012. By Sanjay Gohel (Open ERP)

[MERGE]sync with trunk

Unmerged revisions

5012. By Sanjay Gohel (Open ERP)

[MERGE]sync with trunk

5011. By Sanjay Gohel (Open ERP)

[IMP]add div on partner form view

5010. By Sanjay Gohel (Open ERP)

[MERGE]merge lp:~openerp-dev/openobject-server/trunk-add-x2many-widget-sgo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/ir/ir_actions.xml'
2--- openerp/addons/base/ir/ir_actions.xml 2013-11-25 15:41:40 +0000
3+++ openerp/addons/base/ir/ir_actions.xml 2014-02-10 06:28:26 +0000
4@@ -258,10 +258,10 @@
5 <div class="oe_right oe_button_box" name="buttons">
6 <field name="menu_ir_values_id" invisible="1"/>
7 <button name="create_action" string="Add in the 'More' menu" type="object"
8- attrs="{'invisible':[('menu_ir_values_id','!=',False)]}"
9+ attrs="{'invisible':[('menu_ir_values_id','!=',False)]}" class="oe_link"
10 help="Display an option on related documents to run this sever action"/>
11 <button name="unlink_action" string="Remove from the 'More' menu" type="object"
12- attrs="{'invisible':[('menu_ir_values_id','=',False)]}"
13+ attrs="{'invisible':[('menu_ir_values_id','=',False)]}" class="oe_link"
14 help="Remove the contextual action related to this server action"/>
15 </div>
16 <group>
17
18=== modified file 'openerp/addons/base/res/res_company_view.xml'
19--- openerp/addons/base/res/res_company_view.xml 2013-12-09 13:21:09 +0000
20+++ openerp/addons/base/res/res_company_view.xml 2014-02-10 06:28:26 +0000
21@@ -24,7 +24,7 @@
22 <field name="logo" widget="image" class="oe_avatar oe_left"/>
23 </div>
24 <div class="oe_right oe_button_box" name="button_box">
25- <button name="%(preview_report)d" string="Preview Header/Footer" type="action"/>
26+ <button name="%(preview_report)d" class="oe_link" string="Preview Header/Footer" type="action"/>
27 </div>
28 <div class="oe_title">
29 <label for="name" class="oe_edit_only"/>
30
31=== modified file 'openerp/addons/base/res/res_partner_view.xml'
32--- openerp/addons/base/res/res_partner_view.xml 2014-02-03 16:30:52 +0000
33+++ openerp/addons/base/res/res_partner_view.xml 2014-02-10 06:28:26 +0000
34@@ -144,6 +144,7 @@
35 on_change="onchange_address(use_parent_address, parent_id)"/>
36 <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
37 </div>
38+ <div class="oe_right oe_button_box" name="action_buttons"> </div>
39 <div class="oe_right oe_button_box" name="buttons"> </div>
40
41 <group>