[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20101215042654-04ccazkz5v57ml3j
bzr revid: rpa@tinyerp.com-20101216043335-ji5h61dra451cml4
bzr revid: rpa@tinyerp.com-20101220082255-1g3ea50rkjlacwqw

8 files changed, 103 insertions, 107 deletions

diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index c81bdf2f2a3..7b8b9ddf5ca 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-12-09 11:05+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-11 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-17 05:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -226,6 +226,7 @@ msgid "Compute Scheduling of Task"
 msgstr "Berechne Aufgabenterminierung"
 
 #. 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
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index 31149c41e41..b780800dbf9 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:12+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-11-20 07:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-21 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-17 05:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -49,15 +49,8 @@ msgid "Group By..."
 msgstr ""
 
 #. module: project_long_term
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: project_long_term
-#: 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
-msgid "Resources"
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
 
 #. module: project_long_term
@@ -72,11 +65,21 @@ msgid "Schedule"
 msgstr ""
 
 #. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr ""
 
 #. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid "Day"
@@ -178,16 +181,6 @@ msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Dates"
-
-#. module: project_long_term
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
 #: field:project.phase,state:0
 msgid "State"
 msgstr ""
@@ -204,11 +197,6 @@ msgid "Compute Scheduling of phases for all or specified project"
 msgstr ""
 
 #. module: project_long_term
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
 msgstr ""
@@ -237,6 +225,14 @@ 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
+msgid "Resources"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
 msgid ""
 "To schedule phases of all or a specified project. It then open a gantt "
@@ -255,9 +251,9 @@ msgid "Related Tasks"
 msgstr ""
 
 #. module: project_long_term
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:project.phase:0
+msgid "Dates"
+msgstr "Dates"
 
 #. module: project_long_term
 #: help:project.resource.allocation,useability:0
@@ -323,11 +319,6 @@ msgid "Draft"
 msgstr ""
 
 #. module: project_long_term
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.act_project_phase
 msgid ""
 "A project can be split into the different phases. For each phase, you can "
@@ -425,23 +416,12 @@ msgid "Cancel"
 msgstr ""
 
 #. module: project_long_term
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
 msgstr ""
 
 #. module: project_long_term
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: project_long_term
 #: view:project.phase:0
 msgid "Remaining Hours"
 msgstr ""
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index affa24ae0a3..27fdd46d03c 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-11-05 09:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-06 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-17 05:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -50,16 +50,9 @@ msgid "Group By..."
 msgstr "Grupuj wg..."
 
 #. module: project_long_term
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#. module: project_long_term
-#: 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
-msgid "Resources"
-msgstr "Zasoby"
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
@@ -73,11 +66,21 @@ msgid "Schedule"
 msgstr "Harmonogram"
 
 #. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
 msgstr "Alokacje zasobów"
 
 #. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid "Day"
@@ -112,6 +115,7 @@ msgstr "JM (Jednostka Miary) jest jednostką miary dla czasu trwania"
 #: field:project.phase,project_id:0
 #: view:project.resource.allocation:0
 #: field:project.resource.allocation,project_id:0
+#: view:project.task:0
 msgid "Project"
 msgstr "Projekt"
 
@@ -178,11 +182,6 @@ msgstr "Dostępność"
 
 #. module: project_long_term
 #: view:project.phase:0
-msgid "Dates"
-msgstr "Daty"
-
-#. module: project_long_term
-#: view:project.phase:0
 #: field:project.phase,state:0
 msgid "State"
 msgstr "Stan"
@@ -227,6 +226,22 @@ msgid "Compute Scheduling of Task"
 msgstr "Oblicz planowanie zadania"
 
 #. 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
+msgid "Resources"
+msgstr "Zasoby"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"\t           "
+msgstr ""
+
+#. module: project_long_term
 #: help:project.resource.allocation,date_start:0
 msgid "Starting Date"
 msgstr "Data początkowa"
@@ -237,9 +252,9 @@ msgid "Related Tasks"
 msgstr "Zadania powiązane"
 
 #. module: project_long_term
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Niewłaściwy XML dla architektury widoku!"
+#: view:project.phase:0
+msgid "Dates"
+msgstr "Daty"
 
 #. module: project_long_term
 #: help:project.resource.allocation,useability:0
@@ -305,9 +320,15 @@ msgid "Draft"
 msgstr "Projekt"
 
 #. module: project_long_term
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your resources allocation, describe different tasks and link your "
+"phase to previous and next ones, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"human resources, convert your phases into a series of tasks when you start "
+"working on it."
+msgstr ""
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -403,14 +424,6 @@ msgid "In Progress"
 msgstr "W toku"
 
 #. module: project_long_term
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
-
-#. module: project_long_term
 #: view:project.phase:0
 msgid "Remaining Hours"
 msgstr "Pozostałe godziny"
@@ -433,6 +446,11 @@ msgstr "Czas pracy"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Current"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
 msgid "Start Phase"
 msgstr "Rozpocznij fazę"
 
@@ -526,6 +544,7 @@ msgstr "Brak zadań do obliczania dla Fazy '%s'."
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
 #: field:project.resource.allocation,phase_id:0
+#: view:project.task:0
 #: field:project.task,phase_id:0
 msgid "Project Phase"
 msgstr "Faza projektu"
@@ -577,11 +596,26 @@ msgstr "Domyślnie w dniach"
 msgid "Duration"
 msgstr "Czas trwania"
 
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Usability"
 #~ msgstr "Użyteczność"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Niewłaściwy XML dla architektury widoku!"
+
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych"
 
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+
 #~ msgid "Compute"
 #~ msgstr "Oblicz"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+#~ "specjalnych !"
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/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index cb77f8416ea..60f316ce89d 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-11 15:01+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-12 09:19+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-17 05:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -226,6 +226,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
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