odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] related not in 'More...' 

bzr revid: fp@tinyerp.com-20120927173641-i503k4kycnwjyefj
This commit is contained in:
Fabien Pinckaers 2012-09-27 19:36:41 +02:00
parent ffb34cf11a 1c46b40f09
commit fc9f8491fe
14 changed files with 122 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/account_voucher/voucher_payment_receipt_view.xml
View File

@ -434,7 +434,6 @@
<field name="type" invisible="True"/> <field name="type" invisible="True"/>
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="Payment Information" groups="base.group_user"> <page string="Payment Information" groups="base.group_user">
<label for="line_cr_ids"/> <label for="line_cr_ids"/>

17
addons/event/event_view.xml
View File

@ -1,15 +1,14 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
<act_window <record id="act_event_list_register_event" model="ir.actions.act_window">
id="act_event_list_register_event" <field name="res_model">event.registration</field>
name="Registration" <field name="view_type">form</field>
res_model="event.registration" <field name="name">Registrations</field>
src_model="event.event" <field name="view_mode">calendar,tree,form,graph</field>
view_mode="calendar,tree,form,graph" <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
context="{'search_default_event_id': active_id, 'default_event_id': active_id}" </record>
view_type="form"/>
<!-- Top menu item --> <!-- Top menu item -->
<menuitem name="Events" <menuitem name="Events"

14
addons/hr_contract/hr_contract_view.xml
View File

@ -5,13 +5,13 @@
<!-- Contracts Button on Employee Form --> <!-- Contracts Button on Employee Form -->
<act_window <record id="act_hr_employee_2_hr_contract" model="ir.actions.act_window">
context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}" <field name="res_model">hr.contract</field>
id="act_hr_employee_2_hr_contract" <field name="view_type">form</field>
name="Contracts" <field name="name">Contracts</field>
res_model="hr.contract" <field name="view_mode">tree,form</field>
src_model="hr.employee" <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
groups="base.group_hr_manager"/> </record>
<menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="30" groups="base.group_no_one"/> <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"> <record id="hr_hr_employee_view_form2" model="ir.ui.view">

21
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -58,6 +58,16 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </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="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 name="Periodic Appraisal" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
@ -134,6 +144,9 @@
<field name="evaluation_date"/> <field name="evaluation_date"/>
</group> </group>
</xpath> </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> </field>
</record> </record>
@ -408,13 +421,5 @@
'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks', 'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
'default_subject': 'Reminder to fill up Survey'}"/> '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> </data>
</openerp> </openerp>

18
addons/hr_payroll/hr_payroll_view.xml
View File

@ -369,14 +369,16 @@
<field name="view_id" ref="view_hr_payslip_tree"/> <field name="view_id" ref="view_hr_payslip_tree"/>
<field name="search_view_id" ref="view_hr_payslip_filter"/> <field name="search_view_id" ref="view_hr_payslip_filter"/>
</record> </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" <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll" groups="base.group_hr_user"/>
context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
res_model="hr.payslip" <record id="act_hr_employee_payslip_list" model="ir.actions.act_window">
src_model="hr.employee" <field name="res_model">hr.payslip</field>
view_id ="view_hr_payslip_tree" <field name="name">Payslips</field>
id="act_hr_employee_payslip_list" <field name="view_type">form</field>
groups="base.group_hr_manager"/> <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 --> <!-- Employee View -->
<record id="payroll_hr_employee_view_form" model="ir.ui.view"> <record id="payroll_hr_employee_view_form" model="ir.ui.view">

17
addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
View File

@ -347,18 +347,11 @@
src_model="res.users"/> src_model="res.users"/>
<act_window <act_window
context="{'search_default_account_id': [active_id],'default_account_id': [active_id]}" context="{'search_default_manager_id': [active_id]}"
id="act_account_analytic_account_2_report_timehsheet_account" id="act_res_users_2_report_timesheet_invoice"
name="Timesheets" name="Costs to invoice"
res_model="hr.analytic.timesheet" res_model="report_timesheet.invoice"
src_model="account.analytic.account"/> src_model="res.users"/>
<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"/>
</data> </data>

11
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -340,10 +340,15 @@
</record> </record>
<!-- Timesheet Button on Employee Form --> <!-- 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"> <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
<field name="name">hr.timesheet.sheet.employee.extd_form</field> <field name="name">hr.timesheet.sheet.employee.extd_form</field>
<field name="model">hr.employee</field> <field name="model">hr.employee</field>

2
addons/lunch/wizard/lunch_order_cancel_view.xml
View File

@ -33,7 +33,7 @@
<act_window id="action_lunch_order_cancel_values" <act_window id="action_lunch_order_cancel_values"
key2="client_action_multi" name="Cancel Order" key2="client_action_multi" name="Cancel Order"
res_model="lunch.order.cancel" src_model="lunch.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> </data>
</openerp> </openerp>

2
addons/lunch/wizard/lunch_order_confirm_view.xml
View File

