Thread: [Web-erp-svn] SF.net SVN: web-erp:[5615] trunk (Page 36)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5615
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5615&view=rev
Author:   tim_schofield
Date:     2012-08-30 18:26:44 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
Thomas Timothy Lie: Fix more typos in gettext strings

Modified Paths:
--------------
    trunk/BOMExtendedQty.php
    trunk/BOMIndentedReverse.php
    trunk/ConfirmDispatch_Invoice.php
    trunk/CounterSales.php
    trunk/FixedAssetLocations.php
    trunk/GLProfit_Loss.php
    trunk/Labels.php
    trunk/MRP.php
    trunk/MRPCalendar.php
    trunk/PurchData.php
    trunk/SMTPServer.php
    trunk/SalesInquiry.php
    trunk/WOSerialNos.php
    trunk/api/api_xml-rpc.php
    trunk/reportwriter/languages/en_US/reports.php

Modified: trunk/BOMExtendedQty.php
===================================================================

--- trunk/BOMExtendedQty.php	2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/BOMExtendedQty.php	2012-08-30 18:26:44 UTC (rev 5615)
@@ -27,7 +27,7 @@
 				part char(20),
 				extendedqpa double,
 				sortpart text) DEFAULT CHARSET=utf8";
-	$ErrMsg = _('The SQL to to create passbom failed with the message');
+	$ErrMsg = _('The SQL to create passbom failed with the message');
 	$result = DB_query($sql,$db,$ErrMsg);
 
 	$sql = "CREATE TEMPORARY TABLE tempbom (

Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php	2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/BOMIndentedReverse.php	2012-08-30 18:26:44 UTC (rev 5615)
@@ -23,7 +23,7 @@
 				part char(20),
 				sortpart text) DEFAULT CHARSET=utf8";
 
-	$ErrMsg = _('The SQL to to create passbom failed with the message');
+	$ErrMsg = _('The SQL to create passbom failed with the message');
 	$result = DB_query($sql,$db,$ErrMsg);
 
 	$sql = "CREATE TEMPORARY TABLE tempbom (
@@ -48,7 +48,7 @@
 					  CONCAT(bom.component,bom.parent) AS sortpart
 					  FROM bom
 			  WHERE bom.component ='" . $_POST['Part'] . "'
-			  AND bom.effectiveto >= NOW() 
+			  AND bom.effectiveto >= NOW()
 			  AND bom.effectiveafter <= NOW()";
 	$result = DB_query($sql,$db);
 
@@ -75,7 +75,7 @@
 					 bom.quantity
 					 FROM bom
 			  WHERE bom.component ='" . $_POST['Part'] . "'
-			  AND bom.effectiveto >= NOW() 
+			  AND bom.effectiveto >= NOW()
 			  AND bom.effectiveafter <= NOW()";
 	$result = DB_query($sql,$db);
 
@@ -106,7 +106,7 @@
 						 bom.quantity
 				FROM bom,passbom
 				WHERE bom.component = passbom.part
-				AND bom.effectiveto >= NOW() 
+				AND bom.effectiveto >= NOW()
 				AND bom.effectiveafter <= NOW()";
 		$result = DB_query($sql,$db);
 
@@ -126,7 +126,7 @@
 						  CONCAT(passbom2.sortpart,bom.parent) AS sortpart
 				   FROM bom,passbom2
 				   WHERE bom.component = passbom2.part
-					AND bom.effectiveto >= NOW() 
+					AND bom.effectiveto >= NOW()
 					AND bom.effectiveafter <= NOW()";
 		$result = DB_query($sql,$db);
 		$result = DB_query("SELECT COUNT(*) FROM bom,passbom WHERE bom.component = passbom.part",$db);
@@ -172,8 +172,8 @@
               ORDER BY sortpart";
 	$result = DB_query($sql,$db);
 
