[Web-erp-svn] SF.net SVN: web-erp:[5582] trunk/api

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

Revision: 5582
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5582&view=rev
Author:   daintree
Date:     2012-07-31 20:08:18 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
correct ex rates for receipts

Modified Paths:
--------------
    trunk/api/api_debtortransactions.php
    trunk/api/api_salesorders.php

Modified: trunk/api/api_debtortransactions.php
===================================================================
--- trunk/api/api_debtortransactions.php	2012-07-31 13:29:43 UTC (rev 5581)
+++ trunk/api/api_debtortransactions.php	2012-07-31 20:08:18 UTC (rev 5582)
@@ -269,7 +269,7 @@
 	function InsertDebtorReceipt($Receipt, $User, $Password) {
 
 	/*
-	This function inserts a debtors receipt into a bank account/GL Postings and does the allocation and journals for difference on exchange
+	This function inserts a debtors receipt into a bank account/GL Postings
 
 	$Receipt contains an associative array in the format:
 		 * $Receipt['debtorno'] - the customer code
@@ -387,7 +387,7 @@
 						'" . $PeriodNo . "',
 						'". $CompanyRecord['debtorsact'] . "',
 						'" . $Receipt['reference'] . "',
-						'" . round((-$Receipt['amountfx']-$Receipt['discountfx']) * $FunctionalExRate / $ReceiptExRate,4) . "')";
+						'" . round((-$Receipt['amountfx']-$Receipt['discountfx']) / $CustCurrRow['rate'],4) . "')";
 
 			$result = api_DB_query($SQL,$db,'','',true);
 
@@ -405,7 +405,7 @@
 						'" . $PeriodNo . "',
 						'". $CompanyRecord['pytdiscountact'] . "',
 						'" . $Receipt['reference'] . "',
-						'" . round($Receipt['discountfx'] * $FunctionalExRate / $ReceiptExRate,4) . "')";
+						'" . round($Receipt['discountfx'] / $CustCurrRow['rate'],4) . "')";
 
 				$result = api_DB_query($SQL,$db,'','',true);
 			}
@@ -424,7 +424,7 @@
 						'" . $PeriodNo . "',
 						'" . $Receipt['bankaccount'] . "',
 						'" . $Receipt['reference'] . "',
-						'" . round($Receipt['amountfx'] * $FunctionalExRate / $ReceiptExRate,4) . "')";
+						'" . round($Receipt['amountfx'] / $CustCurrRow['rate'],4) . "')";
 
 			$result = api_DB_query($SQL,$db,'','',true);
 
@@ -448,7 +448,7 @@
 							'" . date('Y-m-d H-i-s') . "',
 							'" . $PeriodNo . "',
 							'" . $Receipt['reference'] . "',
-							'" . ($ReceiptExRate/$FunctionalExRate) . "',
+							'" . $CustCurrRow['rate'] . "',
 							'" . -$Receipt['amountfx'] . "',
 							'" . -$Receipt['discountfx'] . "',
 							'" . $Receipt['paymentmethod'] . "')";

Modified: trunk/api/api_salesorders.php
===================================================================
--- trunk/api/api_salesorders.php	2012-07-31 13:29:43 UTC (rev 5581)
+++ trunk/api/api_salesorders.php	2012-07-31 20:08:18 UTC (rev 5582)
@@ -350,8 +350,10 @@
 		if (sizeof($Errors)==0) {
 
 			$result = api_DB_Query($sql, $db);
+			
 			if (DB_error_no($db) != 0) {
-				$Errors[0] = DatabaseUpdateFailed;
+				//$Errors[0] = DatabaseUpdateFailed;
+				$Errors[0] = $sql;
 			} else {
 				$Errors[0]=0;
 				$Errors[1]=$OrderHeader['orderno'];

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