Thread: [Web-erp-svn] SF.net SVN: web-erp:[5351] trunk/CustomerReceipt.php

Accounting & Best Practice Business Administration System

Brought to you by: daintree, exsonqu, rchacon, tim_schofield, turbopt

web-erp-svn

[Web-erp-svn] SF.net SVN: web-erp:[5351] trunk/CustomerReceipt.php

From: <Ex...@us...> - 2012-05-14 02:05:32

Revision: 5351
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5351&view=rev
Author:   ExsonQu
Date:     2012-05-14 02:05:25 +0000 (Mon, 14 May 2012)
Log Message:
-----------
14/5/2012 Exson: Fixed when user change the currency, the suggested rate can not changed accordingly in CustomerReceipt.php. Reported by Ahmed.Fawzy.

14/5/2012 Ahmed.Fawzy: Fixed bugs that ExchangRateText be applied with locale_number_format() function in CustomerReceipt.php

Modified Paths:
--------------
    trunk/CustomerReceipt.php

Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php	2012-05-14 01:42:49 UTC (rev 5350)
+++ trunk/CustomerReceipt.php	2012-05-14 02:05:25 UTC (rev 5351)
@@ -824,17 +824,19 @@
 }
 if ($_SESSION['ReceiptBatch']->AccountCurrency!=$_SESSION['ReceiptBatch']->Currency AND isset($_SESSION['ReceiptBatch']->AccountCurrency)){
 	if (isset($SuggestedExRate)){
-		$SuggestedExRateText = '<b>' . _('Suggested rate:') . ' ' . locale_number_format($SuggestedExRate,4) . '</b>';
+		$SuggestedExRateText = '<b>' . _('Suggested rate:') . ' ' . locale_number_format($SuggestedExRate,6) . '</b>';
 	} else {
 		$SuggestedExRateText ='';
 	}
 	if ($_SESSION['ReceiptBatch']->ExRate==1 AND isset($SuggestedExRate)){
 		$_SESSION['ReceiptBatch']->ExRate = $SuggestedExRate;
+	}elseif($_POST['Currency'] != $_POST['PreviousCurrency'] and isset($SuggestedExRate)){//the user has changed the currency, then we should revise suggested rate
+		$_SESSION['ReceiptBatch']->ExRate = $SuggestedExRate;
 	}
 	echo '<tr>
 			<td>' . _('Receipt Exchange Rate') . ':</td>
 			<td><input tabindex="4" type="text" name="ExRate" maxlength="10" size="12" class="number" value="' . locale_number_format($_SESSION['ReceiptBatch']->ExRate,6) . '" /></td>
-			<td>' . locale_number_format($SuggestedExRateText,6) . ' <i>' . _('The exchange rate between the currency of the bank account currency and the currency of the receipt') . '. 1 ' . $_SESSION['ReceiptBatch']->AccountCurrency . ' = ? ' . $_SESSION['ReceiptBatch']->Currency . '</i></td>
+			<td>' . $SuggestedExRateText . ' <i>' . _('The exchange rate between the currency of the bank account currency and the currency of the receipt') . '. 1 ' . $_SESSION['ReceiptBatch']->AccountCurrency . ' = ? ' . $_SESSION['ReceiptBatch']->Currency . '</i></td>
 		</tr>';
 }
 
@@ -878,6 +880,7 @@
 		<td>' . _('Narrative') . ':</td>
 		<td><input tabindex="7" type="text" name="BatchNarrative" maxlength="50" size="52" value="' . $_SESSION['ReceiptBatch']->Narrative . '" /></td>
 	</tr>
+	<input type="hidden" name="PreviousCurrency" value="' . $_POST['Currency'] . '" /> 
 	<tr>
 		<td colspan="3">
 		<div class="centre">
@@ -1174,4 +1177,4 @@
 echo '</div>';
 echo '</form>';
 include('includes/footer.inc');
-?>
\ No newline at end of file
+?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Web-erp-svn] SF.net SVN: web-erp:[5351] trunk/CustomerReceipt.php

From: <Ex...@us...> - 2012-05-14 02:05:32

Revision: 5351
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5351&view=rev
Author:   ExsonQu
Date:     2012-05-14 02:05:25 +0000 (Mon, 14 May 2012)
Log Message:
-----------
14/5/2012 Exson: Fixed when user change the currency, the suggested rate can not changed accordingly in CustomerReceipt.php. Reported by Ahmed.Fawzy.

14/5/2012 Ahmed.Fawzy: Fixed bugs that ExchangRateText be applied with locale_number_format() function in CustomerReceipt.php

Modified Paths:
--------------
    trunk/CustomerReceipt.php

Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php	2012-05-14 01:42:49 UTC (rev 5350)
+++ trunk/CustomerReceipt.php	2012-05-14 02:05:25 UTC (rev 5351)
@@ -824,17 +824,19 @@
 }
 if ($_SESSION['ReceiptBatch']->AccountCurrency!=$_SESSION['ReceiptBatch']->Currency AND isset($_SESSION['ReceiptBatch']->AccountCurrency)){
 	if (isset($SuggestedExRate)){
-		$SuggestedExRateText = '<b>' . _('Suggested rate:') . ' ' . locale_number_format($SuggestedExRate,4) . '</b>';
+		$SuggestedExRateText = '<b>' . _('Suggested rate:') . ' ' . locale_number_format($SuggestedExRate,6) . '</b>';
 	} else {
 		$SuggestedExRateText ='';
 	}
 	if ($_SESSION['ReceiptBatch']->ExRate==1 AND isset($SuggestedExRate)){
 		$_SESSION['ReceiptBatch']->ExRate = $SuggestedExRate;
+	}elseif($_POST['Currency'] != $_POST['PreviousCurrency'] and isset($SuggestedExRate)){//the user has changed the currency, then we should revise suggested rate
+		$_SESSION['ReceiptBatch']->ExRate = $SuggestedExRate;
 	}
 	echo '<tr>
 			<td>' . _('Receipt Exchange Rate') . ':</td>
 			<td><input tabindex="4" type="text" name="ExRate" maxlength="10" size="12" class="number" value="' . locale_number_format($_SESSION['ReceiptBatch']->ExRate,6) . '" /></td>
-			<td>' . locale_number_format($SuggestedExRateText,6) . ' <i>' . _('The exchange rate between the currency of the bank account currency and the currency of the receipt') . '. 1 ' . $_SESSION['ReceiptBatch']->AccountCurrency . ' = ? ' . $_SESSION['ReceiptBatch']->Currency . '</i></td>
+			<td>' . $SuggestedExRateText . ' <i>' . _('The exchange rate between the currency of the bank account currency and the currency of the receipt') . '. 1 ' . $_SESSION['ReceiptBatch']->AccountCurrency . ' = ? ' . $_SESSION['ReceiptBatch']->Currency . '</i></td>
 		</tr>';
 }
 
