[MERGE] forward port of branch 8.0 up to ed1c173

3 files changed, 204 insertions, 139 deletions

diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index da12feb8de6..a1275d98a7c 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.pot
@@ -1,13 +1,13 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
 #	* resource
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Project-Id-Version: Odoo Server 8.0rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-21 17:06+0000\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 13:09+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,166 +16,192 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: resource
-#: help:resource.calendar.leaves,resource_id:0
-msgid "If empty, this is a generic holiday for the company. If a resource is set, the holiday/leave is only for this resource"
+#: code:addons/resource/resource.py:685
+#, python-format
+msgid "%s (copy)"
 msgstr ""
 
 #. module: resource
-#: selection:resource.resource,resource_type:0
-msgid "Material"
+#: code:addons/resource/faces/resource.py:340
+#, python-format
+msgid "(vacation)"
 msgstr ""
 
 #. module: resource
-#: field:resource.resource,resource_type:0
-msgid "Resource Type"
+#: model:ir.actions.act_window,help:resource.action_resource_calendar_form
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                Define working hours and time table that could be scheduled to your project members\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: resource
-#: model:ir.model,name:resource.model_resource_calendar_leaves
-#: view:resource.calendar.leaves:0
-msgid "Leave Detail"
+#: field:resource.resource,active:0
+msgid "Active"
 msgstr ""
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
-msgid "Resources Leaves"
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
 msgstr ""
 
 #. module: resource
-#: field:resource.calendar.attendance,dayofweek:0
-msgid "Day of Week"
+#: field:resource.resource,code:0
+msgid "Code"
 msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Thursday"
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:resource.view_resource_calendar_leaves_search
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:resource.view_resource_resource_search
+#: field:resource.resource,company_id:0
+msgid "Company"
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar.leaves:0
-#: view:resource.resource:0
-msgid "Group By..."
+#: code:addons/resource/resource.py:773
+#, python-format
+msgid "Configuration Error!"
 msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Sunday"
+#: field:resource.calendar,create_uid:0
+#: field:resource.calendar.attendance,create_uid:0
+#: field:resource.calendar.leaves,create_uid:0
+#: field:resource.resource,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: resource
-#: field:resource.resource,time_efficiency:0
-msgid "Efficiency Factor"
+#: field:resource.calendar,create_date:0
+#: field:resource.calendar.attendance,create_date:0
+#: field:resource.calendar.leaves,create_date:0
+#: field:resource.resource,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: resource
-#: view:resource.resource:0
-msgid "Search Resource"
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of Week"
 msgstr ""
 
 #. module: resource
-#: view:resource.resource:0
-msgid "Type"
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
 msgstr ""
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
-#: view:resource.resource:0
-msgid "Resources"
+#: view:resource.calendar.leaves:resource.resource_calendar_leave_form
+msgid "Duration"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:389
-#, python-format
-msgid "Make sure the Working time has been configured with proper week days!"
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency Factor"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:307
-#, python-format
-msgid "%s (copy)"
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Time"
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
 
 #. module: resource
-#: constraint:resource.calendar.leaves:0
-msgid "Error! leave start-date must be lower then leave end-date."
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
 msgstr ""
 
 #. module: resource
-#: model:ir.model,name:resource.model_resource_calendar
-msgid "Resource Calendar"
+#: view:resource.calendar.leaves:resource.view_resource_calendar_leaves_search
+#: view:resource.resource:resource.view_resource_resource_search
+msgid "Group By"
 msgstr ""
 
 #. module: resource
-#: field:resource.calendar,company_id:0
-#: view:resource.calendar.leaves:0
-#: field:resource.calendar.leaves,company_id:0
-#: view:resource.resource:0
-#: field:resource.resource,company_id:0
-msgid "Company"
+#: view:resource.calendar.attendance:resource.view_resource_calendar_attendance_form
+msgid "Hours"
 msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Friday"
+#: selection:resource.resource,resource_type:0
+msgid "Human"
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar.attendance:0
-msgid "Hours"
+#: field:resource.calendar,id:0
+#: field:resource.calendar.attendance,id:0
+#: field:resource.calendar.leaves,id:0
+#: field:resource.resource,id:0
+msgid "ID"
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar.leaves:0
-msgid "Reason"
+#: help:resource.calendar.leaves,resource_id:0
+msgid "If empty, this is a generic holiday for the company. If a resource is set, the holiday/leave is only for this resource"
 msgstr ""
 
 #. module: resource
