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

[<ice...@us...>]

Revision: 6316
          http://sourceforge.net/p/web-erp/reponame/6316
Author:   icedlava
Date:     2013-09-01 15:13:06 +0000 (Sun, 01 Sep 2013)
Log Message:
-----------
Update from 'inc tax' to 'ex tax' values in confirmation and invoice page.
Fix typos.

Modified Paths:
--------------
    trunk/ConfirmDispatch_Invoice.php
    trunk/DeliveryDetails.php
    trunk/includes/GetSalesTransGLCodes.inc

Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php	2013-09-01 10:47:27 UTC (rev 6315)
+++ trunk/ConfirmDispatch_Invoice.php	2013-09-01 15:13:06 UTC (rev 6316)
@@ -213,7 +213,7 @@
 
 	} else { /*end if the order was returned sucessfully */
 
-		echo '<br />' . 
+		echo '<br />' .
 		prnMsg( _('This order item could not be retrieved. Please select another order'), 'warn');
 		include ('includes/footer.inc');
 		exit;
@@ -489,11 +489,11 @@
 	AND (!isset($_SESSION['Items'.$identifier]->FreightCost)
 		OR $_POST['ChargeFreightCost']==0)) {
 
-	echo '<td colspan="2" class="number">' .  _('Charge Freight Cost inc Tax') . '</td>
+	echo '<td colspan="2" class="number">' .  _('Charge Freight Cost ex Tax') . '</td>
 		<td><input tabindex="'.$j.'" type="text" required="required" class="number" size="10" maxlength="12" name="ChargeFreightCost" value="0" /></td>';
 	$_SESSION['Items'.$identifier]->FreightCost=0;
 } else {
-	echo '<td colspan="2" class="number">' .  _('Charge Freight Cost inc Tax') . '</td>';
+	echo '<td colspan="2" class="number">' .  _('Charge Freight Cost ex Tax') . '</td>';
 	if (isset($_POST['ProcessInvoice'])) {
 		echo '<td class="number">' . locale_number_format($_SESSION['Items'.$identifier]->FreightCost,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>';
 	} else {
@@ -1668,7 +1668,7 @@
 			<td>' . _('No Of Packages in Delivery'). ':</td>
 			<td><input tabindex="'.$j.'" type="number" maxlength="6" size="6" class="integer" name="Packages" value="' . $_POST['Packages'] . '" /></td>
 		</tr>';
-	
+
 	$j++;
 	echo '<tr>
 			<td>' . _('Action For Balance'). ':</td>

Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php	2013-09-01 10:47:27 UTC (rev 6315)
+++ trunk/DeliveryDetails.php	2013-09-01 15:13:06 UTC (rev 6316)
@@ -118,15 +118,15 @@
 	if ($InputErrors==0){
 
 		if ($_SESSION['DoFreightCalc']==True){
-			list ($_POST['FreightCost'], $BestShipper) = CalcFreightCost($_SESSION['Items'.$identifier]->total, 
-																		$_POST['BrAdd2'], 
-																		$_POST['BrAdd3'], 
-																		$_POST['BrAdd4'], 
-																		$_POST['BrAdd5'], 
-																		$_POST['BrAdd6'], 
-																		$_SESSION['Items'.$identifier]->totalVolume, 
-																		$_SESSION['Items'.$identifier]->totalWeight, 
-																		$_SESSION['Items'.$identifier]->Location, 
+			list ($_POST['FreightCost'], $BestShipper) = CalcFreightCost($_SESSION['Items'.$identifier]->total,
+																		$_POST['BrAdd2'],
+																		$_POST['BrAdd3'],
+																		$_POST['BrAdd4'],
+																		$_POST['BrAdd5'],
+																		$_POST['BrAdd6'],
+																		$_SESSION['Items'.$identifier]->totalVolume,
+																		$_SESSION['Items'.$identifier]->totalWeight,
+																		$_SESSION['Items'.$identifier]->Location,
 																		$_SESSION['Items'.$identifier]->DefaultCurrency,
 																		$db);
 			if ( !empty($BestShipper) ){
@@ -571,14 +571,14 @@
 				//Send email to the Factory Manager
 				if($_SESSION['SmtpSetting']==0){
 					mail($_SESSION['FactoryManagerEmail'],$EmailSubject,$FactoryManagerEmail);
-	
+
 				}else{
 					include('includes/htmlMimeMail.php');
 					$mail = new htmlMimeMail();
 					$mail->setSubject($EmailSubject);
 					$result = SendmailBySmtp($mail,array($_SESSION['FactoryManagerEmail']));
 				}
-				
+
 			} //end if with this sales order there is a shortfall of stock - need to create the WO
 		}//end if auto create WOs in on
 	} /* end inserted line items into sales order details */
@@ -1081,7 +1081,7 @@
 }
 echo '</select></td>
 	</tr>';
-	
+
 echo'	<tr>
 		<td>' .  _('Contact Phone Number') .':</td>
 		<td><input type="tel" size="25" maxlength="25" required="required" name="PhoneNo" value="' . $_SESSION['Items'.$identifier]->PhoneNo . '" title="' . _('Enter the telephone number of the contact at the delivery address.') . '" /></td>
@@ -1153,7 +1153,7 @@
 		}
 
 		echo '<tr>
-				<td>' .  _('Charge Freight Cost inc tax') .':</td>
+				<td>' .  _('Charge Freight Cost ex tax') .':</td>
 				<td><input type="text" class="number" size="10" maxlength="12" name="FreightCost" value="' . $_SESSION['Items'.$identifier]->FreightCost . '" /></td>';
 
 		if ($_SESSION['DoFreightCalc']==true){

Modified: trunk/includes/GetSalesTransGLCodes.inc
===================================================================
--- trunk/includes/GetSalesTransGLCodes.inc	2013-09-01 10:47:27 UTC (rev 6315)
+++ trunk/includes/GetSalesTransGLCodes.inc	2013-09-01 15:13:06 UTC (rev 6316)
@@ -14,7 +14,7 @@
 
 	/*Get the StockCategory for this item */
 
-	$SQL = "SELECT categoryid` FROM stockmaster WHERE stockid='" . $StockID . "'";
+	$SQL = "SELECT categoryid FROM stockmaster WHERE stockid='" . $StockID . "'";
 	$Result=DB_query($SQL,$db);
 	$myrow = DB_fetch_row($Result);
 	$StockCategory = $myrow[0];
@@ -69,7 +69,7 @@
 		DB_free_result($Result);
 		$SQL = "SELECT glcode FROM cogsglpostings
 			WHERE area = 'AN'
-			AND stkcat = = '" . $StockCategory . "'
+			AND stkcat = '" . $StockCategory . "'
 			AND salestype = '" . $SalesType . "'";
 
 		$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg);