[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: rpa@tinyerp.com-20101216055348-7yrvv48hjq15grv9

4 files changed, 5 insertions, 25 deletions

diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot
index 2e28070c646..c3a219ab6a8 100644
--- a/addons/project_long_term/i18n/project_long_term.pot
+++ b/addons/project_long_term/i18n/project_long_term.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:21+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:21+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:10+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:10+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -224,6 +224,7 @@ msgid "Compute Scheduling of Task"
 msgstr ""
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_resource
 #: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
 #: view:project.resource.allocation:0
@@ -500,7 +501,7 @@ msgstr ""
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Time"
+msgid "Working Period"
 msgstr ""
 
 #. module: project_long_term
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index faea0916906..4640ea8fa48 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -153,8 +153,6 @@ class project_phase(osv.osv):
         return {'value': result}
 
     def _check_date_start(self, cr, uid, phase, date_end, context=None):
-       if context is None:
-            context = {}
        """
        Check And Compute date_end of phase if change in date_start < older time.
        """
@@ -175,8 +173,6 @@ class project_phase(osv.osv):
        self.write(cr, uid, [phase.id], {'date_start': dt_start, 'date_end': date_end.strftime('%Y-%m-%d')}, context=context)
 
     def _check_date_end(self, cr, uid, phase, date_start, context=None):
-       if context is None:
-            context = {}
        """
        Check And Compute date_end of phase if change in date_end > older time.
        """
@@ -277,8 +273,6 @@ class project_phase(osv.osv):
         Return a list of  Resource Class objects for the resources allocated to the phase.
         """
         res = {}
-        if context is None:
-            context = {}
         resource_pool = self.pool.get('resource.resource')
         for phase in self.browse(cr, uid, ids, context=context):
             user_ids = map(lambda x:x.resource_id.user_id.id, phase.resource_ids)
@@ -299,8 +293,6 @@ class project_phase(osv.osv):
         resource_pool = self.pool.get('resource.resource')
         resource_allocation_pool = self.pool.get('project.resource.allocation')
         uom_pool = self.pool.get('product.uom')
-        if context is None:
-           context = {}
         default_uom_id = self._get_default_uom_id(cr, uid)
         for phase in self.browse(cr, uid, ids, context=context):
             if not phase.responsible_id:
@@ -366,8 +358,6 @@ class project_phase(osv.osv):
         """
         task_pool = self.pool.get('project.task')
         resource_pool = self.pool.get('resource.resource')
-        if context is None:
-            context = {}
         resources_list = self.generate_resources(cr, uid, ids, context=context)
         return_msg = {}
         for phase in self.browse(cr, uid, ids, context=context):
@@ -431,8 +421,6 @@ class project(osv.osv):
         """
         res = {}
         resource_pool = self.pool.get('resource.resource')
-        if context is None:
-            context = {}
         for project in self.browse(cr, uid, ids, context=context):
             user_ids = map(lambda x:x.id, project.members)
             calendar_id  = project.resource_calendar_id and project.resource_calendar_id.id or False
@@ -444,8 +432,6 @@ class project(osv.osv):
         """
         Schedule the phases.
         """
-        if context is None:
-            context = {}
         if type(ids) in (long, int,):
             ids = [ids]
         phase_pool = self.pool.get('project.phase')
@@ -471,9 +457,6 @@ class project(osv.osv):
         user_pool = self.pool.get('res.users')
         task_pool = self.pool.get('project.task')
         resource_pool = self.pool.get('resource.resource')
-        if context is None:
-            context = {}
-
         resources_list = self.generate_members(cr, uid, ids, context=context)
         return_msg = {}
         for project in self.browse(cr, uid, ids, context=context):
@@ -507,7 +490,7 @@ class resource_resource(osv.osv):
             context = {}
         if context.get('project_id',False):
             project_pool = self.pool.get('project.project')
-            project_rec = project_pool.browse(cr, uid, context['project_id'])
+            project_rec = project_pool.browse(cr, uid, context['project_id'], context=context)
             user_ids = [user_id.id for user_id in project_rec.members]
             args.append(('user_id','in',user_ids))
         return super(resource_resource, self).search(cr, uid, args, offset, limit, order, context, count)
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index ade1da5c9d9..351297384fd 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -44,8 +44,6 @@ class project_compute_phases(osv.osv_memory):
         """
         Compute the phases for scheduling.
         """
-        if context is None:
-            context = {}
         project_pool = self.pool.get('project.project')
         data = self.read(cr, uid, ids, [], context=context)[0]
         if not data['project_id'] and data['target_project'] == 'one':
diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py
index 48039112e86..1a9081b1f5d 100644
--- a/addons/project_long_term/wizard/project_schedule_tasks.py
+++ b/addons/project_long_term/wizard/project_schedule_tasks.py
@@ -32,8 +32,6 @@ class project_schedule_task(osv.osv_memory):
     }
 
     def default_get(self, cr, uid, fields_list, context=None):
-        if context is None:
-            context = {}
         res = super(project_schedule_task, self).default_get(cr, uid, fields_list, context)
         self.compute_date(cr, uid, context=context)
         return res