@ -34,7 +34,7 @@
<act_window id="action_lunch_order_confirm_values" <act_window id="action_lunch_order_confirm_values"
key2="client_action_multi" name="Confirm Order" key2="client_action_multi" name="Confirm Order"
res_model="lunch.order.confirm" src_model="lunch.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> </data>
</openerp> </openerp>

76
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -5,21 +5,36 @@
<menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/> <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
<!-- Marketing Campaign --> <!-- Marketing Campaign -->
<act_window name="All Segments"
res_model="marketing.campaign.segment" <record id="act_marketing_campaing_segment_opened" model="ir.actions.act_window">
src_model="marketing.campaign" <field name="res_model">marketing.campaign.segment</field>
view_type="form" <field name="view_type">form</field>
view_mode="tree,form" <field name="name">Segments</field>
id="act_marketing_campaing_segment_opened" <field name="view_mode">tree,form</field>
context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/> <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 --> <!-- 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"> <record model="ir.ui.view" id="view_marketing_campaign_form">
<field name="name">marketing.campaign.form</field> <field name="name">marketing.campaign.form</field>
@ -35,12 +50,15 @@
</header> </header>
<sheet string="Campaign"> <sheet string="Campaign">
<div class="oe_right oe_button_box" name="button_box"> <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" name="%(act_marketing_campaing_followup)d"
string="Follow-Up"/> string="Follow-Up"/>
<button type="action"
name="%(act_marketing_campaing_segment_opened)d"
string="Segments"/>
</div> </div>
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only"/> <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"/> <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> </data>
</openerp> </openerp>

3
addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
View File

@ -27,7 +27,8 @@
view_mode="form" view_mode="form"
target="new" target="new"
key2="client_action_multi" key2="client_action_multi"
id="act_mrp_repair_invoice"/> id="act_mrp_repair_invoice"
multi="True"/>
</data> </data>
</openerp> </openerp>

26
addons/project/project_view.xml
View File

@ -10,15 +10,14 @@
<menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/> <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"/> <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
<act_window <record id="act_project_project_2_project_task_all" model="ir.actions.act_window">
context="{'search_default_project_id': [active_id], 'default_project_id': active_id}" <field name="res_model">project.task</field>
id="act_project_project_2_project_task_all" <field name="view_type">form</field>
name="Tasks" <field name="name">Tasks</field>
res_model="project.task" <field name="view_mode">kanban,tree,form,calendar,graph</field>
src_model="project.project" <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
view_mode="kanban,tree,form,calendar,graph" </record>
view_type="form"/>
<!-- Project Read/Unread actions --> <!-- Project Read/Unread actions -->
<record id="actions_server_project_unread" model="ir.actions.server"> <record id="actions_server_project_unread" model="ir.actions.server">
@ -207,15 +206,6 @@
</field> </field>
</record> </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"> <record model="ir.ui.view" id="view_project_kanban">
<field name="name">project.project.kanban</field> <field name="name">project.project.kanban</field>
<field name="model">project.project</field> <field name="model">project.project</field>

14
addons/project_issue/project_issue_view.xml
View File

@ -340,13 +340,13 @@
</field> </field>
</record> </record>
<act_window id="act_project_project_2_project_issue_all" <record id="act_project_project_2_project_issue_all" model="ir.actions.act_window">
name="Issues" <field name="res_model">project.issue</field>
src_model="project.project" <field name="view_type">form</field>
res_model="project.issue" <field name="name">Issues</field>
view_type="form" <field name="view_mode">kanban,tree,form,calendar,graph</field>
view_mode="kanban,tree,form,calendar,graph" <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/> </record>
<!-- Project --> <!-- Project -->
<record id="view_project_form_inherited" model="ir.ui.view"> <record id="view_project_form_inherited" model="ir.ui.view">

32
addons/project_long_term/project_long_term_view.xml
View File

@ -83,13 +83,14 @@
<!-- Project Phase --> <!-- Project Phase -->
<act_window id="act_project_phases"
name="Phases" <record id="act_project_phases" model="ir.actions.act_window">
src_model="project.project" <field name="res_model">project.phase</field>
res_model="project.phase" <field name="view_type">form</field>
view_type="form" <field name="name">Phases</field>
view_mode="tree,form" <field name="view_mode">tree,form</field>
context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/> <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"> <record id="project_phase_form" model="ir.ui.view">
<field name="name">Inherit project form : Phase</field> <field name="name">Inherit project form : Phase</field>
@ -123,6 +124,14 @@
</xpath> </xpath>
</field> </field>
</record> </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"> <record id="view_project_phase_form" model="ir.ui.view">
<field name="name">project.phase.form</field> <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"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header> </header>
<sheet> <sheet>
<button name="%(project_phase_task_list)d" string="Related Tasks" type="action" class="oe_right"/>
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only"/> <label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1> <h1><field name="name"/></h1>
@ -336,14 +346,6 @@
</field> </field>
</record> </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"> <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
<field name="name">account.analytic.account.phase.form.inherit</field> <field name="name">account.analytic.account.phase.form.inherit</field>
<field name="model">account.analytic.account</field> <field name="model">account.analytic.account</field>