Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-act-window-imp-bde into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-act-window-imp-bde/+merge/125642
Hello Sir,
I have removed redundant buttons from More Button and
displayed important buttons on related forms.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-act-window-imp-bde/+merge/125642
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-act-window-imp-bde.
=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml 2012-09-11 12:05:36 +0000
+++ account_voucher/voucher_payment_receipt_view.xml 2012-09-21 07:26:19 +0000
@@ -325,7 +325,6 @@
<field name="type" invisible="True"/>
</group>
</group>
-
<notebook>
<page string="Payment Information" groups="base.group_user">
<field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
=== modified file 'event/event_view.xml'
--- event/event_view.xml 2012-09-17 16:33:01 +0000
+++ event/event_view.xml 2012-09-21 07:26:19 +0000
@@ -1,15 +1,13 @@
<?xml version="1.0"?>
<openerp>
<data>
-
- <act_window
- id="act_event_list_register_event"
- name="Registration"
- res_model="event.registration"
- src_model="event.event"
- view_mode="calendar,tree,form,graph"
- context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
- view_type="form"/>
+
+ <record id="act_event_list_register_event" model="ir.actions.act_window">
+ <field name="res_model">event.registration</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">calendar,tree,form,graph</field>
+ <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
+ </record>
<!-- Top menu item -->
<menuitem name="Events"
=== modified file 'hr_contract/hr_contract_view.xml'
--- hr_contract/hr_contract_view.xml 2012-09-17 12:20:12 +0000
+++ hr_contract/hr_contract_view.xml 2012-09-21 07:26:19 +0000
@@ -5,13 +5,12 @@
<!-- Contracts Button on Employee Form -->
- <act_window
- context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
- id="act_hr_employee_2_hr_contract"
- name="Contracts"
- res_model="hr.contract"
- src_model="hr.employee"
- groups="base.group_hr_manager"/>
+ <record id="act_hr_employee_2_hr_contract" model="ir.actions.act_window">
+ <field name="res_model">hr.contract</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
+ </record>
<menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="30" groups="base.group_no_one"/>
<record id="hr_hr_employee_view_form2" model="ir.ui.view">
=== modified file 'hr_evaluation/hr_evaluation_view.xml'
--- hr_evaluation/hr_evaluation_view.xml 2012-09-18 11:30:50 +0000
+++ hr_evaluation/hr_evaluation_view.xml 2012-09-21 07:26:19 +0000
@@ -58,6 +58,15 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
+
+ <!-- Appraisal Interviews Action -->
+
+ <record id="act_hr_employee_2_hr__evaluation_interview" model="ir.actions.act_window">
+ <field name="res_model">hr.evaluation.interview</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="context">{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}</field>
+ </record>
<menuitem name="Appraisal" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="25"/>
<menuitem name="Periodic Appraisal" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
@@ -134,6 +143,9 @@
<field name="evaluation_date"/>
</group>
</xpath>
+ <xpath expr="//div[@name='button_box']" position="inside">
+ <button name="%(act_hr_employee_2_hr__evaluation_interview)d" string="Appraisal Interviews" type="action"/>
+ </xpath>
</field>
</record>
@@ -408,13 +420,5 @@
'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
'default_subject': 'Reminder to fill up Survey'}"/>
- <!-- Appraisal Interviews Button on Employee Form -->
- <act_window
- context="{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}"
- id="act_hr_employee_2_hr__evaluation_interview"
- name="Appraisal Interviews"
- res_model="hr.evaluation.interview"
- src_model="hr.employee"/>
-
</data>
</openerp>
=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml 2012-09-20 09:10:21 +0000
+++ hr_payroll/hr_payroll_view.xml 2012-09-21 07:26:19 +0000
@@ -369,14 +369,15 @@
<field name="view_id" ref="view_hr_payslip_tree"/>
<field name="search_view_id" ref="view_hr_payslip_filter"/>
</record>
- <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll" groups="base.group_hr_user"/>
- <act_window name="Payslips"
- context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
- res_model="hr.payslip"
- src_model="hr.employee"
- view_id ="view_hr_payslip_tree"
- id="act_hr_employee_payslip_list"
- groups="base.group_hr_manager"/>
+
+ <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll" groups="base.group_hr_user"/>
+
+ <record id="act_hr_employee_payslip_list" model="ir.actions.act_window">
+ <field name="res_model">hr.payslip</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
+ </record>
<!-- Employee View -->
<record id="payroll_hr_employee_view_form" model="ir.ui.view">
=== modified file 'hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml'
--- hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml 2012-08-13 16:06:57 +0000
+++ hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml 2012-09-21 07:26:19 +0000
@@ -347,13 +347,6 @@
src_model="res.users"/>
<act_window
- context="{'search_default_account_id': [active_id],'default_account_id': [active_id]}"
- id="act_account_analytic_account_2_report_timehsheet_account"
- name="Timesheets"
- res_model="hr.analytic.timesheet"
- src_model="account.analytic.account"/>
-
- <act_window
context="{'search_default_manager_id': [active_id]}"
id="act_res_users_2_report_timesheet_invoice"
name="Costs to invoice"
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2012-09-20 09:07:06 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2012-09-21 07:26:19 +0000
@@ -340,10 +340,14 @@
</record>
<!-- Timesheet Button on Employee Form -->
- <act_window
- context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
- id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
+ <record id="act_hr_employee_2_hr_timesheet" model="ir.actions.act_window">
+ <field name="res_model">hr_timesheet_sheet.sheet</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
+ </record>
+
<record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
<field name="name">hr.timesheet.sheet.employee.extd_form</field>
<field name="model">hr.employee</field>
=== modified file 'lunch/wizard/lunch_order_cancel_view.xml'
--- lunch/wizard/lunch_order_cancel_view.xml 2012-08-08 13:06:14 +0000
+++ lunch/wizard/lunch_order_cancel_view.xml 2012-09-21 07:26:19 +0000
@@ -33,7 +33,7 @@
<act_window id="action_lunch_order_cancel_values"
key2="client_action_multi" name="Cancel Order"
res_model="lunch.order.cancel" src_model="lunch.order"
- view_mode="form" target="new" view_type="form"/>
+ view_mode="form" target="new" view_type="form" multi="True"/>
</data>
</openerp>
=== modified file 'lunch/wizard/lunch_order_confirm_view.xml'
--- lunch/wizard/lunch_order_confirm_view.xml 2012-08-08 13:06:14 +0000
+++ lunch/wizard/lunch_order_confirm_view.xml 2012-09-21 07:26:19 +0000
@@ -34,7 +34,7 @@
<act_window id="action_lunch_order_confirm_values"
key2="client_action_multi" name="Confirm Order"
res_model="lunch.order.confirm" src_model="lunch.order"
- view_mode="form" target="new" view_type="form"/>
+ view_mode="form" target="new" view_type="form" multi="True"/>
</data>
</openerp>
=== modified file 'marketing_campaign/marketing_campaign_view.xml'
--- marketing_campaign/marketing_campaign_view.xml 2012-08-08 13:06:14 +0000
+++ marketing_campaign/marketing_campaign_view.xml 2012-09-21 07:26:19 +0000
@@ -5,21 +5,33 @@
<menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
<!-- Marketing Campaign -->
- <act_window name="All Segments"
- res_model="marketing.campaign.segment"
- src_model="marketing.campaign"
- view_type="form"
- view_mode="tree,form"
- id="act_marketing_campaing_segment_opened"
- context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
+
+ <record id="act_marketing_campaing_segment_opened" model="ir.actions.act_window">
+ <field name="res_model">marketing.campaign.segment</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="context">{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}</field>
+ </record>
+
+ <!-- Campaign Follow-ups -->
+
+ <record id="act_marketing_campaing_followup" model="ir.actions.act_window">
+ <field name="res_model">marketing.campaign.workitem</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="context">{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}</field>
+ </record>
+
+ <!-- Campaign Statistics -->
+
+ <record id="act_marketing_campaing_stat" model="ir.actions.act_window" >
+ <field name="res_model">campaign.analysis</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="context">{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}</field>
+ </record>
<!-- Campaign Followups -->
- <act_window
- context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
- id="act_marketing_campaing_followup"
- name="Campaign Follow-up" res_model="marketing.campaign.workitem"
- src_model="marketing.campaign" view_mode="tree,form"
- view_type="form"/>
<record model="ir.ui.view" id="view_marketing_campaign_form">
<field name="name">marketing.campaign.form</field>
@@ -35,12 +47,15 @@
</header>
<sheet string="Campaign">
<div class="oe_right oe_button_box" name="button_box">
- <button type="action"
- name="%(act_marketing_campaing_followup)d"
- string="Follow-Up"/>
- <button type="action"
- name="%(act_marketing_campaing_segment_opened)d"
- string="Segments"/>
+ <button type="action"
+ name="%(act_marketing_campaing_stat)d"
+ string="Campaign Statistics"/>
+ <button type="action"
+ name="%(act_marketing_campaing_segment_opened)d"
+ string="Segments"/>
+ <button type="action"
+ name="%(act_marketing_campaing_followup)d"
+ string="Follow-Up"/>
</div>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
@@ -422,29 +437,5 @@
<menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="10"/>
- <act_window name="All Segments"
- res_model="marketing.campaign.segment"
- src_model="marketing.campaign"
- view_type="form"
- view_mode="tree,form"
- id="act_marketing_campaing_segment_opened"
- context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
-
- <!-- Campaign Follow-ups -->
- <act_window
- context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
- id="act_marketing_campaing_followup"
- name="Campaign Follow-up" res_model="marketing.campaign.workitem"
- src_model="marketing.campaign" view_mode="tree,form"
- view_type="form"/>
-
- <!-- Campaign Statistics -->
- <act_window
- context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
- id="act_marketing_campaing_stat"
- name="Campaign Statistics" res_model="campaign.analysis"
- src_model="marketing.campaign" view_mode="tree,form"
- view_type="form"/>
-
</data>
</openerp>
=== modified file 'mrp_repair/wizard/mrp_repair_make_invoice_view.xml'
--- mrp_repair/wizard/mrp_repair_make_invoice_view.xml 2012-08-09 06:05:16 +0000
+++ mrp_repair/wizard/mrp_repair_make_invoice_view.xml 2012-09-21 07:26:19 +0000
@@ -27,7 +27,8 @@
view_mode="form"
target="new"
key2="client_action_multi"
- id="act_mrp_repair_invoice"/>
+ id="act_mrp_repair_invoice"
+ multi="True"/>
</data>
</openerp>
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-09-20 08:49:58 +0000
+++ project/project_view.xml 2012-09-21 07:26:19 +0000
@@ -10,15 +10,13 @@
<menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
<menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
-
- <act_window
- context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
- id="act_project_project_2_project_task_all"
- name="Tasks"
- res_model="project.task"
- src_model="project.project"
- view_mode="kanban,tree,form,calendar,graph"
- view_type="form"/>
+
+ <record id="act_project_project_2_project_task_all" model="ir.actions.act_window">
+ <field name="res_model">project.task</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">kanban,tree,form,calendar,graph</field>
+ <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+ </record>
<!-- Project Read/Unread actions -->
<record id="actions_server_project_unread" model="ir.actions.server">
@@ -207,15 +205,6 @@
</field>
</record>
- <act_window
- context="{'search_default_project_id': active_id, 'default_project_id': active_id}"
- id="act_project_project_2_project_task_all"
- name="Tasks"
- res_model="project.task"
- src_model="project.project"
- view_mode="kanban,tree,form,calendar,graph"
- view_type="form"/>
-
<record model="ir.ui.view" id="view_project_kanban">
<field name="name">project.project.kanban</field>
<field name="model">project.project</field>
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2012-09-20 08:49:58 +0000
+++ project_issue/project_issue_view.xml 2012-09-21 07:26:19 +0000
@@ -340,13 +340,12 @@
</field>
</record>
- <act_window id="act_project_project_2_project_issue_all"
- name="Issues"
- src_model="project.project"
- res_model="project.issue"
- view_type="form"
- view_mode="kanban,tree,form,calendar,graph"
- context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
+ <record id="act_project_project_2_project_issue_all" model="ir.actions.act_window">
+ <field name="res_model">project.issue</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">kanban,tree,form,calendar,graph</field>
+ <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+ </record>
<!-- Project -->
<record id="view_project_form_inherited" model="ir.ui.view">
=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml 2012-09-20 08:49:58 +0000
+++ project_long_term/project_long_term_view.xml 2012-09-21 07:26:19 +0000
@@ -83,13 +83,13 @@
<!-- Project Phase -->
- <act_window id="act_project_phases"
- name="Phases"
- src_model="project.project"
- res_model="project.phase"
- view_type="form"
- view_mode="tree,form"
- context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
+
+ <record id="act_project_phases" model="ir.actions.act_window">
+ <field name="res_model">project.phase</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+ </record>
<record id="project_phase_form" model="ir.ui.view">
<field name="name">Inherit project form : Phase</field>
@@ -123,6 +123,13 @@
</xpath>
</field>
</record>
+
+ <record id="project_phase_task_list" model="ir.actions.act_window">
+ <field name="res_model">project.task</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="context">{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}</field>
+ </record>
<record id="view_project_phase_form" model="ir.ui.view">
<field name="name">project.phase.form</field>
@@ -138,6 +145,7 @@
<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header>
<sheet>
+ <button name="%(project_phase_task_list)d" string="Related Tasks" type="action" class="oe_right"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
@@ -336,14 +344,6 @@
</field>
</record>
- <act_window
- context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
- id="project_phase_task_list"
- name="Related Tasks"
- res_model="project.task"
- src_model="project.phase"
- view_mode="tree,form"/>
-
<record id="analytic_account_inherited_phase_form" model="ir.ui.view">
<field name="name">account.analytic.account.phase.form.inherit</field>
<field name="model">account.analytic.account</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
