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

[<dai...@us...>]

Revision: 7858
          http://sourceforge.net/p/web-erp/reponame/7858
Author:   daintree
Date:     2017-10-17 08:02:49 +0000 (Tue, 17 Oct 2017)
Log Message:
-----------
Phil:Fix InventoryPlanning report

Modified Paths:
--------------
    trunk/InventoryPlanning.php
    trunk/doc/Change.log
    trunk/includes/PDFInventoryPlanPageHeader.inc

Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php	2017-10-15 23:18:52 UTC (rev 7857)
+++ trunk/InventoryPlanning.php	2017-10-17 08:02:49 UTC (rev 7858)
@@ -106,13 +106,14 @@
 	   include('includes/footer.php');
 	   exit;
 	}
-	$Period_0_Name = GetMonthText(mktime(0,0,0,Date('m'),Date('d'),Date('Y')));
-	$Period_1_Name = GetMonthText(mktime(0,0,0,Date('m')-1,Date('d'),Date('Y')));
-	$Period_2_Name = GetMonthText(mktime(0,0,0,Date('m')-2,Date('d'),Date('Y')));
-	$Period_3_Name = GetMonthText(mktime(0,0,0,Date('m')-3,Date('d'),Date('Y')));
-	$Period_4_Name = GetMonthText(mktime(0,0,0,Date('m')-4,Date('d'),Date('Y')));
-	$Period_5_Name = GetMonthText(mktime(0,0,0,Date('m')-5,Date('d'),Date('Y')));
 
+	$Period_0_Name = GetMonthText(date('m', mktime(0,0,0,Date('m'),Date('d'),Date('Y'))));
+	$Period_1_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-1,Date('d'),Date('Y'))));
+	$Period_2_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-2,Date('d'),Date('Y'))));
+	$Period_3_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-3,Date('d'),Date('Y'))));
+	$Period_4_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-4,Date('d'),Date('Y'))));
+	$Period_5_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-5,Date('d'),Date('Y'))));
+
 	include ('includes/PDFInventoryPlanPageHeader.inc');
 
 	$Category = '';

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2017-10-15 23:18:52 UTC (rev 7857)
+++ trunk/doc/Change.log	2017-10-17 08:02:49 UTC (rev 7858)
@@ -1,4 +1,6 @@
 webERP Change Log
+
+17/10/17 Phil: Fix InventoryPlanning.php and includes/PDFInventoryPlanPageHeader.inc to display categories selected and fix month headings displayed
 15/10/17 Andy Couling: New Expenses/Update Expense table header in PcClaimExpensesFromTab.php
 15/10/17 Andy Couling: Fixed the edit/delete cash assignment functionality in PcAssignCashToTab.php
 15/10/17 Andy Couling: Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
@@ -10,13 +12,13 @@
 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.
-17/10/09 Exson: Fixed the non-balance bug in CustomerReceipt.php. And fixed the non rollback problem when there is a non-balance existed. Fixed error noises. 
+17/10/09 Exson: Fixed the non-balance bug in CustomerReceipt.php. And fixed the non rollback problem when there is a non-balance existed. Fixed error noises.
 17/10/03 Exson: Add html view to SuppPriceList.php.
 01/10/26 RChacon: Standardise and add icons for usability.
 27/09/26 RChacon: Increases accuracy in coordinates.
 17/09/26 Exson: Fixed the wrong price retrieved bug in PO_Header.php.
 17/09/26 Exson: Fixed the vendor price bug to ensure only the effective price showed by suppliers in SelectProduct.php.
-17/09/20 Exson: Fixed the bug to make GRN reverse workable. 
+17/09/20 Exson: Fixed the bug to make GRN reverse workable.
 17/09/19 Exson: Fixed customer information missing in CustomerReceipt.php. Reported by Steven Fu.
 18/9/2017 Tim (committed by Andy): Geocode bug fixes. http://www.weberp.org/forum/showthread.php?tid=4380
 17/9/17 VortecCPI: SelectProduct.php made image dispay code match that used in WorkOrderEntry.php

Modified: trunk/includes/PDFInventoryPlanPageHeader.inc
===================================================================
--- trunk/includes/PDFInventoryPlanPageHeader.inc	2017-10-15 23:18:52 UTC (rev 7857)
+++ trunk/includes/PDFInventoryPlanPageHeader.inc	2017-10-17 08:02:49 UTC (rev 7858)
@@ -16,19 +16,18 @@
 
 $FontSize=10;
 
-if (isset($_POST['SupplierID']) and $_POST['SupplierID']=="0"){ //no supplier selected its a stock category report
-	$ReportTitle = _('Inventory Planning for Categories Between') . ' ' . $_POST['FromCriteria'] . ' ' . _('and') . ' ' . $_POST['ToCriteria'];
-} else { //supplier selected its just planning for products from the supplier
-	$ReportTitle = _('Inventory Planning for Products Category') . ' ' . $_POST['FromCriteria'];
+$ReportTitle = _('Inventory Planning for Product Categories');
+foreach ($_POST['Categories'] as $Category) {
+	$ReportTitle .= ' ' . $Category;
 }
 
 if ($_POST['Location']=='All'){
 
-	$LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos,450,$FontSize, $ReportTitle . ' ' . _('for all stock locations'));
+	$LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos,600,$FontSize, $ReportTitle . ' ' . _('for all stock locations'));
 
 } else {
 
-	$LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos,450,$FontSize, $ReportTitle . ' ' . _('for stock at') . ' ' . $_POST['Location']);
+	$LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos,600,$FontSize, $ReportTitle . ' ' . _('for stock at') . ' ' . $_POST['Location']);
 
 }