[MERGE]

bzr revid: uco@tinyerp.com-20101230060753-wujam7otb5f13f0z

4 files changed, 75 insertions, 59 deletions

diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index c727123e2cc..2cfee43022f 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:11+0000\n"
+"PO-Revision-Date: 2010-12-28 08:41+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -360,7 +360,7 @@ msgstr "Cabecera correo"
 #. module: project
 #: view:project.installer:0
 msgid "Configure Your Project Management Application"
-msgstr ""
+msgstr "Configure su aplicación de gestión de proyectos"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -790,7 +790,7 @@ msgstr "Nuevo título de la tarea delegada al usuario."
 #. module: project
 #: view:report.project.task.user:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: project
 #: view:project.installer:0
@@ -798,6 +798,8 @@ msgid ""
 "Various OpenERP applications are available to manage your projects with "
 "different level of control and flexibility."
 msgstr ""
+"Están disponibles varias aplicaciones OpenERP para gestionar sus proyectos "
+"con varios niveles de control y flexibilidad."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -1016,6 +1018,16 @@ msgid ""
 "Project application in order to invoice the time spent on a task, you can "
 "choose to invoice or not one project in the billing section."
 msgstr ""
+"Un proyecto contiene un conjunto de tareas o actividades que se llevarán a "
+"cabo por el personal asignado. Un proyecto puede ser puesto en una "
+"jerarquía, como un hijo de un proyecto padre. Esto le permite diseñar la "
+"estructura de grandes proyectos con las distintas fases repartidas en el "
+"ciclo de duración del proyecto. Cada usuario puede configurar su proyecto "
+"por defecto en sus propias preferencias, con el fin de filtrar de forma "
+"automática las tareas o actividades en las que normalmente trabaja. Si ha "
+"personalizado la aplicación de proyectos con el fin de facturar el tiempo "
+"dedicado a una tarea, puede elegir si facturar o no un proyecto en la "
+"sección de facturación."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1132,7 +1144,7 @@ msgstr "Etapas"
 #. module: project
 #: view:project.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: project
 #: view:project.project:0
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 34a47aba91b..f4c837e5d21 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -41,7 +41,8 @@
                             </group>
                             <group col="2" colspan="2" name="misc">
                                 <separator colspan="2" string="Miscelleanous"/>
-                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
+                                <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                                 <field name="warn_manager"/>
                             </group>
                             <newline/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 86f79857104..77dce617c7f 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -2,7 +2,9 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
+        <menuitem id="base.menu_project_report" name="Reporting"
+            groups="project.group_project_manager"
+            parent="base.menu_main_pm" sequence="50"/>
 
         <record id="view_task_project_user_tree" model="ir.ui.view">
             <field name="name">report.project.task.user.tree</field>
@@ -10,7 +12,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Tasks Analysis">
-                	<field name="name" invisible="1"/>
+                    <field name="name" invisible="1"/>
                     <field name="project_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="date_deadline" invisible="1"/>
@@ -43,13 +45,13 @@
             <field name="model">report.project.task.user</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-	            <graph string="Tasks Analysis" type="bar">
-	                 <field name="name"/>
-	                 <field name="state" group="True"/>
-	                 <field name="no_of_days" operator="+"/>
-	             </graph>
-         	</field>
-    	</record>
+                <graph string="Tasks Analysis" type="bar">
+                     <field name="name"/>
+                     <field name="state" group="True"/>
+                     <field name="no_of_days" operator="+"/>
+                 </graph>
+             </field>
+        </record>
 
         <record id="view_task_project_user_search" model="ir.ui.view">
             <field name="name">report.project.task.user.search</field>
@@ -57,52 +59,52 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
-                	<group colspan="10" col="12">
-	                    <filter icon="terp-go-year" string="  Year  "
+                    <group colspan="10" col="12">
+                        <filter icon="terp-go-year" string="  Year  "
                                 domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-01-01'))]"
