From: <dai...@us...> - 2016-04-26 07:59:23
|
Revision: 7497 http://sourceforge.net/p/web-erp/reponame/7497 Author: daintree Date: 2016-04-26 07:59:21 +0000 (Tue, 26 Apr 2016) Log Message: ----------- committed Tims change to report writer to allow to work with PHP7 Modified Paths: -------------- trunk/doc/Change.log trunk/reportwriter/WriteReport.inc Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-04-25 21:15:09 UTC (rev 7496) +++ trunk/doc/Change.log 2016-04-26 07:59:21 UTC (rev 7497) @@ -1,5 +1,6 @@ webERP Change Log +26/4/16 Phil committed for Tim: apparently only change required for PHP7 see http://www.weberp.org/forum/showthread.php?tid=2733&pid=7132#pid7132 25/4/16 RChacon: In Payments.php, allow to input a customised gltrans.narrative, supptrans.suppreference and supptrans.transtext. 25/4/16 Jan Bakke: google maps api improvement to SubmitCustomerSelection changed script src to https du to mixed content error Updated to Google Maps API v.3 Integrated code lines from ceocode.php to update Customers (custbranch table) without lat (0) but width brpostaddr1 Show Branch Contact beneath Customer Contacts when branch is selected Table-width cleanup - diff submitted in March sorry Phil's bad :-( 25/4/16 Jan Bakke: Improvements to allow .png and .gif images Modified: trunk/reportwriter/WriteReport.inc =================================================================== --- trunk/reportwriter/WriteReport.inc 2016-04-25 21:15:09 UTC (rev 7496) +++ trunk/reportwriter/WriteReport.inc 2016-04-26 07:59:21 UTC (rev 7497) @@ -303,10 +303,15 @@ $ThisMonth = mb_substr($Today,5,2); $ThisYear = mb_substr($Today,0,4); // find total number of days in this month - if ($ThisMonth==04 OR $ThisMonth==06 OR $ThisMonth==09 OR $ThisMonth==11) { $TotalDays=30; } - elseif ($ThisMonth==02 AND date('L', $t)) { $TotalDays=29; } // Leap year - elseif ($ThisMonth==02 AND !date('L', $t)) { $TotalDays=28; } - else { $TotalDays=31; } + if ($ThisMonth == '04' or $ThisMonth == '06' or $ThisMonth == '09' or $ThisMonth == '11') { + $TotalDays=30; + } elseif ($ThisMonth=='02' AND date('L', $t)) { // Leap year + $TotalDays=29; + } elseif ($ThisMonth==02 AND !date('L', $t)) { + $TotalDays=28; + } else { + $TotalDays=31; + } // Calculate date range $DateArray=explode(':',$Prefs['DateListings']['params']); switch ($DateArray[0]) { // based on the date choice selected |