Merge pull request #107 from delcroip/develop

4.1.1

.gitignore

@@ -1,4 +1,5 @@
-/nbproject/0
-/nbproject/
-/htdocs/timesheet/php_errors.log
-build/dump.sql
+nbproject/0
+nbproject/
+htdocs/timesheet/php_errors.log
+htdocs/timesheet/core/lib/dev.inc.php
+build/*

README.md

@@ -15,6 +15,7 @@ DON'T use GITHUB version on dolibarr, there is files that shoudn't be in PROD, a
 * Free download: https://sourceforge.net/projects/dolibarr-timesheet
 * Github: https://github.com/delcroip/dolibarr_project_timesheet
 * FR development thread: https://www.dolibarr.fr/forum/11-suggestionsnouvelles-fonctionnalites/49379-timesheet-vue-pour-les-projets
+* Translation project https://lokalise.co/public/761399855cb829e995d448.06757516/
 
 # Installation
 * Download and unzip the module
@@ -47,17 +48,17 @@ DON'T use GITHUB version on dolibarr, there is files that shoudn't be in PROD, a
 - Background color not working with the metro theme (work arround: replace `background:#fafafa!important` by `background:` in `htdocs\theme\metro\style.css.php:2253`).
 
 # Next dev under analysis
-- Ressource planning  (planning for TL and PM + weekly summary by email to user)
-    - non-project related TS
+
 
 
 # Next developement for other release
+- Ressource planning  (planning for TL and PM + weekly summary by email to user)
+    - non-project related TS
 - finetune the modules rights management (admin ...)
 - handle the right for cust /  supplier / other approval
 - show the Quantity in the step 2 of invoicing (js)
 - my timesheet page to see the status of the TS
     - add automatic reminder for the approval
     - reminder when TS is not filled in ( email and home page)
 - better ajax error when adding fav
-- add total to the otherAP
 - maintain the ajax behavior

build/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     volumes:
       - ../htdocs:/var/www/html/custom:rw
     ports:
-      - 8080:80
+      - 18080:80
     env_file:
       .env
     links:
@@ -18,8 +18,8 @@ services:
     image: mariadb:10.3
     container_name: dolibarr_db
     volumes:
-#      - mysql_data:/var/lib/mysql
-      - ./dump.sql:/var/www/html/dump.sql
+      - mysql_data:/var/lib/mysql
+      - ./mount:/var/www/html
 ## How to reset database
 # 1 on the host download the right db (ver 9 bellow) because  the container doesn't have wget
 #wget https://github.com/Dolibarr/dolibarr/raw/develop/dev/initdemo/mysqldump_dolibarr_9.0.0.sql -o dump.sql

htdocs/timesheet/ChangeLog.md

@@ -1,4 +1,26 @@
 # dolibarr_project_timesheet changelog
+4.1.1 
+- new: add timesheet for other works with project "subordinate"
+
+4.1.0
+- new: timespent admin
+- new: option to allow entering time on closed day (e.g. weekend)
+- new: invoiced time background color (approved color)
+- new: option to allow modification invoiced time
+- new: hidden option now in admin page (hide name, eval, round day )
+- fix: remove warning tasktimesheet not an array
+- fix: remove warning with float hour per day
+- fix: label not display in attendance sheet
+
+4.0.18
+- fix report issue (first group splited in two)
+- new: update task progress declared from timesheet
+
+4.0.17
+- new keeping project when moving to report
+- fix last week/month report short links
+- clean: project invoice as a project tab
+
 4.0.16
 - fix favorite not wworking