From 920e1b77b4d40c427f11b87b149eafe1fb3d24be Mon Sep 17 00:00:00 2001
From: sonikf <93765174+sonikf@users.noreply.github.com>
Date: Sun, 17 Nov 2024 01:47:12 +0200
Subject: [PATCH 1/5] NEW: Add also start date fill buttons for salary clone

---
 htdocs/salaries/card.php | 68 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 63 insertions(+), 5 deletions(-)

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 305d0642270..f1e55308661 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2023		Maxime Nicolas				<maxime@oarces.com>
  * Copyright (C) 2023		Benjamin GREMBI				<benjamin@oarces.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024		Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -758,20 +759,77 @@ if ($id > 0) {
 		);
 
 		//$formquestion[] = array('type' => 'date', 'name' => 'clone_date_ech', 'label' => $langs->trans("Date"), 'value' => -1);
-		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_start', 'label' => $langs->trans("DateStart"), 'value' => -1);
+		if (!empty($object->dateep)) {
+			$formquestion[] = array('type' => 'date', 'name' => 'clone_date_start', 'label' => $langs->trans("DateStart"), 'value' => ($object->dateep) + 86400);
+		} else {
+			$formquestion[] = array('type' => 'date', 'name' => 'clone_date_start', 'label' => $langs->trans("DateStart"), 'value' => -1);
+		}
 		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_end', 'label' => $langs->trans("DateEnd"), 'value' => -1);
 		$formquestion[] = array('type' => 'text', 'name' => 'amount', 'label' => $langs->trans("Amount"), 'value' => price($object->amount), 'morecss' => 'width100 right');
 
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneSalary', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 280);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneSalary', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 300);
 
-		//Add fill with end of month button
+		//Add buttons to fill start and end dates
 		$formconfirm .= "<script>
