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

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

Revision: 7770
          http://sourceforge.net/p/web-erp/reponame/7770
Author:   rchacon
Date:     2017-06-18 01:53:16 +0000 (Sun, 18 Jun 2017)
Log Message:
-----------
It jumps to enter a GL receipt if 'Type'=='GL'.

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

Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php	2017-06-18 01:16:51 UTC (rev 7769)
+++ trunk/CustomerReceipt.php	2017-06-18 01:53:16 UTC (rev 7770)
@@ -600,9 +600,14 @@
 	echo '<div class="centre noprint">',
 		'<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/PDFBankingSummary.php?BatchNo=' . $_SESSION['ReceiptBatch' . $identifier]->BatchNo . '">' . _('Print PDF Batch Summary') . '</a></p>';
 	echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/allocation.png" title="' . _('Allocate') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/CustomerAllocations.php">' . _('Allocate Receipts') . '</a></p>';
-	echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/transactions.png" title="', _('Enter Receipts'), '" /> ', '<a href="', $RootPath, '/CustomerReceipt.php?NewReceipt=Yes&Type=Customer">', _('Enter Receipts'), '</a></p>',
+	echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/transactions.png" title="', _('Enter Receipts'), '" /> ', '<a href="', $RootPath, '/CustomerReceipt.php?NewReceipt=Yes&Type=';
+	if ($_GET['Type']=='GL') {
+		echo 'GL';
+	} else {
+		echo 'Customer';
+	}
+	echo '">', _('Enter Receipts'), '</a></p>',
 		'</div>';
-
 	unset($_SESSION['ReceiptBatch' . $identifier]);
 	include('includes/footer.php');
 	exit;

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2017-06-18 01:16:51 UTC (rev 7769)
+++ trunk/doc/Change.log	2017-06-18 01:53:16 UTC (rev 7770)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+17/06/17 RChacon: In CustomerReceipt.php, if 'Type'=='GL' it jumps to enter a GL receipt.
 08/06/17 Exson: Fixed quotation and orders are mixed in searching result of SelectSalesOrder.php.
 1/6/17 VortecCPI fixed empty list error in GLAccounts.php, GLCashFlowsIndirect.php, GLCashFlowsSetup.php
 18/5/17 Phil: remove changes in Andrew's PO_Items.php script that increased dp for purchase price to 5 - for some low value currencies this would be inappropriate, better to use the currency decimal places + 2 as per Ricard's idea