From 38f3452f0c97988dc6a13c567a77c616d5846ecd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 19 Aug 2018 01:51:45 +0200 Subject: [PATCH 1/5] Fix trans --- htdocs/langs/en_US/projects.lang | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 058fdee0637..59a17111cd0 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -167,8 +167,9 @@ TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor SelectElement=Select element AddElement=Link to element # Documents models -DocumentModelBeluga=Project template for linked objects overview -DocumentModelBaleine=Project report template for tasks +DocumentModelBeluga=Project document template for linked objects overview +DocumentModelBaleine=Project document template for tasks +DocumentModelTimeSpent=Project report template for time spent PlannedWorkload=Planned workload PlannedWorkloadShort=Workload ProjectReferers=Related items From cca0f4bf22f2f747ae0676a0cd79806af5338ab0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 19 Aug 2018 02:01:18 +0200 Subject: [PATCH 2/5] Fix translation --- htdocs/langs/en_US/projects.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 59a17111cd0..5c66e298fe8 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -229,3 +229,4 @@ DontHavePermissionForCloseProject=You do not have permissions to close the proje DontHaveTheValidateStatus=The project %s must be open to be closed RecordsClosed=%s project(s) closed SendProjectRef=Information project %s +ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Payment of employee wages' must be enabled to define employee hourly rate to have time spent valorized From 116f4a1a0986e0d8cca86f1a702fbcc8caaca756 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 19 Aug 2018 02:22:12 +0200 Subject: [PATCH 3/5] Fix responsive --- htdocs/compta/bank/bankentries_list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 8ddc3de0014..ec41a28327f 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -1423,14 +1423,14 @@ if ($resql) if (! empty($arrayfields['b.conciliated']['checked'])) { - print ''; + print ''; print $objp->conciliated?$langs->trans("Yes"):$langs->trans("No"); print ''; if (! $i) $totalarray['nbfield']++; } // Action edit/delete - print ''; + print ''; // Transaction reconciliated or edit link if ($objp->conciliated && $bankaccount->canBeConciliated() > 0) // If line not conciliated and account can be conciliated { From 547a0aaac7c0dbfb166c3f5a1584fe4919f51900 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 19 Aug 2018 02:43:45 +0200 Subject: [PATCH 4/5] FIX Look and feel v8 --- htdocs/user/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 635e14f7bd4..e30044b8174 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1823,7 +1823,7 @@ else if ($caneditgroup) { print ''; - print img_delete($langs->trans("RemoveFromGroup")); + print img_picto($langs->trans("RemoveFromGroup"), 'unlink'); print ''; } else From 795b2f3d58b5939fdc183acee1ec97671395425e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 19 Aug 2018 03:00:11 +0200 Subject: [PATCH 5/5] FIX Delete file on smartphone --- htdocs/core/class/html.formfile.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 7c457accadf..117ec484c15 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -778,7 +778,8 @@ class FormFile $out.= ''; if ($delallowed) { - $out.= 'numoffiles++; } - // Loop on each file found + // Loop on each link found if (is_array($link_list)) { $colspan=2; @@ -1304,8 +1305,7 @@ class FormFile if (! empty($conf->dol_use_jmobile)) $useajax=0; if (empty($conf->use_javascript_ajax)) $useajax=0; if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0; - - print ''.img_delete().''; + print ''.img_delete().''; } print "";