From 0accdbab0b2c253ca354df9796ab056b7553ecde Mon Sep 17 00:00:00 2001 From: Patrick Delcroix Date: Mon, 7 Mar 2022 18:42:08 +0100 Subject: [PATCH 1/9] fix: show subordinates n all --- htdocs/timesheet/TimesheetReportUser.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/timesheet/TimesheetReportUser.php b/htdocs/timesheet/TimesheetReportUser.php index 79cd8d0..5e59cb6 100644 --- a/htdocs/timesheet/TimesheetReportUser.php +++ b/htdocs/timesheet/TimesheetReportUser.php @@ -94,14 +94,13 @@ // if the user can see ts for other the user id is diferent $userIdlist = array(); $userIdlistfull = getSubordinates($db, $userid, 2, array(), $admin ? ADMIN : ALL, $entity = '1', $admin); +$userIdlistfull[] = $userid; if ($show_all) { - $userIdlistfull[] = $userid; + $userIdlist = $userIdlistfull; - }else if (!empty($userIdSelected) && $userIdSelected <> $userid) { - $userIdlistfull[] = $userid; if (in_array($userIdSelected, $userIdlist) || $admin ) { $userIdlist[] = $userIdSelected; } else{ @@ -111,6 +110,7 @@ } } else{ $userIdlist[] = $userid; + $userIdSelected = $userid; } $reportStatic = new TimesheetReport($db); @@ -165,11 +165,13 @@ '; if($admin){ $form_output .= $form->select_dolusers($userIdSelected, 'userSelected'); - // select short + +} else { + $form_output .= $form->select_dolusers($userIdSelected, 'userSelected', 0, null, 0, $userIdlistfull); +} +if (count($userIdlistfull)>1) { $form_output .= '
':'>').$langs->trans('All') ; -} else { - $form_output .= $form->select_dolusers($userIdSelected, 'userSelected', 0, null, 0, $userIdlist); } From add3b8b4fd363bd33f9089ca6bce2cc112e3fae0 Mon Sep 17 00:00:00 2001 From: Patrick Delcroix Date: Thu, 10 Mar 2022 17:42:53 +0100 Subject: [PATCH 2/9] add date sorting in the pdf reports --- htdocs/timesheet/ChangeLog.md | 5 +++++ htdocs/timesheet/TimesheetReportUser.php | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/htdocs/timesheet/ChangeLog.md b/htdocs/timesheet/ChangeLog.md index 8747d74..9d62c56 100644 --- a/htdocs/timesheet/ChangeLog.md +++ b/htdocs/timesheet/ChangeLog.md @@ -1,4 +1,9 @@ # dolibarr_project_timesheet changelog +4.5.2 +- fix missing subordinates on user reports +- add "all" whenever someone have subordinates +- add date sorting in the pdf reports + 4.5.1 - Fix Project data on reports diff --git a/htdocs/timesheet/TimesheetReportUser.php b/htdocs/timesheet/TimesheetReportUser.php index 5e59cb6..bbe21de 100644 --- a/htdocs/timesheet/TimesheetReportUser.php +++ b/htdocs/timesheet/TimesheetReportUser.php @@ -233,7 +233,7 @@ .dol_print_date( $dateStart, 'dayxcard' ) .'&dateEnd=' . dol_print_date( $dateEnd, 'dayxcard' ) .'&userSelected=' . $userIdSelected - .'&mode=DTU&model=' . $model + .'&mode='.$mode.'model=' . $model .'&invoicabletaskOnly=' . $invoicabletaskOnly .'&ungroup=' . $ungroup .'&showAll=' . $show_all @@ -244,7 +244,7 @@ . dol_print_date( $dateStart, 'dayxcard' ) . '&dateEnd=' . dol_print_date( $dateEnd, 'dayxcard' ) . '&userSelected=' . $userIdSelected - . '&mode=DTU&model=' . $model + . '&mode='.$mode.'model=' . $model . '&invoicabletaskOnly=' . $invoicabletaskOnly . '&ungroup=' . $ungroup . '&showAll=' . $show_all From 0d036a2ac07baa28257e1bb12b7a57fa3f38c618 Mon Sep 17 00:00:00 2001 From: nicolasb827 Date: Wed, 23 Mar 2022 10:10:31 +0100 Subject: [PATCH 3/9] changed foreach to forEach() Firefox show that error on loading. --- htdocs/timesheet/core/js/timesheet.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/timesheet/core/js/timesheet.js b/htdocs/timesheet/core/js/timesheet.js index d563799..3959837 100644 --- a/htdocs/timesheet/core/js/timesheet.js +++ b/htdocs/timesheet/core/js/timesheet.js @@ -722,7 +722,7 @@ function updateProgressElement(element){ if (typeof data.status!== 'undefined' && data.status && data.status!=""){ // display status var obj=JSON.parse(data.status); - Object.keys(obj).foreach (function(key){ + Object.keys(obj).forEach (function(key){ $.jnotify(obj[key].text+obj[key].param,obj[key].type) if (obj[key].type == 'megs'){// only one will be returned } @@ -737,7 +737,7 @@ function updateProgressElement(element){ function updateAllProgress(){ selectElements = document.getElementsByTagName('select') - Object.keys(selectElements).foreach (function(key){ + Object.keys(selectElements).forEach (function(key){ current = selectElements[key]; selectName = current.getAttribute("name"); if (selectName && selectName.indexOf("progressTask") === 0) { From 6910207263f8af5beb07b9caf1c06350bb8c3cae Mon Sep 17 00:00:00 2001 From: nicolasb827 Date: Wed, 23 Mar 2022 10:11:35 +0100 Subject: [PATCH 4/9] changed foreach to forEach foreach is unknown to Firefox --- htdocs/timesheet/core/js/stopWatch.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/timesheet/core/js/stopWatch.js b/htdocs/timesheet/core/js/stopWatch.js index c04a636..91fe0e0 100644 --- a/htdocs/timesheet/core/js/stopWatch.js +++ b/htdocs/timesheet/core/js/stopWatch.js @@ -94,7 +94,7 @@ class Stopwatch { if (typeof data.status!== 'undefined' && data.status && data.status!=""){ // display status var obj=JSON.parse(data.status); - Object.keys(obj).foreach (function(key){ + Object.keys(obj).forEach (function(key){ $.jnotify(obj[key].text+obj[key].param,obj[key].type) }); } @@ -266,4 +266,4 @@ function startStop(evt,user,tsk){ function loadSuccess(data){ //workarroun:the call methode can't be called directly because the this doesn't work int he call back stopwatch.loadSuccess(data); -} \ No newline at end of file +} From a98b834400096d689cc519f718438a457b639692 Mon Sep 17 00:00:00 2001 From: Patrick Delcroix Date: Sun, 22 May 2022 20:39:09 +0200 Subject: [PATCH 5/9] fix not allowed when looking for subordinate user report --- htdocs/timesheet/TimesheetReportUser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/timesheet/TimesheetReportUser.php b/htdocs/timesheet/TimesheetReportUser.php index bbe21de..96e6165 100644 --- a/htdocs/timesheet/TimesheetReportUser.php +++ b/htdocs/timesheet/TimesheetReportUser.php @@ -101,7 +101,7 @@ $userIdlist = $userIdlistfull; }else if (!empty($userIdSelected) && $userIdSelected <> $userid) { - if (in_array($userIdSelected, $userIdlist) || $admin ) { + if (in_array($userIdSelected, $userIdlistfull) || $admin ) { $userIdlist[] = $userIdSelected; } else{ setEventMessage($langs->transnoentitiesnoconv("NotAllowed"), 'errors'); From 12359f986839ad85db37326af3dff0361d1462c5 Mon Sep 17 00:00:00 2001 From: Patrick Delcroix Date: Sun, 22 May 2022 20:39:23 +0200 Subject: [PATCH 6/9] fixing the missing & --- htdocs/timesheet/TimesheetReportUser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/timesheet/TimesheetReportUser.php b/htdocs/timesheet/TimesheetReportUser.php index 96e6165..e916981 100644 --- a/htdocs/timesheet/TimesheetReportUser.php +++ b/htdocs/timesheet/TimesheetReportUser.php @@ -233,7 +233,7 @@ .dol_print_date( $dateStart, 'dayxcard' ) .'&dateEnd=' . dol_print_date( $dateEnd, 'dayxcard' ) .'&userSelected=' . $userIdSelected - .'&mode='.$mode.'model=' . $model + .'&mode='.$mode.'&model=' . $model .'&invoicabletaskOnly=' . $invoicabletaskOnly .'&ungroup=' . $ungroup .'&showAll=' . $show_all @@ -244,7 +244,7 @@ . dol_print_date( $dateStart, 'dayxcard' ) . '&dateEnd=' . dol_print_date( $dateEnd, 'dayxcard' ) . '&userSelected=' . $userIdSelected - . '&mode='.$mode.'model=' . $model + . '&mode='.$mode.'&model=' . $model . '&invoicabletaskOnly=' . $invoicabletaskOnly . '&ungroup=' . $ungroup . '&showAll=' . $show_all From 7073124d8a66739d85d7256a81888d16032a2a9a Mon Sep 17 00:00:00 2001 From: Patrick Delcroix Date: Sun, 22 May 2022 20:56:24 +0200 Subject: [PATCH 7/9] add 2x the buttom --- htdocs/timesheet/Timesheet.php | 1 + .../class/TimesheetUserTasks.class.php | 42 ++++++++++++------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/htdocs/timesheet/Timesheet.php b/htdocs/timesheet/Timesheet.php index 9cbbd5f..1a47b37 100644 --- a/htdocs/timesheet/Timesheet.php +++ b/htdocs/timesheet/Timesheet.php @@ -219,6 +219,7 @@ //$ajax = false; $Form = $task_timesheet->getHTMLNavigation($optioncss); $Form .= $task_timesheet->getHTMLFormHeader(); +$Form .= $task_timesheet->getHTMLActions(); if ($conf->global->TIMESHEET_WHITELIST == 1) { $Form .= '
'; $Form .= '
whitelistmode == 2)?'id = "defaultOpen"':'') diff --git a/htdocs/timesheet/class/TimesheetUserTasks.class.php b/htdocs/timesheet/class/TimesheetUserTasks.class.php index 73f4e1a..f87e765 100644 --- a/htdocs/timesheet/class/TimesheetUserTasks.class.php +++ b/htdocs/timesheet/class/TimesheetUserTasks.class.php @@ -752,14 +752,14 @@ public function updateStatus($user, $status = 0) $error = ($this->id <= 0)?$this->create($user):$this->update($user); if ($error>0) { if ($status == REJECTED)$this->sendRejectedReminders($user); - if (count($this->taskTimesheet)<1) { + if (is_array($this->taskTimesheet) && count($this->taskTimesheet)<1) { $this->fetch($id); } $this->status = DRAFT;// SET THE STATUS TO DRAFT TO GET ALL $this->fetchTaskTimesheet(); $this->status = $status; $this->status = $status; - if (count($this->taskTimesheet)>0)foreach ($this->taskTimesheet as $ts) { + if (is_array($this->taskTimesheet) && count($this->taskTimesheet)>0)foreach ($this->taskTimesheet as $ts) { $tasktime = new TimesheetTask($this->db); $tasktime->unserialize($ts); //$tasktime->appId = $this->id; @@ -827,6 +827,7 @@ public function getHTMLHeader($search = false) $html .= ''; } $html .= ''."\n"; + foreach ($this->headers as $key => $value) { $html .= "\theaders) == 1) { @@ -865,7 +866,7 @@ public function getHTMLFormHeader($ajax = false) */ public function getHTMLTotal() { - $html .= "\n"; + $html = "\n"; $html .= ' TOTAL '; $length = getDayInterval($this->date_start, $this->date_end); $html .= "
id}\"> 
\n"; @@ -883,11 +884,29 @@ public function getHTMLTotal() */ public function getHTMLFooter($ajax = false) { - global $langs, $apflows; + global $langs; //form button $html = '\n"; - $html .= '
'; - $isOpenSatus = in_array($this->status, array(DRAFT, CANCELLED, REJECTED)); + $html .= $this->getHTMLActions(); + $html .= "\n"; + if ($ajax) { + $html .= ''."\n"; + } + return $html; +} + +/** + * + * + */ + +public function getHTMLActions(){ + global $langs, $apflows; + $html = '
'; + $isOpenSatus = in_array($this->status, array(DRAFT, CANCELLED, REJECTED)); if ($isOpenSatus) { $html .= '\n"; //$html .= '\n"; @@ -900,15 +919,8 @@ public function getHTMLFooter($ajax = false) $html .= ''.$langs->trans('Cancel').''; } elseif ($this->status == SUBMITTED)$html .= '\n"; $html .= '
'; - $html .= "\n"; - if ($ajax) { - $html .= ''."\n"; - } - return $html; -} + return $html; + } /* function to genegate the timesheet table header * * @param int $current number associated with the TS AP From 429f330af1b92b8259c4533192b98cc27e7cc3be Mon Sep 17 00:00:00 2001 From: Patrick Delcroix Date: Sun, 29 May 2022 15:33:04 +0200 Subject: [PATCH 8/9] trads update by https://github.com/dolibit-ut --- htdocs/timesheet/langs/de_DE/timesheet.lang | 20 ++++++++++---------- htdocs/timesheet/langs/en_US/timesheet.lang | 4 ++-- htdocs/timesheet/langs/es_ES/timesheet.lang | 4 ++-- htdocs/timesheet/langs/fr_FR/timesheet.lang | 4 ++-- htdocs/timesheet/langs/it_IT/timesheet.lang | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/htdocs/timesheet/langs/de_DE/timesheet.lang b/htdocs/timesheet/langs/de_DE/timesheet.lang index 47c469b..902faea 100644 --- a/htdocs/timesheet/langs/de_DE/timesheet.lang +++ b/htdocs/timesheet/langs/de_DE/timesheet.lang @@ -14,7 +14,7 @@ Approval = Freigabe approvalbyweek = Genehmigung nach Wochen approvalbyweekDesc = Genehmigung von Wochen statt der Genehmigung durch Benutzer. approved = Akzeptiert -approvedColorDesc = Farbe für den Urlaub & Arbeitszeitblatt genehmigt +approvedColorDesc = Farbe für: Urlaub & Arbeitszeitblatt genehmigt approvedOnly = Nur genehmigte ApproveRightsDesc = Recht auf Arbeitszeittabellen genehmigen Attendance = Chrono @@ -23,10 +23,10 @@ AttendanceDesc = Chrono als Standardzeittabelle blackWhiteList = Favoriten blackWhiteListDesc = Aktiviere die Favoritenfilterung blackWhiteListMode = Favoriten Filterung -blackWhiteListModeDesc = Wählen Sie das Standardverhalten für favoris Filterung +blackWhiteListModeDesc = Wählen Sie das Standardverhalten für die Favoritenfilterung BoxApproval = Arbeitszeittabelle Approbationen cancelled = Abgebrochen -cancelledColorDesc = Farbe für den Urlaub & Stundenzettel storniert +cancelledColorDesc = Farbe für: Urlaub & Stundenzettel storniert challenged = Herausgeforderter Checkin = Anreise Checkout = Beenden @@ -38,14 +38,14 @@ ConfirmDeleteTimesheetwhitelist = Sind Sie sicher, diesen Rechnungseintrag zu l Custom = Kundenspezifisch customer = Kunde CustomerApprovalDesc = Die Benutzer, die einen Kunden repräsentieren, müssen die Zeitpläne für ihren Kunden genehmigen. -customerSignature = Des Kunden Visum +customerSignature = Unterschrift des Kunden DateEndColDesc = Zeigt das Enddatum der Aufgabe an DateStartColDesc = Zeigt das Startdatum der Aufgabe an DefaultService = Standardservice für die Rechnungsstellung DeleteTimesheetwhitelist = Eintrag gelöscht DiplayOptions = Anzeigeoptionen draft = Feld-Gruppe Entwurf aktualisiert -draftColorDesc = Farbe für den Entwurf Urlaub & Arbeitszeittabelle +draftColorDesc = Farbe für: Entwurf Urlaub & Arbeitszeittabelle dropdownAjax = Drop-Down-Ajax deaktivieren dropdownAjaxDesc = Deaktivieren Sie die Ajax für Dolibarr Dropdown-Liste (in einem Fall in Frage, eine neue Favoris einzugeben) Employee = Mitarbeiter @@ -146,7 +146,7 @@ RecordNotUpdated = Datensatz nicht aktualisiert RecordSucessfullyCreated = Aufnahme erstellt RecordUpdated = Aufzeichnung aktualisiert rejected = Abgelehnt -rejectedColorDesc = Farbe für den Urlaub & Zeiterfassung von der Genehmigung abgelehnt +rejectedColorDesc = Farbe für: Urlaub & Zeiterfassung von der Genehmigung abgelehnt Reminder = Erinnerung reminderEmailProcess = Sie können die Erinnerung per E-Mail über den Aufgabenplaner von Dolibarr
Job type = Call method of a Dolibarr Class
Module = timesheet
Classes = timesheet/class/TimesheetUserTasks.class.php
Instance/Object to create = TimesheetUserTasks
Method = sendApprovalReminders savedDuration = Gespeicherten Dauer @@ -158,11 +158,11 @@ ShowTimespentNoteDesc = Aktivieren Sie Notizen pro Tag und pro Aufgabe splitedWeek = Aufgespaltene Woche Submit = Abschicken submitted = Gesendet -submittedColorDesc = Farbe für den Urlaub & Arbeitszeitblatt zur Genehmigung eingereicht +submittedColorDesc = Farbe für: Urlaub & Arbeitszeitblatt zur Genehmigung eingereicht Subtask = Teilaufgabe hinzufügen supplier = Lieferant SupplierApprovalDesc = Die Benutzer, die einen Lieferanten repräsentieren, müssen die Zeitpläne für diesen Lieferanten genehmigen. -supplierSignature = Des Lieferanten Visum +supplierSignature = Unterschrift des Lieferanten TaskParent = Übergeordnete Aufgabe TaskParentColDesc = Zeigt die Referenz der übergeordneten Aufgabe und den Titel an, wenn es eine übergeordnete Aufgabe gibt. TasksColDesc = Zeigt die Referenz und den Titel der Aufgabe an @@ -195,7 +195,7 @@ wngMsgHoursExceded = Sie betreten Überstunden Yearweekdate = Stichtag YouHaveApprovalPending = Stundenzettel zu genehmigen YouHaveApprovalPendingMsg = Dears,

Du hast __NB_TS__ Stundenzettel zu genehmigen, bitte melde dich an dolibar an, um sie zu genehmigen.

Mit freundlichen Grüßen

Dein Dolibarr admin. -YouHaveTimesheetRejected = Einer Ihrer vorgelegten Arbeitszeittabelle wurde abgelehnt. +YouHaveTimesheetRejected = Eine Ihrer vorgelegten Arbeitszeittabelle wurde abgelehnt. YouHaveTimesheetRejectedMsg = Hallo,

Die Stundenzettel der Woche %s wurde abgelehnt.
Bitte überprüfen Sie Ihre Eingaben hier:
%s

Mit freundlichen Grüßen minSecondsPerEvent = Minimun in Sekunden maxHoursPerEvent = Maximale Stunden @@ -214,7 +214,7 @@ lastMonth = Letzter Monat thisWeek = Diese Woche ProgressDeclaredColDesc = Zeige Fortschritt deklariert frozen = Geschlossen -frozenColorDesc = Hintergrundfarbe für die abgeschlossenen Aufgaben oder Tage +frozenColorDesc = Hintergrundfarbe für abgeschlossenen Aufgaben oder Tage value = Wert valueColorDesc = Hintergrundfarbe, wenn ein Eintrag vorhanden ist pdfHideNameDesc = Verstecken Sie den Namen des Mitarbeiters auf dem Anwesenheitsblatt diff --git a/htdocs/timesheet/langs/en_US/timesheet.lang b/htdocs/timesheet/langs/en_US/timesheet.lang index 72dfafe..2369150 100644 --- a/htdocs/timesheet/langs/en_US/timesheet.lang +++ b/htdocs/timesheet/langs/en_US/timesheet.lang @@ -38,7 +38,7 @@ ConfirmDeleteTimesheetwhitelist = Are you sure to delete this entry ? Custom = Customized customer = Customer CustomerApprovalDesc = The users representing a customer will have to approve the timesheets concerning their customer. -customerSignature = Customer's visa +customerSignature = Customer's signature DateEndColDesc = Shows the end date of the task DateStartColDesc = Shows the start date of the task DefaultService = Default service for invoicing @@ -162,7 +162,7 @@ submittedColorDesc = Color for the holiday & timesheet submitted for approval Subtask = Subtask supplier = Supplier SupplierApprovalDesc = The users representing a supplier will have to approve the timesheets concerning this supplier. -supplierSignature = Supplier's visa +supplierSignature = Supplier's signature TaskParent = Parent task TaskParentColDesc = Shows the parent task's reference and the title if there is any parent task. TasksColDesc = Shows the task's reference and title diff --git a/htdocs/timesheet/langs/es_ES/timesheet.lang b/htdocs/timesheet/langs/es_ES/timesheet.lang index e0ea477..a263d66 100644 --- a/htdocs/timesheet/langs/es_ES/timesheet.lang +++ b/htdocs/timesheet/langs/es_ES/timesheet.lang @@ -38,7 +38,7 @@ ConfirmDeleteTimesheetwhitelist = Está seguro de eliminar esto? Custom = Personalizado customer = Cliente CustomerApprovalDesc = Los usuarios que representan a un cliente tendrán que aprobar las planillas de tiempo de su cliente. -customerSignature = Visa del cliente +customerSignature = Firma del cliente DateEndColDesc = Muestra la fecha de finalización de la tarea DateStartColDesc = Muestra la fecha de inicio de la tarea DefaultService = Servicio por defecto de facturación. @@ -162,7 +162,7 @@ submittedColorDesc = Color para el día festivo y la hoja de horas presentada pa Subtask = Tarea supplier = Proveedor SupplierApprovalDesc = Los usuarios que representan a un proveedor deberán aprobar las planillas de tiempo de este proveedor. -supplierSignature = Visa del proveedor +supplierSignature = firma del proveedor TaskParent = Tarea principal TaskParentColDesc = Muestra la referencia de la tarea padre y el título si hay alguna tarea padre. TasksColDesc = Muestra la referencia y el título de la tarea diff --git a/htdocs/timesheet/langs/fr_FR/timesheet.lang b/htdocs/timesheet/langs/fr_FR/timesheet.lang index 373c80b..90ebe77 100644 --- a/htdocs/timesheet/langs/fr_FR/timesheet.lang +++ b/htdocs/timesheet/langs/fr_FR/timesheet.lang @@ -38,7 +38,7 @@ ConfirmDeleteTimesheetwhitelist = Êtes-vous certain de vouloir supprimer ce fav Custom = Personnalisé customer = Client CustomerApprovalDesc = Les utilisateurs qui représentent un client devront approuver les feuilles de temps concernant leur client. -customerSignature = Visa du client +customerSignature = Signature du client DateEndColDesc = Indique la date de fin de la tâche DateStartColDesc = Indique la date de départ de la tâche DefaultService = Service par défaut pour la facturation @@ -162,7 +162,7 @@ submittedColorDesc = Couleur des congés et feuilles de temps envoyées pour val Subtask = Tâche enfant supplier = Fournisseur SupplierApprovalDesc = Les utilisateurs qui représentent un fournisseur devront approuver les feuilles de temps concernant ce fournisseur. -supplierSignature = Visa du fournisseur +supplierSignature = Signature du fournisseur TaskParent = Tâche parente TaskParentColDesc = Affiche la référence de la tâche parent et son libellé, s'il existe une tâche parent. TasksColDesc = Contient la référence et le libellé de la tâche diff --git a/htdocs/timesheet/langs/it_IT/timesheet.lang b/htdocs/timesheet/langs/it_IT/timesheet.lang index 348ffbc..3cb5743 100644 --- a/htdocs/timesheet/langs/it_IT/timesheet.lang +++ b/htdocs/timesheet/langs/it_IT/timesheet.lang @@ -38,7 +38,7 @@ ConfirmDeleteTimesheetwhitelist = Sei sicuro di voler eliminare questa voce? Custom = Personalizzato customer = Cliente CustomerApprovalDesc = Gli utenti che rappresentano un cliente dovranno approvare i timesheet relativi al loro cliente. -customerSignature = Visto del cliente +customerSignature = Firma del cliente DateEndColDesc = Indica la data di fine del compito DateStartColDesc = Contiene la data di inizio per l'attività DefaultService = Servizio predefinito per la fatturazione @@ -162,7 +162,7 @@ submittedColorDesc = Colore per la festa e scheda attività sottoposto all'appro Subtask = Bambino Task supplier = Fornitore SupplierApprovalDesc = Gli utenti che rappresentano un fornitore dovranno approvare i schede orarie relativi a questo fornitore. -supplierSignature = Visto del fornitore +supplierSignature = Firma del fornitore TaskParent = attività principale TaskParentColDesc = Contiene il riferimento e l'etichetta del compito genitore a compito TasksColDesc = Contiene il riferimento e il compito di etichette From f5008274648cb82e90b9e696b21352a0a2ac47cb Mon Sep 17 00:00:00 2001 From: Patrick Delcroix Date: Sun, 29 May 2022 15:36:34 +0200 Subject: [PATCH 9/9] rev 4.5.2 --- htdocs/timesheet/ChangeLog.md | 5 +++++ htdocs/timesheet/core/modules/modtimesheet.class.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/timesheet/ChangeLog.md b/htdocs/timesheet/ChangeLog.md index 9d62c56..4e6b3f6 100644 --- a/htdocs/timesheet/ChangeLog.md +++ b/htdocs/timesheet/ChangeLog.md @@ -3,6 +3,11 @@ - fix missing subordinates on user reports - add "all" whenever someone have subordinates - add date sorting in the pdf reports +- trads updates (visa -> signature + DE fixes) +- adds the buttons on top and bottom of the page +- fix bad report url +- fix foreach js syntax (nicolasb827) + 4.5.1 - Fix Project data on reports diff --git a/htdocs/timesheet/core/modules/modtimesheet.class.php b/htdocs/timesheet/core/modules/modtimesheet.class.php index cfdca49..ac39c4d 100644 --- a/htdocs/timesheet/core/modules/modtimesheet.class.php +++ b/htdocs/timesheet/core/modules/modtimesheet.class.php @@ -54,7 +54,7 @@ public function __construct($db) $this->editor_name = 'Patrick Delcroix'; $this->editor_url = 'https://github.com/delcroip'; // Possible values for version are: 'development', 'experimental', 'dolibarr' or version - $this->version = '4.5.1'; + $this->version = '4.5.2'; // Key used in llx_cons table to save module status enabled/disabled(where timesheet is value of property name of module in uppercase) $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); // Where to store the module in setup page(0=common, 1=interface, 2=others, 3=very specific)