From c2c7d88520cad416d2f7064eaa4ffe896d6d90d1 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Thu, 30 Sep 2021 16:40:15 +0200
Subject: [PATCH 1/2] NEW:  NEW: expense reports: conf to pre-fill start/end
 dates with bounds of current month

---
 htdocs/admin/expensereport.php | 11 ++++++++++-
 htdocs/expensereport/card.php  | 11 +++++++++++
 htdocs/langs/en_US/admin.lang  |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index f7c9a84c5d1..badbcc784e4 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -145,7 +145,10 @@ if ($action == 'updateMask') {
 	$draft = GETPOST('EXPENSEREPORT_DRAFT_WATERMARK', 'alpha');
 	$res2 = dolibarr_set_const($db, "EXPENSEREPORT_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
-	if (!$res1 > 0 || !$res2 > 0) {
+	$dates = GETPOST('EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH', 'int');
+	$res3 = dolibarr_set_const($db, 'EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH', intval($dates), 'chaine', 0, '', $conf->entity);
+
+	if (!$res1 > 0 || !$res2 > 0 || !$res3 > 0) {
 		$error++;
 	}
 
@@ -458,6 +461,12 @@ print $form->textwithpicto($langs->trans("WatermarkOnDraftExpenseReports"), $htm
 print '<input class="flat minwidth200" type="text" name="EXPENSEREPORT_DRAFT_WATERMARK" value="'.$conf->global->EXPENSEREPORT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
 
+print '<tr class="oddeven"><td>';
+print $langs->trans('PrefillExpenseReportDatesWithCurrentMonth');
+print '</td><td class="right">';
+print $form->selectyesno('EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH', empty($conf->global->EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH) ? 0 : 1, 1);
+print '</td></tr>';
+
 print '</table>';
 
 print $form->buttonsSaveCancel("Save", '');
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index f982b046793..1c52265d5e5 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -68,6 +68,17 @@ $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('socid_id',
 
 $childids = $user->getAllChildIds(1);
 
+if (! empty($conf->global->EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH)) {
+	if (empty($date_start)) {
+		$date_start = dol_mktime(0, 0, 0, (int) dol_print_date(dol_now(), '%m'),  1, (int) dol_print_date(dol_now(), '%Y'));
+	}
+
+	if (empty($date_end)) {
+		// date('t') => number of days in the month, so last day of the month too
+		$date_end = dol_mktime(0, 0, 0, (int) dol_print_date(dol_now(), '%m'), (int) date('t'), (int) dol_print_date(dol_now(), '%Y'));
+	}
+}
+
 // Hack to use expensereport dir
 $rootfordata = DOL_DATA_ROOT;
 $rootforuser = DOL_DATA_ROOT;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 48887552e7e..84e670b339a 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -517,6 +517,7 @@ Field=Field
 ProductDocumentTemplates=Document templates to generate product document
 FreeLegalTextOnExpenseReports=Free legal text on expense reports
 WatermarkOnDraftExpenseReports=Watermark on draft expense reports
+PrefillExpenseReportDatesWithCurrentMonth=Pre-fill dates with start and end dates of the current month
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails

From a5daf9de9d722cb77209e37d86bdc85e023ff924 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Oct 2021 21:09:03 +0200
Subject: [PATCH 2/2] Update admin.lang

---
 htdocs/langs/en_US/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 84e670b339a..f28b2a085e9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -517,7 +517,7 @@ Field=Field
 ProductDocumentTemplates=Document templates to generate product document
 FreeLegalTextOnExpenseReports=Free legal text on expense reports
 WatermarkOnDraftExpenseReports=Watermark on draft expense reports
-PrefillExpenseReportDatesWithCurrentMonth=Pre-fill dates with start and end dates of the current month
+PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails