From 973f408b6e3caa54a862b887f759279d214d487b Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Wed, 3 Nov 2021 20:35:57 +0100
Subject: [PATCH] Fix default enddate subscription must be in futur

---
 htdocs/adherents/subscription.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 1316a337610..839680c3874 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -943,8 +943,10 @@ if ($rowid > 0) {
 		}
 		if (!$datefrom) {
 			$datefrom = $object->datevalid;
-			if ($object->datefin > 0) {
-				$datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
+			if ($object->datefin > 0 && dol_now() > dol_time_plus_duree(dol_time_plus_duree($object->datefin, 2 * $defaultdelay, $defaultdelayunit), -1, 'd') {
+				$datefrom = dol_time_plus_duree($object->datefin, 1, 'd');	
+			} else {
+				$datefrom = dol_get_first_day(dol_print_date(time(), "%Y"));
 			}
 		}
 		print $form->selectDate($datefrom, '', '', '', '', "subscription", 1, 1);