From 60c508b1c439900d022804f96bb69616da9dda33 Mon Sep 17 00:00:00 2001
From: dev2a <contact@dev2a.pro>
Date: Thu, 11 Jan 2018 15:52:45 +0100
Subject: [PATCH] Get start date from fiscal year

if start date is empty, get date from current accounting fiscal year, else from company fiscal month setting
---
 htdocs/accountancy/bookkeeping/balance.php    | 29 +++++++-----
 htdocs/accountancy/bookkeeping/list.php       | 29 +++++++-----
 .../accountancy/bookkeeping/listbyaccount.php | 44 +++++++++++--------
 htdocs/accountancy/bookkeeping/listbyyear.php | 22 +++++++++-
 4 files changed, 84 insertions(+), 40 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index cdc7d779418..e6697557775 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -69,17 +69,26 @@ $form = new Form($db);
 
 if (empty($search_date_start) && ! GETPOSTISSET('formfilteraction'))
 {
-	$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
-	$year_start = dol_print_date(dol_now(), '%Y');
-	$year_end = $year_start + 1;
-	$month_end = $month_start - 1;
-	if ($month_end < 1)
-	{
-		$month_end = 12;
-		$year_end--;
+	$sql = 	"SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
+	$sql .= " where date_start < now() and date_end > now() limit 1";
+	$res = $db->query($sql);
+	if ($res->num_rows > 0) {
+		$fiscalYear = $db->fetch_object($res);
+		$search_date_start = strtotime($fiscalYear->date_start);
+		$search_date_end = strtotime($fiscalYear->date_end);
+	} else {
+		$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
+		$year_start = dol_print_date(dol_now(), '%Y');
+		$year_end = $year_start + 1;
+		$month_end = $month_start - 1;
+		if ($month_end < 1)
+		{
+			$month_end = 12;
+			$year_end--;
+		}
+		$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
+		$search_date_end = dol_get_last_day($year_end, $month_end);
 	}
-	$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-	$search_date_end = dol_get_last_day($year_end, $month_end);
 }
 if ($sortorder == "")
 	$sortorder = "ASC";
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 0310906ab6b..29dfbeeec59 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -101,17 +101,26 @@ $form = new Form($db);
 
 if (! in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && ! isset($_POST['begin']) && ! isset($_GET['begin']) && ! isset($_POST['formfilteraction']) && empty($page) && ! GETPOST('noreset','int'))
 {
-	$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
-	$year_start = dol_print_date(dol_now(), '%Y');
-	$year_end = $year_start + 1;
-	$month_end = $month_start - 1;
-	if ($month_end < 1)
-	{
-		$month_end = 12;
-		$year_end--;
+	$query = 	"SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
+	$query .= " where date_start < now() and date_end > now() limit 1";
+	$res = $db->query($query);
+	if ($res->num_rows > 0) {
+		$fiscalYear = $db->fetch_object($res);
+		$search_date_start = strtotime($fiscalYear->date_start);
+		$search_date_end = strtotime($fiscalYear->date_end);
+	} else {
+		$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
+		$year_start = dol_print_date(dol_now(), '%Y');
+		$year_end = $year_start + 1;
+		$month_end = $month_start - 1;
+		if ($month_end < 1)
+		{
+			$month_end = 12;
+			$year_end--;
+		}
+		$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
+		$search_date_end = dol_get_last_day($year_end, $month_end);
 	}
-	$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-	$search_date_end = dol_get_last_day($year_end, $month_end);
 }
 
 
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index e1fa349bccc..c4be9d99181 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -40,22 +40,8 @@ $page = GETPOST("page");
 $sortorder = GETPOST("sortorder");
 $sortfield = GETPOST("sortfield");
 $action = GETPOST('action', 'alpha');
-
-if (empty($search_date_start))
-{
-	$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
-	$year_start = dol_print_date(dol_now(), '%Y');
-	$year_end = $year_start + 1;
-	$month_end = $month_start - 1;
-	if ($month_end < 1)
-	{
-		$month_end = 12;
-		$year_end--;
-	}
-	$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-	$search_date_end = dol_get_last_day($year_end, $month_end);
-}
-
+$search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+$search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
 
 
@@ -84,8 +70,30 @@ $pagenext = $page + 1;
 if ($sortorder == "") $sortorder = "ASC";
 if ($sortfield == "") $sortfield = "t.rowid";
 
-if (empty($search_date_start)) $search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
-if (empty($search_date_end)) $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
+if (empty($search_date_start)) {
+	$sql = 	"SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
+	$sql .= " where date_start < now() and date_end > now() limit 1";
+	$res = $db->query($sql);
+	if ($res->num_rows > 0) {
+		$fiscalYear = $db->fetch_object($res);
+		$search_date_start = strtotime($fiscalYear->date_start);
+		$search_date_end = strtotime($fiscalYear->date_end);
+	} else {
+		$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
+		$year_start = dol_print_date(dol_now(), '%Y');
+		$year_end = $year_start + 1;
+		$month_end = $month_start - 1;
+		if ($month_end < 1)
+		{
+			$month_end = 12;
+			$year_end--;
+		}
+		$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
+		$search_date_end = dol_get_last_day($year_end, $month_end);
+		$search_date_start = 	dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
+		$search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
+	}
+}
 
 $object = new BookKeeping($db);
 
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
index 6891e1d8947..dc46b28677a 100644
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -71,8 +71,26 @@ $formaccounting = new FormAccounting($db);
 
 // Filter
 if (empty($search_date_start)) {
-	$search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
-	$search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
+	$sql = 	"SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
+	$sql .= " where date_start < now() and date_end > now() limit 1";
+	$res = $db->query($sql);
+	if ($res->num_rows > 0) {
+		$fiscalYear = $db->fetch_object($res);
+		$search_date_start = strtotime($fiscalYear->date_start);
+		$search_date_end = strtotime($fiscalYear->date_end);
+	} else {
+		$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
+		$year_start = dol_print_date(dol_now(), '%Y');
+		$year_end = $year_start + 1;
+		$month_end = $month_start - 1;
+		if ($month_end < 1)
+		{
+			$month_end = 12;
+			$year_end--;
+		}
+		$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
+		$search_date_end = dol_get_last_day($year_end, $month_end);
+	}
 }
 if ($sortorder == "")
 	$sortorder = "ASC";