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

[MERGE] lp:878149 

bzr revid: qdp-launchpad@openerp.com-20111025154445-kvn3k3jbj1zzbhw8
This commit is contained in:
Quentin (OpenERP) 2011-10-25 17:44:45 +02:00
parent 889b6d20d3 bbd8f2dc25
commit 8ff449f75b
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_anglo_saxon/__openerp__.py
View File

@ -19,7 +19,7 @@
##############################################################################
{
"name" : "Anglo-Saxon Accouting",
"name" : "Anglo-Saxon Accounting",
"version" : "1.2",
"author" : "OpenERP SA, Veritos",
"website" : "http://tinyerp.com - http://veritos.nl",

2
addons/account_followup/__openerp__.py
View File

@ -20,7 +20,7 @@
##############################################################################
{
'name': 'Followups Management',
'name': 'Followup Management',
'version': '1.0',
'category': 'Accounting & Finance',
'complexity': "normal",

2
addons/hr_attendance/__openerp__.py
View File

@ -21,7 +21,7 @@
{
'name': 'Attendances',
'name': 'Attendance',
'version': '1.1',
'category': 'Human Resources',
'complexity': "easy",

10
addons/hr_attendance/hr_attendance_view.xml
View File

@ -50,7 +50,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Hr Attendance Search">
<filter icon="terp-stock_align_left_24" string="My Attendances" domain="[('employee_id.user_id.id', '=', uid)]" />
<filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
<separator orientation="vertical"/>
<filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
<separator orientation="vertical"/>
@ -68,7 +68,7 @@
</record>
<record id="open_view_attendance" model="ir.actions.act_window">
<field name="name">Attendances</field>
<field name="name">Attendance</field>
<field name="res_model">hr.attendance</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -79,7 +79,7 @@
<menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
<menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="4" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
<menuitem id="menu_hr_attendance" name="Attendance" parent="hr.menu_hr_root" sequence="4" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
<menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20"/>
@ -116,8 +116,8 @@
<field name="view_id" ref="view_attendance_reason"/>
</record>
<menuitem
sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendances"
<menuitem
sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendance"
groups="base.group_extended"/>
<menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config"/>

2
addons/hr_contract/__openerp__.py
View File

@ -21,7 +21,7 @@
{
'name': "Employee's Contracts",
'name': "Employee Contracts",
'version': '1.0',
'category': 'Human Resources',
'complexity': "easy",

2
addons/hr_holidays/__openerp__.py
View File

@ -21,7 +21,7 @@
{
"name": "Leaves Management",
"name": "Leave Management",
"version": "1.5",
"author": ['OpenERP SA', 'Axelor'],
"category": "Human Resources",