[merge] with latest addons

bzr revid: rmu@tinyerp.com-20120823114608-zerb6vg7l1ckf5mi
author: Ravish Murari (OpenERP) <rmu@tinyerp.com> 2012-08-23 17:16:08 +0530
committer: Ravish Murari (OpenERP) <rmu@tinyerp.com> 2012-08-23 17:16:08 +0530
commit: 05acae2e2fe8b72d7b1523fa0dd91a8e7d2ea09f (patch)
tree: 337084f7e348d9a84e2530c2eb8362a5c966d024 /addons/project_long_term
parent: c5f7f6ecdf710985f29cc73e310ea1f3852b468d (diff)
parent: 79224ea6722e0f2644239b582d86346f32021c0a (diff)
33 files changed, 1358 insertions, 328 deletions
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 8ed12a06e10..2968a5b035d 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -20,38 +20,41 @@
 ##############################################################################
 
 {
-    "name": "Long Term Projects",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "website": "http://www.openerp.com",
-    "category": "Project Management",
-    "images": ["images/project_phase_form.jpeg","images/project_phases.jpeg", "images/resources_allocation.jpeg"],
-    "depends": ["project"],
-    "description": """
+    'name': 'Long Term Projects',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'category': 'Project Management',
+    'images': ['images/project_phase_form.jpeg','images/project_phases.jpeg', 'images/resources_allocation.jpeg'],
+    'depends': ['project'],
+    'description': """
 Long Term Project management module that tracks planning, scheduling, resources allocation.
 ===========================================================================================
 
-Features
---------
-    * Manage Big project.
-    * Define various Phases of Project.
-    * Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given.
-      If no project given then all the draft,open and pending state phases will be taken.
-    * Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks.
-    * Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date
+Features:
+---------
+    * Manage Big project
+    * Define various Phases of Project
+    * Compute Phase Scheduling: Compute start date and end date of the phases
+      which are in draft, open and pending state of the project given. If no
+      project given then all the draft, open and pending state phases will be taken.
+    * Compute Task Scheduling: This works same as the scheduler button on
+      project.phase. It takes the project as argument and computes all the open,
+      draft and pending tasks.
+    * Schedule Tasks: All the tasks which are in draft, pending and open state
+      are scheduled with taking the phase's start date.
     """,
-    "init_xml": [],
-    "demo_xml": ["project_long_term_demo.xml"],
-    "test": [
+    'demo': ['project_long_term_demo.xml'],
+    'test': [
           'test/phase_process.yml',
           'test/task_process.yml',
     ],
-    "update_xml": [
-        "security/ir.model.access.csv",
-        "project_long_term_view.xml",
-        "project_long_term_workflow.xml",
-        "wizard/project_compute_phases_view.xml",
-        "wizard/project_compute_tasks_view.xml",
+    'data': [
+        'security/ir.model.access.csv',
+        'project_long_term_view.xml',
+        'project_long_term_workflow.xml',
+        'wizard/project_compute_phases_view.xml',
+        'wizard/project_compute_tasks_view.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/project_long_term/i18n/ar.po b/addons/project_long_term/i18n/ar.po
index af4189253b3..e4859c5f75b 100644
--- a/addons/project_long_term/i18n/ar.po
+++ b/addons/project_long_term/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index 2e748ee5a9c..afd8216df7d 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/da.po b/addons/project_long_term/i18n/da.po
index 6533d8987db..5b6ce585453 100644
--- a/addons/project_long_term/i18n/da.po
+++ b/addons/project_long_term/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index 12ecb8646e7..f53e34c0cb6 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index f541e23c69a..82f0c276df8 100644
--- a/addons/project_long_term/i18n/es.po
+++ b/addons/project_long_term/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/es_CR.po b/addons/project_long_term/i18n/es_CR.po
index ca0a2c90f19..cd54b36536f 100644
--- a/addons/project_long_term/i18n/es_CR.po
+++ b/addons/project_long_term/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 "Language: es\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/es_EC.po b/addons/project_long_term/i18n/es_EC.po
new file mode 100644
index 00000000000..cec5a0f9a46
--- /dev/null
+++ b/addons/project_long_term/i18n/es_EC.po
@@ -0,0 +1,533 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-07-24 16:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@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: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Siguientes fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Tareas del proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr "Usuarios asignados"
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr "Progreso"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+"¡Error! La fecha de inicio del proyecto debe ser menor que la fecha final "
+"del proyecto."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr "Fases en progreso"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying Settings"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Planificar"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Error ! No puede crear tareas recursivas."
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "¡Error! No puede asignar un escalado al mismo proyecto!"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:126
+#, python-format
+msgid "Day"
+msgstr "Día"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr "Asignación Fases de Usuario"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. 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 users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+"Un proyecto se puede dividir en diferentes fases. Para cada fase, se puede "
+"definir la asignación de usuarios, describir las diferentes tareas, vincular "
+"las fases previas y posteriores de una fase y añadir restricciones de fecha "
+"para la programación automática. Utilice la planificación a largo plazo con "
+"el fin de Planificar sus usuarios disponibles, convertir sus fases en una "
+"serie de tareas cuando se empiece a trabajar en el proyecto."
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Calcular un sólo proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Fases previas"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "UdM (Unidad de Medida) es la unidad de medida para la duración"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr "Planificación de Usuarios"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+" Es calculado por el planificador en función de la fecha de inicio y la "
+"duración"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Error!"
+msgstr "Error!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Fecha de cierre"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr "Calcular todos los proyectos"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "Cancelar"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:141
+#, python-format
+msgid " (copy)"
+msgstr " (copiar)"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr "Asignación de usuarios a un proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "C_alcular"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr "Nuevo"
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr "Calculo basado en las tareas relacionadas"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "UdM duración"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Fecha de inicio mínima"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "My Projects"
+msgstr "Mis Proyectos"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Tareas relacionadas"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "New Phases"
+msgstr "Nueva Fase"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr "Por favor, especifique un proyecto para planificar."
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "Forzar que la fase epiece después de esta fecha"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Tareas del proyecto"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"Es calculado por el planificador en función de la fecha inicio o fecha fin "
+"de la fase anterior"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "La fecha-inicio de la fase debe ser menor que la fecha-fin."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Month"
+msgstr "Mes de inicio"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.user.allocation,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "Forzar que la fase termine antes de esta fecha"
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr ""
+"Los Recursos del proyecto se puede calcular automáticamente por el "
+"planificador"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Pending Phases"
+msgstr "Fases pendientes"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Calcular tareas del proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Restricciones"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Indica el orden cuando se muestra la lista de fases"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Fases del proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "En progreso"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr "Planificación de fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Iniciar fase"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Phase"
+msgstr "Fase"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"Si la fase se crea, el estado es \"Borrador\".\n"
+" Si la fase comienza, el estado cambia a \"En Proceso\".\n"
+" Si se necesita revisión, la fase está en estado \"Pendiente\".\n"
+" Si la fase está terminada, el estado se fija en \"z\"."
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.user.allocation,date_end:0
+msgid "End Date"
+msgstr "Fecha de finalización"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Detalles de tareas"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Duración"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project Users"
+msgstr "Usuarios del proyecto"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
+msgid "Project Phase"
+msgstr "Fase del proyecto"
+
+#. 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"
+"               "
+msgstr ""
+"Para planificar las fases en su totalidad o de un proyecto específico. "
+"Entonces, abra una vista de Gantt.\n"
+"               "
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Calcular fases del proyecto"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "No se permiten bucles en fases"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Ausencia de recursos"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
+msgid "Schedule Tasks"
+msgstr "Planificar tareas"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Por defecto en días"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr "Forzar asignación de usuarios"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Planificación"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Mostrando configuración"
diff --git a/addons/project_long_term/i18n/fi.po b/addons/project_long_term/i18n/fi.po
index 0a07c784311..e7209e67bde 100644
--- a/addons/project_long_term/i18n/fi.po
+++ b/addons/project_long_term/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index 632d62b39d7..c55e3582939 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/hr.po b/addons/project_long_term/i18n/hr.po
index bd4d578d6fa..c634626e1ed 100644
--- a/addons/project_long_term/i18n/hr.po
+++ b/addons/project_long_term/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/hu.po b/addons/project_long_term/i18n/hu.po
index 434e279237c..a0721aa6bbf 100644
--- a/addons/project_long_term/i18n/hu.po
+++ b/addons/project_long_term/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index 669df55ed58..31cca39375b 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ja.po b/addons/project_long_term/i18n/ja.po
index 3bdbd1f4961..b6942982ae9 100644
--- a/addons/project_long_term/i18n/ja.po
+++ b/addons/project_long_term/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-11 04:46+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -490,7 +490,7 @@ msgstr "順序"
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
-msgstr "リソースの休暇"
+msgstr "休暇リソース"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
index 0673ffaded1..50c53125eef 100644
--- a/addons/project_long_term/i18n/lv.po
+++ b/addons/project_long_term/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/mn.po b/addons/project_long_term/i18n/mn.po
new file mode 100644
index 00000000000..6a35bb779e4
--- /dev/null
+++ b/addons/project_long_term/i18n/mn.po
@@ -0,0 +1,529 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-24 13:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Дараагийн Шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Төслийн Даалгаврууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr "Оноогдсон Хэрэглэгчид"
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr "Явц"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr "Боловсруулагдаж байгаа Шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying Settings"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Тов"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+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:126
+#, python-format
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr "Шатны Хэрэглэгчийн Хуваарьлалт"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+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 "
+"define your users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+"Төсөл нь ялгаатай шатуудад хуваагдаж болно. Шат бүрт хэрэглэгчдийн "
+"хуваарьлалтыг хийж болно. Шатуудад даалгавруудыг онооно. Шатуудыг өмнөх, "
+"хойдох шаттай нь холбож болно. Шатуудад автомат товлолтыг хийх огнооны "
+"хяналтуудыг нэмэх боломжтой. Урт хугацааны төлөвлөлтийг байгаа хэрэглэгчид "
+"төлөвлөхдөө хэрэглэж төслийг эхлэхдээ шатуудыг бүлэг даалгаврууд руу "
+"хөрвүүлэх замаар эхлүүлнэ."
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Нэг төслийг Тооцоолох"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Өмнөх Шатууд"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "Х.Н (Хэмжих Нэгж) гэдэг нь үргэлжлэх хугацааг хэмжих нэгж юм."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr "Хэрэглэгчдийг Төлөвлөх"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+" Энэ нь эхлэх огноо, үргэлжлэх хугацааны дагуу товлогчоор тооцоологддог."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Error!"
+msgstr "Алдаа!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Дуусах огноо"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Дуусгах огноо"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr "Миний бүх төслийг тооцоолох"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "_Цуцлах"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:141
+#, python-format
+msgid " (copy)"
+msgstr " (хувилах)"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr "Төслийн Хэрэглэгчийн Хуваарьлалт"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "Тооцоолох"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr "Шинэ"
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr "Холбогдох даалгавар дээр үндэслэн тооцоологдсон"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "Үргэлжлэх Х.Н"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Хамгийн бага эхлэх огноо"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr "Нөөц"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "My Projects"
+msgstr "Миний төслүүд"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Эхлэх огноо"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Холбогдох даалгаврууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "New Phases"
+msgstr "Шинэ Шатууд"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr "Төслийн товийг зааж өгнө үү."
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "шатыг энэ огнооны дараанаас хүчээр эхлүүлэх"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Төслийн даалгаврууд"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"төслийн эхлэх огноо эсвэл өмнөх шатын дуусах огнооны дагуу товлогчоор "
+"автоматаар энэ нь тооцоологддог."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "Шатын эхлэх огноо нь дуусах огнооноос өмнө байх ёстой."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Month"
+msgstr "Эхлэх Сар"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.user.allocation,date_start:0
+msgid "Start Date"
+msgstr "Эхлэх огноо"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "энэ огнооны өмнө шатыг хүчээр дуусгах"
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr "Төсөл дахь нөөц нь товлогчоор автоматаар тооцоологдож болно."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Pending Phases"
+msgstr "Хүлээгдэж байгаа шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Хүлээгдэж буй"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
+msgid "User"
+msgstr "Хэрэглэгч"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Төсөлийн Даалгавруудыг Тооцоолох"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Хяналт"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Шатуудын жагсаалтыг харуулах дарааллын эрэмбийг өгнө"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Төслийн шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Хийгдсэн"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "Хийгдэж байна"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Үлдсэн цаг"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Time"
+msgstr "Ажлын цаг"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr "Шатуудыг Товыг Гаргах"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Шатыг эхлэх"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Total Hours"
+msgstr "Нийт цаг"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr "Хэрэглэгчид"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Phase"
+msgstr "Шат"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"Хэрэв шат үүсгэгдсэн бол төлөв нь 'Ноорог' болно.\n"
+" Хэрэв шат эхлэсэн бол төлөв нь 'Хийгдэж байна' болно.\n"
+" Хэрэв шат үзлэг хийгдэх хэрэгтэй бол 'Хүлээгдэж буй' төлөвтэй болно.        "
+"                          \n"
+" Хэрэв шат дууссан бол 'Хийгдсэн' төлөвтэй болно."
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.user.allocation,date_end:0
+msgid "End Date"
+msgstr "Дуусах огноо"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Нэр"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Даалгаврын Дэлгэрэнгүй"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Үргэлжлэх хугацаа"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project Users"
+msgstr "Төслийн Хэрэглэгчид"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
+msgid "Project Phase"
+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 "
+"view.\n"
+"               "
+msgstr ""
+"Бүх төслийн эсвэл тухайлсан төслийн шатыг товыг гаргах. Дараа нь Гантт "
+"харагдацаар нээгдэнэ.\n"
+"               "
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Төслийн Шатыг Тооцоолох"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "Шатанд давталт зөвшөөрөгдөхгүй"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Нөөцийн Амралт, Чөлөө"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
+msgid "Schedule Tasks"
+msgstr "Даалгавруудыг Товлох"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Анхныхаар өдрөөр"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr "Оноогдсон хэрэглэгчдийг албадах"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Товлох"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Тохиргоонууд харуулах"
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index b41290182cd..0e84060aaba 100644
--- a/addons/project_long_term/i18n/nl.po
+++ b/addons/project_long_term/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -42,7 +42,7 @@ msgstr "Groepeer op..."
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
-msgstr "Toegewezen egbruiker"
+msgstr "Toegewezen gebruiker"
 
 #. module: project_long_term
 #: field:project.phase,progress:0
@@ -67,7 +67,7 @@ msgstr "Afbeeld instellingen"
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Schedule"
-msgstr "Planning"
+msgstr "Planning berekenen"
 
 #. module: project_long_term
 #: constraint:project.task:0
@@ -141,7 +141,8 @@ msgstr "Planning voor gebruikers"
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
 msgstr ""
-" Het is berekend door de planning volgens de startdatum en de doorlooptijd."
+" Het is berekend door de taakplanner volgens de startdatum en de "
+"doorlooptijd."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_project
@@ -279,7 +280,7 @@ msgid ""
 "It's computed by the scheduler according the project date or the end date of "
 "the previous phase."
 msgstr ""
-"Het is berekend door de planning volgens de project datum of de einddatum "
+"Het is berekend door de taakplanner volgens de project datum of de einddatum "
 "van de vorige fase."
 
 #. module: project_long_term
@@ -313,8 +314,8 @@ msgstr "de fase forceren te eindigen vóór deze datum"
 msgid ""
 "The ressources on the project can be computed automatically by the scheduler"
 msgstr ""
-"The resources van een project kunnen worden automatisch worden berekend door "
-"de planner."
+"De resources van een project kunnen automatisch worden berekend door de "
+"taakplanner."
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -400,7 +401,7 @@ msgstr "Werktijd"
 #: model:ir.ui.menu,name:project_long_term.menu_compute_phase
 #: view:project.compute.phases:0
 msgid "Schedule Phases"
-msgstr "Geplande fases"
+msgstr "Bereken fases"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -508,7 +509,7 @@ msgstr "Afwezigheid resource"
 #: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
 #: view:project.compute.tasks:0
 msgid "Schedule Tasks"
-msgstr "Taken plannen"
+msgstr "Bereken taken"
 
 #. module: project_long_term
 #: help:project.phase,duration:0
@@ -524,10 +525,7 @@ msgstr "Forceer gebruikerstoewijzing"
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
 msgid "Scheduling"
-msgstr "Planning"
-
-#~ msgid "Displaying settings"
-#~ msgstr "Afbeeld instellingen"
+msgstr "Planning berekenen"
 
 #~ msgid "Resources Allocation"
 #~ msgstr "Resource toewijzing"
@@ -645,3 +643,6 @@ msgstr "Planning"
 
 #~ msgid "Planning"
 #~ msgstr "Planning"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Weergave instellingen"
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index 288944e8f38..bec5bb71d3e 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index e1255b76366..7aca4caa234 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -208,7 +208,7 @@ msgstr "Estado"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr ""
+msgstr "Computar"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -488,7 +488,7 @@ msgstr "Calcula fases do projeto"
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
-msgstr ""
+msgstr "Não são permitidos ciclos fechados nas fases"
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
diff --git a/addons/project_long_term/i18n/pt_BR.po b/addons/project_long_term/i18n/pt_BR.po
index 56aacddfb06..344a22a99e4 100644
--- a/addons/project_long_term/i18n/pt_BR.po
+++ b/addons/project_long_term/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ro.po b/addons/project_long_term/i18n/ro.po
index 3b176786b0c..cc92d00cbc6 100644
--- a/addons/project_long_term/i18n/ro.po
+++ b/addons/project_long_term/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -26,7 +26,7 @@ msgstr "Etape"
 #: view:project.phase:0
 #: field:project.phase,next_phase_ids:0
 msgid "Next Phases"
-msgstr "Etapele următoare"
+msgstr "Etapele urmatoare"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -37,29 +37,29 @@ msgstr "Sarcinile proiectului"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
-msgstr ""
+msgstr "Utilizatori alocati"
 
 #. module: project_long_term
 #: field:project.phase,progress:0
 msgid "Progress"
-msgstr "Desfășurare"
+msgstr "In desfasurare"
 
 #. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
-"Eroare! data de început a proiectului trebuie să fie mai mică decât data de "
-"sfârșit a proiectului."
+"Eroare! data de inceput a proiectului trebuie sa fie mai mica decat data de "
+"sfarsit a proiectului."
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "In Progress Phases"
-msgstr ""
+msgstr "Etape in desfasurare"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -69,17 +69,17 @@ msgstr "Afisare setări"
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Schedule"
-msgstr "Programează"
+msgstr "Programati"
 
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr "Eroare ! Nu puteți crea sarcini recursive."
+msgstr "Eroare ! Nu puteti crea sarcini recursive."
 
 #. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Eroare! Nu puteți atribui o intensificare aceluiași proiect!"
+msgstr "Eroare! Nu puteti atribui o avansare aceluiasi proiect!"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:126
@@ -90,12 +90,12 @@ msgstr "Zi"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_user_allocation
 msgid "Phase User Allocation"
-msgstr ""
+msgstr "Alocare Etapa Utilizator"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
-msgstr "Sarcină"
+msgstr "Sarcina"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.act_project_phase
@@ -107,11 +107,17 @@ msgid ""
 "users, convert your phases into a series of tasks when you start working on "
 "the project."
 msgstr ""
+"Un proiect poate fi impartit in diferite etape. Pentru fiecare etapa, puteti "
+"sa definiti alocarea utilizatorului, sa descrieti diferite sarcini si sa "
+"legati etapa d-voastra la etapele anterioare si ulterioare, sa adaugati "
+"constrangeri de date pentru programarea automata. Utilizati planificarea pe "
+"termen lung pentru a planifica utilizatorii disponibili, a transforma "
+"etapele intr-o serie de sarcini atunci cand incepeti lucrul la proiect."
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
-msgstr "Calculează un Singur Proiect"
+msgstr "Calculati un Singur Proiect"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -122,7 +128,7 @@ msgstr "Etapele anterioare"
 #. module: project_long_term
 #: help:project.phase,product_uom:0
 msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
-msgstr "UM (Unitatea de Măsură) este unitatea de măsurare a Duratei"
+msgstr "UdM (Unitatea de Masura) este unitatea de masurare a Duratei"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
@@ -130,15 +136,15 @@ msgstr "UM (Unitatea de Măsură) este unitatea de măsurare a Duratei"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Planning of Users"
-msgstr ""
+msgstr "Planificarea Utilizatorilor"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
 msgid ""
 " It's computed by the scheduler according to the start date and the duration."
 msgstr ""
-" Este calculat de către programator in functie de data de inceput si de "
-"durată."
+" Este calculat de catre programator in functie de data de inceput si de "
+"durata."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_project
@@ -161,28 +167,28 @@ msgstr "Eroare!"
 #. module: project_long_term
 #: selection:project.phase,state:0
 msgid "Cancelled"
-msgstr "Anulat(ă)"
+msgstr "Anulat(a)"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_end:0
 msgid "Ending Date"
-msgstr "Data de sfârșit"
+msgstr "Data de sfarsit"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
-msgstr "Data scadentă"
+msgstr "Termen limita"
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All My Projects"
-msgstr ""
+msgstr "Calculeaza toate Proiectele mele"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
-msgstr "_Anulează"
+msgstr "_Anulati"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:141
@@ -193,7 +199,7 @@ msgstr " (copie)"
 #. module: project_long_term
 #: view:project.user.allocation:0
 msgid "Project User Allocation"
-msgstr ""
+msgstr "Alocare Utilizator Proiect"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -205,28 +211,28 @@ msgstr "Stare"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr "C_alculează"
+msgstr "C_alculati"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "New"
-msgstr "Nou"
+msgstr "Nou(a)"
 
 #. module: project_long_term
 #: help:project.phase,progress:0
 msgid "Computed based on related tasks"
-msgstr ""
+msgstr "Calculat pe baza sarcinilor asociate"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
-msgstr "UM durată"
+msgstr "UdM durata"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
-msgstr "Data minimă de început"
+msgstr "Data minima de inceput"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
@@ -242,7 +248,7 @@ msgstr "Proiectele mele"
 #. module: project_long_term
 #: help:project.user.allocation,date_start:0
 msgid "Starting Date"
-msgstr "Data de început"
+msgstr "Data de inceput"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
@@ -252,23 +258,23 @@ msgstr "Sarcini asociate"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "New Phases"
-msgstr "Faze noi"
+msgstr "Etape noi"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Please specify a project to schedule."
-msgstr ""
+msgstr "Va rugam sa specificati un proiect de programat."
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
 msgid "force the phase to start after this date"
-msgstr "impune inceperea etapei după această dată"
+msgstr "impune inceperea etapei dupa aceasta data"
 
 #. module: project_long_term
 #: field:project.phase,task_ids:0
 msgid "Project Tasks"
-msgstr "Sarcini proiect"
+msgstr "Sarcini Proiect"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
@@ -276,7 +282,7 @@ msgid ""
 "It's computed by the scheduler according the project date or the end date of "
 "the previous phase."
 msgstr ""
-"Este calculat de către programator in functie de data proiectului sau de "
+"Este calculat de catre programator in functie de data proiectului sau de "
 "data incheierii etapei precedente."
 
 #. module: project_long_term
@@ -288,45 +294,45 @@ msgstr "Luna"
 #: constraint:project.phase:0
 msgid "Phase start-date must be lower than phase end-date."
 msgstr ""
-"Data de inceput a etapei trebuie să fie mai mică decat data de sfarsit."
+"Data de inceput a etapei trebuie saă fie mai mica decat data de sfarsit."
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Month"
-msgstr "Lună start"
+msgstr "Inceput luna"
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
 #: field:project.user.allocation,date_start:0
 msgid "Start Date"
-msgstr "Data de început"
+msgstr "Data de inceput"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
-msgstr "impune incheierea etapei inainte de această dată"
+msgstr "impune incheierea etapei inainte de aceasta data"
 
 #. module: project_long_term
 #: help:project.phase,user_ids:0
 msgid ""
 "The ressources on the project can be computed automatically by the scheduler"
-msgstr ""
+msgstr "Resursele din proiect pot fi calculate automat de catre programator"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Draft"
-msgstr "Ciornă"
+msgstr "Ciorna"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Pending Phases"
-msgstr "Faze în așteptare"
+msgstr "Etape in asteptare"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
-msgstr "În așteptare"
+msgstr "In asteptare"
 
 #. module: project_long_term
 #: view:project.user.allocation:0
@@ -337,17 +343,17 @@ msgstr "Utilizator"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
-msgstr "Calculează Sarcinile Proiectului"
+msgstr "Calculati Sarcinile Proiectului"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Constraints"
-msgstr "Constrângeri:"
+msgstr "Constrangeri"
 
 #. module: project_long_term
 #: help:project.phase,sequence:0
 msgid "Gives the sequence order when displaying a list of phases."
-msgstr "Prezintă ordinea secventei atunci cand afisează o listă cu etape."
+msgstr "Prezinta ordinea secventei atunci cand afiseaza o lista cu etape."
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -368,25 +374,25 @@ msgstr "Efectuat"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Cancel"
-msgstr "Anulează"
+msgstr "Anulati"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
-msgstr "În desfăsurare"
+msgstr "In curs de desfasurare"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Remaining Hours"
-msgstr "Ore rămase"
+msgstr "Ore ramase"
 
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
-"Eroare ! Data de sfârșit a sarcinii trebuie să fie mai mare decât data de "
-"început"
+"Eroare ! Data de sfarsit a sarcinii trebuie sa fie mai mare decat data de "
+"inceput"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
@@ -398,12 +404,12 @@ msgstr "Program de lucru"
 #: model:ir.ui.menu,name:project_long_term.menu_compute_phase
 #: view:project.compute.phases:0
 msgid "Schedule Phases"
-msgstr ""
+msgstr "Programati Etapele"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Phase"
-msgstr "Începe etapa"
+msgstr "Incepeti etapa"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -418,7 +424,7 @@ msgstr "Utilizatori"
 #. module: project_long_term
 #: view:project.user.allocation:0
 msgid "Phase"
-msgstr "Etapă"
+msgstr "Etapa"
 
 #. module: project_long_term
 #: help:project.phase,state:0
@@ -429,17 +435,17 @@ msgid ""
 "          \n"
 " If the phase is over, the states is set to 'Done'."
 msgstr ""
-"Dacă etapa este creată, starea este 'Ciornă'.\n"
-" Dacă etapa a inceput, starea devine 'In desfăsurare'.\n"
-" Dacă este necesară verificarea, starea este 'In asteptare'.                 "
+"Daca etapa este creata, starea este 'Ciorna'.\n"
+" Daca etapa a inceput, starea devine 'In desfasurare'.\n"
+" Daca este necesara verificarea, starea este 'In asteptare'.                 "
 "                   \n"
-" Dacă etapa este incheiată, starea este setată pe'Efectuat'."
+" Daca etapa este incheiata, starea este setata pe'Efectuat'."
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
 #: field:project.user.allocation,date_end:0
 msgid "End Date"
-msgstr "Data de sfârșit"
+msgstr "Data de sfarsit"
 
 #. module: project_long_term
 #: field:project.phase,name:0
@@ -449,7 +455,7 @@ msgstr "Nume"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Tasks Details"
-msgstr "Detalii sarcină"
+msgstr "Detalii sarcini"
 
 #. module: project_long_term
 #: field:project.phase,duration:0
@@ -459,7 +465,7 @@ msgstr "Durata"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Project Users"
-msgstr ""
+msgstr "Utilizatori Proiect"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
@@ -477,11 +483,14 @@ msgid ""
 "view.\n"
 "               "
 msgstr ""
+"Pentru programarea etapelor tuturor proiectelor sau a unui anumit proiect. "
+"Apoi afiseaza o vizualizare a diagramei Gantt.\n"
+"               "
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
-msgstr "Calculează Etapele Proiectului"
+msgstr "Calculati Etapele Proiectului"
 
 #. module: project_long_term
 #: constraint:project.phase:0
@@ -491,19 +500,19 @@ msgstr "Nu sunt permise bucle in etape"
 #. module: project_long_term
 #: field:project.phase,sequence:0
 msgid "Sequence"
-msgstr "Secvență"
+msgstr "Secventa"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
-msgstr "Concediu Resursă"
+msgstr "Resursa Concedii"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
 #: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
 #: view:project.compute.tasks:0
 msgid "Schedule Tasks"
-msgstr "Programează Sarcini"
+msgstr "Programati Sarcini"
 
 #. module: project_long_term
 #: help:project.phase,duration:0
@@ -514,7 +523,7 @@ msgstr "Implicit in zile"
 #: view:project.phase:0
 #: field:project.phase,user_force_ids:0
 msgid "Force Assigned Users"
-msgstr ""
+msgstr "Impuneti Utilizatori Alocati"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
@@ -642,4 +651,4 @@ msgstr "Programare"
 #~ msgstr "Calculează toate proiectele"
 
 #~ msgid "Displaying settings"
-#~ msgstr "Afișare setări"
+#~ msgstr "Afisare setari"
diff --git a/addons/project_long_term/i18n/sv.po b/addons/project_long_term/i18n/sv.po
index c93e11abe4e..04a335c2a9a 100644
--- a/addons/project_long_term/i18n/sv.po
+++ b/addons/project_long_term/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -106,7 +106,7 @@ msgid ""
 "the project."
 msgstr ""
 "Ett projekt kan delas in i flera olika faser. Varje fas kan du definiera "
-"användares beläggning, beskriva olika aktivieteter och länka dina faser till "
+"användares beläggning, beskriva olika aktiviteter och länka dina faser till "
 "andra faser, datumregler för automatisk schemaläggning. Använd "
 "långtidsplanering för detaljplanera dina användares beläggning, konvertera "
 "dina faser till en serie av aktiviteter när projektarbetet verkligen kommer "
@@ -516,7 +516,7 @@ msgstr "Dagar som standard"
 #: view:project.phase:0
 #: field:project.phase,user_force_ids:0
 msgid "Force Assigned Users"
-msgstr "Tvinga anslutna användare"
+msgstr "Nödvändiga projektdeltagare"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
@@ -524,4 +524,4 @@ msgid "Scheduling"
 msgstr "Schemaläggning"
 
 #~ msgid "Displaying settings"
-#~ msgstr "Visar inställningar"
+#~ msgstr "Vyinställningar"
diff --git a/addons/project_long_term/i18n/tr.po b/addons/project_long_term/i18n/tr.po
index 416867cccb3..3b286bfe63d 100644
--- a/addons/project_long_term/i18n/tr.po
+++ b/addons/project_long_term/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 29363eacf2f..7f1c5ddf0d0 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:13+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 19d58f101ef..d5ac3868a5e 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -114,7 +114,7 @@ class project_phase(osv.osv):
         'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'),
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
-            help="The ressources on the project can be computed automatically by the scheduler"),
+            help="The resources on the project can be computed automatically by the scheduler."),
         'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'Status', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
@@ -225,13 +225,9 @@ class project(osv.osv):
 
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-        'use_phases': fields.boolean('Use Phases', help="Check this field if project manages phases"),
         'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"),
     }
-    _defaults = {
-        'use_phases': True,
-    }
-
+    
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
@@ -273,6 +269,26 @@ class project(osv.osv):
         return True
 project()
 
+class account_analytic_account(osv.osv):
+    _inherit = 'account.analytic.account'
+    _description = 'Analytic Account'
+    _columns = {
+        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+    }
+    
+    def on_change_template(self, cr, uid, ids, template_id, context=None):
+        res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
+        if template_id and 'value' in res:
+            template = self.browse(cr, uid, template_id, context=context)
+            res['value']['use_phases'] = template.use_phases
+        return res
+
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
+        return res or vals.get('use_phases')
+
+account_analytic_account()
+
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 4cd6d5cdec4..bca8231fdaa 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -5,7 +5,7 @@
         This Demo data file Human Resources, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
         -->
 
-        <record id="project.project_integrate_openerp" model="project.project">
+        <record id="project.project_project_1" model="project.project">
             <field name="resource_calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
@@ -14,11 +14,11 @@
         <record id="project_phase_1" model="project.phase">
             <field eval="[(6, 0, [])]" name="previous_phase_ids"/>
             <field name="name">Collect Requirement and Make SRS</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="1" name="sequence"/>
             <field name="duration">30</field>
             <field name="constraint_date_start" eval="time.strftime('%Y-%m-01 10:00:00')"></field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
 
         <function model="project.phase" name="set_open" eval="[ref('project_phase_1')]"/>
@@ -26,48 +26,48 @@
         <record id="project_phase_2" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_1')])]" name="previous_phase_ids"/>
             <field name="name">Design Model</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="2" name="sequence"/>
             <field name="duration">20</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
         <function model="project.phase" name="set_open" eval="[ref('project_phase_2')]"/>
         
         <record id="project_phase_3" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
             <field name="name">Planning and compute Risk analysis, Time chart </field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="3" name="sequence"/>
             <field name="duration">20</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
         <function model="project.phase" name="set_open" eval="[ref('project_phase_3')]"/>
 
         <record id="project_phase_4" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_3')])]" name="previous_phase_ids"/>
             <field name="name">Development and Integration</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="4" name="sequence"/>
             <field name="duration">90</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
 
         <record id="project_phase_5" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_4')])]" name="previous_phase_ids"/>
             <field name="name">Review and Testing</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="5" name="sequence"/>
             <field name="duration">30</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
 
         <record id="project_phase_6" model="project.phase">
             <field eval="[(6, 0, [ref('project_phase_5')])]" name="previous_phase_ids"/>
             <field name="name">Deployement and Training</field>
-            <field name="product_uom" ref="product.uom_day"/>
+            <field name="product_uom" ref="product.product_uom_day"/>
             <field eval="6" name="sequence"/>
             <field name="duration">10</field>
-            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="project_id" ref="project.project_project_1"/>
         </record>
 
         <function model="project.phase" name="set_open" eval="[ref('project_phase_6')]"/>
@@ -90,65 +90,21 @@
         </record>
 
         <record id="project.project_task_5" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
         <record id="project.project_task_6" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
+            <field name="phase_id" ref="project_phase_5"/>
         </record>
 
         <record id="project.project_task_7" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
-        </record>
-
-        <record id="project.project_task_8" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
-        </record>
-
-        <record id="project.project_task_9" model="project.task">
-            <field name="phase_id" ref="project_phase_3"/>
-        </record>
-
-        <record id="project.project_task_10" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_11" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_12" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_13" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_14" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_15" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_16" model="project.task">
-            <field name="phase_id" ref="project_phase_4"/>
-        </record>
-
-        <record id="project.project_task_17" model="project.task">
-            <field name="phase_id" ref="project_phase_6"/>
-        </record>
-
-        <record id="project.project_task_18" model="project.task">
             <field name="phase_id" ref="project_phase_6"/>
         </record>
 
         <!-- run scheduling of phase -->
-        <!--<function model="project.project" name="schedule_phases" eval="(ref('project.project_integrate_openerp'),)"/>-->
+        <!--<function model="project.project" name="schedule_phases" eval="(ref('project.project_project_1'),)"/>-->
         <!-- run scheduling of tasks -->
-        <!--<function model="project.project" name="schedule_tasks" eval="(ref('project.project_integrate_openerp'),)"/>-->
+        <!--<function model="project.project" name="schedule_tasks" eval="(ref('project.project_project_1'),)"/>-->
 
     </data>
 </openerp>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 18babab66a4..b4b98e8fe4a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,16 +2,12 @@
 <openerp>
     <data>
 
-    <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="3"/>
-
-    # ------------------------------------------------------
-    # Project User Allocation
-    # ------------------------------------------------------
+        <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="3"/>
 
+        <!-- Project User Allocation -->
         <record id="view_project_user_allocation_gantt" model="ir.ui.view">
             <field name="name">project.user.allocation.gantt</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">gantt</field>
             <field name="arch" type="xml">
               <gantt date_start="date_start" date_stop="date_end" default_group_by="user_id">
               </gantt>
@@ -21,7 +17,6 @@
         <record id="view_project_user_allocation_calendar" model="ir.ui.view">
             <field name="name">project.user.allocation.calendar</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_start" date_stop="date_end" day_length="12" string="Users">
@@ -35,7 +30,6 @@
         <record id="view_project_user_allocation_form" model="ir.ui.view">
             <field name="name">project.user.allocation.form</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project User Allocation" version="7.0">
                     <group col="4">
@@ -52,7 +46,6 @@
         <record id="view_project_user_allocation_list" model="ir.ui.view">
             <field name="name">project.user.allocation.list</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Project User Allocation">
@@ -66,18 +59,13 @@
        <record id="view_project_user_allocation_search" model="ir.ui.view">
             <field name="name">project.user.allocation.search</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Planning of Users">
-                    <group>
-                        <field name="user_id"/>
-                        <field name="phase_id"/>
-                        <field name="project_id"/>
-                    </group>
-                    <newline/>
+                    <field name="user_id"/>
+                    <field name="phase_id"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By...">
                         <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
@@ -94,35 +82,32 @@
         </record>
 
 
-    # ------------------------------------------------------
-    # Project Phase
-    # ------------------------------------------------------
+        <!-- Project Phase -->
+        <act_window id="act_project_phases"
+            name="Phases"
+            src_model="project.project"
+            res_model="project.phase"
+            view_type="form"
+            view_mode="tree,form"
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
 
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
             <field name="model">project.project</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <field name="use_tasks" position="after">
-                    <field name="use_phases"/>
-                </field>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr>
+                        <td><group><field name="use_phases"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
             </field>
         </record>
 
-        <act_window id="act_project_phases"
-            name="Phases"
-            src_model="project.project"
-            res_model="project.phase"
-            view_type="form"
-            view_mode="tree,form"
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
-        />
-
         <record id="view_project_kanban_phase" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>
-            <field name="type">kanban</field>
             <field name="inherit_id" ref="project.view_project_kanban"/>
             <field name="arch" type="xml">
                 <field name="use_tasks" position="after">
@@ -135,15 +120,14 @@
                 </xpath>
             </field>
         </record>
-        
+
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
             <field name="model">project.phase</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project Phase" version="7.0">
                 <header>
-                    <button string="Start Phase" name="set_open" states="pending,draft"/>
+                    <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/>
                     <button string="Done" name="set_done" states="pending,open"/>
                     <button string="Pending" name="set_pending" states="open"/>
                     <button string="Draft" name="set_draft" states="open"/>
@@ -151,23 +135,24 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
-                    <label for="project_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
-                    </h2>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                    </div>
                     <group>
                         <group>
-                            <field name="date_start"/>
-                            <field name="date_end"/>
-                        </group><group>
-                            <label for="duration"/>
+                            <label for="date_start" string="Duration"/>
                             <div>
-                                <field name="duration" class="oe_inline"/>
-                                <field name="product_uom"/>
+                                <div>
+                                    <field name="duration" class="oe_inline"/>
+                                    <field name="product_uom" class="oe_inline"/>
+                                </div>
+                                <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
                             </div>
                         </group>
+                        <group>
+                            <field name="project_id" on_change="onchange_project(project_id)"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Planning of Users">
@@ -180,7 +165,7 @@
                                   <form string="Project Users" version="7.0">
                                       <group col="4">
                                           <field name="user_id"/>
-                                          <field name="date_start" />
+                                          <field name="date_start"/>
                                           <field name="date_end"/>
                                       </group>
                                   </form>
@@ -193,7 +178,7 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="date_start"/>
-                                    <field name="date_end" />
+                                    <field name="date_end"/>
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="project_id" invisible="1"/>
                                     <field name="total_hours" sum='Total Hours'/>
@@ -210,10 +195,9 @@
                                 </group>
                                 <group>
                                     <field name="sequence"/>
+                                     <field name="user_force_ids" widget="many2many_tags"/>
                                 </group>
                             </group>
-                           <separator string="Force Assigned Users"/>
-                           <field name="user_force_ids" widget="many2many_tags" />
                            <separator string="Previous Phases"/>
                            <field name="previous_phase_ids"/>
                            <separator string="Next Phases"/>
@@ -228,7 +212,6 @@
         <record id="view_project_phase_list" model="ir.ui.view">
             <field name="name">project.phase.list</field>
             <field name="model">project.phase</field>
-            <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancelled','done');blue:state == 'pending'" string="Project Phases">
@@ -245,7 +228,6 @@
         <record id="view_project_phase_calendar" model="ir.ui.view">
             <field name="name">project.phase.calendar</field>
             <field name="model">project.phase</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="project_id" date_start="date_start" date_stop="date_end" day_length="12">
@@ -257,7 +239,6 @@
         <record id="view_project_phase_gantt" model="ir.ui.view">
             <field name="name">project.phase.gantt</field>
             <field name="model">project.phase</field>
-            <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <gantt date_stop="date_end" date_start="date_start" default_group_by="project_id">
@@ -268,27 +249,20 @@
         <record id="view_project_phase_search" model="ir.ui.view">
             <field name="name">project.phase.search</field>
             <field name="model">project.phase</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Project Phases">
-                    <group>
-                        <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
-                        <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="project_id">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
-                        </field>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Project Phases"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                    <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
+                    <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
+                    <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
+                    <separator/>
+                    <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
-                        <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/>
                     </group>
                 </search>
@@ -315,17 +289,13 @@
         </record>
 
 
-    # ------------------------------------------------------
-    # Project Task
-    # ------------------------------------------------------
-
+        <!-- Project Task -->
         <record id="view_phase_task_form2" model="ir.ui.view">
             <field name="name">phase.task.form2</field>
             <field name="model">project.task</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='effective_hours']" position="after">
+                <xpath expr="//field[@name='user_id']" position="after">
                     <field name="phase_id" context="{'default_project_id' : project_id}"/>
                 </xpath>
             </field>
@@ -333,7 +303,6 @@
         <record id="view_phase_task_search_form" model="ir.ui.view">
             <field name="name">phase.task.search.form</field>
             <field name="model">project.task</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="before">
@@ -345,7 +314,6 @@
          <record id="view_phase_task_search_form_group" model="ir.ui.view">
             <field name="name">phase.task.search.form.group</field>
             <field name="model">project.task</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
             <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" position="after">
@@ -357,7 +325,6 @@
          <record id="view_phase_task_search_form_tree" model="ir.ui.view">
             <field name="name">phase.task.search.form.tree</field>
             <field name="model">project.task</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="project.view_task_tree2"/>
             <field name="arch" type="xml">
                 <field name="project_id" position="after">
@@ -366,19 +333,30 @@
             </field>
         </record>
 
-    <act_window
-        context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
-        id="project_phase_task_list"
-        name="Related Tasks"
-        res_model="project.task"
-        src_model="project.phase"
-        view_mode="tree,form"
-        />
-
-    # ------------------------------------------------------
-    # Menu Items
-    # ------------------------------------------------------
+        <act_window
+            context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
+            id="project_phase_task_list"
+            name="Related Tasks"
+            res_model="project.task"
+            src_model="project.phase"
+            view_mode="tree,form"/>
+
+        <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.phase.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
+                </xpath>
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                    <field name="use_phases"/>
+                </xpath>
+            </field>
+        </record>
 
+        <!-- Menu Items -->
         <menuitem action="act_project_phase_list"
             id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>
 
@@ -391,7 +369,7 @@
             parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_users_project1"
-            name="Resources" parent="project.menu_definitions" sequence="3"/>
+            name="Resources" parent="base.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_users_project1" sequence="2"/>
diff --git a/addons/project_long_term/project_long_term_workflow.xml b/addons/project_long_term/project_long_term_workflow.xml
index 3a821ddd274..317f98d9a35 100644
--- a/addons/project_long_term/project_long_term_workflow.xml
+++ b/addons/project_long_term/project_long_term_workflow.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-		<record id="wkf_phase" model="workflow">
+        <record id="wkf_phase" model="workflow">
             <field name="name">project.phase.wkf</field>
             <field name="osv">project.phase</field>
             <field name="on_create">True</field>
@@ -31,7 +31,7 @@
             <field name="action">set_cancel()</field>
         </record>
 
-		<record id="act_phase_pending" model="workflow.activity">
+        <record id="act_phase_pending" model="workflow.activity">
             <field name="wkf_id" ref="wkf_phase"/>
             <field name="name">set_pending</field>
             <field name="kind">function</field>
@@ -64,7 +64,7 @@
             <field name="signal">set_done</field>
         </record>
 
-		<record id="t3" model="workflow.transition">
+        <record id="t3" model="workflow.transition">
             <field name="act_from" ref="act_start_phase"/>
             <field name="act_to" ref="act_phase_pending"/>
             <field name="signal">set_pending</field>
@@ -106,5 +106,5 @@
             <field name="signal">set_draft</field>
         </record>
 
- 	</data>
+     </data>
 </openerp>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 6ca496f691d..2a00088b8f4 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -7,3 +7,6 @@ access_resource_resource_user,user.user user,resource.model_resource_resource,pr
 access_resource_calendar_leaves_user,user.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1
 access_resource_resource_manager,user.user manager,resource.model_resource_resource,project.group_project_manager,1,1,1,1
 access_project_user_allocation_manager,project.user.allocation.manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
+access_project_resource_calendar_attendance,resource.calendar.attendance,resource.model_resource_calendar_attendance,project.group_project_manager,1,0,0,0
+
+
diff --git a/addons/project_long_term/test/phase_process.yml b/addons/project_long_term/test/phase_process.yml
index 725c5b2a97d..8738834b103 100644
--- a/addons/project_long_term/test/phase_process.yml
+++ b/addons/project_long_term/test/phase_process.yml
@@ -5,7 +5,7 @@
 -
   !record {model: project.compute.phases, id: project_compute_phases01}:
     target_project: 'one'
-    project_id: project.project_integrate_openerp
+    project_id: project.project_project_1
 -
   I schedule the phases.
 -
@@ -15,7 +15,7 @@
   I check the starting date and ending date on the phases after scheduling.
 -
   !python {model: project.project}: |
-     project = self.browse(cr, uid, ref("project.project_integrate_openerp"), context=context)
+     project = self.browse(cr, uid, ref("project.project_project_1"), context=context)
      def _convert(date):
         import time
         return time.strptime(date, '%Y-%m-%d %H:%M:%S')
diff --git a/addons/project_long_term/test/task_process.yml b/addons/project_long_term/test/task_process.yml
index 64ecef73476..a7065de315f 100644
--- a/addons/project_long_term/test/task_process.yml
+++ b/addons/project_long_term/test/task_process.yml
@@ -2,7 +2,7 @@
   I create a record to compute the tasks of project.
 -
   !record {model: project.compute.tasks, id: project_compute_tasks0}:
-    project_id: project.project_integrate_openerp
+    project_id: project.project_project_1
 -
   I compute and shedule the tasks.
 -
@@ -12,7 +12,7 @@
   Check if tasks scheduled, check that either of task's start_date, end_date and user_id is not null
 -
   !python {model: project.project}: |
-    prj = self.browse(cr, uid, [ref("project.project_integrate_openerp")])[0]
+    prj = self.browse(cr, uid, [ref("project.project_project_1")])[0]
     for task in prj.tasks:
         if task.state in ('done','cancelled'):
             continue
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 37c7256cb7c..c9fcf5aca70 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -5,16 +5,17 @@
         <record id="view_project_compute_phases_select" model="ir.ui.view">
             <field name="name">Schedule Phases</field>
             <field name="model">project.compute.phases</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
-                      <header>
-                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
-                      </header>
                       <group>
                           <field name="target_project"/>
                           <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
                       </group>
+                      <footer>
+                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
+                          or
+                         <button string="Cancel" class="oe_link" special="cancel" />
+                      </footer>
                   </form>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 3ceac7e9a9e..8b807806cde 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -5,15 +5,16 @@
         <record id="view_project_compute_tasks" model="ir.ui.view">
             <field name="name">Schedule Tasks</field>
             <field name="model">project.compute.tasks</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
-                     <header>
-                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
-                     </header>
                      <group>
                          <field name="project_id"/>
                      </group>
+                     <footer>
+                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                     </footer>
                   </form>
             </field>
         </record>
author	Ravish Murari (OpenERP) <rmu@tinyerp.com>	2012-08-23 17:16:08 +0530
committer	Ravish Murari (OpenERP) <rmu@tinyerp.com>	2012-08-23 17:16:08 +0530
commit	05acae2e2fe8b72d7b1523fa0dd91a8e7d2ea09f (patch)
tree	337084f7e348d9a84e2530c2eb8362a5c966d024 /addons/project_long_term
parent	c5f7f6ecdf710985f29cc73e310ea1f3852b468d (diff)
parent	79224ea6722e0f2644239b582d86346f32021c0a (diff)