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

[REF] Remove temp field from view and add sequence for view form of crm.metting 

bzr revid: jke@openerp.com-20131126200506-zr5fp99xa2lq4qno
This commit is contained in:
jke-openerp 2013-11-26 21:05:06 +01:00
parent 61cb04c5af
commit e6c1545262
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/base_calendar/crm_meeting_view.xml
View File

@ -27,6 +27,7 @@
<record model="ir.ui.view" id="view_crm_meeting_form">
<field name="name">CRM - Meetings Form</field>
<field name="model">crm.meeting</field>
<field name="sequence">1</field>
<field name="arch" type="xml">
<form string="Meetings" version="7.0">
<sheet>
@ -157,6 +158,7 @@
<record model="ir.ui.view" id="view_crm_meeting_form_popup">
<field name="name">Meetings Popup</field>
<field name="model">crm.meeting</field>
<field name="sequence">5</field>
<field name="arch" type="xml">
<form string="Meetings" version="7.0">
<field name="state" invisible="1"/>
@ -188,8 +190,6 @@
<field name="model">crm.meeting</field>
<field name="arch" type="xml">
<tree string="Meetings" fonts="bold:message_unread==True">
<button name="do_run_stack_scheduler" string="RUN SCHEDULER" type="object" />
<field name="name" string="Subject"/>
<field name="date" string="Event Date"/>
<field name="user_id"/>
@ -199,7 +199,6 @@
<field name="state" invisible="True"/>
<field name="duration"/>
<field name="message_unread" invisible="1"/>
</tree>
</field>
</record>

2
addons/hr_holidays/__openerp__.py
View File

@ -45,7 +45,7 @@ You can keep track of leaves in different ways by following reports:
A synchronization with an internal agenda (Meetings of the CRM module) is also possible in order to automatically create a meeting when a holiday request is accepted by setting up a type of meeting in Leave Type.
""",
'images': ['images/hr_allocation_requests.jpeg', 'images/hr_leave_requests.jpeg', 'images/leaves_analysis.jpeg'],
'depends': ['hr', 'web_calendar','base_calendar', 'process', 'resource'],
'depends': ['hr', 'base_calendar', 'process', 'resource'],
'data': [
'security/ir.model.access.csv',
'security/ir_rule.xml',