-	                    	    help="Current Year"/>
-	                    <filter icon="terp-go-month" string="   Month   "
-	                    		name="month"
-	                    		domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-	                    		help="Current Month"/>
-		                <filter icon="terp-go-week"
-	                            string="    Month-1    "
-	                            separator="1"
+                                help="Current Year"/>
+                        <filter icon="terp-go-month" string="   Month   "
+                                name="month"
+                                domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                                help="Current Month"/>
+                        <filter icon="terp-go-week"
+                                string="    Month-1    "
+                                separator="1"
                                 domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-	                            help="Previous Month"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Draft"
-	                    		icon="terp-document-new"
-	                    		domain="[('state','=','draft')]"
-	                    		help = "Draft tasks"/>
-		                <filter string="Current"
-		                		icon="terp-check"
-		                		domain="[('state', '=' ,'open')]"
-		                		help = "In progress tasks"/>
-	                   	<filter string="Pending"
-	                   			icon="terp-gtk-media-pause"
-	                   			domain="[('state','=','pending')]"
-	                   			help = "Pending tasks"/>
-                      	<filter string="Done"
-                    			icon="terp-dialog-close"
-                    			name="done"
-                    			domain="[('state','=','done')]"/>
+                                help="Previous Month"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Draft"
+                                icon="terp-document-new"
+                                domain="[('state','=','draft')]"
+                                help = "Draft tasks"/>
+                        <filter string="Current"
+                                icon="terp-check"
+                                domain="[('state', '=' ,'open')]"
+                                help = "In progress tasks"/>
+                           <filter string="Pending"
+                                   icon="terp-gtk-media-pause"
+                                   domain="[('state','=','pending')]"
+                                   help = "Pending tasks"/>
+                          <filter string="Done"
+                                icon="terp-dialog-close"
+                                name="done"
+                                domain="[('state','=','done')]"/>
                        <separator orientation="vertical"/>
-	                    <field name="project_id">
-	                        <filter icon="terp-folder-violet"
-	                        		string="My Projects"
-	                        		help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
+                        <field name="project_id">
+                            <filter icon="terp-folder-violet"
+                                    string="My Projects"
+                                    help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
                           </field>
 
                           <field name="user_id" widget="selection">
-	                        <filter icon="terp-personal"
-	                        		string="My Task"
-	                        		help = "My tasks"
-	                        		domain="[('user_id','=',uid)]" />
-	                        <filter icon="terp-personal-"
-	                        		string="Non Assigned Tasks to users"
-	                        		help="Non Assigned Tasks to users"
-	                        		domain="[('user_id','=',False)]"/>
+                            <filter icon="terp-personal"
+                                    string="My Task"
+                                    help = "My tasks"
+                                    domain="[('user_id','=',uid)]" />
+                            <filter icon="terp-personal-"
+                                    string="Non Assigned Tasks to users"
+                                    help="Non Assigned Tasks to users"
+                                    domain="[('user_id','=',False)]"/>
                           </field>
                       <field name="partner_id" />
                     </group>
@@ -149,7 +151,7 @@
             <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
-        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report" groups="project.group_project_manager"/>
+        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
 
    <!-- Views and action for project dashboard -->
    <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
@@ -187,7 +189,7 @@
         <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
     </record>
 
-	<record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
+    <record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_project_vs_remaining_hours_tree"/>
@@ -275,7 +277,7 @@
         <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
     </record>
 
-	<record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
+    <record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_project_vs_planned_total_hours_tree"/>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index fb237e88769..659948bc4d0 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -6,7 +6,7 @@
 "access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,1,1,1
 "access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
 "access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
-"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,0
+"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
 "access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1
 "access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1
 "access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,1,1,1
@@ -21,3 +21,4 @@
 "access_project_vs_hours_manager","project.vs.hours.manager","model_project_vs_hours","project.group_project_manager",1,1,1,1
 "access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
 "access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
+"access_account_analytic_line_project","account.analytic.line project","analytic.model_account_analytic_line","project.group_project_manager",1,1,1,1