[MERGE] related not in 'More...'
bzr revid: fp@tinyerp.com-20120927173641-i503k4kycnwjyefj
This commit is contained in:
commit
fc9f8491fe
|
@ -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"/>
|
||||
|
|
|
@ -2,14 +2,13 @@
|
|||
<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"
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -59,6 +59,16 @@
|
|||
<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"/>
|
||||
<menuitem parent="hr.menu_hr_configuration" id="menu_open_view_hr_evaluation_plan_tree"
|
||||
|
@ -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>
|
||||
|
|
|
@ -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"/>
|
||||
|
||||
<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">
|
||||
|
|
|
@ -346,13 +346,6 @@
|
|||
res_model="report_timesheet.account"
|
||||
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"
|
||||
|
|
|
@ -340,9 +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="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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
@ -36,11 +51,14 @@
|
|||
<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"/>
|
||||
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 +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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -11,14 +11,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="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>
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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>
|
||||
|
@ -124,6 +125,14 @@
|
|||
</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>
|
||||
<field name="model">project.phase</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>
|
||||
|
|
Loading…
Reference in New Issue