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

[<tu...@us...>]

Revision: 7876
          http://sourceforge.net/p/web-erp/reponame/7876
Author:   turbopt
Date:     2017-12-11 20:57:10 +0000 (Mon, 11 Dec 2017)
Log Message:
-----------
(forums) SelectSalesOrder.php: Consistent delivery address and correct a unit conversion issue.

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

Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php	2017-12-11 17:47:30 UTC (rev 7875)
+++ trunk/SelectSalesOrder.php	2017-12-11 20:57:10 UTC (rev 7876)
@@ -286,6 +286,7 @@
 		  									  suppdeladdress5,
 		  									  suppdeladdress6,
 		  									  supptel,
+		  									  contact,
 		  									  version,
 		  									  revised,
 		  									  deliveryby,
@@ -300,12 +301,12 @@
 		  										'" . $SuppRow['rate'] . "',
 		  										'" . $_SESSION['UserID'] . "',
 		  										'" . $_SESSION['UserStockLocation'] . "',
-		  										'" . $DelAddRow['locationname'] . "',
 		  										'" . $DelAddRow['deladd1'] . "',
 		  										'" . $DelAddRow['deladd2'] . "',
 		  										'" . $DelAddRow['deladd3'] . "',
 		  										'" . $DelAddRow['deladd4'] . "',
-		  										'" . $DelAddRow['deladd5'] . ' ' . $DelAddRow['deladd6'] . "',
+		  										'" . $DelAddRow['deladd5'] . "',
+		  										'" . $DelAddRow['deladd6'] . "',
 		  										'" . $DelAddRow['tel'] . "',
 		  										'" . $SuppRow['address1'] . "',
 		  										'" . $SuppRow['address2'] . "',
@@ -314,6 +315,7 @@
 		  										'" . $SuppRow['address5'] . "',
 		  										'" . $SuppRow['address6'] . "',
 		  										'" . $SuppRow['telephone'] . "',
+		  										'" . $DelAddRow['contact'] . "',
 		  										'1.0',
 		  										'" . Date('Y-m-d') . "',
 		  										'" . $_SESSION['Default_Shipper'] . "',
@@ -345,7 +347,7 @@
 		      						     '" . FormatDateForSQL($DeliveryDate) . "',
 		      						     '" . $ItemRow['suppliers_partno']  . '  ' . $ItemRow['supplierdescription']  . "',
 		      						     '" . $ItemRow['stockact'] . "',
-		      						     '" . $ItemRow['price'] . "',
+		      						     '" . $ItemRow['price']/$ItemRow['conversionfactor'] . "',
 		      						     '" . $ItemRow['orderqty'] . "',
 		      						     '" . $ItemRow['suppliersuom'] . "',
 		      						     '" . $ItemRow['suppliers_partno'] . "',
@@ -354,7 +356,7 @@
 				$DbgMsg =_('The SQL statement used to insert the purchase order detail record and failed was');
 
 				$result =DB_query($sql,$ErrMsg,$DbgMsg,true);
-				$Order_Value  += ($ItemRow['price']*$ItemRow['orderqty']);
+				$Order_Value  += ($ItemRow['price']*$ItemRow['orderqty']/$ItemRow['conversionfactor']);
 			} /* end of the loop round the items on the sales order  that we wish to place purchase orders for */
 
 

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2017-12-11 17:47:30 UTC (rev 7875)
+++ trunk/doc/Change.log	2017-12-11 20:57:10 UTC (rev 7876)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+11/12/17 Paul Becker: (forums) SelectSalesOrder.php: Consistent delivery address and correct a unit conversion issue.
 11/12/17 PaulT: PHP 7 constructor compatibility change to htmlMimeMail.php and mimePart.php
 6/12/17 RChacon: Order by transaction date and add link to debtors in Dashboard.php script.
 3/12/17 Phil commited Tim's BankAccountBalances.php script