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

[<tu...@us...>]

Revision: 7908
          http://sourceforge.net/p/web-erp/reponame/7908
Author:   turbopt
Date:     2018-01-08 05:57:24 +0000 (Mon, 08 Jan 2018)
Log Message:
-----------
SalesGraph.php: Replace period numbers in graph title with month and year. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=7946)

Modified Paths:
--------------
    trunk/SalesGraph.php
    trunk/doc/Change.log

Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php	2018-01-08 00:56:50 UTC (rev 7907)
+++ trunk/SalesGraph.php	2018-01-08 05:57:24 UTC (rev 7908)
@@ -218,6 +218,18 @@
 		$SelectClause = 'qty';
 	}
 
+	$SQL = "SELECT YEAR(`lastdate_in_period`) AS year, MONTHNAME(`lastdate_in_period`) AS month
+			  FROM `periods`
+			 WHERE `periodno`='" . $_POST['FromPeriod'] . "' OR periodno='" . $_POST['ToPeriod'] . "'";
+
+	$result = DB_query($SQL);
+
+	$fromPeriod = DB_fetch_array($result);
+	$_POST['FromPeriod'] = $fromPeriod['month'] . ' ' . $fromPeriod['year'];
+
+	$toPeriod = DB_fetch_array($result);
+	$_POST['ToPeriod'] = $toPeriod['month'] . ' ' . $toPeriod['year'];
+
 	$GraphTitle .= ' ' . _('From Period') . ' ' . $_POST['FromPeriod'] . ' ' . _('to') . ' ' . $_POST['ToPeriod'] . "\n\r";
 
 	if ($_POST['SalesArea']=='All'){

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2018-01-08 00:56:50 UTC (rev 7907)
+++ trunk/doc/Change.log	2018-01-08 05:57:24 UTC (rev 7908)
@@ -1,7 +1,8 @@
 webERP Change Log
 
-8/1/18   Paul Becker (PaulT commit): WriteReport.inc: Fix broken page number handling. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=7955)
-8/1/18   PaulT: Change.log: Update remaining past commit entries (during the past few weeks) to give credit to the right person(s) involved with the change, and when applicable, add the related forum URL for historical reference.
+8/1/18   Paul Becker/Tim (PaulT commit): SalesGraph.php: Replace period numbers in graph title with month and year. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=7946)
+7/1/18   Paul Becker (PaulT commit): WriteReport.inc: Fix broken page number handling. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=7955)
+7/1/18   PaulT: Change.log: Update remaining past commit entries (during the past few weeks) to give credit to the right person(s) involved with the change, and when applicable, add the related forum URL for historical reference.
 7/1/18   Phil:  Update phpxmlrpc to latest from https://github.com/gggeek/phpxmlrpc
 6/1/18   PaulT: Change.log: Update some past commit entries to give credit to the right person(s) involved with the change, and when applicable, add the related forum URL for historical reference.
 6/1/18   Paul Becker and Tim (PaulT commit): SelectSalesOrder.php: Fix handling to correct table heading value. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8000)