-    $ListCount = DB_num_rows($result); 
-    
+    $ListCount = DB_num_rows($result);
+
 	While ($myrow = DB_fetch_array($result,$db)){
 
 		$YPos -=$line_height;

Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php	2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/ConfirmDispatch_Invoice.php	2012-08-30 18:26:44 UTC (rev 5615)
@@ -830,7 +830,7 @@
 			} else {
 				$AssetNumber =   intval(mb_substr($OrderLine->StockID,6,mb_strlen($OrderLine->StockID)-$HyphenOccursAt-1));
 			}
-			prnMsg (_('The asset number beind disposed of is:') . ' ' . $AssetNumber, 'info');
+			prnMsg (_('The asset number being disposed of is:') . ' ' . $AssetNumber, 'info');
 		} else {
 			$IsAsset = false;
 			$AssetNumber = 0;
@@ -1440,7 +1440,7 @@
 											'" . $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . ' ' . _('disposal') . "',
 											'" . -$DisposalRow['cost'] . "')";
 
-					$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The reversal of asset cost on dispoal GL posting could not be inserted because');
+					$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The reversal of asset cost on disposal GL posting could not be inserted because');
 					$DbgMsg = _('The following SQL to insert the GLTrans record was used');
 					$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
 				}

Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php	2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/CounterSales.php	2012-08-30 18:26:44 UTC (rev 5615)
@@ -996,13 +996,13 @@
 
 	/* Now Get the area where the sale is to from the branches table */
 
-		$SQL = "SELECT 	area,
+		$SQL = "SELECT area,
 						defaultshipvia
 				FROM custbranch
 				WHERE custbranch.debtorno ='". $_SESSION['Items'.$identifier]->DebtorNo . "'
 				AND custbranch.branchcode = '" . $_SESSION['Items'.$identifier]->Branch . "'";
 
-		$ErrMsg = _('We were unable to load the area where the sale is to from the custbranch table');
+		$ErrMsg = _('We were unable to load the area from the custbranch table where the sale is to ');
 		$Result = DB_query($SQL,$db, $ErrMsg);
 		$myrow = DB_fetch_row($Result);
 		$Area = $myrow[0];

Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php	2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/FixedAssetLocations.php	2012-08-30 18:26:44 UTC (rev 5615)
@@ -28,7 +28,7 @@
 	}
 }
 if (isset($_GET['SelectedLocation'])) {
-	$sql="SELECT * FROM fixedassetlocations 
+	$sql="SELECT * FROM fixedassetlocations
 		WHERE locationid='".$_GET['SelectedLocation']."'";
 	$result = DB_query($sql, $db);
 	$myrow = DB_fetch_array($result);
@@ -50,11 +50,11 @@
 			$InputError=1;
 		}
 		if ($InputError==0) {
-			 $sql="UPDATE fixedassetlocations 
+			 $sql="UPDATE fixedassetlocations
 					SET locationdescription='" . $_POST['LocationDescription'] . "',
 						parentlocationid='" . $_POST['ParentLocationID'] . "'
 					WHERE locationid ='" . $_POST['LocationID'] . "'";
-					
+
 			 $result=DB_query($sql,$db);
 			 echo '<meta http-equiv="Refresh" content="0; url="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'">';
 		}
@@ -74,7 +74,7 @@
 		$result = DB_query($sql,$db);
 		$myrow=DB_fetch_row($result);
 		if ($myrow[0]>0) {
-			prnMsg(_('You have assets in this location location so it cannot be removed'), 'warn');
+			prnMsg(_('You have assets in this location so it cannot be removed'), 'warn');
 			$InputError=1;
 		}
 		if ($InputError==0) {

Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php	2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/GLProfit_Loss.php	2012-08-30 18:26:44 UTC (rev 5615)
@@ -12,8 +12,8 @@
 	$_POST['SelectADifferentPeriod']='Select A Different Period';
 }
 
