[MERGE] merge with team1 branch

bzr revid: sbh@tinyerp.com-20101215063057-8x4icuelo0ejotnk

5 files changed, 153 insertions, 79 deletions

diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index c81bdf2f2a3..f91e4cb553e 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-11-18 16:12+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-14 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -50,9 +50,16 @@ msgid "Group By..."
 msgstr "Gruppierung..."
 
 #. module: project_long_term
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen."
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Fehlerhafter Modellname in der Aktion."
+
+#. 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 "Ressourcen"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
@@ -66,21 +73,11 @@ msgid "Schedule"
 msgstr "Zeitplanung"
 
 #. 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 "Zuweisung Ressourcen"
 
 #. module: project_long_term
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
-
-#. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid "Day"
@@ -182,6 +179,16 @@ msgstr "Verfügbarkeit"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Dates"
+msgstr "Daten"
+
+#. module: project_long_term
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
+msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#. module: project_long_term
+#: view:project.phase:0
 #: field:project.phase,state:0
 msgid "State"
 msgstr "Status"
@@ -198,6 +205,11 @@ msgid "Compute Scheduling of phases for all or specified project"
 msgstr "Berechne Terminierung aller Phasen für das spezifizierte Projekt"
 
 #. module: project_long_term
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
 msgstr "Dauer ME"
@@ -226,13 +238,6 @@ msgid "Compute Scheduling of Task"
 msgstr "Berechne Aufgabenterminierung"
 
 #. 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 "Ressourcen"
-
-#. 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 "
@@ -254,9 +259,9 @@ msgid "Related Tasks"
 msgstr "Verknüpfte Aufgaben"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Dates"
-msgstr "Daten"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
 
 #. module: project_long_term
 #: help:project.resource.allocation,useability:0
@@ -323,6 +328,11 @@ msgid "Draft"
 msgstr "Entwurf"
 
 #. module: project_long_term
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#. 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 "
@@ -429,12 +439,25 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #. module: project_long_term
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #. module: project_long_term
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Die Objektbez. muss mit einem x_ beginnen und darf keine Sonderzeichen haben "
+"!"
+
+#. module: project_long_term
 #: view:project.phase:0
 msgid "Remaining Hours"
 msgstr "Verbleib. Stunden"
@@ -608,26 +631,8 @@ msgstr "Gem. Standard in Tagen"
 msgid "Duration"
 msgstr "Dauer"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafter Modellname in der Aktion."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbez. muss mit einem x_ beginnen und darf keine Sonderzeichen haben "
-#~ "!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#~ msgid "Error! project start-date must be lower then project end-date."
+#~ msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen."
 
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+#~ msgid "Error! You cannot assign escalation to the same project!"
+#~ msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index 31149c41e41..c4e9c575e15 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -13,7 +13,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-11-21 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-14 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index affa24ae0a3..600f979972d 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-11-18 16:12+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-14 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -112,6 +112,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"
 
@@ -182,6 +183,11 @@ msgid "Dates"
 msgstr "Daty"
 
 #. 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"
@@ -199,6 +205,11 @@ msgid "Compute Scheduling of phases for all or specified project"
 msgstr "Oblicz planowanie faz dla wszystkich lub wybranych projektów"
 
 #. 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 "JM czasu trwania"
@@ -227,6 +238,14 @@ msgid "Compute Scheduling of Task"
 msgstr "Oblicz planowanie zadania"
 
 #. 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"
@@ -310,6 +329,17 @@ msgid "Error ! You can not create recursive Menu."
 msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
 
 #. 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 "
+"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
 #: selection:project.phase,state:0
 msgid "Pending"
@@ -397,6 +427,11 @@ msgid "Cancel"
 msgstr "Anuluj"
 
 #. 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"
@@ -433,6 +468,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 +566,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"
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index cb77f8416ea..58c294ec169 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-11-18 16:12+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-14 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -50,9 +50,16 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: project_long_term
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Erro! A data de início do projeto deve ser anterior à do seu fim"
+#: 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"
+msgstr "Recursos"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
@@ -66,21 +73,11 @@ msgid "Schedule"
 msgstr ""
 
 #. module: project_long_term
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro! Não se pode criar tarefas recursivamente"
-
-#. 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"
@@ -182,6 +179,16 @@ msgstr "Disponibilidade"
 
 #. module: project_long_term
 #: view:project.phase:0
+msgid "Dates"
+msgstr "Datas"
+
+#. 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 "Estado"
@@ -198,6 +205,11 @@ 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 ""
@@ -226,13 +238,6 @@ msgid "Compute Scheduling of Task"
 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"
-msgstr "Recursos"
-
-#. 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 "
@@ -251,9 +256,9 @@ msgid "Related Tasks"
 msgstr "Tarefas relacionadas"
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Dates"
-msgstr "Datas"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
 
 #. module: project_long_term
 #: help:project.resource.allocation,useability:0
@@ -319,6 +324,11 @@ msgid "Draft"
 msgstr "Rascunho"
 
 #. 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 "
@@ -416,12 +426,23 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. 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 "Em curso"
 
 #. 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 "Horas restantes"
@@ -588,3 +609,9 @@ msgstr ""
 #: field:project.phase,duration:0
 msgid "Duration"
 msgstr "Duração"
+
+#~ msgid "Error ! You cannot create recursive tasks."
+#~ msgstr "Erro! Não se pode criar tarefas recursivamente"
+
+#~ msgid "Error! project start-date must be lower then project end-date."
+#~ msgstr "Erro! A data de início do projeto deve ser anterior à do seu fim"
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 0cdb7af5ad7..c29a783dc97 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -151,6 +151,7 @@
                         <page string="Task Detail">
                             <field colspan="4" name="task_ids" context="{'default_project_id' :project_id}" nolabel="1">
                                  <tree editable="bottom" string="Project's Tasks">
+                                    <field name="sequence"/>
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="planned_hours" widget="float_time"/>
@@ -197,9 +198,9 @@
                                 <field name="sequence"/>
                             </group>
                            <separator colspan="4" string="Previous Phases"/>
-                           <field colspan="4" name="previous_phase_ids" nolabel="1"/>
+                           <field colspan="4" name="previous_phase_ids" nolabel="1" domain="[('id','!=',active_id)]"/>
                            <separator colspan="4" string="Next Phases"/>
-                           <field colspan="4" name="next_phase_ids" nolabel="1"/>
+                           <field colspan="4" name="next_phase_ids" nolabel="1" domain="[('id','!=',active_id)]"/>
                         </page>
                     </notebook>
                     <newline/>