|
From: <rc...@us...> - 2015-08-19 15:02:24
|
Revision: 7344
http://sourceforge.net/p/web-erp/reponame/7344
Author: rchacon
Date: 2015-08-19 15:02:21 +0000 (Wed, 19 Aug 2015)
Log Message:
-----------
In AnalysisHorizontalIncome.php, delete variable $period because it is not used anywhere (thanks Tim). Extract header.inc from if.
Modified Paths:
--------------
trunk/AnalysisHorizontalIncome.php
trunk/doc/Change.log
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2015-08-19 07:37:57 UTC (rev 7343)
+++ trunk/AnalysisHorizontalIncome.php 2015-08-19 15:02:21 UTC (rev 7344)
@@ -23,9 +23,8 @@
$_POST['SelectADifferentPeriod']='Select A Different Period';
}
+include('includes/header.inc');
if((!isset($_POST['FromPeriod']) AND !isset($_POST['ToPeriod'])) OR isset($_POST['SelectADifferentPeriod'])) {
-
- include('includes/header.inc');
echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/printer.png" title="', // Icon image.
_('Print Horizontal Analysis of Statement of Comprehensive Income'), '" /> ', // Icon title.
@@ -52,7 +51,6 @@
$DefaultFromDate = Date ('Y-m-d', Mktime(0,0,0,$_SESSION['YearEnd'] + 2,0,Date('Y')-1));
$FromDate = Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,$_SESSION['YearEnd'] + 2,0,Date('Y')-1));
}
- $period=GetPeriod($FromDate, $db);
$sql = "SELECT periodno, lastdate_in_period
FROM periods
@@ -127,10 +125,7 @@
include ('includes/GLPostings.inc');
} else {
- include('includes/header.inc');
-
$NumberOfMonths = $_POST['ToPeriod'] - $_POST['FromPeriod'] + 1;
-
if($NumberOfMonths >12) {
echo '<br />';
prnMsg(_('A period up to 12 months in duration can be specified') . ' - ' . _('the system automatically shows a comparative for the same period from the previous year') . ' - ' . _('it cannot do this if a period of more than 12 months is specified') . '. ' . _('Please select an alternative period range'),'error');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-08-19 07:37:57 UTC (rev 7343)
+++ trunk/doc/Change.log 2015-08-19 15:02:21 UTC (rev 7344)
@@ -1,5 +1,6 @@
webERP Change Log
+19/08/15 RChacon: In AnalysisHorizontalIncome.php, delete variable $period because it is not used anywhere (thanks Tim). Extract header.inc from if.
13/08/15 RChacon: In doc/ManualGeneralLedger.html, add help for the horizontal analysis.
13/08/15 RChacon: Add new script AnalysisHorizontalIncome.php to generate an horizontal analysis of the statement of comprehensive income. In AnalysisHorizontalPosition.php, adjust signs and add report footnote.
05/08/15 RChacon: In AnalysisHorizontalPosition.php, modify DB_fetch_array() function because it requires only one parameter (thanks Tim). Other improvements.
|