[MRG] from trunk

bzr revid: nicolas.bessi@camptocamp.com-20101115101016-3ll7wnxyfe9s1mr8

2 files changed, 62 insertions, 56 deletions

diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index af74a8bc664..affa24ae0a3 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -8,35 +8,35 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-09-29 10:37+0000\n"
+"PO-Revision-Date: 2010-11-05 09:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-11-06 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
 #: model:ir.module.module,shortdesc:project_long_term.module_meta_information
 msgid "Long Term Project Management"
-msgstr ""
+msgstr "Zarządzanie projektami długoterminowymi"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 msgid "Compute Scheduling of Phases"
-msgstr ""
+msgstr "Oblicz planowanie faz"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,next_phase_ids:0
 msgid "Next Phases"
-msgstr "Nastepna faza"
+msgstr "Nastepne fazy"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Project's Tasks"
-msgstr ""
+msgstr "Zadania projektu"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -65,7 +65,7 @@ msgstr "Zasoby"
 #: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
 #: view:project.resource.allocation:0
 msgid "Resources Allocation"
-msgstr ""
+msgstr "Alokacja zasobów"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
@@ -75,7 +75,7 @@ msgstr "Harmonogram"
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
 msgid "Resource Allocations"
-msgstr ""
+msgstr "Alokacje zasobów"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:0
@@ -91,18 +91,18 @@ msgstr "Zadanie"
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute a Single Project"
-msgstr ""
+msgstr "Oblicz pojedyńczy projekt"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,previous_phase_ids:0
 msgid "Previous Phases"
-msgstr ""
+msgstr "Poprzenie fazy"
 
 #. module: project_long_term
 #: help:project.phase,product_uom:0
 msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "JM (Jednostka Miary) jest jednostką miary dla czasu trwania"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_project
@@ -130,17 +130,17 @@ msgstr "Anulowano"
 #: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid "No tasks to compute for Project '%s'."
-msgstr ""
+msgstr "Brak zadań do obliczeń w Projekcie '%s'"
 
 #. module: project_long_term
 #: help:project.resource.allocation,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data końcowa"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
 msgid "Ending Date of the phase"
-msgstr ""
+msgstr "Końcowa data fazy"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -150,7 +150,7 @@ msgstr "Planowanie"
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
 msgid "Deadline"
-msgstr ""
+msgstr "Termin"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
@@ -162,19 +162,19 @@ msgstr "_Anuluj"
 #: 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 "Oblicz planowanie fazy"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopia)"
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
 #: field:project.resource.allocation,useability:0
 msgid "Availability"
-msgstr ""
+msgstr "Dostępność"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -191,50 +191,50 @@ msgstr "Stan"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr ""
+msgstr "_Oblicz"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 msgid "Compute Scheduling of phases for all or specified project"
-msgstr ""
+msgstr "Oblicz planowanie faz dla wszystkich lub wybranych projektów"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
-msgstr ""
+msgstr "JM czasu trwania"
 
 #. 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 "Oblicz planowanie zadań"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_start:0
 msgid "Minimum Start Date"
-msgstr ""
+msgstr "Minimalna data początkowa"
 
 #. 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 "Alokacja zasobów projektu"
 
 #. module: project_long_term
 #: view:project.compute.tasks:0
 msgid "Compute Scheduling of Task"
-msgstr ""
+msgstr "Oblicz planowanie zadania"
 
 #. module: project_long_term
 #: help:project.resource.allocation,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data początkowa"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Related Tasks"
-msgstr ""
+msgstr "Zadania powiązane"
 
 #. module: project_long_term
 #: constraint:ir.ui.view:0
@@ -245,12 +245,12 @@ msgstr "Niewłaściwy XML dla architektury widoku!"
 #: help:project.resource.allocation,useability:0
 msgid ""
 "Availability of this resource for this project phase in percentage (=50%)"
-msgstr ""
+msgstr "Dostępność tego zasobu dla tej fazy projektu w procentach (=50%)"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
 msgid "force the phase to start after this date"
-msgstr ""
+msgstr "wymuś start fazy po tej dacie"
 
 #. module: project_long_term
 #: field:project.phase,task_ids:0
@@ -260,7 +260,7 @@ msgstr "Zadania projektu"
 #. module: project_long_term
 #: field:project.phase,resource_ids:0
 msgid "Project Resources"
-msgstr ""
+msgstr "Zasoby projektu"
 
 #. module: project_long_term
 #: view:project.schedule.tasks:0