-if ((!isset($_POST['FromPeriod']) 
-	AND !isset($_POST['ToPeriod'])) 
+if ((!isset($_POST['FromPeriod'])
+	AND !isset($_POST['ToPeriod']))
 		OR isset($_POST['SelectADifferentPeriod'])){
 
 	include('includes/header.inc');
@@ -21,12 +21,12 @@
 	echo '<p class="page_title_text">
 			<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Profit and Loss Report') . '
 		</p>';
-	echo '<div class="page_help_text">' . _('Profit and loss statement (P&amp;L), also called an Income Statment, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') . 
+	echo '<div class="page_help_text">' . _('Profit and loss statement (P&amp;L), also called an Income Statement, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') .
 		'<br />'
 	. _('The purpose of the income statement is to show whether the company made or lost money during the period being reported.') . '<br />'
 	. _('The P&amp;L represents a period of time. This contrasts with the Balance Sheet, which represents a single moment in time.') . '<br />'
 	. _('webERP is an "accrual" based system (not a "cash based" system).  Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.') . '</div>';
-	
+
 	echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
     echo '<div>';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -46,9 +46,9 @@
 			<tr><td>' . _('Select Period From') . ':</td>
 				<td><select name="FromPeriod">';
 
-	$sql = "SELECT periodno, 
-					lastdate_in_period 
-			FROM periods 
+	$sql = "SELECT periodno,
+					lastdate_in_period
+			FROM periods
 			ORDER BY periodno DESC";
 	$Periods = DB_query($sql,$db);
 
@@ -594,7 +594,7 @@
 					accountgroups.sequenceintb,
 					accountgroups.groupname,
 					chartdetails.accountcode";
-		
+
 	$AccountsResult = DB_query($SQL,$db,_('No general ledger accounts were returned by the SQL because'),_('The SQL that failed was'));
 
 	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('General Ledger Profit Loss Inquiry') . '" alt="" />' . ' ' . _('Statement of Profit and Loss for the') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' and including ' . $PeriodToDate . '</p>';
@@ -814,7 +814,7 @@
 							locale_number_format($TotalIncome - $SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces']),
 							locale_number_format($TotalBudgetIncome - $SectionPrdBudget,$_SESSION['CompanyRecord']['decimalplaces']),
 							locale_number_format($TotalLYIncome - $SectionPrdLY,$_SESSION['CompanyRecord']['decimalplaces']));
-	
+
 					if ($TotalIncome !=0){
 						$PrdGPPercent = 100*($TotalIncome - $SectionPrdActual)/$TotalIncome;
 					} else {

Modified: trunk/Labels.php
===================================================================
--- trunk/Labels.php	2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/Labels.php	2012-08-30 18:26:44 UTC (rev 5615)
@@ -42,7 +42,7 @@
 								WHERE labelfieldid='" . $_POST['LabelFieldID' . $i] . "'",
 								$db);
 			} else {
-				prnMsg (_('Entries for Vertical Position, Horizonal Position, and Font Size must be integers.'),'error');
+				prnMsg (_('Entries for Vertical Position, Horizontal Position, and Font Size must be integers.'),'error');
 			}
 		}
 	}
@@ -433,7 +433,7 @@
 			FROM labelfields
 			WHERE labelid = '" . $SelectedLabelID . "'
 			ORDER BY vpos DESC";
-	$ErrMsg = _('Could note get the label fields because');
+	$ErrMsg = _('Could not get the label fields because');
 	$result = DB_query($SQL,$db,$ErrMsg);
 	$i=0;
 	echo '<table class="selection">
@@ -443,7 +443,7 @@
 					<tr>
 						<th>' . _('Field') . '</th>
 						<th>' . _('Vertical') . '<br />' . _('Position')  . '<br />(VPos)</th>
-						<th>' . _('Horizonal') . '<br />' . _('Position') . '<br />(HPos)</th>
+						<th>' . _('Horizontal') . '<br />' . _('Position') . '<br />(HPos)</th>
 						<th>' . _('Font Size') . '</th>
 						<th>' . _('Bar-code') . '</th>
 					</tr>';

Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php	2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/MRP.php	2012-08-30 18:26:44 UTC (rev 5615)
@@ -24,7 +24,7 @@
 
 	$sql = "CREATE TEMPORARY TABLE passbom (part char(20),
 											sortpart text) DEFAULT CHARSET=utf8";
-	$ErrMsg = _('The SQL to to create passbom failed with the message');
+	$ErrMsg = _('The SQL to create passbom failed with the message');
 	$result = DB_query($sql,$db,$ErrMsg);
 
 	$sql = "CREATE TEMPORARY TABLE tempbom (parent char(20),

