From c4a6108acf2322d45df3e73c2068258f6a4acd7c Mon Sep 17 00:00:00 2001
From: Daniel Seichter <daniel.seichter@erpware.de>
Date: Tue, 12 Nov 2019 12:49:38 +0100
Subject: [PATCH 1/4] #12408 using MAIN_DURATION_OF_WORKDAY during creation of
 invoices

---
 htdocs/projet/tasks/time.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index fa7efdfa2a5..54736ebc40f 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -390,7 +390,7 @@ if ($action == 'confirm_generateinvoice')
 
 				// Define qty per hour
 				$qtyhour = round($value['timespent'] / 3600, 2);
-				$qtyhourtext = convertSecondToTime($value['timespent']);
+				$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
 
 				// If no unit price known
 				if (empty($pu_ht))

From bda512630a76c7d1a4f5e18cbddb16bb0d2c7299 Mon Sep 17 00:00:00 2001
From: Daniel Seichter <daniel.seichter@erpware.de>
Date: Tue, 12 Nov 2019 15:55:40 +0100
Subject: [PATCH 2/4] extend .gitignore to not do versioning composer installed
 libraries

---
 .gitignore | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6aa74f44ed0..fd10310671a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,18 @@ htdocs/includes/bin/
 htdocs/includes/composer/
 /.pydevproject
 /dolibarr_genesis.mp4
+composer.phar
+htdocs/includes/ckeditor/
+htdocs/includes/mike42/
+htdocs/includes/doctrine/
+htdocs/includes/jakub-onderka/
+htdocs/includes/phpoffice
+htdocs/includes/sebastian/
+htdocs/includes/squizlabs/
+htdocs/includes/symfony/
+htdocs/includes/phpdocumentor/
+htdocs/includes/phpspec/
+htdocs/includes/phpunit/
+htdocs/includes/restler/
+htdocs/includes/tecnickcom/
+htdocs/includes/webmozart/

From 0e450b2acf3413c76c70e7aaa97360cd642089a2 Mon Sep 17 00:00:00 2001
From: Daniel Seichter <daniel.seichter@erpware.de>
Date: Tue, 12 Nov 2019 16:17:23 +0100
Subject: [PATCH 3/4] remove duplicate entries

---
 build/.gitignore  | 1 -
 htdocs/.gitignore | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/build/.gitignore b/build/.gitignore
index be85c819547..54c5d8be9c3 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -5,6 +5,5 @@
 /dolibarr-*.tgz
 /dolibarr-*.rpm
 /dolibarr-*.zip
-/dolibarr-*.tgz
 /*.exe
 /html
diff --git a/htdocs/.gitignore b/htdocs/.gitignore
index d51eaffd235..ef87c0455d6 100644
--- a/htdocs/.gitignore
+++ b/htdocs/.gitignore
@@ -16,9 +16,6 @@
 /teclib*
 /test.php
 /ultimatepdf*
-/lead
-/dolimed*
-/allscreens*
 /ecommerce/
 /cabinetmed*
 /webmail*

From dba640b281232d9b362ca7346faa63cfc3a87250 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Nov 2019 08:58:42 +0100
Subject: [PATCH 4/4] Update .gitignore

---
 .gitignore | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd10310671a..b47c754f8d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,17 +28,12 @@ htdocs/includes/composer/
 /.pydevproject
 /dolibarr_genesis.mp4
 composer.phar
-htdocs/includes/ckeditor/
-htdocs/includes/mike42/
 htdocs/includes/doctrine/
 htdocs/includes/jakub-onderka/
-htdocs/includes/phpoffice
-htdocs/includes/sebastian/
-htdocs/includes/squizlabs/
-htdocs/includes/symfony/
 htdocs/includes/phpdocumentor/
 htdocs/includes/phpspec/
 htdocs/includes/phpunit/
-htdocs/includes/restler/
-htdocs/includes/tecnickcom/
+htdocs/includes/sebastian/
+htdocs/includes/squizlabs/
+htdocs/includes/symfony/
 htdocs/includes/webmozart/