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

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

Revision: 5856
          http://sourceforge.net/p/web-erp/reponame/5856
Author:   daintree
Date:     2013-04-27 22:07:54 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
Samudaya - PO_Items.php bug on deletion then readd to order

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

Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php	2013-04-27 18:09:51 UTC (rev 5855)
+++ trunk/PO_Items.php	2013-04-27 22:07:54 UTC (rev 5856)
@@ -43,7 +43,7 @@
 			if (!is_numeric(filter_number_format($_POST['SuppQty'.$POLine->LineNo]))){
 				prnMsg(_('The quantity in the supplier units is expected to be numeric. Please re-enter as a number'),'error');
 			} else { //ok to update the PO object variables
-				$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Quantity = filter_number_format(round(filter_number_format($_POST['SuppQty'.$POLine->LineNo])*filter_number_format($_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor),$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->DecimalPlaces));
+				$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Quantity = round(filter_number_format($_POST['SuppQty'.$POLine->LineNo])*$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor,$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->DecimalPlaces);
 			}
 			if (!is_numeric(filter_number_format($_POST['SuppPrice'.$POLine->LineNo]))){
 				prnMsg(_('The supplier price is expected to be numeric. Please re-enter as a number'),'error');
@@ -399,8 +399,7 @@
 
 if(isset($_GET['Delete'])){
 	if($_SESSION['PO'.$identifier]->Some_Already_Received($_GET['Delete'])==0){
-		$_SESSION['PO'.$identifier]->LineItems[$_GET['Delete']]->Deleted=True;
-		$_SESSION['PO'.$identifier]->LinesOnOrder --;
+		$_SESSION['PO'.$identifier]->remove_from_order($_GET['Delete']);
 		include ('includes/PO_UnsetFormVbls.php');
 	} else {
 		prnMsg( _('This item cannot be deleted because some of it has already been received'),'warn');
@@ -1178,7 +1177,7 @@
 		if (DB_num_rows($PurchDataResult)>0) {
 			$PurchDataRow = DB_fetch_array($PurchDataResult);
 			$OrderUnits=$PurchDataRow['suppliersuom'];
-			$ConversionFactor =$PurchDataRow['conversionfactor'];
+			$ConversionFactor = locale_number_format($PurchDataRow['conversionfactor'],'Variable');
 		} else {
 			$OrderUnits=$myrow['units'];
 			$ConversionFactor =1;
@@ -1205,4 +1204,4 @@
 echo '</div>
       </form>';
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2013-04-27 18:09:51 UTC (rev 5855)
+++ trunk/doc/Change.log	2013-04-27 22:07:54 UTC (rev 5856)
@@ -1,5 +1,9 @@
 OwebERP Change Log
-26/04/2013: Exson Fix the image broken problem for Manual/ManualGettingStarted.html Chinese version
+
+27/4/13 Samudaya: Fixed a bug in PO_Items.php when a line of a purchase order is deleted (other than the last line) and then subsequently a new line is added - the last line of the order is over-written. 
+27/4/13 Samudaya: PO_Items.php When purchasing a non-stock item (asset), AssetID goes to wrong column in purchorderdetails table (Column name - suppliers_partno). Fixed the bug and now save the AssetID in the correct assetid column.
+27/4/13 Samudaya: Fixed the Page Navigation (Go, Previous, Next) problem. This problem occurs  there are many assets and display as several pages.
+26/04/2013 Exson: Fix the image broken problem for Manual/ManualGettingStarted.html Chinese version
 25/4/13 Tim: Selecting customer in Contracts form was not working - fixed
 25/4/13 Bob Thomas: WorkOrderIssue.php was not showing the serialised items with a quantity that could be issued was showing them all in error
 25/4/13 Phil: BOMs.php fixed error that allowed auto issue to be flagged on serialised items