[Merge]

bzr revid: vir@tinyerp.com-20101019044533-186ta8ghj4x15o31

1 files changed, 108 insertions, 80 deletions

diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot
index e508e1f3fba..aa2332a2b47 100644
--- a/addons/project_long_term/i18n/project_long_term.pot
+++ b/addons/project_long_term/i18n/project_long_term.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-08-20 10:11:42+0000\n"
-"PO-Revision-Date: 2010-08-20 10:11:42+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:51+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:51+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,6 @@ msgstr ""
 
 #. module: project_long_term
 #: view:project.compute.phases:0
-#: view:project.compute.tasks:0
 msgid "Compute Scheduling of Phases"
 msgstr ""
 
@@ -39,16 +38,10 @@ msgstr ""
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
-#: view:project.phase:0
 msgid "Phases"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "_Compute"
-msgstr ""
-
-#. module: project_long_term
 #: view:project.phase:0
 #: view:project.resource.allocation:0
 msgid "Group By..."
@@ -60,45 +53,26 @@ msgid "Invalid model name in the action definition."
 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
-#: field:project.compute.phases,target_project:0
-msgid "Schedule"
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.module.module,description:project_long_term.module_meta_information
-msgid "\n"
-"\n"
-"        Long Term Project management module that tracks planning, scheduling, resources allocation.\n"
-"        Mainly used with Big project management.\n"
-"            - Project Phases will be maintained by Manager of the project\n"
-"            - Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given.\n"
-"                                        If no project given then all the draft,open and pending state phases will be taken\n"
-"            - 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\n"
-"            - Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date\n"
-"\n"
-"    "
+#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+#: view:project.resource.allocation:0
+msgid "Resources"
 msgstr ""
 
 #. 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.resource.allocation:0
-msgid "Resource Allocations"
+msgid "Resources Allocation"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.resource.allocation:0
-msgid "R.A."
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
 msgstr ""
 
 #. module: project_long_term
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+msgid "Resource Allocations"
 msgstr ""
 
 #. module: project_long_term
@@ -134,6 +108,8 @@ msgstr ""
 #: field:project.compute.tasks,project_id:0
 #: view:project.phase:0
 #: field:project.phase,project_id:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,project_id:0
 msgid "Project"
 msgstr ""
 
@@ -149,29 +125,29 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: project_long_term
-#: field:project.resource.allocation,useability:0
-msgid "Usability"
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "No tasks to compute for Project '%s'."
 msgstr ""
 
 #. module: project_long_term
-#: help:project.resource.allocation,useability:0
-msgid "Usability of this resource for this project phase in percentage (=50%)"
+#: help:project.resource.allocation,date_end:0
+msgid "Ending Date"
 msgstr ""
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
-#: field:project.resource.allocation,phase_id_date_end:0
 msgid "Ending Date of the phase"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.compute.phases:0
-msgid "This wizard will schedule phases for all or specified project"
+#: view:project.phase:0
+msgid "Planning"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Planning"
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
 msgstr ""
 
 #. module: project_long_term
@@ -187,13 +163,15 @@ msgid "Compute Phase Scheduling"
 msgstr ""
 
 #. module: project_long_term
-#: constraint:res.users:0
-msgid "The chosen company is not in the allowed companies for this user"
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid " (copy)"
 msgstr ""
 
 #. module: project_long_term
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,useability:0
+msgid "Availability"
 msgstr ""
 
 #. module: project_long_term
@@ -208,6 +186,17 @@ 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.compute.phases:0
+msgid "Compute Scheduling of phases for all or specified project"
+msgstr ""
+
+#. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration UoM"
 msgstr ""
@@ -219,6 +208,11 @@ msgid "Compute Task Scheduling"
 msgstr ""
 
 #. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_resource_allocation
 #: view:project.phase:0
 #: view:project.resource.allocation:0
@@ -226,9 +220,13 @@ msgid "Project Resource Allocation"
 msgstr ""
 
 #. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource
-msgid "Resources"
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_start:0
+msgid "Starting Date"
 msgstr ""
 
 #. module: project_long_term
@@ -242,6 +240,11 @@ msgid "Invalid XML for View Architecture!"
 msgstr ""
 
 #. module: project_long_term
