[Web-erp-svn] SF.net SVN: web-erp:[7851] trunk

[<rc...@us...>]

Revision: 7851
          http://sourceforge.net/p/web-erp/reponame/7851
Author:   rchacon
Date:     2017-10-11 19:05:01 +0000 (Wed, 11 Oct 2017)
Log Message:
-----------
If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css
)

Modified Paths:
--------------
    trunk/GLCashFlowsIndirect.php
    trunk/GLCashFlowsSetup.php
    trunk/doc/Change.log
    trunk/includes/header.php

Modified: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php	2017-10-11 18:16:40 UTC (rev 7850)
+++ trunk/GLCashFlowsIndirect.php	2017-10-11 19:05:01 UTC (rev 7851)
@@ -470,7 +470,7 @@
 					INNER JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode
 					INNER JOIN accountgroups ON chartmaster.group_=accountgroups.groupname
 				WHERE accountgroups.pandl=1";
-		$Result = DB_query($Sql); 
+		$Result = DB_query($Sql);
 		$MyRow1 = DB_fetch_array($Result);
 		echo	colDebitCredit($MyRow1['ActualProfit']),
 				colDebitCredit($MyRow1['LastProfit']),
@@ -753,14 +753,14 @@
 		'/images/reports.png" title="', // Icon image.
 		$Title, '" /> ', // Icon title.
 		$Title, '</p>';// Page title.
-	if(!isset($_SESSION['ShowPageHelp']) OR $_SESSION['ShowPageHelp']) {// If it is not set the $_SESSION['ShowPageHelp'] parameter OR it is TRUE, shows the page help text:
-		echo '<div class="page_help_text">',
-			_('The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities.'), '<br />',
-			_('The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.'), '<br />',
-			_('The statement of cash flows represents a period of time. This contrasts with the statement of financial position, which represents a single moment in time.'), '<br />',
-			_('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'),
-			'</div>';
-	}
+
+	echo '<div class="page_help_text">',
+		_('The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities.'), '<br />',
+		_('The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.'), '<br />',
+		_('The statement of cash flows represents a period of time. This contrasts with the statement of financial position, which represents a single moment in time.'), '<br />',
+		_('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'),
+		'</div>';
+
 	// Shows a form to allow input of criteria for the report to generate:
 	echo '<br />',
 		'<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">',

Modified: trunk/GLCashFlowsSetup.php
===================================================================
--- trunk/GLCashFlowsSetup.php	2017-10-11 18:16:40 UTC (rev 7850)
+++ trunk/GLCashFlowsSetup.php	2017-10-11 19:05:01 UTC (rev 7851)
@@ -145,14 +145,12 @@
 	'/images/maintenance.png" title="', // Icon image.
 	$Title, '" /> ', // Icon title.
 	$Title, '</p>';// Page title.
-	// BEGIN menu.
-if(!isset($page_help) OR $page_help) {
-	// If it is not set the $page_help parameter OR it is TRUE, shows the page help text:
-	echo '<div class="page_help_text">',
-		_('The statement of cash flows, using direct and indirect methods, is partitioned into three sections: operating activities, investing activities and financing activities.'), '<br />',
-		_('You must classify all accounts in any of those three sections of the cash flow statement, or as no effect on cash flow, or as cash or cash equivalent.'),
-		 '</div>';
-}
+
+echo '<div class="page_help_text">',
+	_('The statement of cash flows, using direct and indirect methods, is partitioned into three sections: operating activities, investing activities and financing activities.'), '<br />',
+	_('You must classify all accounts in any of those three sections of the cash flow statement, or as no effect on cash flow, or as cash or cash equivalent.'),
+	 '</div>';
+
 // Show a form to allow input of the action for the script to do:
 echo '<br />',
 	'<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">',

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2017-10-11 18:16:40 UTC (rev 7850)
+++ trunk/doc/Change.log	2017-10-11 19:05:01 UTC (rev 7851)
@@ -1,5 +1,7 @@
 webERP Change Log
 
+17/10/11 RChacon: If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css
+).
 17/10/11 RChacon: Set decimals variable for exchange rate in Currencies.php.
 17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate in Payments.php.
 17/10/11 Exson: Fix the indian_number_format bug in MiscFunctions.php.

Modified: trunk/includes/header.php
===================================================================
--- trunk/includes/header.php	2017-10-11 18:16:40 UTC (rev 7850)
+++ trunk/includes/header.php	2017-10-11 19:05:01 UTC (rev 7851)
@@ -43,8 +43,12 @@
 			'<link href="', $RootPath, '/css/', $_SESSION['Theme'], '/default.css" rel="stylesheet" type="text/css" media="screen"/>',
 			'<meta name="viewport" content="width=device-width, initial-scale=1">',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels).
 			'<script type="text/javascript" src="', $RootPath, '/javascripts/MiscFunctions.js"></script>',
-			'<title>', $Title, '</title>',
-		'</head>',
+			'<title>', $Title, '</title>';
+	// If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text:
+	if(isset($_SESSION['ShowPageHelp']) AND !$_SESSION['ShowPageHelp']) {
+		echo '<style>.page_help_text, DIV.page_help_text {display:none;}</style>';
+	}
+	echo '</head>',
 
 		'<body>',
 			'<div id="CanvasDiv">',