-#: view:resource.resource:0
-#: field:resource.resource,user_id:0
-msgid "User"
+#: help:resource.resource,active:0
+msgid "If the active field is set to False, it will allow you to hide the resource record without removing it."
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar.leaves:0
-msgid "Date"
+#: view:resource.resource:resource.view_resource_resource_search
+msgid "Inactive"
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar.leaves:0
-msgid "Search Working Period Leaves"
+#: field:resource.calendar,write_uid:0
+#: field:resource.calendar.attendance,write_uid:0
+#: field:resource.calendar.leaves,write_uid:0
+#: field:resource.resource,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: resource
-#: field:resource.calendar.attendance,date_from:0
-msgid "Starting Date"
+#: field:resource.calendar,write_date:0
+#: field:resource.calendar.attendance,write_date:0
+#: field:resource.calendar.leaves,write_date:0
+#: field:resource.resource,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: resource
-#: field:resource.calendar,manager:0
-msgid "Workgroup Manager"
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:resource.resource_calendar_leave_form
+#: view:resource.calendar.leaves:resource.resource_calendar_leave_tree
+msgid "Leave Detail"
 msgstr ""
 
 #. module: resource
-#: field:resource.calendar.leaves,date_to:0
-msgid "End Date"
+#: view:resource.calendar.leaves:resource.view_resource_calendar_leaves_search
+msgid "Leave Month"
 msgstr ""
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
-msgid "Closing Days"
+#: field:resource.calendar,leave_ids:0
+msgid "Leaves"
 msgstr ""
 
 #. module: resource
-#: model:ir.ui.menu,name:resource.menu_resource_config
-#: view:resource.calendar.leaves:0
-#: field:resource.calendar.leaves,resource_id:0
-#: view:resource.resource:0
-msgid "Resource"
+#: code:addons/resource/resource.py:773
+#, python-format
+msgid "Make sure the Working time has been configured with proper week days!"
+msgstr ""
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
 msgstr ""
 
 #. module: resource
@@ -187,29 +213,30 @@ msgid "Name"
 msgstr ""
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
-#: field:resource.calendar,attendance_ids:0
-#: view:resource.calendar.attendance:0
-#: field:resource.calendar.leaves,calendar_id:0
-#: field:resource.resource,calendar_id:0
-msgid "Working Time"
+#: view:resource.calendar.leaves:resource.resource_calendar_leave_form
+#: view:resource.calendar.leaves:resource.resource_calendar_leave_tree
+#: view:resource.calendar.leaves:resource.view_resource_calendar_leaves_search
+msgid "Reason"
 msgstr ""
 
 #. module: resource
-#: help:resource.calendar.attendance,hour_from:0
-msgid "Start and End time of working."
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar.leaves:0
-#: view:resource.resource:0
-msgid "Working Period"
+#: model:ir.ui.menu,name:resource.menu_resource_config
+#: view:resource.calendar.leaves:resource.view_resource_calendar
+#: view:resource.calendar.leaves:resource.view_resource_calendar_leaves_search
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:resource.resource_resource_form
+#: view:resource.resource:resource.view_resource_resource_search
+msgid "Resource"
 msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Wednesday"
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
 msgstr ""
 
 #. module: resource
@@ -218,13 +245,14 @@ msgid "Resource Detail"
 msgstr ""
 
 #. module: resource
-#: field:resource.resource,active:0
-msgid "Active"
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
+msgid "Resource Leaves"
 msgstr ""
 
 #. module: resource
-#: help:resource.resource,active:0
-msgid "If the active field is set to False, it will allow you to hide the resource record without removing it."
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
 msgstr ""
 
 #. module: resource
@@ -233,53 +261,65 @@ msgid "Resource's Calendar"
 msgstr ""
 
 #. module: resource
-#: field:resource.calendar.attendance,hour_from:0
-msgid "Work from"
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: model:ir.ui.menu,name:resource.menu_resource_resource
+#: view:resource.resource:resource.resource_resource_tree
+msgid "Resources"
 msgstr ""
 
 #. module: resource
-#: model:ir.actions.act_window,help:resource.action_resource_calendar_form
-msgid "Define working hours and time table that could be scheduled to your project members"
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
-#: help:resource.resource,user_id:0
-msgid "Related user name for the resource to manage its access."
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid "Resources allow you to create and manage resources that should be involved in a specific project phase. You can also set their efficiency level and workload based on their weekly working hours."
 msgstr ""
 
 #. module: resource
-#: help:resource.resource,calendar_id:0
-msgid "Define the schedule of resource"
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar.leaves:0
-msgid "Starting Date of Leave"
+#: view:resource.resource:resource.view_resource_resource_search
+msgid "Search Resource"
 msgstr ""
 
 #. module: resource
-#: field:resource.resource,code:0
-msgid "Code"
+#: view:resource.calendar.leaves:resource.view_resource_calendar_leaves_search
+msgid "Search Working Period Leaves"
 msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Monday"
+#: view:resource.calendar:resource.view_resource_calendar_search
+msgid "Search Working Time"
 msgstr ""
 
 #. module: resource
-#: field:resource.calendar.attendance,hour_to:0
-msgid "Work to"
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
 msgstr ""
 
 #. module: resource
