diff options
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/account_voucher/voucher_payment_receipt_view.xml | 1 | ||||
| -rw-r--r-- | addons/event/event_view.xml | 17 | ||||
| -rw-r--r-- | addons/hr_contract/hr_contract_view.xml | 14 | ||||
| -rw-r--r-- | addons/hr_evaluation/hr_evaluation_view.xml | 21 | ||||
| -rw-r--r-- | addons/hr_payroll/hr_payroll_view.xml | 18 | ||||
| -rw-r--r-- | addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml | 17 | ||||
| -rw-r--r-- | addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 11 | ||||
| -rw-r--r-- | addons/lunch/wizard/lunch_order_cancel_view.xml | 2 | ||||
| -rw-r--r-- | addons/lunch/wizard/lunch_order_confirm_view.xml | 2 | ||||
| -rw-r--r-- | addons/marketing_campaign/marketing_campaign_view.xml | 76 | ||||
| -rw-r--r-- | addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml | 3 | ||||
| -rw-r--r-- | addons/project/project_view.xml | 26 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 14 | ||||
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 32 |
14 files changed, 122 insertions, 132 deletions
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index c4fe05060d0..78b76e5c9b7 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -434,7 +434,6 @@ <field name="type" invisible="True"/> </group> </group> - <notebook> <page string="Payment Information" groups="base.group_user"> <label for="line_cr_ids"/> diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index fd396053d5d..40019513126 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -1,15 +1,14 @@ <?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="name">Registrations</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" diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 6566f303d36..0659d661420 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -5,13 +5,13 @@ <!-- 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="name">Contracts</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"> diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 29d68d7a12c..2f3deae7b60 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -58,6 +58,16 @@ <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="name">Interviews</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 +144,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 +421,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> diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index ef3c0ea2e9f..3ba9467395e 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -369,14 +369,16 @@ <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="name">Payslips</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"> diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index 2d4b0debde8..6d6fe2f3776 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -347,18 +347,11 @@ 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" - res_model="report_timesheet.invoice" - src_model="res.users"/> + context="{'search_default_manager_id': [active_id]}" + id="act_res_users_2_report_timesheet_invoice" + name="Costs to invoice" + res_model="report_timesheet.invoice" + src_model="res.users"/> </data> diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 6c92e28564e..43642678ae1 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -340,10 +340,15 @@ </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="name">Timesheets</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> diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml index 8421dd74f9b..91d6a959241 100644 --- a/addons/lunch/wizard/lunch_order_cancel_view.xml +++ b/addons/lunch/wizard/lunch_order_cancel_view.xml @@ -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> diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml index dadde4ed089..022d17acea3 100644 --- a/addons/lunch/wizard/lunch_order_confirm_view.xml +++ b/addons/lunch/wizard/lunch_order_confirm_view.xml @@ -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> diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 19b9536c432..189bd8285f2 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -5,21 +5,36 @@ <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="name">Segments</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="name">Workitems</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="name">Campaign Follow-up</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 +50,15 @@ </header> <sheet string="Campaign"> <div class="oe_right oe_button_box" name="button_box"> - <button type="action" + <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"/> - <button type="action" - name="%(act_marketing_campaing_segment_opened)d" - string="Segments"/> </div> <div class="oe_title"> <label for="name" class="oe_edit_only"/> @@ -422,29 +440,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> diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml index 431cf0d54b4..21d71064901 100644 --- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml +++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml @@ -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> diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 83d3414f74e..745b4dfb43d 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -10,15 +10,14 @@ <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="name">Tasks</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 +206,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> diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 8d54520261f..3214b93c8d3 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -340,13 +340,13 @@ </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="name">Issues</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"> diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 55a91b36f08..909f838a0f8 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -83,13 +83,14 @@ <!-- 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="name">Phases</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 +124,14 @@ </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="name">Tasks</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 +147,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 +346,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> |