[MERGE] Merged with main branch

bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2

3 files changed, 546 insertions, 9 deletions

diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 8ed12a06e10..3882eddbdb5 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -31,14 +31,18 @@
 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"],
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..b00191d8a44
--- /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-07-25 04:37+0000\n"
+"X-Generator: Launchpad (build 15679)\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/project_long_term.py b/addons/project_long_term/project_long_term.py
index a4df1eb6917..7604d43af1b 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\'.'),