+			// Buttons for start date: previous month, current month, previous week, current week
+			$('#clone_date_start').after(
+				$('<button id=\"start_prev_month\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('PreviousMonth')."</button>')
+				.add('<button id=\"start_curr_month\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('CurrentMonth')."</button>')
+				.add('<button id=\"start_prev_week\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('PreviousWeek')."</button>')
+				.add('<button id=\"start_curr_week\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('CurrentWeek')."</button>')
+			);
+
+			$('#start_prev_month').click(function(){
+				var now = new Date();
+				var startPrevMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1);
+				setStartDate(startPrevMonth);
+			});
+
+			$('#start_curr_month').click(function(){
+				var now = new Date();
+				var startCurrMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+			setStartDate(startCurrMonth);
+			});
+
+			$('#start_prev_week').click(function(){
+				var now = new Date();
+				var startPrevWeek = new Date(now.setDate(now.getDate() - now.getDay() - 7));
+				startPrevWeek.setDate(startPrevWeek.getDate() + 1);
+				setStartDate(startPrevWeek);
+			});
+
+			$('#start_curr_week').click(function(){
+				var now = new Date();
+				var startCurrWeek = new Date(now.setDate(now.getDate() - now.getDay() + 1)); 
+				setStartDate(startCurrWeek);
+			});
+
+			function setStartDate(date) {
+				$('#clone_date_start').val(formatDate(date, '".$langs->trans("FormatDateShortJavaInput")."'));
+				$('#clone_date_startday').val(date.getDate());
+				$('#clone_date_startmonth').val(date.getMonth() + 1);
+				$('#clone_date_startyear').val(date.getFullYear());
+			}
+
+   			// Button for end date
 			$('#clone_date_end').after($('<button id=\"fill_end_of_month\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('FillEndOfMonth')."</button>'));
 			$('#fill_end_of_month').click(function(){
 				var clone_date_startmonth = +$('#clone_date_startmonth').val();
 				var clone_date_startyear = +$('#clone_date_startyear').val();
-				var end_date = new Date(clone_date_startyear, clone_date_startmonth, 0);
-				end_date.setMonth(clone_date_startmonth - 1);
+				var end_date;
+
+				if (clone_date_startmonth && clone_date_startyear) {
+					end_date = new Date(clone_date_startyear, clone_date_startmonth, 0);
+				} else {
+					var currentDate = new Date();
+					var currentDay = currentDate.getDate();
+					if (currentDay <= 15) {
+						end_date = new Date(currentDate.getFullYear(), currentDate.getMonth(), 0);
+					} else {
+						end_date = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0);
+					}
+				}
+
 				$('#clone_date_end').val(formatDate(end_date,'".$langs->trans("FormatDateShortJavaInput")."'));
 				$('#clone_date_endday').val(end_date.getDate());
 				$('#clone_date_endmonth').val(end_date.getMonth() + 1);

From fd10b6206d0efd93e66bb5a0c5e1ff7eda4817ae Mon Sep 17 00:00:00 2001
From: sonikf <93765174+sonikf@users.noreply.github.com>
Date: Sun, 17 Nov 2024 01:57:42 +0200
Subject: [PATCH 2/5] Update salaries.lang

---
 htdocs/langs/en_US/salaries.lang | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/salaries.lang b/htdocs/langs/en_US/salaries.lang
index 202c88c7d18..2898efa675e 100644
--- a/htdocs/langs/en_US/salaries.lang
+++ b/htdocs/langs/en_US/salaries.lang
@@ -32,5 +32,9 @@ VirementOrder=Credit transfer request
 BankTransferAmount=Amount of credit transfer
 WithdrawalReceipt=Credit transfer order
 OrderWaiting=Pending order
-FillEndOfMonth=Fill with end of month
+FillEndOfMonth=End of month
+PreviousMonth=PrevMonth
+CurrentMonth=CurrMonth
+PreviousWeek=PrevWeek
+CurrentWeek=CurrWeek
 UserPaySlip=Pay Slip

From a00fb0f5db1a3ef3574e0df86c58cb100492a684 Mon Sep 17 00:00:00 2001
From: sonikf <93765174+sonikf@users.noreply.github.com>
Date: Sun, 17 Nov 2024 14:43:21 +0200
Subject: [PATCH 3/5] fix duplicate translation strings

---
 htdocs/salaries/card.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index f1e55308661..47ca884a5af 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -773,10 +773,10 @@ if ($id > 0) {
 		$formconfirm .= "<script>
 			// Buttons for start date: previous month, current month, previous week, current week
 			$('#clone_date_start').after(
-				$('<button id=\"start_prev_month\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('PreviousMonth')."</button>')
-				.add('<button id=\"start_curr_month\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('CurrentMonth')."</button>')
-				.add('<button id=\"start_prev_week\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('PreviousWeek')."</button>')
-				.add('<button id=\"start_curr_week\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('CurrentWeek')."</button>')
+				$('<button id=\"start_prev_month\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('PreviousMonthShort')."</button>')
+				.add('<button id=\"start_curr_month\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('CurrentMonthShort')."</button>')
+				.add('<button id=\"start_prev_week\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('PreviousWeekShort')."</button>')
+				.add('<button id=\"start_curr_week\" class=\"dpInvisibleButtons\" style=\"color: var(--colortextlink);font-size: 0.8em;opacity: 0.7;margin-left:4px;\" type=\"button\">".$langs->trans('CurrentWeekShort')."</button>')
 			);
 
 			$('#start_prev_month').click(function(){

From bc9e75a785bdf1b4a9651f053fa1ee03cf03de55 Mon Sep 17 00:00:00 2001
From: sonikf <93765174+sonikf@users.noreply.github.com>
Date: Sun, 17 Nov 2024 14:45:09 +0200
Subject: [PATCH 4/5] fix duplicate translation strings

---
 htdocs/langs/en_US/salaries.lang | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/en_US/salaries.lang b/htdocs/langs/en_US/salaries.lang
index 2898efa675e..cf85a1386ae 100644
--- a/htdocs/langs/en_US/salaries.lang
+++ b/htdocs/langs/en_US/salaries.lang
@@ -33,8 +33,8 @@ BankTransferAmount=Amount of credit transfer
 WithdrawalReceipt=Credit transfer order
 OrderWaiting=Pending order
 FillEndOfMonth=End of month
-PreviousMonth=PrevMonth
-CurrentMonth=CurrMonth
-PreviousWeek=PrevWeek
-CurrentWeek=CurrWeek
+PreviousMonthShort=PrevMonth
+CurrentMonthShort=CurrMonth
+PreviousWeekShort=PrevWeek
+CurrentWeekShort=CurrWeek
 UserPaySlip=Pay Slip

From 63dbc8d4de1e60fe70ea135b49cf7165c11c15dd Mon Sep 17 00:00:00 2001
From: sonikf <93765174+sonikf@users.noreply.github.com>
Date: Sun, 17 Nov 2024 14:52:50 +0200
Subject: [PATCH 5/5] fix white space

---
 htdocs/salaries/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 47ca884a5af..2435e6ae1a2 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -800,7 +800,7 @@ if ($id > 0) {
 
 			$('#start_curr_week').click(function(){
 				var now = new Date();
-				var startCurrWeek = new Date(now.setDate(now.getDate() - now.getDay() + 1)); 
+				var startCurrWeek = new Date(now.setDate(now.getDate() - now.getDay() + 1));
 				setStartDate(startCurrWeek);
 			});