Use new period selection functions written by Paul Becker

Files changed in commit: AnalysisHorizontalIncome.php GLCashFlowsIndirect.php GLProfit_Loss.php GLTagProfit_Loss.php GLTrialBalance.php SalesGraph.php On branch master Add the new selection box and make clear it is alternative to from and to If something is selected in the new period selection then use calculated from and to dates As per this forum thread: http://www.weberp.org/forum/showthread.php?tid=8131&pid=14707#pid14707
webERP-team · Mar 31, 2018 · 4d3e7d3 · 4d3e7d3
1 parent e6e56ac
commit 4d3e7d3
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 7 deletions.
diff --git a/AnalysisHorizontalIncome.php b/AnalysisHorizontalIncome.php
@@ -26,6 +26,11 @@ function RelativeChange($selected_period, $previous_period) {
 	$_POST['SelectADifferentPeriod']='Select A Different Period';
 }
 
+if ($_POST['Period'] != '') {
+	$_POST['FromPeriod'] = ReportPeriod($_POST['Period'], 'From');
+	$_POST['ToPeriod'] = ReportPeriod($_POST['Period'], 'To');
+}
+
 include('includes/header.php');
 if((!isset($_POST['FromPeriod']) AND !isset($_POST['ToPeriod'])) OR isset($_POST['SelectADifferentPeriod'])) {
 	echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
@@ -105,6 +110,20 @@ function RelativeChange($selected_period, $previous_period) {
 	echo		'</select></td>
 			</tr>
 			<tr>
+				<td>
+					<h3>', _('OR'), '</h3>
+				</td>
+			</tr>';
+
+	if (!isset($_POST['Period'])) {
+		$_POST['Period'] = '';
+	}
+
+	echo '<tr>
+			<td>', _('Select Period'), ':</td>
+			<td>', ReportPeriodList($_POST['Period'], array('l', 't')), '</td>
+		</tr>
+		<tr>
 				<td>', _('Detail or summary'), ':</td>
 				<td><select name="Detail" required="required" title="', _('Selecting Summary will show on the totals at the account group level'), '" >
 					<option value="Summary">', _('Summary'), '</option>

diff --git a/GLCashFlowsIndirect.php b/GLCashFlowsIndirect.php
@@ -68,6 +68,11 @@ function colDebitCredit($Amount) {
 	prnMsg(_('The period should be 12 months or less in duration. Please select an alternative period range.'), 'error');
 }
 
+if ($_POST['Period'] != '') {
+	$_POST['PeriodFrom'] = ReportPeriod($_POST['Period'], 'From');
+	$_POST['PeriodTo'] = ReportPeriod($_POST['Period'], 'To');
+}
+
 // Main code:
 if(isset($_POST['PeriodFrom']) AND isset($_POST['PeriodTo']) AND $_POST['Action']!='New') {// If all parameters are set and valid, generates the report:
 	echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
@@ -779,9 +784,24 @@ function colDebitCredit($Amount) {
 	echo			'</select>',
 					(!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Select the end of the reporting period') : ''), // If it is not set the $_SESSION['ShowFieldHelp'] parameter OR it is TRUE, shows the page help text.
 		 		'</td>
-			</tr>',
+			</tr>';
+
+	echo '<tr>
+			<td>
+				<h3>', _('OR'), '</h3>
+			</td>
+		</tr>';
+
+	if (!isset($_POST['Period'])) {
+		$_POST['Period'] = '';
+	}
+
+	echo '<tr>
+			<td>', _('Select Period'), ':</td>
+			<td>', ReportPeriodList($_POST['Period'], array('l', 't')), '</td>
+		</tr>';
 			// Show the budget for the period:
-			'<tr>',
+	echo '<tr>',
 			 	'<td><label for="ShowBudget">', _('Show the budget for the period'), '</label></td>
 			 	<td><input',($_POST['ShowBudget'] ? ' checked="checked"' : ''), ' id="ShowBudget" name="ShowBudget" type="checkbox">', // "Checked" if ShowBudget is set AND it is TRUE.
 			 		(!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Check this box to show the budget for the period') : ''), // If it is not set the $_SESSION['ShowFieldHelp'] parameter OR it is TRUE, shows the page help text.

diff --git a/GLProfit_Loss.php b/GLProfit_Loss.php
@@ -14,6 +14,11 @@
 	$_POST['SelectADifferentPeriod']='Select A Different Period';
 }
 
+if ($_POST['Period'] != '') {
+	$_POST['FromPeriod'] = ReportPeriod($_POST['Period'], 'From');
+	$_POST['ToPeriod'] = ReportPeriod($_POST['Period'], 'To');
+}
+
 if ((!isset($_POST['FromPeriod'])
 	AND !isset($_POST['ToPeriod']))
 		OR isset($_POST['SelectADifferentPeriod'])){
@@ -102,6 +107,21 @@
 	}
 	echo '</select></td></tr>';
 
+	echo '<tr>
+			<td>
+				<h3>', _('OR'), '</h3>
+			</td>
+		</tr>';
+
+	if (!isset($_POST['Period'])) {
+		$_POST['Period'] = '';
+	}
+
+	echo '<tr>
+			<td>', _('Select Period'), ':</td>
+			<td>', ReportPeriodList($_POST['Period'], array('l', 't')), '</td>
+		</tr>';
+
 	echo '<tr>
 			<td>' . _('Detail Or Summary').':</td>
 			<td><select name="Detail">

diff --git a/GLTagProfit_Loss.php b/GLTagProfit_Loss.php
@@ -14,6 +14,11 @@
 	$_POST['SelectADifferentPeriod']='Select A Different Period';
 }
 
+if ($_POST['Period'] != '') {
+	$_POST['FromPeriod'] = ReportPeriod($_POST['Period'], 'From');
+	$_POST['ToPeriod'] = ReportPeriod($_POST['Period'], 'To');
+}
+
 if ((!isset($_POST['FromPeriod']) AND !isset($_POST['ToPeriod'])) OR isset($_POST['SelectADifferentPeriod'])){
 
 	include('includes/header.php');
@@ -91,6 +96,22 @@
 		}
 	}
 	echo '</select></td></tr>';
+
+	echo '<tr>
+			<td>
+				<h3>', _('OR'), '</h3>
+			</td>
+		</tr>';
+
+	if (!isset($_POST['Period'])) {
+		$_POST['Period'] = '';
+	}
+
+	echo '<tr>
+			<td>', _('Select Period'), ':</td>
+			<td>', ReportPeriodList($_POST['Period'], array('l', 't')), '</td>
+		</tr>';
+
 	//Select the tag
 	echo '<tr>
 			<td>' . _('Select tag') . '</td>

diff --git a/GLTrialBalance.php b/GLTrialBalance.php
@@ -23,6 +23,11 @@
 	$_POST['SelectADifferentPeriod']=_('Select A Different Period');
 }
 
+if ($_POST['Period'] != '') {
+	$_POST['FromPeriod'] = ReportPeriod($_POST['Period'], 'From');
+	$_POST['ToPeriod'] = ReportPeriod($_POST['Period'], 'To');
+}
+
 if ((! isset($_POST['FromPeriod'])
 	AND ! isset($_POST['ToPeriod']))
 	OR isset($_POST['SelectADifferentPeriod'])){
@@ -107,6 +112,11 @@
 
 	echo '</select></td>
 		</tr>
+		<tr>
+			<td>
+				<h3>', _('OR'), '</h3>
+			</td>
+		</tr>
 		<tr>
 			<td>' . _('Select Period') . ':</td>
 			<td>' . ReportPeriodList( $_POST['Period'] ) . '</td>
@@ -133,11 +143,6 @@
 	$FontSize = 10;
 	$line_height = 12;
 
-	if ($_POST['Period'] != '') {
-		$_POST['FromPeriod'] = ReportPeriod($_POST['Period'], 'From');
-		$_POST['ToPeriod'] = ReportPeriod($_POST['Period'], 'To');
-	}
-
 	$NumberOfMonths = $_POST['ToPeriod'] - $_POST['FromPeriod'] + 1;
 
 	$sql = "SELECT lastdate_in_period

diff --git a/SalesGraph.php b/SalesGraph.php
@@ -89,6 +89,21 @@
 	}
 	echo '</select></td></tr>';
 
+	echo '<tr>
+			<td>
+				<h3>', _('OR'), '</h3>
+			</td>
+		</tr>';
+
+	if (!isset($_POST['Period'])) {
+		$_POST['Period'] = '';
+	}
+
+	echo '<tr>
+			<td>', _('Select Period'), ':</td>
+			<td>', ReportPeriodList($_POST['Period'], array('l', 't')), '</td>
+		</tr>';
+
 	$AreasResult = DB_query("SELECT areacode, areadescription FROM areas ORDER BY areadescription");
 
 	if (!isset($_POST['SalesArea'])){
@@ -217,6 +232,11 @@
 		$SelectClause = 'qty';
 	}
 
+	if ($_POST['Period'] != '') {
+		$_POST['FromPeriod'] = ReportPeriod($_POST['Period'], 'From');
+		$_POST['ToPeriod'] = ReportPeriod($_POST['Period'], 'To');
+	}
+
 	$SQL = "SELECT YEAR(`lastdate_in_period`) AS year, MONTHNAME(`lastdate_in_period`) AS month
 			  FROM `periods`
 			 WHERE `periodno`='" . $_POST['FromPeriod'] . "' OR periodno='" . $_POST['ToPeriod'] . "'";