Modified: trunk/MRPCalendar.php
===================================================================
--- trunk/MRPCalendar.php	2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/MRPCalendar.php	2012-08-30 18:26:44 UTC (rev 5615)
@@ -83,15 +83,15 @@
 				manufacturingflag smallint(6) NOT NULL default '1',
 				INDEX (daynumber),
 				PRIMARY KEY (calendardate)) DEFAULT CHARSET=utf8";
-	$ErrMsg = _('The SQL to to create passbom failed with the message');
+	$ErrMsg = _('The SQL to create passbom failed with the message');
 	$result = DB_query($sql,$db,$ErrMsg);
 
 	$i = 0;
 
 	/* $DaysTextArray used so can get text of day based on the value get from DayOfWeekFromSQLDate of
-	 the calendar date. See if that text is in the ExcludeDays array note no gettext here hard coded english days from $_POST*/ 
+	 the calendar date. See if that text is in the ExcludeDays array note no gettext here hard coded english days from $_POST*/
 	$DaysTextArray = array('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday');
-	
+
 	$ExcludeDays = array($_POST['Sunday'],$_POST['Monday'],$_POST['Tuesday'],$_POST['Wednesday'],
 						 $_POST['Thursday'],$_POST['Friday'],$_POST['Saturday']);
 
@@ -122,7 +122,7 @@
 	// manufacturing day that precedes it. That way can read the table by the non-manufacturing day,
 	// subtract the leadtime from the daynumber, and find the valid manufacturing day with that daynumber.
 	$DayNumber = 1;