-#: model:ir.model,name:resource.model_resource_calendar_attendance
-msgid "Work Detail"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Start and End time of working."
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:resource.view_resource_calendar_leaves_search
+msgid "Starting Date of Leave by Month"
 msgstr ""
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
-msgid "Tuesday"
+msgid "Sunday"
 msgstr ""
 
 #. module: resource
@@ -288,50 +328,68 @@ msgid "This field depict the efficiency of the resource to complete tasks. e.g
 msgstr ""
 
 #. module: resource
-#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
-#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
-msgid "Resource Leaves"
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
 msgstr ""
 
 #. module: resource
-#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
-msgid "Resources allow you to create and manage resources that should be involved in a specific project phase. You can also set their efficiency level and workload based on their weekly working hours."
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
 msgstr ""
 
 #. module: resource
-#: view:resource.resource:0
-msgid "Inactive"
+#: view:resource.resource:resource.view_resource_resource_search
+msgid "Type"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/faces/resource.py:340
-#, python-format
-msgid "(vacation)"
+#: view:resource.resource:resource.view_resource_resource_search
+#: field:resource.resource,user_id:0
+msgid "User"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:389
-#, python-format
-msgid "Configuration Error!"
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
 msgstr ""
 
 #. module: resource
-#: selection:resource.resource,resource_type:0
-msgid "Human"
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar.leaves:0
-msgid "Duration"
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
 msgstr ""
 
 #. module: resource
-#: field:resource.calendar.leaves,date_from:0
-msgid "Start Date"
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
 msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Saturday"
+#: field:resource.calendar,manager:0
+msgid "Workgroup Manager"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:resource.view_resource_calendar_leaves_search
+#: view:resource.resource:resource.view_resource_resource_search
+msgid "Working Period"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: model:ir.ui.menu,name:resource.menu_resource_calendar
+#: view:resource.calendar:resource.resource_calendar_form
+#: view:resource.calendar:resource.view_resource_calendar_search
+#: view:resource.calendar:resource.view_resource_calendar_tree
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:resource.view_resource_calendar_attendance_form
+#: view:resource.calendar.attendance:resource.view_resource_calendar_attendance_tree
+#: field:resource.calendar.leaves,calendar_id:0
+#: field:resource.resource,calendar_id:0
+msgid "Working Time"
 msgstr ""
 
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 5a43234ac46..b16fd210593 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -329,7 +329,8 @@ class resource_calendar(osv.osv):
         # no calendar: try to use the default_interval, then return directly
         if id is None:
             if default_interval:
-                intervals.append((start_dt.replace(hour=default_interval[0]), start_dt.replace(hour=default_interval[1])))
+                working_interval = (start_dt.replace(hour=default_interval[0], minute=0, second=0), start_dt.replace(hour=default_interval[1], minute=0, second=0))
+            intervals = self.interval_remove_leaves(working_interval, work_limits)
             return intervals
 
         working_intervals = []
@@ -371,10 +372,16 @@ class resource_calendar(osv.osv):
                           resource_id=None, default_interval=None, context=None):
         hours = 0.0
         for day in rrule.rrule(rrule.DAILY, dtstart=start_dt,
-                               until=end_dt + datetime.timedelta(days=1),
+                               until=(end_dt + datetime.timedelta(days=1)).replace(hour=0, minute=0, second=0),
                                byweekday=self.get_weekdays(cr, uid, id, context=context)):
+            day_start_dt = day.replace(hour=0, minute=0, second=0)
+            if start_dt and day.date() == start_dt.date():
+                day_start_dt = start_dt
+            day_end_dt = day.replace(hour=23, minute=59, second=59)
+            if end_dt and day.date() == end_dt.date():
+                day_end_dt = end_dt
             hours += self.get_working_hours_of_date(
-                cr, uid, id, start_dt=day,
+                cr, uid, id, start_dt=day_start_dt, end_dt=day_end_dt,
                 compute_leaves=compute_leaves, resource_id=resource_id,
                 default_interval=default_interval,
                 context=context)
diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv
index bf8504e2f46..6112565d9bf 100644
--- a/addons/resource/security/ir.model.access.csv
+++ b/addons/resource/security/ir.model.access.csv
@@ -2,6 +2,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_resource_calendar,resource.calendar,model_resource_calendar,base.group_system,1,1,1,1

 access_resource_calendar_attendance,resource.calendar.attendance,model_resource_calendar_attendance,base.group_system,1,1,1,1

 access_resource_resource,resource.resource,model_resource_resource,base.group_system,1,0,0,0

-access_resource_resource_all,resource.resource all,model_resource_resource,,1,0,0,0

+access_resource_resource_all,resource.resource all,model_resource_resource,base.group_user,1,0,0,0

 access_resource_calendar_leaves_user,resource.calendar.leaves,model_resource_calendar_leaves,base.group_user,1,0,0,0

 access_resource_calendar_leaves,resource.calendar.leaves,model_resource_calendar_leaves,base.group_system,1,1,1,1