[MERGE] cleanup @type for <menuitem>, now inferred from action + replace explicit record when possible
The corresponding server-side patch is rev.4358 rev-id odo@openerp.com-20120822171932-xz6i6k5nxurqfac9 in openobject-server. bzr revid: odo@openerp.com-20120822172130-3n1v93uwwwfrj17b
This commit is contained in:
commit
e459388304
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<!-- rename root menu "Accounting" -->
|
||||
<record id="account.menu_finance" model="ir.ui.menu">
|
||||
<field name="name">Accounting</field>
|
||||
</record>
|
||||
<!-- Rename root menu "Accounting" -->
|
||||
<!-- Top menu item -->
|
||||
<menuitem name="Accounting"
|
||||
id="account.menu_finance"/>
|
||||
</data>
|
||||
|
||||
<data noupdate="1">
|
||||
|
@ -19,10 +19,8 @@
|
|||
<field name="type">automatic</field>
|
||||
<field name="sequence">100</field>
|
||||
</record>
|
||||
</data>
|
||||
|
||||
<data noupdate="1">
|
||||
<!-- notify all employees of module installation -->
|
||||
<!-- Notify all employees of module installation -->
|
||||
<function model="mail.group" name="message_append_note">
|
||||
<!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
|
||||
<value eval="[ref('mail.group_all_employees')]"/>
|
||||
|
|
|
@ -2,9 +2,8 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<!-- Calendar Attendee Form View -->
|
||||
|
||||
<record id="attendee_form_view_inherit" model="ir.ui.view">
|
||||
<!-- Calendar Attendee Form View -->
|
||||
<record id="attendee_form_view_inherit" model="ir.ui.view">
|
||||
<field name="name">calendar.attendee.form.inherit</field>
|
||||
<field name="model">calendar.attendee</field>
|
||||
<field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
|
||||
|
@ -13,7 +12,7 @@
|
|||
<field name="categ_id" string="Event Type"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data noupdate="1">
|
||||
<!-- notify all employees of module installation -->
|
||||
|
||||
<!-- Notify all employees of module installation -->
|
||||
<function model="mail.group" name="message_append_note">
|
||||
<!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
|
||||
<value eval="[ref('mail.group_all_employees')]"/>
|
||||
|
@ -20,13 +21,7 @@
|
|||
<field eval=""""My Timesheet"""" name="name"/>
|
||||
</record>
|
||||
|
||||
<record id="menu_act_hr_timesheet_sheet_form_my_current" model="ir.ui.menu">
|
||||
<field name="name">My Current Timesheet</field>
|
||||
<field eval="1" name="sequence"/>
|
||||
<field name="parent_id" ref="hr_attendance.menu_hr_time_tracking"/>
|
||||
<field name="icon">STOCK_JUSTIFY_FILL</field>
|
||||
<field name="action" ref="ir_actions_server_timsheet_sheet"/>
|
||||
</record>
|
||||
<menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="1"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
@ -8,21 +8,11 @@
|
|||
groups="base.group_user"
|
||||
sequence="10"/>
|
||||
|
||||
<!-- left-side menu: Feeds !-->
|
||||
<!-- Left-side menu: Feeds -->
|
||||
<menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main" groups="base.group_user" sequence="10"/>
|
||||
|
||||
<record id="mail_wallfeeds" model="ir.ui.menu">
|
||||
<field name="name">News Feed</field>
|
||||
<field name="sequence" eval="10"/>
|
||||
<field name="action" ref="action_mail_all_feeds"/>
|
||||
<field name="parent_id" ref="mail_feeds"/>
|
||||
</record>
|
||||
<record id="mail_myfeeds" model="ir.ui.menu">
|
||||
<field name="name">My Feeds</field>
|
||||
<field name="sequence" eval="11"/>
|
||||
<field name="action" ref="action_mail_my_feeds"/>
|
||||
<field name="parent_id" ref="mail_feeds"/>
|
||||
</record>
|
||||
<menuitem id="mail_wallfeeds" name="News Feed" parent="mail_feeds" action="action_mail_all_feeds" sequence="10"/>
|
||||
<menuitem id="mail_myfeeds" name="My Feeds" parent="mail_feeds" action="action_mail_my_feeds" sequence="11"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
@ -35,15 +35,14 @@ with the effect of creating, editing and deleting either ways.
|
|||
'website': 'http://www.openerp.com',
|
||||
'images': ['images/invoice_task_work.jpeg', 'images/my_timesheet.jpeg', 'images/working_hour.jpeg'],
|
||||
'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
|
||||
'init_xml': ['project_timesheet_data.xml'],
|
||||
'update_xml': [
|
||||
"security/ir.model.access.csv",
|
||||
"security/project_timesheet_security.xml",
|
||||
"process/project_timesheet_process.xml",
|
||||
"report/task_report_view.xml",
|
||||
"project_timesheet_view.xml",
|
||||
],
|
||||
'demo_xml': ["project_timesheet_demo.xml"],
|
||||
'data': [
|
||||
'security/ir.model.access.csv',
|
||||
'security/project_timesheet_security.xml',
|
||||
'process/project_timesheet_process.xml',
|
||||
'report/task_report_view.xml',
|
||||
'project_timesheet_view.xml',
|
||||
],
|
||||
'demo': ['project_timesheet_demo.xml'],
|
||||
'test': [
|
||||
'test/worktask_entry_to_timesheetline_entry.yml',
|
||||
'test/work_timesheet.yml',
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<!-- <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
|
||||
<field name="name">Time Tracking</field>
|
||||
<field eval="5" name="sequence"/>
|
||||
<field name="parent_id" ref="base.menu_main_pm"/>
|
||||
</record>
|
||||
|
||||
<record id="menu_act_project_management_timesheet_sheet_form" model="ir.ui.menu">
|
||||
<field name="name">My Timesheet</field>
|
||||
<field eval="5" name="sequence"/>
|
||||
<field name="parent_id" ref="base.menu_project_management_time_tracking"/>
|
||||
<field name="icon">STOCK_JUSTIFY_FILL</field>
|
||||
<field name="action" ref="hr_timesheet_sheet.ir_actions_server_timsheet_sheet"/>
|
||||
</record> -->
|
||||
|
||||
</data>
|
||||
</openerp>
|
Loading…
Reference in New Issue