+#: help:project.resource.allocation,useability:0
+msgid "Availability of this resource for this project phase in percentage (=50%)"
+msgstr ""
+
+#. module: project_long_term
 #: help:project.phase,constraint_date_start:0
 msgid "force the phase to start after this date"
 msgstr ""
@@ -262,6 +265,11 @@ msgid "_Ok"
 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 ""
@@ -272,9 +280,8 @@ msgid "project.schedule.tasks"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,constraint_date_start:0
 #: field:project.phase,date_start:0
+#: field:project.resource.allocation,date_start:0
 msgid "Start Date"
 msgstr ""
 
@@ -289,12 +296,6 @@ msgid "force the phase to finish before this date"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_tasks.py:0
-#, python-format
-msgid "Project must have members assigned !"
-msgstr ""
-
-#. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "Draft"
@@ -312,17 +313,12 @@ msgid "Pending"
 msgstr ""
 
 #. module: project_long_term
-#: constraint:project.task:0
-msgid "Error! Task start-date must be lower then task end-date."
+#: field:project.resource.allocation,name:0
+msgid "unknown"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.phase:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
+#: field:project.resource.allocation,user_id:0
 msgid "User"
 msgstr ""
 
@@ -332,8 +328,8 @@ msgid "Task Detail"
 msgstr ""
 
 #. module: project_long_term
-#: view:project.compute.tasks:0
-msgid "Compute"
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
 msgstr ""
 
 #. module: project_long_term
@@ -342,25 +338,30 @@ msgid "Project Compute Tasks"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid "No responsible person assigned !"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_tasks.py:0
-#: code:addons/project_long_term/wizard/project_schedule_tasks.py:0
+#: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid "Error"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#: code:addons/project_long_term/project_long_term.py:0
 #, python-format
 msgid "You must assign a responsible person for phase '%s' !"
 msgstr ""
 
 #. 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 ""
+
+#. module: project_long_term
 #: view:project.phase:0
 msgid "Constraints"
 msgstr ""
@@ -374,6 +375,7 @@ msgstr ""
 #: 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"
@@ -402,9 +404,8 @@ msgid "The Object name must start with x_ and not contain any special character
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_schedule_tasks.py:0
-#, python-format
-msgid "Phase must have resources assigned !"
+#: view:project.phase:0
+msgid "Remaining Hours"
 msgstr ""
 
 #. module: project_long_term
@@ -413,11 +414,17 @@ msgid "Other Info"
 msgstr ""
 
 #. module: project_long_term
+#: view:project.phase:0
 #: field:project.phase,responsible_id:0
 msgid "Responsible"
 msgstr ""
 
 #. module: project_long_term
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.phase:0
 msgid "Start Phase"
 msgstr ""
@@ -429,18 +436,28 @@ msgid "Please Specify Project to be schedule"
 msgstr ""
 
 #. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project_long_term
 #: view:project.schedule.tasks:0
 msgid "Task Scheduling completed successfully."
 msgstr ""
 
 #. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task for specified project."
+msgstr ""
+
+#. module: project_long_term
 #: view:project.resource.allocation:0
 msgid "Phase"
 msgstr ""
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
-#: field:project.resource.allocation,phase_id_date_start:0
 msgid "Starting Date of the phase"
 msgstr ""
 
@@ -453,8 +470,8 @@ msgid "If the phase is created the state 'Draft'.\n"
 msgstr ""
 
 #. module: project_long_term
-#: field:project.phase,constraint_date_end:0
 #: field:project.phase,date_end:0
+#: field:project.resource.allocation,date_end:0
 msgid "End Date"
 msgstr ""
 
@@ -475,12 +492,23 @@ msgid "Working Period"
 msgstr ""
 
 #. module: project_long_term
+#: model:ir.model,name:project_long_term.model_resource_resource
+msgid "Resource Detail"
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
 #: view:project.phase:0
 msgid "Scheduling"
 msgstr ""
 
 #. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "No tasks to compute for Phase '%s'."
+msgstr ""
+
+#. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
 #: view:project.phase:0
 #: field:project.resource.allocation,phase_id:0