From 4411908b23bbc13d48245dd5e7d8f45c5defaefe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 25 Feb 2014 04:18:13 +0100 Subject: [PATCH] Fixed translations of project export wizard --- htdocs/core/modules/modProjet.class.php | 12 ++++++------ htdocs/exports/export.php | 5 ++++- htdocs/langs/en_US/projects.lang | 9 +++++++++ htdocs/langs/es_ES/projects.lang | 9 +++++++++ htdocs/theme/eldy/img/object_task_time.png | Bin 0 -> 199 bytes 5 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 htdocs/theme/eldy/img/object_task_time.png diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index fb7fa20533b..e606a2db5a5 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -187,8 +187,8 @@ class modProjet extends DolibarrModules $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country', 's.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode', - 'p.rowid'=>"ProjectId",'p.ref'=>"ProjectRef",'p.datec'=>"DateCreation",'p.dateo'=>"DateDebutProjet",'p.datee'=>"DateFinProjet",'p.fk_statut'=>'ProjectStatus','p.description'=>"projectNote", - 'pt.rowid'=>'RefTask','pt.dateo'=>"TaskDateo",'pt.datee'=>"TaskDatee",'pt.duration_effective'=>"DurationEffective",'pt.planned_workload'=>"DurationPlanned",'pt.progress'=>"Progress",'pt.description'=>"TaskDesc", + 'p.rowid'=>"ProjectId",'p.ref'=>"RefProject",'p.datec'=>"DateCreation",'p.dateo'=>"DateStart",'p.datee'=>"DateEnd",'p.fk_statut'=>'Status','p.description'=>"Description", + 'pt.rowid'=>'RefTask','pt.dateo'=>"TaskDateStart",'pt.datee'=>"TaskDateEnd",'pt.duration_effective'=>"DurationEffective",'pt.planned_workload'=>"PlannedWorkload",'pt.progress'=>"Progress",'pt.description'=>"TaskDescription", 'ptt.task_date'=>'TaskTimeDate','ptt.task_duration'=>"TimesSpent",'ptt.fk_user'=>"TaskTimeUser",'ptt.note'=>"TaskTimeNote"); $this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_pays:libelle', @@ -197,10 +197,10 @@ class modProjet extends DolibarrModules 'pt.dateo'=>"Date",'pt.datee'=>"Date",'pt.duration_effective'=>"Duree",'pt.planned_workload'=>"Number",'pt.progress'=>"Number",'pt.description'=>"Text", 'ptt.task_date'=>'Date','ptt.task_duration'=>"Duree",'ptt.fk_user'=>"List:user:Name",'ptt.note'=>"Text"); - $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company', - 's.tel'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company', - 'f.rowid'=>"project",'f.ref'=>"project",'f.datec'=>"project",'f.duree'=>"project",'f.fk_statut'=>"project",'f.description'=>"project", - 'pt.rowid'=>'task','pt.dateo'=>"task",'pt.datee'=>"task",'pt.duration_effective'=>"task",'pt.planned_workload'=>"task",'pt.progress'=>"task",'pt.description'=>"task", + $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company', + 's.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company', + 'p.rowid'=>"project",'p.ref'=>"project",'p.datec'=>"project",'p.dateo'=>"project",'p.datee'=>"project",'p.duree'=>"project",'p.fk_statut'=>"project",'p.description'=>"project", + 'pt.rowid'=>'projecttask','pt.dateo'=>"projecttask",'pt.datee'=>"projecttask",'pt.duration_effective'=>"projecttask",'pt.planned_workload'=>"projecttask",'pt.progress'=>"projecttask",'pt.description'=>"projecttask", 'ptt.task_date'=>'task_time','ptt.task_duration'=>"task_time",'ptt.fk_user'=>"task_time",'ptt.note'=>"task_time"); diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index aefe5490802..9d8c59f8eaa 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -91,7 +91,10 @@ $entitytolang = array( 'other' => 'Other', 'trip' => 'TripsAndExpenses', 'shipment' => 'Shipments', - 'shipment_line'=> 'ShipmentLine' + 'shipment_line'=> 'ShipmentLine', + 'project' => 'Projects', + 'projecttask' => 'Tasks', + 'task_time' => 'TaskTimeSpent' ); $array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array(); diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index ba0b6b6dcd2..c6355cdec95 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - projects +RefProject=Ref. project +ProjectId=Project Id Project=Project Projects=Projects SharedProject=Everybody @@ -30,11 +32,18 @@ TimeSpent=Time spent TimesSpent=Time spent RefTask=Ref. task LabelTask=Label task +TaskTimeSpent=Time spent on tasks +TaskTimeUser=Task time user +TaskTimeNote=Task time note +TaskTimeDate=Task time date NewTimeSpent=New time spent MyTimeSpent=My time spent MyTasks=My tasks Tasks=Tasks Task=Task +TaskDateStart=Task start date +TaskDateEnd=Task end date +TaskDescription=Task description NewTask=New task AddTask=Add task AddDuration=Add duration diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index 1df7fd8d92a..04e5723e9f2 100644 --- a/htdocs/langs/es_ES/projects.lang +++ b/htdocs/langs/es_ES/projects.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - projects +RefProject=Ref. proyecto +ProjectId=Id proyecto Project=Proyecto Projects=Proyectos SharedProject=Proyecto compartido @@ -30,11 +32,18 @@ TimeSpent=Tiempo dedicado TimesSpent=Tiempos dedicados RefTask=Ref. tarea LabelTask=Etiqueta tarea +TaskTimeSpent=Tiempo dedicado a tareas +TaskTimeUser=Usuario de tiempo dedicado +TaskTimeNote=Nota de tiempo dedicado +TaskTimeDate=Fecha de tiempo dedicado NewTimeSpent=Nuevo tiempo dedicado MyTimeSpent=Mi tiempo dedicado MyTasks=Mis tareas Tasks=Tareas Task=Tarea +TaskDateStart=Fecha inicio tarea +TaskDateEnd=Fecha fin tarea +TaskDescription=Descripción de tarea NewTask=Nueva tarea AddTask=Añadir tarea AddDuration=Indicar duración diff --git a/htdocs/theme/eldy/img/object_task_time.png b/htdocs/theme/eldy/img/object_task_time.png new file mode 100644 index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!VDyL#uerODaPU;cPEB*=VV?2IYI$GA+G=b z|6jIj*|b?Nu3o(gWX~_#;#?)61X7yh?e4vL>4nJaD4z_MyE9? lK9WujUNMOxAp(mS8H6JFu1;5C6$k2M@O1TaS?83{1OOqAH4Oj& literal 0 HcmV?d00001