[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20110831092527-b86v0k9l0cvpbu0b

3 files changed, 140 insertions, 109 deletions

diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index 05ad33d52b4..c3845a869d9 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.po
@@ -8,66 +8,69 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-06 22:09+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-17 23:04+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: Catalan <ca@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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
 msgid "Long Term Project Management"
-msgstr ""
+msgstr "Gestió de projectes a llarg plaç"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 msgid "Compute Scheduling of Phases"
-msgstr ""
+msgstr "Calcula la planificació de fases"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,next_phase_ids:0
 msgid "Next Phases"
-msgstr ""
+msgstr "Següents fases"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Project's Tasks"
-msgstr ""
+msgstr "Tasques del projecte"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
 msgid "Phases"
-msgstr ""
+msgstr "Fases"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"Error! La data d'inici del projecte ha de ser anterior a la data final del "
+"projecte."
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
-msgstr ""
+msgstr "Assignació de recursos"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Displaying settings"
-msgstr ""
+msgstr "Configuració de visualització"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Schedule"
-msgstr ""
+msgstr "Horari"
 
 #. module: project_long_term
 #: model:ir.module.module,description:project_long_term.module_meta_information
@@ -90,55 +93,73 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"        Mòdul de Gestió de Projectes a llarg termini que realitza el "
+"seguiment de planejament, programació, assignació de recursos.\n"
+"        Utilitzat principalment amb la gestió de projectes grans.\n"
+"            - Les Fases del Projecte seran gestionades per l'Administrador "
+"del projecte\n"
+"            - Calcula la Programació de Fases: Calcula la data d'inici i "
+"data de finalització de les fases del projecte en estat esborrador, obert i "
+"pendent.\n"
+"                                        Si no hi ha cap projecte concret, "
+"llavors es portaran totes les fases en estat esborrador, obert i pendent\n"
+"            - Calcula la Programació de Tasques: Això funciona igual que el "
+"botó programador de project.phase. Pren el projecte com a argument i calcula "
+"totes les tasques obertes, en esborrany i pendents.\n"
+"            - Programa tasques: Totes les tasques en estat esborrador, "
+"pendent i obert es programen des de la data d'inici de la fase\n"
+"\n"
+"    "
 
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Error! No podeu crear tasques recursives."
 
 #. 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
 msgid "Resource Allocations"
-msgstr ""
+msgstr "Assignació de recursos"
 
 #. module: project_long_term
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Error! No podeu assignar un escalat al mateix projecte."
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:133
+#: code:addons/project_long_term/project_long_term.py:128
 #, python-format
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tasca"
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
-msgstr ""
+msgstr "Calcular un sol projecte"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,previous_phase_ids:0
 msgid "Previous Phases"
-msgstr ""
+msgstr "Fases prèvies"
 
 #. module: project_long_term
 #: help:project.phase,product_uom:0
 msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "UdM (Unitat de Mesura) és la unitat de mesura per la durada"
 
 #. 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 ""
+msgstr " És calculat pel planificador d'acord a la data d'inici i la durada."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_project
@@ -150,103 +171,103 @@ msgstr ""
 #: field:project.resource.allocation,project_id:0
 #: view:project.task:0
 msgid "Project"
-msgstr ""
+msgstr "Projecte"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:50
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Error!"
 
 #. module: project_long_term
 #: selection:project.phase,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lada"
 
 #. module: project_long_term
 #: help:project.resource.allocation,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Planning"
-msgstr ""
+msgstr "Planificació"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
-msgstr ""
+msgstr "Data limit"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Canceŀla"
 
 #. 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
 msgid "Compute Phase Scheduling"
-msgstr ""
+msgstr "Calcula planificació de fases"
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:195
+#: code:addons/project_long_term/project_long_term.py:190
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (còpia)"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 #: field:project.resource.allocation,useability:0
 msgid "Availability"
-msgstr ""
+msgstr "Disponibilitat"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr ""
+msgstr "C_alcula"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 msgid "Compute Scheduling of phases for all or specified project"
-msgstr ""
+msgstr "Calcula planificació de fases per tots o el projecte especificat"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
-msgstr ""
+msgstr "UdM duració"
 
 #. 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
 msgid "Compute Task Scheduling"
-msgstr ""
+msgstr "Calcula planificació de tasques"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
-msgstr ""
+msgstr "Data d'inici mínima"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_resource_allocation
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 msgid "Project Resource Allocation"
-msgstr ""
+msgstr "Assignació de recursos del projecte"
 
 #. module: project_long_term
 #: view:project.compute.tasks:0
 msgid "Compute Scheduling of Task"
-msgstr ""
+msgstr "Calcula planificació de tasques"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_resource
@@ -254,7 +275,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
 #: view:project.resource.allocation:0
 msgid "Resources"
-msgstr ""
+msgstr "Recursos"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
@@ -263,52 +284,57 @@ msgid ""
 "view.\n"
 "\t           "
 msgstr ""
+"Per programar les fases de tots els projectes, o un d'específic. A "
+"continuació, obrirà una vista de Gantt.\n"
+"\t           "
 
 #. module: project_long_term
 #: help:project.resource.allocation,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Related Tasks"
-msgstr ""
+msgstr "Tasques relacionades"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: project_long_term
 #: help:project.resource.allocation,useability:0
 msgid ""
 "Availability of this resource for this project phase in percentage (=50%)"
 msgstr ""
+"La disponibilitat d'aquest recurs per aquesta fase del projecte en "
+"percentatge (= 50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
 msgid "force the phase to start after this date"
-msgstr ""
+msgstr "força la fase d'inici després d'aquesta data"
 
 #. module: project_long_term
 #: field:project.phase,task_ids:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Tasques de projecte"
 
 #. module: project_long_term
 #: field:project.phase,resource_ids:0
 msgid "Project Resources"
-msgstr ""
+msgstr "Recursos del projecte"
 
 #. module: project_long_term
 #: view:project.schedule.tasks:0
 msgid "_Ok"
-msgstr ""
+msgstr "_D'acord"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Schedule and Display info"
-msgstr ""
+msgstr "Planifica i mostra informació"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
@@ -316,21 +342,24 @@ msgid ""
 "It's computed by the scheduler according the project date or the end date of "
 "the previous phase."
 msgstr ""
+"És calculat pel planificador en funció de la data d'inici o data de "
+"finalització de la fase anterior"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Phase start-date must be lower than phase end-date."
 msgstr ""
+"La data d'inici de la fase ha de ser anterior a la data de finalització."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_schedule_tasks
 msgid "project.schedule.tasks"
-msgstr ""
+msgstr "projecte.planifica.tasques"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,help:project_long_term.act_project_phase
@@ -342,69 +371,77 @@ msgid ""
 "human resources, convert your phases into a series of tasks when you start "
 "working on the project."
 msgstr ""
+"Un projecte es pot dividir en diferents fases. Per a cada fase, podeu "
+"definir la seva assignació de recursos, descriure diferents tasques i "
+"vincular la seva fase a fases prèvies i posteriors, afegir restriccions de "
+"data per a la programació automàtica. Quan comenceu a treballar en el "
+"projecte, utilitzeu el planejament a llarg termini per planificar els seus "
+"recursos humans disponibles i convertir les seves fases en una sèrie de "
+"tasques."
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
 #: field:project.resource.allocation,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Resource Allocation"
-msgstr ""
+msgstr "Asignació de recursos"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
 msgid "force the phase to finish before this date"
-msgstr ""
+msgstr "Força que la fase acabi abans d'aquesta data"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Esborrany"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendent"
 
 #. module: project_long_term
 #: field:project.resource.allocation,name:0
 msgid "unknown"
-msgstr ""
+msgstr "desconegut"
 
 #. module: project_long_term
 #: field:project.resource.allocation,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Task Detail"
-msgstr ""
+msgstr "Detall de la tasca"
 
 #. module: project_long_term
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
 msgstr ""
+"Hores de treball de l'horari per a ajustar l'informe del diagrama de Gantt"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
-msgstr ""
+msgstr "Calcula tasques del projecte"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Constraints"
-msgstr ""
+msgstr "Restriccions"
 
 #. module: project_long_term
 #: help:project.phase,sequence:0
 msgid "Gives the sequence order when displaying a list of phases."
-msgstr ""
+msgstr "Indica l'ordre quan es mostra la llista de fases"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -414,77 +451,78 @@ msgstr ""
 #: view:project.phase:0
 #: field:project.project,phase_ids:0
 msgid "Project Phases"
-msgstr ""
+msgstr "Fases del projecte"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Done"
-msgstr ""
+msgstr "Realitzat"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Cancel"
-msgstr ""
+msgstr "Canceŀla"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "En procés"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Hores restants"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,responsible_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Horari de treball"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Phase"
-msgstr ""
+msgstr "Comença fase"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:50
 #, python-format
 msgid "Please Specify Project to be schedule"
-msgstr ""
+msgstr "Si us plau seleccioneu el projecte a planificar"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Total d'hores"
 
 #. module: project_long_term
 #: view:project.schedule.tasks:0
 msgid "Task Scheduling completed successfully."
-msgstr ""
+msgstr "Planificació de tasques completada satisfactòriament."
 
 #. module: project_long_term
 #: view:project.compute.tasks:0
 msgid "Compute Scheduling of Task for specified project."
-msgstr ""
+msgstr "Calcula planificació de tasques per al projecte específic"
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
 msgid "Phase"
-msgstr ""
+msgstr "Fase"
 
 #. module: project_long_term
 #: help:project.phase,state:0
@@ -495,43 +533,48 @@ msgid ""
 "          \n"
 " If the phase is over, the states is set to 'Done'."
 msgstr ""
+"Si la fase es crea, l'estat és \"Esborrany\".\n"
+" Si la fase comença, l'estat canvia a \"En Procés\".\n"
+" Si es necessita revisió, la fase està en estat \"Pendent\".                 "
+"                 \n"
+" Si la fase està acabada, l'estat es fixa en \"Fet\"."
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
 #: field:project.resource.allocation,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Data final"
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
 #: field:project.resource.allocation,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Recurs"
 
 #. module: project_long_term
 #: field:project.phase,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "Detalls de tasques"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 msgid "Working Period"
-msgstr ""
+msgstr "Horari laboral"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Detall del recurs"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
 msgid "Scheduling"
-msgstr ""
+msgstr "Planificació"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
@@ -540,51 +583,51 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,phase_id:0
 msgid "Project Phase"
-msgstr ""
+msgstr "Fase del projecte"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
-msgstr ""
+msgstr "Cerca fases del projecte"
 
 #. module: project_long_term
 #: field:project.schedule.tasks,msg:0
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
-msgstr ""
+msgstr "No es permeten bucles en les fases"
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seqüència"
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All Projects"
-msgstr ""
+msgstr "Calcula tots els projectes"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Absències de recursos"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
 #: view:project.phase:0
 #: view:project.schedule.tasks:0
 msgid "Schedule Tasks"
-msgstr ""
+msgstr "Planifica tasques"
 
 #. module: project_long_term
 #: help:project.phase,duration:0
 msgid "By default in days"
-msgstr ""
+msgstr "Per defecte en dies"
 
 #. module: project_long_term
 #: field:project.phase,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Durada"
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b720da13654..819fdbd7542 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -267,7 +267,7 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress Phases" icon="terp-check"/>
+                        <filter string="Current" domain="[('state','in',('open','draft','pending'))]"  name="current" help="Draft, In Progress and Pending 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"/>
diff --git a/addons/project_long_term/test/test_schedule_tasks_case1.yml b/addons/project_long_term/test/test_schedule_tasks_case1.yml
index febb2aa3576..d40b61d6b3a 100644
--- a/addons/project_long_term/test/test_schedule_tasks_case1.yml
+++ b/addons/project_long_term/test/test_schedule_tasks_case1.yml
@@ -1,20 +1,9 @@
 -
   In order to test scheduling of tasks, I create four tasks with different sequences and schedule them.
 - 
-  I create address for first user.
-- 
-  !record {model: res.partner.address, id: res_partner_address_user0}:
-    name: User 1
-- 
-  I create address for second user.
-- 
-  !record {model: res.partner.address, id: res_partner_address_user1}:
-    name: User 2    
-- 
   I create first user.
 - 
   !record {model: res.users, id: res_users_user0}:
-    address_id: res_partner_address_user0
     company_id: base.main_company
     context_lang: en_US
     groups_id:
@@ -27,7 +16,6 @@
   I create second user.
 - 
   !record {model: res.users, id: res_users_user1}:
-    address_id: res_partner_address_user1
     company_id: base.main_company
     context_lang: en_US
     groups_id: