rev 4.0.17

delcroip · Jun 11, 2019 · 8d9e7b7 · 8d9e7b7
1 parent 474ed1a
commit 8d9e7b7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/build/docker-compose.yml b/build/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - ../htdocs:/var/www/html/custom:rw
     ports:
-      - 801:80
+      - 8080:80
     env_file:
       .env
     links:

diff --git a/htdocs/timesheet/TimesheetProjectInvoice.php b/htdocs/timesheet/TimesheetProjectInvoice.php
@@ -388,7 +388,7 @@ function htmlPrintServiceChoice($user, $task, $class, $duration, $tasktimelist,
         $objtemp = new Task($db);
         $objtemp->fetch($task);
         $taskLabel = $objtemp->label ;
-        $taskHTML .= str_replace('classfortooltip', 'classfortooltip colTasks', $objtemp->getNomUrl(0, "withproject", "task", $conf->global->TIMESHEET_HIDE_REF));    
+        $taskHTML .= str_replace('classfortooltip', 'classfortooltip colTasks', $objtemp->getNomUrl(0, "withproject", "task", $conf->global->TIMESHEET_HIDE_REF));
     }
 
     $html = '<tr class = "'.$class.'"><th align = "left" width = "20%">'.$userName;

diff --git a/htdocs/timesheet/core/lib/includeMain.lib.php b/htdocs/timesheet/core/lib/includeMain.lib.php
@@ -40,6 +40,6 @@
 }
 if (! $res) die("Include of main fails") ;
 
-if ($user->admin && version_compare("4.0.8", $conf->global->TIMESHEET_VERSION) > 0){
+if ($user->admin && version_compare("4.0.16", $conf->global->TIMESHEET_VERSION) > 0){
     setEventMessage("Version of timesheet updated, please deactivate then reactivate the module", 'warnings');
 }
diff --git a/htdocs/timesheet/core/modules/modtimesheet.class.php b/htdocs/timesheet/core/modules/modtimesheet.class.php
@@ -52,7 +52,7 @@ public function __construct($db)
                 // Module description, used if translation string 'ModuleXXXDesc' not found(where XXX is value of numeric property 'numero' of module)
                 $this->description = "TimesheetView";
                 // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-                $this->version = '4.0.16';
+                $this->version = '4.0.17';
                 // Key used in llx_const table to save module status enabled/disabled(where MYMODULE 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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ services: @@
         volumes:
           - ../htdocs:/var/www/html/custom:rw
         ports:
-          - 801:80
+          - 8080:80
         env_file:
           .env
         links:
@@ Expand Down @@