@@ -878,6 +880,7 @@
 		<td>' . _('Narrative') . ':</td>
 		<td><input tabindex="7" type="text" name="BatchNarrative" maxlength="50" size="52" value="' . $_SESSION['ReceiptBatch']->Narrative . '" /></td>
 	</tr>
+	<input type="hidden" name="PreviousCurrency" value="' . $_POST['Currency'] . '" /> 
 	<tr>
 		<td colspan="3">
 		<div class="centre">
@@ -1174,4 +1177,4 @@
 echo '</div>';
 echo '</form>';
 include('includes/footer.inc');
-?>
\ No newline at end of file
+?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Web-erp-svn] SF.net SVN: web-erp:[6261] trunk/CustomerReceipt.php

From: <te...@us...> - 2013-08-20 01:54:04

Revision: 6261
          http://sourceforge.net/p/web-erp/reponame/6261
Author:   tehonu
Date:     2013-08-20 01:54:00 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
Added ORDER BY accountname (If accountcode is not shown to user, order should be by name)

Modified Paths:
--------------
    trunk/CustomerReceipt.php

Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php	2013-08-20 01:48:47 UTC (rev 6260)
+++ trunk/CustomerReceipt.php	2013-08-20 01:54:00 UTC (rev 6261)
@@ -750,9 +750,9 @@
 				bankaccounts.accountcode,
 				bankaccounts.currcode
 		FROM bankaccounts INNER JOIN chartmaster
-		ON bankaccounts.accountcode=chartmaster.accountcode";
+		ON bankaccounts.accountcode=chartmaster.accountcode
+		ORDER BY bankaccountname";
 
-
 $ErrMsg = _('The bank accounts could not be retrieved because');
 $DbgMsg = _('The SQL used to retrieve the bank accounts was');
 $AccountsResults = DB_query($SQL,$db,$ErrMsg,$DbgMsg);

[Web-erp-svn] SF.net SVN: web-erp:[7013] trunk/CustomerReceipt.php

From: <ex...@us...> - 2014-12-05 04:03:07

Revision: 7013
          http://sourceforge.net/p/web-erp/reponame/7013
Author:   exsonqu
Date:     2014-12-05 04:02:57 +0000 (Fri, 05 Dec 2014)
Log Message:
-----------
5/12/14 Exson: Fixed the branch field bug in CustomerReceipt.php. Reported by wertthey.

Modified Paths:
--------------
    trunk/CustomerReceipt.php

Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php	2014-12-02 19:24:34 UTC (rev 7012)
+++ trunk/CustomerReceipt.php	2014-12-05 04:02:57 UTC (rev 7013)
@@ -631,7 +631,7 @@
 						SELECT *
 						FROM 	custbranch
 						WHERE 	custbranch.debtorno = debtorsmaster.debtorno
-							AND custbranch.salesperson='" . $_SESSION['SalesmanLogin'] . "')";
+							AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "')";
 		}
 
 		$CustomerSearchResult = DB_query($SQL,'','',false,false);

[Web-erp-svn] SF.net SVN: web-erp:[7562] trunk/CustomerReceipt.php

From: <ex...@us...> - 2016-06-29 06:27:57

Revision: 7562
          http://sourceforge.net/p/web-erp/reponame/7562
Author:   exsonqu
Date:     2016-06-29 06:27:55 +0000 (Wed, 29 Jun 2016)
Log Message:
-----------
29/06/16 Exson: add identifier to avoid SESSION overwritten in CustomerReceipt.php.

Modified Paths:
--------------
    trunk/CustomerReceipt.php

Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php	2016-06-29 05:35:22 UTC (rev 7561)
+++ trunk/CustomerReceipt.php	2016-06-29 06:27:55 UTC (rev 7562)
@@ -17,13 +17,19 @@
 
 include('includes/header.inc');
 include('includes/SQL_CommonFunctions.inc');
+if (empty($_GET['identifier'])) {
+	$identifier = date('U');
+} else {
+	$identifier = $_GET['identifier'];
+}
+	
 
 $msg='';
 
 if (isset($_GET['NewReceipt'])){
-	unset($_SESSION['ReceiptBatch']->Items);
-	unset($_SESSION['ReceiptBatch']);
-	unset($_SESSION['CustomerRecord']);
+	unset($_SESSION['ReceiptBatch' . $identifier]->Items);
+	unset($_SESSION['ReceiptBatch' . $identifier]);
+	unset($_SESSION['CustomerRecord' . $identifier]);
 }
 
 if (isset($_POST['Cancel'])) {
@@ -47,11 +53,11 @@
 } else {
 	$BankAccountEmpty=false;
 }
-
-if (!isset($_GET['Delete']) AND isset($_SESSION['ReceiptBatch'])){
+$Errors = array();
+if (!isset($_GET['Delete']) AND isset($_SESSION['ReceiptBatch' . $identifier])){
 	//always process a header update unless deleting an item
 
-	$_SESSION['ReceiptBatch']->Account = $_POST['BankAccount'];
+	$_SESSION['ReceiptBatch' . $identifier]->Account = $_POST['BankAccount'];
 	/*Get the bank account currency and set that too */
 
 	$SQL = "SELECT bankaccountname,
@@ -67,9 +73,9 @@
 
 	if (DB_num_rows($result)==1){
 		$myrow = DB_fetch_array($result);
-		$_SESSION['ReceiptBatch']->BankAccountName = $myrow['bankaccountname'];
-		$_SESSION['ReceiptBatch']->AccountCurrency=$myrow['currcode'];
-		$_SESSION['ReceiptBatch']->CurrDecimalPlaces=$myrow['decimalplaces'];
+		$_SESSION['ReceiptBatch' . $identifier]->BankAccountName = $myrow['bankaccountname'];
+		$_SESSION['ReceiptBatch' . $identifier]->AccountCurrency=$myrow['currcode'];
+		$_SESSION['ReceiptBatch' . $identifier]->CurrDecimalPlaces=$myrow['decimalplaces'];
 		unset($result);
 	} elseif (DB_num_rows($result)==0 AND !$BankAccountEmpty){
 		prnMsg( _('The bank account number') . ' ' . $_POST['BankAccount'] . ' ' . _('is not set up as a bank account'),'error');
@@ -80,41 +86,41 @@
 	if (!Is_Date($_POST['DateBanked'])){
 		$_POST['DateBanked'] = Date($_SESSION['DefaultDateFormat']);
 	}
-	$_SESSION['ReceiptBatch']->DateBanked = $_POST['DateBanked'];
+	$_SESSION['ReceiptBatch' . $identifier]->DateBanked = $_POST['DateBanked'];
 	if (isset($_POST['ExRate']) AND $_POST['ExRate']!=''){
 		if (is_numeric(filter_number_format($_POST['ExRate']))){
-			$_SESSION['ReceiptBatch']->ExRate = filter_number_format($_POST['ExRate']);
+			$_SESSION['ReceiptBatch' . $identifier]->ExRate = filter_number_format($_POST['ExRate']);
 		} else {
 			prnMsg(_('The exchange rate entered should be numeric'),'warn');
 		}
 	}
 	if (isset($_POST['FunctionalExRate']) AND $_POST['FunctionalExRate']!=''){
 		if (is_numeric(filter_number_format($_POST['FunctionalExRate']))){
-			$_SESSION['ReceiptBatch']->FunctionalExRate=filter_number_format($_POST['FunctionalExRate']); //ex rate between receipt currency and account currency
+			$_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate=filter_number_format($_POST['FunctionalExRate']); //ex rate between receipt currency and account currency
 		} else {
 			prnMsg(_('The functional exchange rate entered should be numeric'),'warn');
 		}
 	}
-	$_SESSION['ReceiptBatch']->ReceiptType = $_POST['ReceiptType'];
+	$_SESSION['ReceiptBatch' . $identifier]->ReceiptType = $_POST['ReceiptType'];
 
 	if (!isset($_POST['Currency'])){
 		$_POST['Currency']=$_SESSION['CompanyRecord']['currencydefault'];
 	}
 
-	if ($_SESSION['ReceiptBatch']->Currency!=$_POST['Currency']){
+	if ($_SESSION['ReceiptBatch' . $identifier]->Currency!=$_POST['Currency']){
 
-		$_SESSION['ReceiptBatch']->Currency=$_POST['Currency']; //receipt currency
+		$_SESSION['ReceiptBatch' . $identifier]->Currency=$_POST['Currency']; //receipt currency
 		/*Now customer receipts entered using the previous currency need to be ditched
 		and a warning message displayed if there were some customer receipted entered */
-		if (count($_SESSION['ReceiptBatch']->Items)>0){
-			unset($_SESSION['ReceiptBatch']->Items);
+		if (count($_SESSION['ReceiptBatch' . $identifier]->Items)>0){
+			unset($_SESSION['ReceiptBatch' . $identifier]->Items);
 			prnMsg(_('Changing the currency of the receipt means that existing entries need to be re-done - only customers trading in the selected currency can be selected'),'warn');
 		}
 
 	}
 
-	if ($_SESSION['ReceiptBatch']->AccountCurrency==$_SESSION['CompanyRecord']['currencydefault']){
-		$_SESSION['ReceiptBatch']->FunctionalExRate = 1;
+	if ($_SESSION['ReceiptBatch' . $identifier]->AccountCurrency==$_SESSION['CompanyRecord']['currencydefault']){
+		$_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate = 1;
 		$SuggestedFunctionalExRate =1;
 	} elseif (!$BankAccountEmpty) {
 		/*To illustrate the rates required
@@ -127,33 +133,33 @@
 		*/
 
 		/*Get suggested FunctionalExRate between the bank account currency and the home (functional) currency */
-		$result = DB_query("SELECT rate, decimalplaces FROM currencies WHERE currabrev='" . $_SESSION['ReceiptBatch']->AccountCurrency . "'");
+		$result = DB_query("SELECT rate, decimalplaces FROM currencies WHERE currabrev='" . $_SESSION['ReceiptBatch' . $identifier]->AccountCurrency . "'");
 		$myrow = DB_fetch_array($result);
 		$SuggestedFunctionalExRate = $myrow['rate'];
-		$_SESSION['ReceiptBatch']->CurrDecimalPlaces = $myrow['decimalplaces'];
+		$_SESSION['ReceiptBatch' . $identifier]->CurrDecimalPlaces = $myrow['decimalplaces'];
 
 	} //end else account currency != functional currency
 
-	if ($_POST['Currency']==$_SESSION['ReceiptBatch']->AccountCurrency){
-		$_SESSION['ReceiptBatch']->ExRate = 1; //ex rate between receipt currency and account currency
+	if ($_POST['Currency']==$_SESSION['ReceiptBatch' . $identifier]->AccountCurrency){
+		$_SESSION['ReceiptBatch' . $identifier]->ExRate = 1; //ex rate between receipt currency and account currency
 		$SuggestedExRate=1;
 	} elseif(isset($_POST['Currency'])) {
 		/*Get the exchange rate between the functional currency and the receipt currency*/
-		$result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['ReceiptBatch']->Currency . "'");
+		$result = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['ReceiptBatch' . $identifier]->Currency . "'");
 		$myrow = DB_fetch_array($result);
 		$TableExRate = $myrow['rate']; //this is the rate of exchange between the functional currency and the receipt currency
 		/*Calculate cross rate to suggest appropriate exchange rate between receipt currency and account currency */
 		$SuggestedExRate = $TableExRate/$SuggestedFunctionalExRate;
 	}
 
-	$_SESSION['ReceiptBatch']->BankTransRef = $_POST['BankTransRef'];
-	$_SESSION['ReceiptBatch']->Narrative = $_POST['BatchNarrative'];
+	$_SESSION['ReceiptBatch' . $identifier]->BankTransRef = $_POST['BankTransRef'];
+	$_SESSION['ReceiptBatch' . $identifier]->Narrative = $_POST['BatchNarrative'];
 
 } elseif (isset($_GET['Delete'])) {
 	/* User hit delete the receipt entry from the batch */
-	$_SESSION['ReceiptBatch']->remove_receipt_item($_GET['Delete']);
+	$_SESSION['ReceiptBatch' . $identifier]->remove_receipt_item($_GET['Delete']);
 } else { //it must be a new receipt batch
-	$_SESSION['ReceiptBatch'] = new Receipt_Batch;
+	$_SESSION['ReceiptBatch' . $identifier] = new Receipt_Batch;
 }
 
 
@@ -193,7 +199,7 @@
  			}
  		}
  		if ($AllowThisPosting) {
- 			$_SESSION['ReceiptBatch']->add_to_batch(filter_number_format($_POST['Amount']),
+ 			$_SESSION['ReceiptBatch' . $identifier]->add_to_batch(filter_number_format($_POST['Amount']),
 													$_POST['CustomerID'],
 													filter_number_format($_POST['Discount']),
 													$_POST['Narrative'],
@@ -208,7 +214,7 @@
 }
 
 if (isset($Cancel)){
-	unset($_SESSION['CustomerRecord']);
+	unset($_SESSION['CustomerRecord' . $identifier]);
 	unset($_POST['CustomerID']);
 	unset($_POST['CustomerName']);
 	unset($_POST['Amount']);
@@ -234,7 +240,7 @@
   and add up the non-GL ones for posting to debtors later,
   also add the total discount total receipts*/
 
-	$PeriodNo = GetPeriod($_SESSION['ReceiptBatch']->DateBanked,$db);
+	$PeriodNo = GetPeriod($_SESSION['ReceiptBatch' . $identifier]->DateBanked,$db);
 
 	if ($_SESSION['CompanyRecord']==0){
 		prnMsg(_('The company has not yet been set up properly') . ' - ' . _('this information is needed to process the batch') . '. ' . _('Processing has been cancelled'),'error');
@@ -252,7 +258,7 @@
 		$i++;
 	}
 
-	$_SESSION['ReceiptBatch']->BatchNo = GetNextTransNo(12,$db);
+	$_SESSION['ReceiptBatch' . $identifier]->BatchNo = GetNextTransNo(12,$db);
 	/*Start a transaction to do the whole lot inside */
 	$result = DB_Txn_Begin();
 
@@ -282,7 +288,7 @@
 	echo '</tr>
 		</thead><tbody>';
 
-	foreach ($_SESSION['ReceiptBatch']->Items as $ReceiptItem) {
+	foreach ($_SESSION['ReceiptBatch' . $identifier]->Items as $ReceiptItem) {
 
 		if ($k==1){
 			echo '<tr class="OddTableRows">';
@@ -296,14 +302,14 @@
 		$Result=DB_query($SQL);
 		$myrow=DB_fetch_array($Result);
 
-		echo '<td>', $_SESSION['ReceiptBatch']->BatchNo, '</td>
-			<td>', $_SESSION['ReceiptBatch']->DateBanked, '</td>
-			<td>', $ReceiptItem->CustomerName, '</td>
-			<td class="text">', $ReceiptItem->GLCode, ' - ', $myrow['accountname'], '</td>
-			<td class="number">', locale_number_format($ReceiptItem->Amount/$_SESSION['ReceiptBatch']->ExRate/$_SESSION['ReceiptBatch']->FunctionalExRate,$_SESSION['ReceiptBatch']->CurrDecimalPlaces), '</td>';
+		echo '<td>' . $_SESSION['ReceiptBatch' . $identifier]->BatchNo . '</td>
+			<td>' . $_SESSION['ReceiptBatch' . $identifier]->DateBanked . '</td>
+			<td>' . $ReceiptItem->CustomerName . '</td>
+			<td class="text">' . $ReceiptItem->GLCode . ' - ' . $myrow['accountname'] . '</td>
+			<td class="number">' . locale_number_format($ReceiptItem->Amount/$_SESSION['ReceiptBatch' . $identifier]->ExRate/$_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate,$_SESSION['ReceiptBatch' . $identifier]->CurrDecimalPlaces)  . '</td>';
 
 		if ($ReceiptItem->GLCode ==''){
-			echo '<td class="noprint"><a target="_blank" href="', $RootPath, '/PDFReceipt.php?BatchNumber=', $_SESSION['ReceiptBatch']->BatchNo, '&ReceiptNumber=', $CustomerReceiptCounter, '">', _('Print a Customer Receipt'), '</a></td></tr>';
+			echo '<td class="noprint"><a target="_blank" href="', $RootPath, '/PDFReceipt.php?BatchNumber=', $_SESSION['ReceiptBatch' . $identifier]->BatchNo, '&ReceiptNumber=', $CustomerReceiptCounter, '">', _('Print a Customer Receipt'), '</a></td></tr>';
 			$CustomerReceiptCounter += 1;
 		}
 
@@ -319,12 +325,12 @@
 											tag)
 					VALUES (
 						12,
-						'" . $_SESSION['ReceiptBatch']->BatchNo . "',
-						'" . FormatDateForSQL($_SESSION['ReceiptBatch']->DateBanked) . "',
+						'" . $_SESSION['ReceiptBatch' . $identifier]->BatchNo . "',
+						'" . FormatDateForSQL($_SESSION['ReceiptBatch' . $identifier]->DateBanked) . "',
 						'" . $PeriodNo . "',
 						'" . $ReceiptItem->GLCode . "',
 						'" . $ReceiptItem->Narrative . "',
-						'" . -($ReceiptItem->Amount/$_SESSION['ReceiptBatch']->ExRate/$_SESSION['ReceiptBatch']->FunctionalExRate) . "',
+						'" . -($ReceiptItem->Amount/$_SESSION['ReceiptBatch' . $identifier]->ExRate/$_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate) . "',
 						'" . $ReceiptItem->tag . "'" . "
 					)";
 				$ErrMsg = _('Cannot insert a GL entry for the receipt because');
@@ -349,9 +355,9 @@
 				$TrfFromBankCurrCode = $TrfFromBankRow['currcode'];
 				$TrfFromBankExRate = $TrfFromBankRow['rate'];
 
-				if ($_SESSION['ReceiptBatch']->AccountCurrency == $TrfFromBankCurrCode){
+				if ($_SESSION['ReceiptBatch' . $identifier]->AccountCurrency == $TrfFromBankCurrCode){
 					/*Make sure to use the same rate if the transfer is between two bank accounts in the same currency */
-					$TrfFromBankExRate = $_SESSION['ReceiptBatch']->FunctionalExRate;
+					$TrfFromBankExRate = $_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate;
 				}
 
 				/*Consider an example - had to be currencies I am familar with sorry so I could figure it out!!
@@ -398,12 +404,12 @@
 							1,
 							'" . $ReceiptItem->GLCode . "',
 							'" . _('Act Transfer') ." - " . $ReceiptItem->Narrative . "',
-							'" . (($_SESSION['ReceiptBatch']->ExRate * $_SESSION['ReceiptBatch']->FunctionalExRate)/$TrfFromBankExRate). "',
+							'" . (($_SESSION['ReceiptBatch' . $identifier]->ExRate * $_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate)/$TrfFromBankExRate). "',
 							'" . $TrfFromBankExRate . "',
-							'" . FormatDateForSQL($_SESSION['ReceiptBatch']->DateBanked) . "',
-							'" . $_SESSION['ReceiptBatch']->ReceiptType . "',
+							'" . FormatDateForSQL($_SESSION['ReceiptBatch' . $identifier]->DateBanked) . "',
+							'" . $_SESSION['ReceiptBatch' . $identifier]->ReceiptType . "',
 							'" . -$ReceiptItem->Amount . "',
-							'" . $_SESSION['ReceiptBatch']->Currency . "'
+							'" . $_SESSION['ReceiptBatch' . $identifier]->Currency . "'
 						)";
 
 				$DbgMsg = _('The SQL that failed to insert the bank transaction was');
@@ -413,7 +419,7 @@
 
 		} else { //its not a GL item - its a customer receipt then
 			/*Accumulate the total debtors credit including discount */
-			$BatchDebtorTotal += (($ReceiptItem->Discount + $ReceiptItem->Amount)/$_SESSION['ReceiptBatch']->ExRate/$_SESSION['ReceiptBatch']->FunctionalExRate);
+			$BatchDebtorTotal += (($ReceiptItem->Discount + $ReceiptItem->Amount)/$_SESSION['ReceiptBatch' . $identifier]->ExRate/$_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate);
 			/*Create a DebtorTrans entry for each customer deposit */
 
 			/*The rate of exchange required here is the rate between the functional (home) currency and the customer receipt currency
@@ -424,6 +430,7 @@
 											type,
 											debtorno,
 											branchcode,
+											order_,
 											trandate,
 											inputdate,
 											prd,
@@ -435,16 +442,17 @@
 											invtext,
 											salesperson)
 					VALUES (
-						'" . $_SESSION['ReceiptBatch']->BatchNo . "',
+						'" . $_SESSION['ReceiptBatch' . $identifier]->BatchNo . "',
 						12,
 						'" . $ReceiptItem->Customer . "',
 						'',
-						'" . FormatDateForSQL($_SESSION['ReceiptBatch']->DateBanked) . "',
+						'" . $ReceiptItem->ID . "',
+						'" . FormatDateForSQL($_SESSION['ReceiptBatch' . $identifier]->DateBanked) . "',
 						'" . date('Y-m-d H-i-s') . "',
 						'" . $PeriodNo . "',
-						'" . $_SESSION['ReceiptBatch']->ReceiptType  . ' ' . $ReceiptItem->PayeeBankDetail . "',
+						'" . $_SESSION['ReceiptBatch' . $identifier]->ReceiptType  . ' ' . $ReceiptItem->PayeeBankDetail . "',
 						'',
-						'" . ($_SESSION['ReceiptBatch']->FunctionalExRate*$_SESSION['ReceiptBatch']->ExRate) . "',
+						'" . ($_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate*$_SESSION['ReceiptBatch' . $identifier]->ExRate) . "',
 						'" . -$ReceiptItem->Amount . "',
 						'" . -$ReceiptItem->Discount . "',
 						'" . $ReceiptItem->Narrative. "',
@@ -455,7 +463,7 @@
 			$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
 			$SQL = "UPDATE debtorsmaster
-						SET lastpaiddate = '" . FormatDateForSQL($_SESSION['ReceiptBatch']->DateBanked) . "',
+						SET lastpaiddate = '" . FormatDateForSQL($_SESSION['ReceiptBatch' . $identifier]->DateBanked) . "',
 						lastpaid='" . $ReceiptItem->Amount ."'
 					WHERE debtorsmaster.debtorno='" . $ReceiptItem->Customer . "'";
 
@@ -464,8 +472,8 @@
 			$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
 		} //end of if its a customer receipt
-		$BatchDiscount += ($ReceiptItem->Discount/$_SESSION['ReceiptBatch']->ExRate/$_SESSION['ReceiptBatch']->FunctionalExRate);
-		$BatchReceiptsTotal += ($ReceiptItem->Amount/$_SESSION['ReceiptBatch']->ExRate/$_SESSION['ReceiptBatch']->FunctionalExRate);
+		$BatchDiscount += ($ReceiptItem->Discount/$_SESSION['ReceiptBatch' . $identifier]->ExRate/$_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate);
+		$BatchReceiptsTotal += ($ReceiptItem->Amount/$_SESSION['ReceiptBatch' . $identifier]->ExRate/$_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate);
 
 	} /*end foreach $ReceiptItem */
 	echo '</tbody></table>';
@@ -484,15 +492,15 @@
 								currcode)
 		VALUES (
 			12,
-			'" . $_SESSION['ReceiptBatch']->BatchNo . "',
-			'" . $_SESSION['ReceiptBatch']->Account . "',
-			'" . $_SESSION['ReceiptBatch']->BankTransRef . "',
-			'" . $_SESSION['ReceiptBatch']->ExRate . "',
-			'" . $_SESSION['ReceiptBatch']->FunctionalExRate . "',
-			'" . FormatDateForSQL($_SESSION['ReceiptBatch']->DateBanked) . "',
-			'" . $_SESSION['ReceiptBatch']->ReceiptType . "',
-			'" . ($BatchReceiptsTotal * $_SESSION['ReceiptBatch']->FunctionalExRate * $_SESSION['ReceiptBatch']->ExRate) . "',
-			'" . $_SESSION['ReceiptBatch']->Currency . "'
+			'" . $_SESSION['ReceiptBatch' . $identifier]->BatchNo . "',
+			'" . $_SESSION['ReceiptBatch' . $identifier]->Account . "',
+			'" . $_SESSION['ReceiptBatch' . $identifier]->BankTransRef . "',
+			'" . $_SESSION['ReceiptBatch' . $identifier]->ExRate . "',
+			'" . $_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate . "',
+			'" . FormatDateForSQL($_SESSION['ReceiptBatch' . $identifier]->DateBanked) . "',
+			'" . $_SESSION['ReceiptBatch' . $identifier]->ReceiptType . "',
+			'" . ($BatchReceiptsTotal * $_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate * $_SESSION['ReceiptBatch' . $identifier]->ExRate) . "',
+			'" . $_SESSION['ReceiptBatch' . $identifier]->Currency . "'
 		)";
 	$DbgMsg = _('The SQL that failed to insert the bank account transaction was');
 	$ErrMsg = _('Cannot insert a bank transaction');
@@ -512,11 +520,11 @@
 										amount)
 				VALUES (
 					12,
-					'" . $_SESSION['ReceiptBatch']->BatchNo . "',
-					'" . FormatDateForSQL($_SESSION['ReceiptBatch']->DateBanked) . "',
+					'" . $_SESSION['ReceiptBatch' . $identifier]->BatchNo . "',
+					'" . FormatDateForSQL($_SESSION['ReceiptBatch' . $identifier]->DateBanked) . "',
 					'" . $PeriodNo . "',
-					'" . $_SESSION['ReceiptBatch']->Account . "',
-					'" . $_SESSION['ReceiptBatch']->Narrative . "',
+					'" . $_SESSION['ReceiptBatch' . $identifier]->Account . "',
+					'" . $_SESSION['ReceiptBatch' . $identifier]->Narrative . "',
 					'" . $BatchReceiptsTotal . "'
 				)";
 			$DbgMsg = _('The SQL that failed to insert the GL transaction fro the bank account debit was');
@@ -536,11 +544,11 @@
 										amount)
 						VALUES (
 							12,
-							'" . $_SESSION['ReceiptBatch']->BatchNo . "',
-							'" . FormatDateForSQL($_SESSION['ReceiptBatch']->DateBanked) . "',
+							'" . $_SESSION['ReceiptBatch' . $identifier]->BatchNo . "',
+							'" . FormatDateForSQL($_SESSION['ReceiptBatch' . $identifier]->DateBanked) . "',
 							'" . $PeriodNo . "',
 							'". $_SESSION['CompanyRecord']['debtorsact'] . "',
-							'" . $_SESSION['ReceiptBatch']->Narrative . "',
+							'" . $_SESSION['ReceiptBatch' . $identifier]->Narrative . "',
 							'" . -$BatchDebtorTotal . "'
 							)";
 			$DbgMsg = _('The SQL that failed to insert the GL transaction for the debtors account credit was');
@@ -560,18 +568,18 @@
 										amount)
 						VALUES (
 								12,
-								'" . $_SESSION['ReceiptBatch']->BatchNo . "',
-								'" . FormatDateForSQL($_SESSION['ReceiptBatch']->DateBanked) . "',
+								'" . $_SESSION['ReceiptBatch' . $identifier]->BatchNo . "',
+								'" . FormatDateForSQL($_SESSION['ReceiptBatch' . $identifier]->DateBanked) . "',
 								'" . $PeriodNo . "',
 								'" . $_SESSION['CompanyRecord']['pytdiscountact'] . "',
-								'" . $_SESSION['ReceiptBatch']->Narrative . "',
+								'" . $_SESSION['ReceiptBatch' . $identifier]->Narrative . "',
 								'" . $BatchDiscount . "'
 							)";
 			$DbgMsg = _('The SQL that failed to insert the GL transaction for the payment discount debit was');
 			$ErrMsg = _('Cannot insert a GL transaction for the payment discount debit');
 			$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 		} //end if there is some discount
-		EnsureGLEntriesBalance(12,$_SESSION['ReceiptBatch']->BatchNo,$db);
+		EnsureGLEntriesBalance(12,$_SESSION['ReceiptBatch' . $identifier]->BatchNo,$db);
 	} //end if there is GL work to be done - ie config is to link to GL
 
 
@@ -579,15 +587,15 @@
 	$DbgMsg = _('The SQL that failed was');
 	$result = DB_Txn_Commit();
 	echo '<br />';
-	prnMsg( _('Receipt batch') . ' ' . $_SESSION['ReceiptBatch']->BatchNo . ' ' . _('has been successfully entered into the database'),'success');
+	prnMsg( _('Receipt batch') . ' ' . $_SESSION['ReceiptBatch' . $identifier]->BatchNo . ' ' . _('has been successfully entered into the database'),'success');
 
 	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']->BatchNo . '">' . _('Print PDF Batch Summary') . '</a></p>';
+		'<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>',
 		'</div>';
 
-	unset($_SESSION['ReceiptBatch']);
+	unset($_SESSION['ReceiptBatch' . $identifier]);
 	include('includes/footer.inc');
 	exit;
 
@@ -605,7 +613,7 @@
 			$SQL = "SELECT debtorsmaster.debtorno,
 						debtorsmaster.name
 					FROM debtorsmaster
-					WHERE debtorsmaster.currcode= '" . $_SESSION['ReceiptBatch']->Currency . "'";
+					WHERE debtorsmaster.currcode= '" . $_SESSION['ReceiptBatch' . $identifier]->Currency . "'";
 	} else {
 		if (mb_strlen($_POST['Keywords'])>0) {
 			//insert wildcard characters in spaces
@@ -615,21 +623,21 @@
 						debtorsmaster.name
 					FROM debtorsmaster
 					WHERE debtorsmaster.name " . LIKE . " '". $SearchString . "'
-					AND debtorsmaster.currcode= '" . $_SESSION['ReceiptBatch']->Currency . "'";
+					AND debtorsmaster.currcode= '" . $_SESSION['ReceiptBatch' . $identifier]->Currency . "'";
 
 		} elseif (mb_strlen($_POST['CustCode'])>0){
 			$SQL = "SELECT debtorsmaster.debtorno,
 						debtorsmaster.name
 					FROM debtorsmaster
 					WHERE debtorsmaster.debtorno " . LIKE . " '%" . $_POST['CustCode'] . "%'
-					AND debtorsmaster.currcode= '" . $_SESSION['ReceiptBatch']->Currency . "'";
+					AND debtorsmaster.currcode= '" . $_SESSION['ReceiptBatch' . $identifier]->Currency . "'";
 		} elseif (mb_strlen($_POST['CustInvNo'])>0){
 			$SQL = "SELECT debtortrans.debtorno,
 						debtorsmaster.name
 					FROM debtorsmaster LEFT JOIN debtortrans
 					ON debtorsmaster.debtorno=debtortrans.debtorno
 					WHERE debtortrans.transno " . LIKE . " '%" . $_POST['CustInvNo'] . "%'
-					AND debtorsmaster.currcode= '" . $_SESSION['ReceiptBatch']->Currency . "'";
+					AND debtorsmaster.currcode= '" . $_SESSION['ReceiptBatch' . $identifier]->Currency . "'";
 		}
 	}
 		if ($_SESSION['SalesmanLogin'] != '') {
@@ -671,8 +679,8 @@
 	the receipt held entirely as session variables until the button clicked to process*/
 
 
-	if (isset($_SESSION['CustomerRecord'])){
-	   unset($_SESSION['CustomerRecord']);
+	if (isset($_SESSION['CustomerRecord' . $identifier])){
+	   unset($_SESSION['CustomerRecord' . $identifier]);
 	}
 
 	$SQL = "SELECT debtorsmaster.name,
@@ -764,20 +772,20 @@
 		$NIL_BALANCE = False;
 	}
 
-	$_SESSION['CustomerRecord'] = DB_fetch_array($CustomerResult);
+	$_SESSION['CustomerRecord' . $identifier] = DB_fetch_array($CustomerResult);
 
 	if ($NIL_BALANCE==True){
-		$_SESSION['CustomerRecord']['balance']=0;
-		$_SESSION['CustomerRecord']['due']=0;
-		$_SESSION['CustomerRecord']['overdue1']=0;
-		$_SESSION['CustomerRecord']['overdue2']=0;
+		$_SESSION['CustomerRecord' . $identifier]['balance']=0;
+		$_SESSION['CustomerRecord' . $identifier]['due']=0;
+		$_SESSION['CustomerRecord' . $identifier]['overdue1']=0;
+		$_SESSION['CustomerRecord' . $identifier]['overdue2']=0;
 	}
 } /*end of if customer has just been selected  all info required read into $_SESSION['CustomerRecord']*/
 
 /*set up the form whatever */
 
 
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Type='.$_GET['Type'] . '" method="post" id="form1">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Type='.$_GET['Type'] . '&amp;identifier=' . $identifier . '" method="post" id="form1">';
 echo '<div>';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
@@ -822,7 +830,7 @@
 	echo '<option value=""></option>';
 	while ($myrow=DB_fetch_array($AccountsResults)){
 		/*list the bank account names */
-		if ($_SESSION['ReceiptBatch']->Account==$myrow['accountcode']){
+		if ($_SESSION['ReceiptBatch' . $identifier]->Account==$myrow['accountcode']){
 			echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['bankaccountname'] . ' - ' . $myrow['currcode'] . '</option>';
 		} else {
 			echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['bankaccountname']. ' - ' . $myrow['currcode'] . '</option>';
@@ -832,20 +840,20 @@
 		</tr>';
 }
 
-if (!Is_Date($_SESSION['ReceiptBatch']->DateBanked)){
-	$_SESSION['ReceiptBatch']->DateBanked = Date($_SESSION['DefaultDateFormat']);
+if (!Is_Date($_SESSION['ReceiptBatch' . $identifier]->DateBanked)){
+	$_SESSION['ReceiptBatch' . $identifier]->DateBanked = Date($_SESSION['DefaultDateFormat']);
 }
 
 echo '<tr>
 		<td>' . _('Date Banked') . ':</td>
-		<td><input tabindex="2" type="text" required="required" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="DateBanked" maxlength="10" size="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['ReceiptBatch']->DateBanked . '" /></td>
+		<td><input tabindex="2" type="text" required="required" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="DateBanked" maxlength="10" size="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['ReceiptBatch' . $identifier]->DateBanked . '" /></td>
 	</tr>
 	<tr>
 		<td>' . _('Currency') . ':</td>
 		<td><select tabindex="3" name="Currency" onchange="ReloadForm(form1.BatchInput)">';
 
-if (!isset($_SESSION['ReceiptBatch']->Currency)){
-  $_SESSION['ReceiptBatch']->Currency=$_SESSION['CompanyRecord']['currencydefault'];
+if (!isset($_SESSION['ReceiptBatch' . $identifier]->Currency)){
+  $_SESSION['ReceiptBatch' . $identifier]->Currency=$_SESSION['CompanyRecord']['currencydefault'];
 }
 
 $SQL = "SELECT currency, currabrev, rate FROM currencies";
@@ -857,7 +865,7 @@
 } else {
 	include('includes/CurrenciesArray.php'); // To get the currency name from the currency code.
 	while ($myrow=DB_fetch_array($result)){
-		if ($_SESSION['ReceiptBatch']->Currency==$myrow['currabrev']){
+		if ($_SESSION['ReceiptBatch' . $identifier]->Currency==$myrow['currabrev']){
 			echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $CurrencyName[$myrow['currabrev']] . '</option>';
 		} else {
 			echo '<option value="' . $myrow['currabrev'] . '">' . $CurrencyName[$myrow['currabrev']] . '</option>';
@@ -868,37 +876,37 @@
 }
 
 
-if (!isset($_SESSION['ReceiptBatch']->ExRate)){
-	$_SESSION['ReceiptBatch']->ExRate=1;
+if (!isset($_SESSION['ReceiptBatch' . $identifier]->ExRate)){
+	$_SESSION['ReceiptBatch' . $identifier]->ExRate=1;
 }
 
-if (!isset($_SESSION['ReceiptBatch']->FunctionalExRate)){
-	$_SESSION['ReceiptBatch']->FunctionalExRate=1;
+if (!isset($_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate)){
+	$_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate=1;
 }
-if($_SESSION['ReceiptBatch']->AccountCurrency != $_SESSION['ReceiptBatch']->Currency AND isset($_SESSION['ReceiptBatch']->AccountCurrency)) {
-	if($_SESSION['ReceiptBatch']->ExRate==1 AND isset($SuggestedExRate)) {
-		$_SESSION['ReceiptBatch']->ExRate = $SuggestedExRate;
+if ($_SESSION['ReceiptBatch' . $identifier]->AccountCurrency != $_SESSION['ReceiptBatch' . $identifier]->Currency AND isset($_SESSION['ReceiptBatch' . $identifier]->AccountCurrency)) {
+	if($_SESSION['ReceiptBatch' . $identifier]->ExRate==1 AND isset($SuggestedExRate)) {
+		$_SESSION['ReceiptBatch' . $identifier]->ExRate = $SuggestedExRate;
 	} elseif($_POST['Currency'] != $_POST['PreviousCurrency'] AND isset($SuggestedExRate)) {//the user has changed the currency, then we should revise suggested rate
-		$_SESSION['ReceiptBatch']->ExRate = $SuggestedExRate;
+		$_SESSION['ReceiptBatch' . $identifier]->ExRate = $SuggestedExRate;
 	}
 
 	if(isset($SuggestedExRate)) {
-		$SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['ReceiptBatch']->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate,8) . ' ' . $_SESSION['ReceiptBatch']->Currency . '</b>';
+		$SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['ReceiptBatch' . $identifier]->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate,8) . ' ' . $_SESSION['ReceiptBatch']->Currency . '</b>';
 	} else {
-		$SuggestedExRateText = '<b>1 ' . $_SESSION['ReceiptBatch']->AccountCurrency . ' = ? ' . $_SESSION['ReceiptBatch']->Currency . '</b>';
+		$SuggestedExRateText = '<b>1 ' . $_SESSION['ReceiptBatch' . $identifier]->AccountCurrency . ' = ? ' . $_SESSION['ReceiptBatch' . $identifier]->Currency ...
 
[truncated message content]

[Web-erp-svn] SF.net SVN: web-erp:[7579] trunk/CustomerReceipt.php

From: <te...@us...> - 2016-08-05 02:53:33

Revision: 7579
          http://sourceforge.net/p/web-erp/reponame/7579
Author:   tehonu
Date:     2016-08-05 02:53:30 +0000 (Fri, 05 Aug 2016)
Log Message:
-----------
Fix variable needing identifier

Modified Paths:
--------------
    trunk/CustomerReceipt.php

Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php	2016-08-02 10:02:32 UTC (rev 7578)
+++ trunk/CustomerReceipt.php	2016-08-05 02:53:30 UTC (rev 7579)
@@ -1071,8 +1071,8 @@
 
 }
 
-if (isset($_POST['GLEntry']) AND isset($_SESSION['ReceiptBatch'])){
-/* Set up a heading for the transaction entry for a GL Receipt */
+if (isset($_POST['GLEntry']) AND isset($_SESSION['ReceiptBatch' . $identifier])){
+	/* Set up a heading for the transaction entry for a GL Receipt */
 	echo '<br />
 		<table class="selection">
 			<tr>

[Web-erp-svn] SF.net SVN: web-erp:[7591] trunk/CustomerReceipt.php

From: <te...@us...> - 2016-08-16 13:33:10

Revision: 7591
          http://sourceforge.net/p/web-erp/reponame/7591
Author:   tehonu
Date:     2016-08-16 13:33:08 +0000 (Tue, 16 Aug 2016)
Log Message:
-----------
Fixed bug as did not populate Functional Exchange Rate (thanks to Tim)

Modified Paths:
--------------
    trunk/CustomerReceipt.php

Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php	2016-08-16 13:26:43 UTC (rev 7590)
+++ trunk/CustomerReceipt.php	2016-08-16 13:33:08 UTC (rev 7591)
@@ -912,7 +912,7 @@
 	}
 	echo '<tr>
 			<td>', _('Functional Exchange Rate'), ':</td>
-			<td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" tabindex="5" type="text" value="', $_POST['FunctionalExRate'], '" /> ', $SuggestedFunctionalExRateText, ' <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'),  '.</i></td>
+			<td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" tabindex="5" type="text" value="', $_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate, '" /> ', $SuggestedFunctionalExRateText, ' <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'),  '.</i></td>
 		</tr>';
 }