@@ -270,12 +270,12 @@ msgstr ""
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Phase start-date must be lower than phase end-date."
-msgstr ""
+msgstr "Data początkowa projektu musi być mniejsza od daty końcowej."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_schedule_tasks
@@ -291,7 +291,7 @@ msgstr "Data Początkowa"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Resource Allocation"
-msgstr ""
+msgstr "Alokacja zasobów"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -328,23 +328,24 @@ msgstr "Użytkownik"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Task Detail"
-msgstr ""
+msgstr "Szczegóły zadania"
 
 #. module: project_long_term
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
 msgstr ""
+"Rozkład godzin roboczych do uwzględnienia w raporcie z wykresem Gantta"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
-msgstr ""
+msgstr "Obliczanie zadań projektu"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid "No responsible person assigned !"
-msgstr ""
+msgstr "Nie przypisano osoby odpowiedzialnej"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:0
@@ -356,13 +357,13 @@ msgstr "Błąd"
 #: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid "You must assign a responsible person for phase '%s' !"
-msgstr ""
+msgstr "Musisz podać osobę odpowiedzialną za fazę '%s' !"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid "Should have Resources Allocation or Project Members!"
-msgstr ""
+msgstr "Musi być Alokacja zasobów lub Członkowie projektu!"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -372,7 +373,7 @@ msgstr "Ograniczenia"
 #. module: project_long_term
 #: help:project.phase,sequence:0
 msgid "Gives the sequence order when displaying a list of phases."
-msgstr ""
+msgstr "Ustala kolejność wyświetlania listy faz."
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -382,7 +383,7 @@ msgstr ""
 #: view:project.phase:0
 #: field:project.project,phase_ids:0
 msgid "Project Phases"
-msgstr ""
+msgstr "Fazy projektu"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -428,34 +429,34 @@ msgstr "Odpowiedzialny"
 #. module: project_long_term
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Czas pracy"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Phase"
-msgstr ""
+msgstr "Rozpocznij fazę"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:0
 #, python-format
 msgid "Please Specify Project to be schedule"
-msgstr ""
+msgstr "Wybierz projekt do zaplanowania"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Suma godzin"
 
 #. module: project_long_term
 #: view:project.schedule.tasks:0
 msgid "Task Scheduling completed successfully."
-msgstr ""
+msgstr "Planowanie zadań zakończono pomyślnie"
 
 #. module: project_long_term
 #: view:project.compute.tasks:0
 msgid "Compute Scheduling of Task for specified project."
-msgstr ""
+msgstr "Oblicz planowanie zadań dla projektu"
 
 #. module: project_long_term
 #: view:project.resource.allocation:0
@@ -476,6 +477,11 @@ msgid ""
 "          \n"
 " If the phase is over, the states is set to 'Done'."
 msgstr ""
+"Po utworzeniu faza jest w stanie 'Projekt'.\n"
+" Po uruchomieniu faza przechodzi w stan 'W toku'.\n"
+" Jeśli jest potrzebny przegląd, to faza wchodzi w stan 'Oczekiwanie'.        "
+"                          \n"
+" Jeśli faza jest zakończona, to stan jest ustawiany na 'Wykonano'."
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
@@ -502,7 +508,7 @@ msgstr "Godziny pracy"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Szczegóły zasobu"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
@@ -514,7 +520,7 @@ msgstr "Harmonogram"
 #: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid "No tasks to compute for Phase '%s'."
-msgstr ""
+msgstr "Brak zadań do obliczania dla Fazy '%s'."
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
@@ -527,7 +533,7 @@ msgstr "Faza projektu"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
-msgstr ""
+msgstr "Obliczenie faz projektu"
 
 #. module: project_long_term
 #: field:project.schedule.tasks,msg:0
@@ -537,7 +543,7 @@ msgstr "Wiadomość"
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
-msgstr ""
+msgstr "Zapętlenia w fazach są niedozwolone"
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
@@ -547,7 +553,7 @@ msgstr "Numeracja"
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All Projects"
-msgstr ""
+msgstr "Oblicz wszystkie projekty"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
@@ -564,7 +570,7 @@ msgstr "Planuj zadania"
 #. module: project_long_term
 #: help:project.phase,duration:0
 msgid "By default in days"
-msgstr ""
+msgstr "Domyślnie w dniach"
 
 #. module: project_long_term
 #: field:project.phase,duration:0
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 79f11af4bbd..eaaafe5090a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -257,8 +257,8 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-document-new" default="1"/>
-                        <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-camera_test"/>
+	                    <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress Phases" icon="terp-check" default="1"/>
+                        <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"/>
@@ -287,7 +287,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
-            <field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
+            <field name="context">{"search_default_current": 1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
             <field name="help">A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next ones, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on it.</field>
         </record>
@@ -297,7 +297,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
-             <field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
+             <field name="context">{"search_default_current": 1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>