-	$sql = "SELECT * FROM mrpcalendar 
+	$sql = "SELECT * FROM mrpcalendar
 			ORDER BY calendardate";
 	$result = DB_query($sql,$db,$ErrMsg);
 	while ($myrow = DB_fetch_array($result)) {
@@ -306,7 +306,7 @@
 	if (!isset($_POST['ChangeDate'])) {
 		$_POST['ChangeDate']=date($_SESSION['DefaultDateFormat']);
 	}
-	
+
 	echo '<br />
 		<table class="selection">
 		<tr>

Modified: trunk/PurchData.php
===================================================================
--- trunk/PurchData.php	2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/PurchData.php	2012-08-30 18:26:44 UTC (rev 5615)
@@ -8,15 +8,15 @@
 include ('includes/header.inc');
 
 if (isset($_GET['SupplierID'])) {
-	$SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
+    $SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
 } elseif (isset($_POST['SupplierID'])) {
-	$SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
+    $SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
 }
 
 if (isset($_GET['StockID'])) {
-	$StockID = trim(mb_strtoupper($_GET['StockID']));
+    $StockID = trim(mb_strtoupper($_GET['StockID']));
 } elseif (isset($_POST['StockID'])) {
-	$StockID = trim(mb_strtoupper($_POST['StockID']));
+    $StockID = trim(mb_strtoupper($_POST['StockID']));
 }
 
 if (isset($_POST['StockUOM'])) {
@@ -28,12 +28,13 @@
 echo '<a href="' . $rootpath . '/SelectProduct.php">' . _('Back to Items') . '</a><br />';
 
 if (isset($_POST['SupplierDescription'])) {
-	$_POST['SupplierDescription'] = trim($_POST['SupplierDescription']);
+    $_POST['SupplierDescription'] = trim($_POST['SupplierDescription']);
 }
 
 if ((isset($_POST['AddRecord']) OR isset($_POST['UpdateRecord'])) AND isset($SupplierID)) { /*Validate Inputs */
 	$InputError = 0; /*Start assuming the best */
-	if ($StockID == '' OR !isset($StockID)) {
+
+if ($StockID == '' OR !isset($StockID)) {
 		$InputError = 1;
 		prnMsg(_('There is no stock item set up enter the stock code or select a stock item using the search page'), 'error');
 	}
@@ -41,8 +42,7 @@
 		$InputError = 1;
 		unset($_POST['Price']);
 		prnMsg(_('The price entered was not numeric and a number is expected. No changes have been made to the database'), 'error');
-	}
-	if ($_POST['Price'] == 0) {
+	}elseif ($_POST['Price'] == 0) {
 		prnMsg(_('The price entered is zero') . '   ' . _('Is this intentional?'), 'warn');
 	}
 	if (!is_numeric(filter_number_format($_POST['LeadTime']))) {
@@ -60,252 +60,227 @@
 		unset($_POST['ConversionFactor']);
 		prnMsg(_('The conversion factor entered was not numeric') . ' (' . _('a number is expected') . '). ' . _('The conversion factor is the number which the price must be divided by to get the unit price in our unit of measure') . '. <br />' . _('E.g.') . ' ' . _('The supplier sells an item by the tonne and we hold stock by the kg') . '. ' . _('The suppliers price must be divided by 1000 to get to our cost per kg') . '. ' . _('The conversion factor to enter is 1000') . '. <br /><br />' . _('No changes will be made to the database'), 'error');
 	}
-	if ($InputError == 0 AND isset($_POST['AddRecord'])) {
-		$sql = "INSERT INTO purchdata (supplierno,
-										stockid,
-										price,
-										effectivefrom,
-										suppliersuom,
-										conversionfactor,
-										supplierdescription,
-										suppliers_partno,
-										leadtime,
-										minorderqty,
-										preferred)
-									VALUES ('" . $SupplierID . "',
-										'" . $StockID . "',
-										'" . filter_number_format($_POST['Price']) . "',
-										'" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
-										'" . $_POST['SuppliersUOM'] . "',
-										'" . $_POST['ConversionFactor'] . "',
-										'" . $_POST['SupplierDescription'] . "',
-										'" . $_POST['SupplierCode'] . "',
-										'" . $_POST['LeadTime'] . "',
-										'" . $_POST['MinOrderQty'] . "',
-										'" . $_POST['Preferred'] . "'
-									)";
-		$ErrMsg = _('The supplier purchasing details could not be added to the database because');
-		$DbgMsg = _('The SQL that failed was');
-		$AddResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
-		prnMsg(_('This supplier purchasing data has been added to the database'), 'success');
-
-		/* If the new purchdata is the preferred one, the old ones from the same suppliers shouldn't be preferred.
-		Are kept only for historic information only */
-		if ($_POST['Preferred'] == 1){
-			$sql = "UPDATE purchdata SET preferred='0'
-								WHERE purchdata.stockid='".$StockID."'
-									AND purchdata.supplierno='".$SupplierID."'
-									AND purchdata.effectivefrom < '" . FormatDateForSQL($_POST['EffectiveFrom']) . "'";
-			$ErrMsg = _('The preferred supplier details could not be update because');
-			$DbgMsg = _('The SQL that failed was');
-			$UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
-			prnMsg(_('Supplier preferred flag has been updated'), 'success');
-		}
-	}
-	if ($InputError == 0 AND isset($_POST['UpdateRecord'])) {
-		$sql = "UPDATE purchdata SET price='" . filter_number_format($_POST['Price']) . "',
-									effectivefrom='" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
-									suppliersuom='" . $_POST['SuppliersUOM'] . "',
-									conversionfactor='" . $_POST['ConversionFactor'] . "',
-									supplierdescription='" . $_POST['SupplierDescription'] . "',
-									suppliers_partno='" . $_POST['SupplierCode'] . "',
-									leadtime='" . $_POST['LeadTime'] . "',
-									minorderqty='" . $_POST['MinOrderQty'] . "',
-									preferred='" . $_POST['Preferred'] . "'
+    if ($InputError == 0 AND isset($_POST['AddRecord'])) {
+        $sql = "INSERT INTO purchdata (supplierno,
+								stockid,
+								price,
+								effectivefrom,
+								suppliersuom,
+								conversionfactor,
+								supplierdescription,
+								suppliers_partno,
+								leadtime,
+								minorderqty,
+								preferred)
+						VALUES ('" . $SupplierID . "',
+							'" . $StockID . "',
+							'" . filter_number_format($_POST['Price']) . "',
+							'" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
+							'" . $_POST['SuppliersUOM'] . "',
+							'" . filter_number_format($_POST['ConversionFactor']) . "',
+							'" . $_POST['SupplierDescription'] . "',
+							'" . $_POST['SupplierCode'] . "',
+							'" . filter_number_format($_POST['LeadTime']) . "',			                '" . filter_number_format($_POST['MinOrderQty']) . "',
+							'" . $_POST['Preferred'] . "')";
+        $ErrMsg = _('The supplier purchasing details could not be added to the database because');
+        $DbgMsg = _('The SQL that failed was');
+        $AddResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+        prnMsg(_('This supplier purchasing data has been added to the database'), 'success');
+    }
+    if ($InputError == 0 AND isset($_POST['UpdateRecord'])) {
+        $sql = "UPDATE purchdata SET price='" . filter_number_format($_POST['Price']) . "',
+								effectivefrom='" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
+								suppliersuom='" . $_POST['SuppliersUOM'] . "',
+								conversionfactor='" . filter_number_format($_POST['ConversionFactor']) . "',
+								supplierdescription='" . $_POST['SupplierDescription'] . "',
+								suppliers_partno='" . $_POST['SupplierCode'] . "',
+								leadtime='" . filter_number_format($_POST['LeadTime']) . "',
+								minorderqty='" . filter_number_format($_POST['MinOrderQty']) . "',
+								preferred='" . $_POST['Preferred'] . "'
 							WHERE purchdata.stockid='".$StockID."'
-								AND purchdata.supplierno='".$SupplierID."'
-								AND purchdata.effectivefrom='" . $_POST['WasEffectiveFrom'] . "'";
-		$ErrMsg = _('The supplier purchasing details could not be update because');
-		$DbgMsg = _('The SQL that failed was');
-		$UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
-		prnMsg(_('Supplier purchasing data has been updated'), 'success');
-	}
-	if ($InputError == 0 AND (isset($_POST['UpdateRecord']) OR isset($_POST['AddRecord']))) {
-		/*update or insert took place and need to clear the form  */
-		unset($SupplierID);
-		unset($_POST['Price']);
-		unset($CurrCode);
-		unset($_POST['SuppliersUOM']);
-		unset($_POST['EffectiveFrom']);
-		unset($_POST['ConversionFactor']);
-		unset($_POST['SupplierDescription']);
-		unset($_POST['LeadTime']);
-		unset($_POST['Preferred']);
-		unset($_POST['SupplierCode']);
-		unset($_POST['MinOrderQty']);
-		unset($SuppName);
-	}
+							AND purchdata.supplierno='".$SupplierID."'
+							AND purchdata.effectivefrom='" . $_POST['WasEffectiveFrom'] . "'";
+        $ErrMsg = _('The supplier purchasing details could not be updated because');
+        $DbgMsg = _('The SQL that failed was'
+);
+        $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+        prnMsg(_('Supplier purchasing data has been updated'), 'success');
+    }
+    if ($InputError == 0 AND (isset($_POST['UpdateRecord']) OR isset($_POST['AddRecord']))) {
+        /*update or insert took place and need to clear the form  */
+        unset($SupplierID);
+        unset($_POST['Price']);
+        unset($CurrCode);
+        unset($_POST['SuppliersUOM']);
+        unset($_POST['EffectiveFrom']);
+        unset($_POST['ConversionFactor']
+);
+        unset($_POST['SupplierDescription']);
+        unset($_POST['LeadTime']);
+        unset($_POST['Preferred']);
+        unset($_POST['SupplierCode']);
+        unset($_POST['MinOrderQty']);
+        unset($SuppName);
+    }
 }
 
 if (isset($_GET['Delete'])) {
-	$sql = "DELETE FROM purchdata
-				WHERE purchdata.supplierno='".$SupplierID."'
-				AND purchdata.stockid='".$StockID."'
-				AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
-	$ErrMsg = _('The supplier purchasing details could not be deleted because');
-	$DelResult = DB_query($sql, $db, $ErrMsg);
-	prnMsg(_('This purchasing data record has been successfully deleted'), 'success');
-	unset($SupplierID);
+    $sql = "DELETE FROM purchdata
+	   				WHERE purchdata.supplierno='".$SupplierID."'
+	   				AND purchdata.stockid='".$StockID."'
+	   				AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
+    $ErrMsg = _('The supplier purchasing details could not be deleted because');
+    $DelResult = DB_query($sql, $db, $ErrMsg);
+    prnMsg(_('This purchasing data record has been successfully deleted'), 'success');
+    unset($SupplierID);
 }
 
 if (!isset($_GET['Edit'])) {
 	echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . ' ' . _('For Stock Code') . ' - ' . $StockID . '</p><br />';
-	$sql = "SELECT purchdata.supplierno,
-					suppliers.suppname,
-					purchdata.price,
-					suppliers.currcode,
-					purchdata.effectivefrom,
-					purchdata.suppliersuom,
-					purchdata.supplierdescription,
-					purchdata.leadtime,
-					purchdata.suppliers_partno,
-					purchdata.minorderqty,
-					purchdata.preferred,
-					purchdata.conversionfactor,
-					currencies.decimalplaces AS currdecimalplaces
-				FROM purchdata
-				INNER JOIN suppliers
-					ON purchdata.supplierno=suppliers.supplierid
-				INNER JOIN currencies
-					ON suppliers.currcode=currencies.currabrev
-				WHERE purchdata.stockid = '" . $StockID . "'
-				ORDER BY purchdata.effectivefrom DESC, supplierno";
-	$ErrMsg = _('The supplier purchasing details for the selected part could not be retrieved because');
-	$PurchDataResult = DB_query($sql, $db, $ErrMsg);
-	if (DB_num_rows($PurchDataResult) == 0 and $StockID != '') {
+    $sql = "SELECT purchdata.supplierno,
+				suppliers.suppname,
+				purchdata.price,
+				suppliers.currcode,
+				purchdata.effectivefrom,
+				purchdata.suppliersuom,
+				purchdata.supplierdescription,
+				purchdata.leadtime,
+				purchdata.suppliers_partno,
+				purchdata.minorderqty,
+				purchdata.preferred,
+				purchdata.conversionfactor,
+				currencies.decimalplaces AS currdecimalplaces
+			FROM purchdata INNER JOIN suppliers
+				ON purchdata.supplierno=suppliers.supplierid
+			INNER JOIN currencies
+				ON suppliers.currcode=currencies.currabrev
+			WHERE purchdata.stockid = '" . $StockID . "'
+			ORDER BY purchdata.effectivefrom DESC";
+    $ErrMsg = _('The supplier purchasing details for the selected part could not be retrieved because');
+    $PurchDataResult = DB_query($sql, $db, $ErrMsg);
+    if (DB_num_rows($PurchDataResult) == 0 and $StockID != '') {
 		prnMsg(_('There is no purchasing data set up for the part selected'), 'info');
-		$sql="SELECT stockmaster.decimalplaces
-				FROM stockmaster
-				WHERE stockmaster.stockid = '" . $StockID . "'";
-		$DecimalPlacesResult=DB_query($sql, $db);
-		$DecimalPlacesRow=DB_fetch_array($DecimalPlacesResult);
-		$StockDecimalPlaces=$DecimalPlacesRow['decimalplaces'];
 		$NoPurchasingData=1;
-	} else if ($StockID != '') {
-		echo '<table cellpadding="2" class="selection">';
-		$TableHeader = '<tr>
-							<th>' . _('Supplier') . '</th>
-							<th>' . _('Price') . '</th>
-							<th>' . _('Currency') . '</th>
-							<th>' . _('Effective From') . '</th>
-							<th>' . _('Supplier Unit') . '</th>
-							<th>' . _('Conversion Factor') . '</th>
-							<th>' . _('Price Our Units') . '</th>
-							<th>' . _('Min Order Qty') . '</th>
-							<th>' . _('Lead Time') . '</th>
-							<th>' . _('Preferred') . '</th>
-						</tr>';
-		echo $TableHeader;
-		$CountPreferreds = 0;
-		$k = 0; //row colour counter
-		while ($myrow = DB_fetch_array($PurchDataResult)) {
-			if ($myrow['preferred'] == 1) {
-				echo '<tr class="EvenTableRows">';
-			} elseif ($k == 1) {
-				echo '<tr class="EvenTableRows">';
-				$k = 0;
-			} else {
-				echo '<tr class="OddTableRows">';
-				$k++;
-			}
-			if ($myrow['preferred'] == 1) {
-				$DisplayPreferred = _('Yes');
-				$CountPreferreds++;
-			} else {
-				$DisplayPreferred = _('No');
-			}
-			printf('<td>%s</td>
+    } else if ($StockID != '') {
+        echo '<table cellpadding="2" class="selection">';
+        $TableHeader = '<tr><th>' . _('Supplier') . '</th>
+						<th>' . _('Price') . '</th>
+						<th>' . _('Supplier Unit') . '</th>
+						<th>' . _('Conversion Factor') . '</th>
+						<th>' . _('Cost Per Our Unit') .  '</th>
+						<th>' . _('Currency') . '</th>
+						<th>' . _('Effective From') . '</th>
+						<th>' . _('Min Order Qty') . '</th>
+						<th>' . _('Lead Time') . '</th>
+						<th>' . _('Preferred') . '</th>
+					</tr>';
+        echo $TableHeader;
+        $CountPreferreds = 0;
+        $k = 0; //row colour counter
+        while ($myrow = DB_fetch_array($PurchDataResult)) {
+            if ($myrow['preferred'] == 1) {
+                echo '<tr class="EvenTableRows">';
+            } elseif ($k == 1) {
+                echo '<tr class="EvenTableRows">';
+                $k = 0;
+            } else {
+                echo '<tr class="OddTableRows">';
+                $k++;
+            }
+            if ($myrow['preferred'] == 1) {
+                $DisplayPreferred = _('Yes');
+                $CountPreferreds++;
+
+       } else {
+                $DisplayPreferred = _('No');
+            }
+	    $UPriceDecimalPlaces = max($myrow['currdecimalplaces'],$_Session['StandardCostDecimalPlaces']);
+            printf('<td>%s</td>
 					<td class="number">%s</td>
 					<td>%s</td>
-					<td>%s</td>
-					<td>%s</td>
 					<td class="number">%s</td>
 					<td class="number">%s</td>
-					<td class="number">%s</td>
-					<td class="number">%s ' . _('days') . '</td>
 					<td>%s</td>
-					<td><a href="%s?StockID=%s&amp;SupplierID=%s&amp;Edit=1&amp;EffectiveFrom=%s">' . _('Edit') . '</a></td>
-					<td><a href="%s?StockID=%s&amp;SupplierID=%s&amp;Copy=1&amp;EffectiveFrom=%s">' . _('Copy') . '</a></td>
-					<td><a href="%s?StockID=%s&amp;SupplierID=%s&amp;Delete=1&amp;EffectiveFrom=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this suppliers price?') . '\');">' . _('Delete') . '</a></td>
+					<td>%s</td>
+					<td>%s</td>
+					<td>%s ' . _('days') . '</td>
+					<td>%s</td>
+					<td><a href="%s?StockID=%s&SupplierID=%s&Edit=1&EffectiveFrom=%s">' . _('Edit') . '</a></td>
+					<td><a href="%s?StockID=%s&SupplierID=%s&Delete=1&EffectiveFrom=%s" onclick=\'return confirm("' . _('Are you sure you wish to delete this suppliers price?') . '");\'>' . _('Delete') . '</a></td>
 					</tr>',
 					$myrow['suppname'],
-					locale_number_format($myrow['price'], $myrow['currdecimalplaces']),
-					$myrow['currcode'],
-					ConvertSQLDate($myrow['effectivefrom']),
+					locale_number_format($myrow['price'],$UPriceDecimalPlaces),
 					$myrow['supplie...
 
[truncated message content]

Thread: [Web-erp-svn] SF.net SVN: web-erp:[5615] trunk (Page 36)

Accounting & Best Practice Business Administration System

web-erp-svn