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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4555
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4555&view=rev
Author:   daintree
Date:     2011-04-19 10:18:49 +0000 (Tue, 19 Apr 2011)

Log Message:
-----------
more quoting xhtml sql

Modified Paths:
--------------
    trunk/DebtorsAtPeriodEnd.php
    trunk/DeliveryDetails.php
    trunk/DiscountCategories.php
    trunk/DiscountMatrix.php
    trunk/EDIMessageFormat.php
    trunk/EmailCustTrans.php
    trunk/ExchangeRateTrend.php
    trunk/FixedAssetCategories.php
    trunk/GLAccountInquiry.php
    trunk/GLBalanceSheet.php
    trunk/GLBudgets.php
    trunk/GLTags.php
    trunk/GLTrialBalance.php
    trunk/GoodsReceived.php
    trunk/InventoryQuantities.php
    trunk/InventoryValuation.php
    trunk/Locations.php
    trunk/MRPReschedules.php
    trunk/OutstandingGRNs.php
    trunk/geo_displaymap_customers.php
    trunk/geo_displaymap_suppliers.php
    trunk/includes/ConnectDB_mysqli.inc
    trunk/includes/PDFInventoryValnPageHeader.inc
    trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
    trunk/sql/mysql/upgrade3.11.1-4.00.sql
    trunk/sql/mysql/weberp-demo.sql
    trunk/sql/mysql/weberp-new.sql

Modified: trunk/DebtorsAtPeriodEnd.php
===================================================================

--- trunk/DebtorsAtPeriodEnd.php	2011-04-18 07:49:36 UTC (rev 4554)
+++ trunk/DebtorsAtPeriodEnd.php	2011-04-19 10:18:49 UTC (rev 4555)
@@ -1,9 +1,7 @@
 <?php
-//$PageSecurity = 2;
 
 /* $Id$*/
 
-/* $Revision: 1.16 $ */
 include('includes/session.inc');
 
 if (isset($_POST['PrintPDF'])
@@ -58,9 +56,9 @@
 		$title = _('Customer Balances') . ' - ' . _('Problem Report');
 		include('includes/header.inc');
 		prnMsg(_('The customer details could not be retrieved by the SQL because') . DB_error_msg($db),'error');
-		echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+		echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
 		if ($debug==1){
-			echo "<br>$SQL";
+			echo '<br />' . $SQL;
 		}
 		include('includes/footer.inc');
 		exit;
@@ -70,7 +68,7 @@
 		$title = _('Customer Balances') . ' - ' . _('Problem Report');
 		include('includes/header.inc');
 		prnMsg(_('The customer details listing has no clients to report on'),'warn');
-		echo "<br><a href='".$rootpath."'/index.php?.'" . SID . "'>" . _('Back to the menu') . "</a>";
+		echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
 		include('includes/footer.inc');
 		exit;
 	}
@@ -115,22 +113,10 @@
 
 	$LeftOvers = $pdf->addTextWrap(50,$YPos,160,$FontSize,_('Total balances'),'left');
 	$LeftOvers = $pdf->addTextWrap(220,$YPos,60,$FontSize,$DisplayTotBalance,'right');
-	/* UldisN
-	$buf = $pdf->output();
-	$len = strlen($buf);
+	
+	$pdf->OutputD($_SESSION['DatabaseName'] . '_DebtorBals_' . date('Y-m-d').'.pdf');
+	$pdf->__destruct(); 
 
-	header('Content-type: application/pdf');
-	header("Content-Length: ".$len);
-	header('Content-Disposition: inline; filename=DebtorBals.pdf');
-	header('Expires: 0');
-	header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-	header('Pragma: public');
-
-	$pdf->stream();
-	*/
-	$pdf->OutputD($_SESSION['DatabaseName'] . '_DebtorBals_' . date('Y-m-d').'.pdf');//UldisN
-	$pdf->__destruct(); //UldisN
-
 } else { /*The option to print PDF was not hit */
 
 	$title=_('Debtor Balances');
@@ -142,29 +128,33 @@
 
 	/*if $FromCriteria is not set then show a form to allow input	*/
 
-		echo '<form action=' . $_SERVER['PHP_SELF'] . " method='POST'><table class=selection>";
+		echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">
+				<table class="selection">';
 		echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
-		echo '<tr><td>' . _('From Customer Code') .":</font></td><td><input tabindex=1 Type=text maxlength=6 size=7 name=FromCriteria value='1'></td></tr>";
-		echo '<tr><td>' . _('To Customer Code') . ":</td><td><input tabindex=2 Type=text maxlength=6 size=7 name=ToCriteria value='zzzzzz'></td></tr>";
+		echo '<tr><td>' . _('From Customer Code') .':</font></td>
+				<td><input tabindex=1 Type=text maxlength=6 size=7 name="FromCriteria" value="1"></td>
+				</tr>';
+		echo '<tr><td>' . _('To Customer Code') . ':</td>
+				<td><input tabindex=2 type="text" maxlength=6 size=7 name="ToCriteria" value="zzzzzz"></td></tr>';
 
-		echo '<tr><td>' . _('Balances As At') . ":</td><td><select tabindex=3 Name='PeriodEnd'>";
+		echo '<tr><td>' . _('Balances As At') . ':</td>
+				<td><select tabindex=3 name="PeriodEnd">';
 
-		$sql = 'SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC';
+		$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
 		$Periods = DB_query($sql,$db,_('Could not retrieve period data because'),_('The SQL that failed to get the period data was'));
 
 		while ($myrow = DB_fetch_array($Periods,$db)){
 
-			echo '<option VALUE=' . $myrow['periodno'] . '>' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']);
+			echo '<option value=' . $myrow['periodno'] . '>' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
 
 		}
 	}
 
 	echo '</select></td></tr>';
+	echo '</table>
+			<br /><div class="centre"><input tabindex=5 type=submit name="PrintPDF" value="' . _('Print PDF') . '"></div>';
 
-
-	echo "</table><br><div class='centre'><input tabindex=5 type=Submit Name='PrintPDF' Value='" . _('Print PDF') . "'></div>";
-
 	include('includes/footer.inc');
 } /*end of else not PrintPDF */
 

Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php	2011-04-18 07:49:36 UTC (rev 4554)
+++ trunk/DeliveryDetails.php	2011-04-19 10:18:49 UTC (rev 4555)
@@ -10,7 +10,6 @@
 
 /* Session started in header.inc for password checking the session will contain the details of the order from the Cart class object. The details of the order come from SelectOrderItems.php 			*/
 
-//$PageSecurity=1;
 include('includes/session.inc');
 $title = _('Order Delivery Details');
 include('includes/header.inc');
@@ -644,35 +643,35 @@
 										WHERE orderno='" .$_SESSION['ExistingOrder'] . "'", $db,$ErrMsg,$DbgMsg,true);
 			$ErrMsg = _('Could not insert the contract bill of materials');
 			$InsContractBOM = DB_query("INSERT INTO bom (parent,
-																									 component,
-																									 workcentreadded,
-																									 loccode,
-																									 effectiveafter,
-																									 effectiveto)
-																						SELECT contractref,
-																								stockid,
-																								workcentreadded,
-																							'" . $_SESSION['Items'.$identifier]->Location ."',
-																							'" . Date('Y-m-d') . "',
-																							'2037-12-31'
-																						FROM contractbom
-																						WHERE contractref='" . $ContractRow['contractref'] . "'",$db,$ErrMsg,$DbgMsg);
+														 component,
+														 workcentreadded,
+														 loccode,
+														 effectiveafter,
+														 effectiveto)
+											SELECT contractref,
+													stockid,
+													workcentreadded,
+												'" . $_SESSION['Items'.$identifier]->Location ."',
+												'" . Date('Y-m-d') . "',
+												'2037-12-31'
+											FROM contractbom
+											WHERE contractref='" . $ContractRow['contractref'] . "'",$db,$ErrMsg,$DbgMsg);
 
 			$ErrMsg = _('Unable to insert a new work order for the sales order item');
 			$InsWOResult = DB_query("INSERT INTO workorders (wo,
-																											 loccode,
-																											 requiredby,
-																											 startdate)
-																							 VALUES ('" . $WONo . "',
-																									'" . $_SESSION['Items'.$identifier]->Location ."',
-																									'" . $ContractRow['requireddate'] . "',
-																									'" . Date('Y-m-d'). "')",
-																									$db,$ErrMsg,$DbgMsg);
+															 loccode,
+															 requiredby,
+															 startdate)
+											 VALUES ('" . $WONo . "',
+													'" . $_SESSION['Items'.$identifier]->Location ."',
+													'" . $ContractRow['requireddate'] . "',
+													'" . Date('Y-m-d'). "')",
+													$db,$ErrMsg,$DbgMsg);
 			//Need to get the latest BOM to roll up cost but also add the contract other requirements
 			$CostResult = DB_query("SELECT SUM((materialcost+labourcost+overheadcost)*contractbom.quantity) AS cost
-															FROM stockmaster INNER JOIN contractbom
-															ON stockmaster.stockid=contractbom.stockid
-															WHERE contractbom.contractref='" .  $ContractRow['contractref'] . "'",
+									FROM stockmaster INNER JOIN contractbom
+									ON stockmaster.stockid=contractbom.stockid
+									WHERE contractbom.contractref='" .  $ContractRow['contractref'] . "'",
 									$db);
 			$CostRow = DB_fetch_row($CostResult);
 			if (is_null($CostRow[0]) OR $CostRow[0]==0){
@@ -682,8 +681,8 @@
 				$Cost = $CostRow[0]; //cost of contract BOM
 			}
 			$CostResult = DB_query("SELECT SUM(costperunit*quantity) AS cost
-												FROM contractreqts
-												WHERE contractreqts.contractref='" .  $ContractRow['contractref'] . "'",
+									FROM contractreqts
+									WHERE contractreqts.contractref='" .  $ContractRow['contractref'] . "'",
 									$db);
 			$CostRow = DB_fetch_row($CostResult);
 			//add other requirements cost to cost of contract BOM
@@ -750,13 +749,13 @@
 		}
 
 		$LineItemsSQL = "UPDATE salesorderdetails SET unitprice='"  . $StockItem->Price . "',
-								quantity='" . $StockItem->Quantity . "',
-								discountpercent='" . floatval($StockItem->DiscountPercent) . "',
-								completed='" . $Completed . "',
-								poline='" . $StockItem->POLine . "',
-								itemdue='" . FormatDateForSQL($StockItem->ItemDue) . "'
-					WHERE salesorderdetails.orderno='" . $_SESSION['ExistingOrder'] . "'
-					AND salesorderdetails.orderlineno='" . $StockItem->LineNumber . "'";
+													quantity='" . $StockItem->Quantity . "',
+													discountpercent='" . floatval($StockItem->DiscountPercent) . "',
+													completed='" . $Completed . "',
+													poline='" . $StockItem->POLine . "',
+													itemdue='" . FormatDateForSQL($StockItem->ItemDue) . "'
+						WHERE salesorderdetails.orderno='" . $_SESSION['ExistingOrder'] . "'
+						AND salesorderdetails.orderlineno='" . $StockItem->LineNumber . "'";
 
 		$DbgMsg = _('The SQL that was used to modify the order line and failed was');
 		$ErrMsg = _('The updated order line cannot be modified because');
@@ -771,10 +770,24 @@
 
 	prnMsg(_('Order Number') .' ' . $_SESSION['ExistingOrder'] . ' ' . _('has been updated'),'success');
 
-	echo '<br /><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td><td><a href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier  . '&TransNo=' . $_SESSION['ExistingOrder'] . '">'. _('Print packing slip - pre-printed stationery') .'</a></td></tr>';
-	echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td><td><a  target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?identifier='.$identifier  . '&TransNo=' . $_SESSION['ExistingOrder'] . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td></tr>';
-	echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt=""></td><td><a href="' . $rootpath .'/ConfirmDispatch_Invoice.php?identifier='.$identifier  . '&OrderNumber=' . $_SESSION['ExistingOrder'] . '">'. _('Confirm Order Delivery Quantities and Produce Invoice') .'</a></td></tr>';
-	echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt=""></td><td><a href="' . $rootpath .'/SelectSalesOrder.php?identifier='.$identifier   . '">'. _('Select A Different Order') .'</a></td></tr></table>';
+	echo '<br />
+			<table class="selection">
+			<tr>
+				<td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td><td><a href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier  . '&TransNo=' . $_SESSION['ExistingOrder'] . '">'. _('Print packing slip - pre-printed stationery') .'</a></td>
+			</tr>';
+	echo '<tr>
+			<td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td>
+			<td><a  target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?identifier='.$identifier  . '&TransNo=' . $_SESSION['ExistingOrder'] . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td>
+		</tr>';
+	echo '<tr>
+			<td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt=""></td>
+			<td><a href="' . $rootpath .'/ConfirmDispatch_Invoice.php?identifier='.$identifier  . '&OrderNumber=' . $_SESSION['ExistingOrder'] . '">'. _('Confirm Order Delivery Quantities and Produce Invoice') .'</a></td>
+		</tr>';
+	echo '<tr>
+			<td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt=""></td>
+			<td><a href="' . $rootpath .'/SelectSalesOrder.php?identifier='.$identifier   . '">'. _('Select A Different Order') .'</a></td>
+		</tr>
+		</table>';
 	include('includes/footer.inc');
 	exit;
 }
@@ -786,7 +799,7 @@
 echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Delivery') . '" alt="" />' . ' ' . _('Delivery Details');
 echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo;
 echo '</b>&nbsp;' . _('Customer Name') . ' :<b> ' . $_SESSION['Items'.$identifier]->CustomerName . '</p>';
-//echo '<font size=4><b>'. _('Customer') .' : ' . $_SESSION['Items'.$identifier]->CustomerName . '</b></font>';
+
 echo '<form action="' . $_SERVER['PHP_SELF'] . '?identifier='.$identifier  . '" method=post>';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
@@ -942,14 +955,14 @@
 
 $ErrMsg = _('The stock locations could not be retrieved');
 $DbgMsg = _('SQL used to retrieve the stock locations was') . ':';
-$StkLocsResult = DB_query('SELECT locationname,loccode
-					FROM locations',$db, $ErrMsg, $DbgMsg);
+$StkLocsResult = DB_query("SELECT locationname,loccode
+							FROM locations",$db, $ErrMsg, $DbgMsg);
 
 while ($myrow=DB_fetch_row($StkLocsResult)){
 	if ($_SESSION['Items'.$identifier]->Location==$myrow[1]){
-		echo '<option selected value="'.$myrow[1].'">'.$myrow[0];
+		echo '<option selected value="' . $myrow[1] . '">' . $myrow[0] . '</option>';
 	} else {
-		echo '<option value="'.$myrow[1].'">'.$myrow[0];
+		echo '<option value="'.$myrow[1].'">'.$myrow[0] . '</option>';
 	}
 }
 
@@ -1031,75 +1044,68 @@
 	/* This field will control whether or not to display the company logo and
 	address on the packlist */
 
-	echo '<tr><td>' . _('Packlist Type') . ':</td><td><select name="DeliverBlind">';
-		for ($p = 1; $p <= 2; $p++) {
-			echo '<option value=' . $p;
-			if ($p == $_SESSION['Items'.$identifier]->DeliverBlind) {
-				echo ' selected>';
-			} else {
-				echo '>';
-			}
-			switch ($p) {
-				case 2:
-					echo _('Hide Company Details/Logo');
-			break;
-				default:
-					echo _('Show Company Details/Logo');
-			break;
-			}
-		}
+	echo '<tr><td>' . _('Packlist Type') . ':</td>
+			<td><select name="DeliverBlind">';
+			
+	if ($_SESSION['Items'.$identifier]->DeliverBlind ==2){
+		echo '<option value="1">' . _('Show Company Details/Logo') . '</option>';
+		echo '<option selected value="2">' . _('Hide Company Details/Logo') . '</option>';
+	} else {
+		echo '<option selected value="1">' . _('Show Company Details/Logo') . '</option>';
+		echo '<option value="2">' . _('Hide Company Details/Logo') . '</option>';
+	}
 	echo '</select></td></tr>';
 
 if (isset($_SESSION['PrintedPackingSlip']) and $_SESSION['PrintedPackingSlip']==1){
 
 	echo '<tr>
 		<td>'. _('Reprint packing slip') .':</td>
-	<td><select name="ReprintPackingSlip">';
-	echo '<option value=0>' . _('Yes');
-	echo '<option selected value=1>' . _('No');
+		<td><select name="ReprintPackingSlip">';
+	echo '<option value=0>' . _('Yes') . '</option>';
+	echo '<option selected value=1>' . _('No') . '</option>';
 	echo '</select>	'. _('Last printed') .': ' . ConvertSQLDate($_SESSION['DatePackingSlipPrinted']) . '</td></tr>';
-
 } else {
-
 	echo '<input type=hidden name="ReprintPackingSlip" value=0>';
-
 }
 
 echo '<tr><td>'. _('Charge Freight Cost inc tax') .':</td>';
-echo '<td><input type=text class=number size=10 maxlength=12 name="FreightCost" VALUE=' . $_SESSION['Items'.$identifier]->FreightCost . '></td>';
+echo '<td><input type=text class="number" size=10 maxlength=12 name="FreightCost" value="' . $_SESSION['Items'.$identifier]->FreightCost . '"></td>';
 
 if ($_SESSION['DoFreightCalc']==true){
-	echo '<td><input type=submit name="Update" VALUE="' . _('Recalc Freight Cost') . '"></td></tr>';
+	echo '<td><input type=submit name="Update" value="' . _('Recalc Freight Cost') . '"></td></tr>';
 }
 
 if ((!isset($_POST['ShipVia']) OR $_POST['ShipVia']=='') AND isset($_SESSION['Items'.$identifier]->ShipVia)){
 	$_POST['ShipVia'] = $_SESSION['Items'.$identifier]->ShipVia;
 }
 
-echo '<tr><td>'. _('Freight/Shipper Method') .':</td><td><select name="ShipVia">';
+echo '<tr><td>'. _('Freight/Shipper Method') .':</td>
+			<td><select name="ShipVia">';
+
 $ErrMsg = _('The shipper details could not be retrieved');
 $DbgMsg = _('SQL used to retrieve the shipper details was') . ':';
-$sql = 'SELECT shipper_id, shippername
-		FROM shippers';
+
+$sql = "SELECT shipper_id, shippername FROM shippers";
 $ShipperResults = DB_query($sql,$db,$ErrMsg,$DbgMsg);
 while ($myrow=DB_fetch_array($ShipperResults)){
 	if ($myrow['shipper_id']==$_POST['ShipVia']){
-			echo '<option selected value=' . $myrow['shipper_id'] . '>' . $myrow['shippername'];
+			echo '<option selected value=' . $myrow['shipper_id'] . '>' . $myrow['shippername'] . '</option>';
 	}else {
-		echo '<option value=' . $myrow['shipper_id'] . '>' . $myrow['shippername'];
+		echo '<option value=' . $myrow['shipper_id'] . '>' . $myrow['shippername'] . '</option>';
 	}
 }
 
 echo '</select></td></tr>';
 
 
-echo '<tr><td>'. _('Quotation Only') .':</td><td><select name="Quotation">';
+echo '<tr><td>'. _('Quotation Only') .':</td>
+		<td><select name="Quotation">';
 if ($_SESSION['Items'.$identifier]->Quotation==1){
-	echo '<option selected value=1>' . _('Yes');
-	echo '<option value=0>' . _('No');
+	echo '<option selected value=1>' . _('Yes') . '</option>';
+	echo '<option value=0>' . _('No') . '</option>';
 } else {
-	echo '<option VALUE=1>' . _('Yes');
-	echo '<option selected VALUE=0>' . _('No');
+	echo '<option value=1>' . _('Yes') . '</option>';
+	echo '<option selected value=0>' . _('No') . '</option>';
 }
 echo '</select></td></tr>';
 
@@ -1110,9 +1116,9 @@
 
 if ($_SESSION['ExistingOrder']==0){
 	echo '<br /><br /><input type=submit name="ProcessOrder" value="' . _('Place Order') . '">';
-	echo '<br /><br /><input type=submit name="MakeRecurringOrder" VALUE="' . _('Create Recurring Order') . '">';
+	echo '<br /><br /><input type=submit name="MakeRecurringOrder" value="' . _('Create Recurring Order') . '">';
 } else {
-	echo '<br /><input type=submit name="ProcessOrder" VALUE="' . _('Commit Order Changes') . '">';
+	echo '<br /><input type=submit name="ProcessOrder" value="' . _('Commit Order Changes') . '">';
 }
 
 echo '</div></form>';

Modified: trunk/DiscountCategories.php
===================================================================
--- trunk/DiscountCategories.php	2011-04-18 07:49:36 UTC (rev 4554)
+++ trunk/DiscountCategories.php	2011-04-19 10:18:49 UTC (rev 4555)
@@ -1,9 +1,7 @@
 <?php
-/* $Revision: 1.10 $ */
+
 /* $Id$*/
 
-//$PageSecurity = 11;
-
 include('includes/session.inc');
 
 $title = _('Discount Categories Maintenance');
@@ -15,7 +13,7 @@
 	$_POST['StockID']=$_POST['stockID'];
 } elseif (isset($_GET['StockID'])) {
 	$_POST['StockID']=$_GET['StockID'];
-	$_POST['chooseoption']=1;
+	$_POST['ChooseOption']=1;
 	$_POST['selectchoice']=1;
 }
 
@@ -42,7 +40,7 @@
 	if ($InputError !=1) {
 
 		$sql = "UPDATE stockmaster SET discountcategory='" . $_POST['DiscountCategory'] . "'
-			WHERE stockid='" . strtoupper($_POST['StockID']) . "'";
+				WHERE stockid='" . strtoupper($_POST['StockID']) . "'";
 
 		$result = DB_query($sql,$db, _('The discount category') . ' ' . $_POST['DiscountCategory'] . ' ' . _('record for') . ' ' . strtoupper($_POST['StockID']) . ' ' . _('could not be updated because'));
 
@@ -58,8 +56,8 @@
 	$sql="UPDATE stockmaster SET discountcategory='' WHERE stockid='" . trim(strtoupper($_GET['StockID'])) ."'";
 	$result = DB_query($sql,$db);
 	prnMsg( _('The stock master record has been updated to no discount category'),'success');
-	echo '<br>';
-} elseif (isset($_POST['submitcategory'])) {
+	echo '<br />';
+} elseif (isset($_POST['SubmitCategory'])) {
 	$sql="UPDATE stockmaster
 		SET discountcategory='".$_POST['DiscountCategory']."'
 		WHERE categoryid='".$_POST['stockcategory']."'";
@@ -67,7 +65,7 @@
 }
 
 if (isset($_POST['selectchoice'])) {
-	echo "<form name='update' method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+	echo '<form name="update" method="post" action="' . $_SERVER['PHP_SELF'] . '">';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 	$sql = "SELECT DISTINCT discountcategory FROM stockmaster WHERE discountcategory <>''";
@@ -79,31 +77,37 @@
 
 		while ($myrow = DB_fetch_array($result)){
 			if ($myrow['discountcategory']==$_POST['DiscCat']){
-				echo "<option selected value='" . $myrow['discountcategory'] . "'>" . $myrow['discountcategory'];
+				echo '<option selected value="' . $myrow['discountcategory'] . '">' . $myrow['discountcategory']  . '</option>';
 			} else {
-				echo "<option value='" . $myrow['discountcategory'] . "'>" . $myrow['discountcategory'];
+				echo '<option value="' . $myrow['discountcategory'] . '">' . $myrow['discountcategory'] . '</option>';
 			}
 			echo '</option>';
 		}
 
 		echo '</select></td>';
-		echo '<td><input type="submit" name="select" value="'._('Select').'"></td></tr></table><br>';
+		echo '<td><input type="submit" name="select" value="'._('Select').'"></td></tr></table><br />';
 	}
 
-	echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+	echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-	echo '<input type="hidden" name="chooseoption" value="'.$_POST['chooseoption'].'">';
+	echo '<input type="hidden" name="ChooseOption" value="'.$_POST['ChooseOption'].'">';
 	echo '<input type="hidden" name="selectchoice" value="'.$_POST['selectchoice'].'">';
 
-	if (isset($_POST['chooseoption']) and $_POST['chooseoption']==1) {
-		echo '<table class=selection><tr><td>'. _('Discount Category Code') .':</td><td>';
+	if (isset($_POST['ChooseOption']) and $_POST['ChooseOption']==1) {
+		echo '<table class="selection"><tr><td>'. _('Discount Category Code') .':</td><td>';
 
 		if (isset($_POST['DiscCat'])) {
-			echo "<input type='text' name='DiscountCategory' maxlength=2 size=2 value='" . $_POST['DiscCat'] .
-				"'></td><td>"._('OR')."</td><td></td><td>"._('OR')."</td></tr>";
+			echo '<input type="text" name="DiscountCategory" maxlength=2 size=2 value="' . $_POST['DiscCat'] .'"></td>
+				<td>'._('OR') . '</td>
+				<td></td>
+				<td>'._('OR').'</td>
+				</tr>';
 		} else {
-			echo "<input type='text' name='DiscountCategory' maxlength=2 size=2></td><td>".
-				_('OR')."</td><td></td><td>"._('OR')."</td></tr>";
+			echo '<input type="text" name="DiscountCategory" maxlength=2 size=2></td>
+				<td>' ._('OR') . '</td>
+				<td></td>
+				<td>'._('OR') . '</td>
+				</tr>';
 		}
 
 		if (!isset($_POST['StockID'])) {
@@ -115,46 +119,53 @@
 		if (!isset($_POST['PartDesc'])) {
 			$_POST['PartDesc']='';
 		}
-		echo '<tr><td>'. _('Enter Stock Code') .":</td><td><input type='text' name='StockID' size=20 maxlength=20
-			value='".$_POST['StockID']."'></td>
-			<td>"._('Partial code').":</td><td><input type='text' name='PartID' size=10 maxlength=10 value='".$_POST['PartID']."'></td>
-			<td>"._('Partial description').":</td><td><input type='text' name='PartDesc' size=10 value='".$_POST['PartDesc']."' maxlength=10></td>
-			<td><input type='Submit' name='search' value='". _('Search') ."'></td></tr>";
+		echo '<tr><td>'. _('Enter Stock Code') .':</td>
+				<td><input type="text" name="StockID" size=20 maxlength=20 value="' . $_POST['StockID'] . '"></td>
+				<td>'._('Partial code') . ':</td>
+				<td><input type="text" name="PartID" size=10 maxlength=10 value="' . $_POST['PartID'] . '"></td>
+				<td>' . _('Partial description') . ':</td>
+				<td><input type="text" name="PartDesc" size=10 value="' . $_POST['PartDesc'] .'" maxlength=10></td>
+				<td><input type="submit" name="search" value="' . _('Search') .'"></td></tr>';
 
 		echo '</table>';
 
-		echo "<br><div class='centre'><input type='Submit' name='submit' value='". _('Update Item') ."'></div>";
+		echo '<br /><div class="centre"><input type="submit" name="submit" value="'. _('Update Item') .'"></div>';
 
 		if (isset($_POST['search'])) {
 			if ($_POST['PartID']!='' and $_POST['PartDesc']=='')
-				$sql="SELECT stockid, description FROM stockmaster WHERE stockid LIKE '%".$_POST['PartID']."%'";
+				$sql="SELECT stockid, description FROM stockmaster 
+						WHERE stockid " . LIKE  . " '%".$_POST['PartID']."%'";
 			if ($_POST['PartID']=='' and $_POST['PartDesc']!='')
-				$sql="SELECT stockid, description FROM stockmaster WHERE description LIKE '%".$_POST['PartDesc']."%'";
+				$sql="SELECT stockid, description FROM stockmaster 
+						WHERE description " . LIKE  . " '%".$_POST['PartDesc']."%'";
 			if ($_POST['PartID']!='' and $_POST['PartDesc']!='')
-				$sql="SELECT stockid, description FROM stockmaster WHERE stockid LIKE '%".$_POST['PartID']."%' and
-				 description LIKE '%".$_POST['PartDesc']."%'";
+				$sql="SELECT stockid, description FROM stockmaster 
+						WHERE stockid " . LIKE  . " '%".$_POST['PartID']."%' 
+						AND description " . LIKE . " '%".$_POST['PartDesc']."%'";
 			$result=DB_query($sql,$db);
 			if (!isset($_POST['stockID'])) {
-				echo _('Select a part code').':<br>';
+				echo _('Select a part code').':<br />';
 				while ($myrow=DB_fetch_array($result)) {
-					echo '<input type="submit" name="stockID" value="'.$myrow['stockid'].'"><br>';
+					echo '<input type="submit" name="stockID" value="'.$myrow['stockid'].'" /><br />';
 				}
 			}
 		}
 	} else {
-		echo '<table class=selection><tr><td>'._('Assign discount category').'</td>';
-		echo '<td><input type="text" name="DiscountCategory" maxlength=2 size=2></td>';
+		echo '<table class=selection>
+				<tr>
+				<td>'._('Assign discount category').'</td>';
+		echo '<td><input type="text" name="DiscountCategory" maxlength=2 size=2 /></td>';
 		echo '<td>'._('to all items in stock category').'</td>';
-		$sql = 'SELECT categoryid,
+		$sql = "SELECT categoryid,
 				categorydescription
-				FROM stockcategory';
+				FROM stockcategory";
 		$result = DB_query($sql, $db);
 		echo '<td><select name="stockcategory">';
 		while ($myrow=DB_fetch_array($result)) {
 			echo '<option value="'.$myrow['categoryid'].'">'.$myrow['categorydescription'].'</option>';
 		}
 		echo '</select></td></tr></table>';
-		echo "<br><div class='centre'><input type='Submit' name='submitcategory' value='". _('Update Items') ."'></div>";
+		echo '<br /><div class="centre"><input type="submit" name="SubmitCategory" value="'. _('Update Items') .'"></div>';
 	}
 	echo '</form>';
 
@@ -182,10 +193,10 @@
 
 		$result = DB_query($sql,$db);
 
-		echo '<br><table class=selection>';
-		echo "<tr>
-			<th>". _('Discount Category') ."</th>
-			<th>". _('Item') .'</th></tr>';
+		echo '<br /><table class="selection">';
+		echo '<tr>
+			<th>'. _('Discount Category') .'</th>
+			<th>'. _('Item') .'</th></tr>';
 
 		$k=0; //row colour counter
 
@@ -197,16 +208,16 @@
 				echo '<tr class="OddTableRows">';
 				$k=1;
 			}
-			$DeleteURL = $_SERVER['PHP_SELF'] . '?' . SID . '&Delete=yes&StockID=' . $myrow['stockid'] . '&DiscountCategory=' . $myrow['discountcategory'];
+			$DeleteURL = $_SERVER['PHP_SELF'] . '?Delete=yes&StockID=' . $myrow['stockid'] . '&DiscountCategory=' . $myrow['discountcategory'];
 
-			printf("<td>%s</td>
-				<td>%s - %s</td>
-				<td><a href='%s'>". _('Delete') .'</td>
-				</tr>',
-				$myrow['discountcategory'],
-				$myrow['stockid'],
-				$myrow['description'],
-				$DeleteURL);
+			printf('<td>%s</td>
+					<td>%s - %s</td>
+					<td><a href="%s">'. _('Delete') .'</td>
+					</tr>',
+					$myrow['discountcategory'],
+					$myrow['stockid'],
+					$myrow['description'],
+					$DeleteURL);
 
 		}
 
@@ -214,20 +225,22 @@
 
 	} else { /* $_POST['DiscCat'] ==0 */
 
-		echo '</div><br>';
+		echo '</div><br />';
 		prnMsg( _('There are currently no discount categories defined') . '. ' . _('Enter a two character abbreviation for the discount category and the stock code to which this category will apply to. Discount rules can then be applied to this discount category'),'info');
 	}
 }
 
 if (!isset($_POST['selectchoice'])) {
-	echo "<form method='post' name='choose' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+	echo '<form method="post" name="choose" action="' . $_SERVER['PHP_SELF'] .  '">';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-	echo '<table class=selection>';
+	echo '<table class="selection">';
 	echo '<tr><td>'._('Update discount category for').'</td>';
-	echo '<td><select name="chooseoption" onChange="ReloadForm(choose.selectchoice)">';
+	echo '<td><select name="ChooseOption" onChange="ReloadForm(choose.selectchoice)">';
 	echo '<option value="1">'._('a single stock item').'</option>';
 	echo '<option value="2">'._('a complete stock category').'</option>';
-	echo '</select></td></tr></table><br>';
+	echo '</select></td></tr>
+		</table>
+		<br />';
 	echo '<div class="centre"><input type="submit" name="selectchoice" value="'._('Select').'"></div>';
 }
 

Modified: trunk/DiscountMatrix.php
===================================================================
--- trunk/DiscountMatrix.php	2011-04-18 07:49:36 UTC (rev 4554)
+++ trunk/DiscountMatrix.php	2011-04-19 10:18:49 UTC (rev 4555)
@@ -1,13 +1,11 @@
 <?php
-/* $Revision: 1.9 $ */
+
 /* $Id$*/
 
-//$PageSecurity = 11;
 include('includes/session.inc');
 $title = _('Discount Matrix Maintenance');
 include('includes/header.inc');
 
-
 if (isset($Errors)) {
 	unset($Errors);
 }
@@ -64,7 +62,7 @@
 
 		$result = DB_query($sql,$db);
 		prnMsg( _('The discount matrix record has been added'),'success');
-		echo '<br>';
+		echo '<br />';
 		unset($_POST['DiscountCategory']);
 		unset($_POST['SalesType']);
 		unset($_POST['QuantityBreak']);
@@ -80,30 +78,30 @@
 
 	$result = DB_query($sql,$db);
 	prnMsg( _('The discount matrix record has been deleted'),'success');
-	echo '<br>';
+	echo '<br />';
 }
 
-echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 
-echo '<table class=selection>';
+echo '<table class="selection">';
 
-$sql = 'SELECT typeabbrev,
+$sql = "SELECT typeabbrev,
 		sales_type
-	FROM salestypes';
+		FROM salestypes";
 
 $result = DB_query($sql, $db);
 
 echo '<tr><td>' . _('Customer Price List') . ' (' . _('Sales Type') . '):</td><td>';
 
-echo "<select tabindex=1 name='SalesType'>";
+echo '<select tabindex=1 name="SalesType">';
 
 while ($myrow = DB_fetch_array($result)){
 	if (isset($_POST['SalesType']) and $myrow['typeabbrev']==$_POST['SalesType']){
-		echo "<option selected value='" . $myrow['typeabbrev'] . "'>" . $myrow['sales_type'];
+		echo '<option selected value="' . $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
 	} else {
-		echo "<option value='" . $myrow['typeabbrev'] . "'>" . $myrow['sales_type'];
+		echo '<option value="' . $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
 	}
 }
 
@@ -118,29 +116,26 @@
 
 	while ($myrow = DB_fetch_array($result)){
 		if ($myrow['discountcategory']==$_POST['DiscCat']){
-			echo "<option selected value='" . $myrow['discountcategory'] . "'>" . $myrow['discountcategory'];
+			echo '<option selected value="' . $myrow['discountcategory'] . '">' . $myrow['discountcategory'] . '</option>';
 		} else {
-			echo "<option value='" . $myrow['discountcategory'] . "'>" . $myrow['discountcategory'];
+			echo '<option value="' . $myrow['discountcategory'] . '">' . $myrow['discountcategory'] . '</option>';
 		}
-		echo '</option>';
 	}
 	echo '</select></td>';
 } else {
 	echo '<input type="hidden" name="DiscountCategory" value="">';
 }
 
-echo '<tr><td>' . _('Quantity Break') . ":</td><td><input class='number' tabindex=3 "
-	 . (in_array('QuantityBreak',$Errors) ? "class='inputerror'" : "")
-	 ." type='text' name='QuantityBreak' size=10 maxlength=10></td></tr>";
+echo '<tr><td>' . _('Quantity Break') . '</td>
+		<td><input class="number" tabindex=3 ' . (in_array('QuantityBreak',$Errors) ? 'class="inputerror"' : '') .' type="text" name="QuantityBreak" size=10 maxlength=10></td></tr>';
 
-echo '<tr><td>' . _('Discount Rate') . " (%):</td><td><input class='number' tabindex=4 "
-	. (in_array('DiscountRate',$Errors) ? "class='inputerror'" : "") .
-		"type='text' name='DiscountRate' size=11 maxlength=14></td></tr>";
-echo '</table><br>';
+echo '<tr><td>' . _('Discount Rate') . ' (%):</td>
+		<td><input class="number" tabindex=4 ' . (in_array('DiscountRate',$Errors) ? 'class="inputerror"' : '') . 'type="text" name="DiscountRate" size=11 maxlength=14></td></tr>';
+echo '</table><br />';
 
-echo "<div class='centre'><input tabindex=5 type='submit' name='submit' value='" . _('Enter Information') . "'></div><br>";
+echo '<div class="centre"><input tabindex=5 type="submit" name="submit" value="' . _('Enter Information') . '"></div><br />';
 
-$sql = 'SELECT sales_type,
+$sql = "SELECT sales_type,
 		salestype,
 		discountcategory,
 		quantitybreak,
@@ -149,15 +144,15 @@
 		ON discountmatrix.salestype=salestypes.typeabbrev
 	ORDER BY salestype,
 		discountcategory,
-		quantitybreak';
+		quantitybreak";
 
 $result = DB_query($sql,$db);
 
 echo '<table class=selection>';
-echo "<tr><th>" . _('Sales Type') . "</th>
-	<th>" . _('Discount Category') . "</th>
-	<th>" . _('Quantity Break') . "</th>
-	<th>" . _('Discount Rate') . ' %' . "</th></tr>";
+echo '<tr><th>' . _('Sales Type') . '</th>
+		<th>' . _('Discount Category') . '</th>
+		<th>' . _('Quantity Break') . '</th>
+		<th>' . _('Discount Rate') . ' %' . '</th></tr>';
 
 $k=0; //row colour counter
 
@@ -169,13 +164,13 @@
 		echo '<tr class="OddTableRows">';
 		$k=1;
 	}
-	$DeleteURL = $_SERVER['PHP_SELF'] . '?' . SID . '&Delete=yes&SalesType=' . $myrow['salestype'] . '&DiscountCategory=' . $myrow['discountcategory'] . '&QuantityBreak=' . $myrow['quantitybreak'];
+	$DeleteURL = $_SERVER['PHP_SELF'] . '?Delete=yes&SalesType=' . $myrow['salestype'] . '&DiscountCategory=' . $myrow['discountcategory'] . '&QuantityBreak=' . $myrow['quantitybreak'];
 
-	printf("<td>%s</td>
+	printf('<td>%s</td>
 		<td>%s</td>
-		<td class='number'>%s</td>
-		<td class='number'>%s</td>
-		<td><a href='%s'>" . _('Delete') . '</td>
+		<td class="number">%s</td>
+		<td class="number">%s</td>
+		<td><a href="%s">' . _('Delete') . '</td>
 		</tr>',
 		$myrow['sales_type'],
 		$myrow['discountcategory'],

Modified: trunk/EDIMessageFormat.php
===================================================================
--- trunk/EDIMessageFormat.php	2011-04-18 07:49:36 UTC (rev 4554)
+++ trunk/EDIMessageFormat.php	2011-04-19 10:18:49 UTC (rev 4555)
@@ -97,7 +97,7 @@
 	prnMsg($msg,'success');
 }
 
-echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 echo '<p><table border=0 width=100%>
@@ -124,12 +124,12 @@
 	$result = DB_query($sql,$db);
 
 	echo '<table class=selection>';
-	echo '<tr><th colspan=5><font size=3>' . _('Definition of') . ' ' . $MessageType . ' ' . _('for') . ' ' . $PartnerCode."</font></th></tr>";
-	$TableHeader = "<tr>
-			<th>" . _('Section') . "</th>
-			<th>" . _('Sequence') . "</th>
-			<th>" . _('Format String') . "</th>
-			</tr>";
+	echo '<tr><th colspan=5><font size=3>' . _('Definition of') . ' ' . $MessageType . ' ' . _('for') . ' ' . $PartnerCode.'</font></th></tr>';
+	$TableHeader = '<tr>
+			<th>' . _('Section') . '</th>
+			<th>' . _('Sequence') . '</th>
+			<th>' . _('Format String') . '</th>
+			</tr>';
 	echo $TableHeader;
 
 	$k=0; //row colour counter
@@ -144,12 +144,12 @@
 		}
 
 
-		printf("<td>%s</td>
+		printf('<td>%s</td>
 			<td class=number>%s</td>
 			<td>%s</td>
-			<td><a href=\"%s&SelectedMessageLine=%s\">" . _('Edit') . "</a></td>
-			<td><a href=\"%s&delete=%s\">" . _('Delete') . "</a></td>
-			</tr>",
+			<td><a href="%s&SelectedMessageLine=%s">' . _('Edit') . '</a></td>
+			<td><a href="%s&delete=%s">' . _('Delete') . '</a></td>
+			</tr>',
 			$myrow[1],
 			$myrow[2],
 			$myrow[3],
@@ -161,8 +161,8 @@
 	} //END WHILE LIST LOOP
 	echo '</table><p>';
 	if (DB_num_rows($result)==0){
-		echo "<div class='centre'><input tabindex=1 type=submit name='NewEDIInvMsg' value='" .
-			_('Create New EDI Invoice Message From Default Template') . "'></div><br>";
+		echo '<div class="centre"><input tabindex=1 type=submit name="NewEDIInvMsg" value="' .
+			_('Create New EDI Invoice Message From Default Template') . '"></div><br>';
 	}
 } //end of ifs SelectedLine is not set
 
@@ -188,14 +188,14 @@
 	$_POST['SequenceNo']  = $myrow['sequenceno'];
 	$_POST['LineText']  = $myrow['linetext'];
 
-	echo "<div class='centre'><a href='" . $_SERVER['PHP_SELF'] . '?' . SID . 'MessageType=INVOIC&PartnerCode=' . $myrow['partnercode'] . "'>" . _('Review Message Lines') . '</a></div>';
+	echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?MessageType=INVOIC&PartnerCode=' . $myrow['partnercode'] . '">' . _('Review Message Lines') . '</a></div>';
 
-	echo "<input type=hidden name='SelectedMessageLine' VALUE='" . $SelectedMessageLine . "'>";
-	echo "<input type=hidden name='MessageType' VALUE='" . $myrow['messagetype'] . "'>";
-	echo "<input type=hidden name='PartnerCode' VALUE='" . $myrow['partnercode'] . "'>";
+	echo '<input type=hidden name="SelectedMessageLine" VALUE="' . $SelectedMessageLine . '">';
+	echo '<input type=hidden name="MessageType" VALUE="' . $myrow['messagetype'] . '">';
+	echo '<input type=hidden name="PartnerCode" VALUE="' . $myrow['partnercode'] . '">';
 } else { //end of if $SelectedMessageLine only do the else when a new record is being entered
-	echo "<input type=hidden name='MessageType' VALUE='" . $MessageType . "'>";
-	echo "<input type=hidden name='PartnerCode' VALUE='" . $PartnerCode . "'>";
+	echo '<input type=hidden name="MessageType" VALUE="' . $MessageType . '">';
+	echo '<input type=hidden name="PartnerCode" VALUE="' . $PartnerCode . '">';
 }
 
 echo '<table class=selection>';
@@ -209,20 +209,20 @@
 echo '<select tabindex=2 name="Section">';
 
 if ($_POST['Section']=='Heading') {
-	echo "<option selected VALUE='Heading'>" . _('Heading') . '</option>';
+	echo '<option selected VALUE="Heading">' . _('Heading') . '</option>';
 } else {
-	echo "<option value='Heading'>" . _('Heading') . '</option>';
+	echo '<option value="Heading">' . _('Heading') . '</option>';
 }
 
 if (isset($_POST['Section']) and $_POST['Section']=='Detail') {
-	echo "<option selected VALUE='Detail'>" . _('Detail') . '</option>';
+	echo '<option selected VALUE="Detail">' . _('Detail') . '</option>';
 } else {
-	echo "<option value='Detail'>" . _('Detail') . '</option>';
+	echo '<option value="Detail">' . _('Detail') . '</option>';
 }
 if (isset($_POST['Section']) and $_POST['Section']=='Summary') {
-	echo "<option selected VALUE='Summary'>" . _('Summary') . '</option>';
+	echo '<option selected VALUE="Summary">' . _('Summary') . '</option>';
 } else {
-	echo "<option value='Summary'>" . _('Summary') . '</option>';
+	echo '<option value="Summary">' . _('Summary') . '</option>';
 }
 
 echo '</select>';
@@ -234,20 +234,20 @@
 echo '</td></tr>';
 
 echo '<tr><td>Sequence Number:</td>';
-echo "<td><input tabindex=3 type=text name=SequenceNo size=3 maxlength=3 value=".$_POST['SequenceNo'].">";
-echo "</td></tr>";
-echo "<tr><td>" .  _('Line Text') . ':' ."</td>";
-echo "<td>";
-echo "<input tabindex=4 type='Text' name='LineText' size=50 maxlength=50 VALUE=".$_POST['LineText'] .">";
-echo "</td></tr>";
-echo "</table><br>";
+echo '<td><input tabindex=3 type=text name=SequenceNo size=3 maxlength=3 value='.$_POST['SequenceNo'].'>';
+echo '</td></tr>';
+echo '<tr><td>' .  _('Line Text') . ':' .'</td>';
+echo '<td>';
+echo '<input tabindex=4 type="Text" name="LineText" size=50 maxlength=50 VALUE='.$_POST['LineText'] .'>';
+echo '</td></tr>';
+echo '</table><br>';
 if (isset($_GET['SelectedMessageLine'])) {
-	echo "<div class='centre'><input tabindex=5 type='submit' name='update' value='".  _('Update Information'). "'></div>";
+	echo '<div class="centre"><input tabindex=5 type="submit" name="update" value="'.  _('Update Information'). '"></div>';
 } else {
-	echo "<div class='centre'><input tabindex=5 type='submit' name='submit' value='".  _('Enter Information'). "'></div>";
+	echo '<div class="centre"><input tabindex=5 type="submit" name="submit" value="'.  _('Enter Information'). '"></div>';
 }
 
-echo "</form>";
+echo '</form>';
 
 include('includes/footer.inc');
 ?>
\ No newline at end of file

Modified: trunk/EmailCustTrans.php
===================================================================
--- trunk/EmailCustTrans.php	2011-04-18 07:49:36 UTC (rev 4554)
+++ trunk/EmailCustTrans.php	2011-04-19 10:18:49 UTC (rev 4555)
@@ -37,13 +37,13 @@
 include ('includes/header.inc');
 
 
-echo "<form action='" . $_SERVER['PHP_SELF'] . '?' . SID . "' method=post>";
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
-echo "<input type=hidden name='TransNo' VALUE=" . $_GET['FromTransNo'] . ">";
-echo "<input type=hidden name='InvOrCredit' VALUE=" . $_GET['InvOrCredit'] . '>';
+echo '<input type=hidden name="TransNo" VALUE="' . $_GET['FromTransNo'] . '">';
+echo '<input type=hidden name="InvOrCredit" VALUE="' . $_GET['InvOrCredit'] . '>';
 
-echo '<p><table>';
+echo '<br /><table>';
 
 $SQL = "SELECT email
 		FROM custbranch INNER JOIN debtortrans
@@ -62,11 +62,11 @@
 	$EmailAddress ='';
 }
 
-echo '<tr><td>' . _('Email') . ' ' . $_GET['InvOrCredit'] . ' ' . _('number') . ' ' . $_GET['FromTransNo'] . ' ' . _('to') . ":</td>
-	<td><input type=TEXT name='EmailAddr' maxlength=60 size=60 VALUE='" . $EmailAddress . "'</td>
-	</table>";
+echo '<tr><td>' . _('Email') . ' ' . $_GET['InvOrCredit'] . ' ' . _('number') . ' ' . $_GET['FromTransNo'] . ' ' . _('to') . ':</td>
+	<td><input type=TEXT name="EmailAddr" maxlength=60 size=60 VALUE="' . $EmailAddress . '"></td>
+	</table>';
 
-echo "<br><div class='centre'><input type=submit name='DoIt' VALUE='" . _('OK') . "'>";
+echo '<br><div class="centre"><input type=submit name="DoIt" VALUE="' . _('OK') . '">';
 echo '</div></form>';
 include ('includes/footer.inc');
 ?>
\ No newline at end of file

Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php	2011-04-18 07:49:36 UTC (rev 4554)
+++ trunk/ExchangeRateTrend.php	2011-04-19 10:18:49 UTC (rev 4555)
@@ -23,7 +23,7 @@
 // SHOW OUR MAIN INPUT FORM
 // ************************
 
-	echo "<form method='post' name=update action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+	echo '<form method="post" name=update action="' . $_SERVER['PHP_SELF'] . '">';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 	echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' .
 		_('View Currency Trend') . '" alt="" />' . ' ' . _('View Currency Trend') . '</p>';
@@ -40,9 +40,9 @@
 		while ($myrow=DB_fetch_array($result)) {
 			if ($myrow['currabrev']!=$_SESSION['CompanyRecord']['currencydefault']){
 				if ( $CurrencyToShow==$myrow['currabrev'] )	{
-					echo '<option selected value=' . $myrow['currabrev'] . '>' . $myrow['country'] . ' ' . $myrow['currency'] . '&nbsp;(' . $myrow['currabrev'] . ')';
+					echo '<option selected value=' . $myrow['currabrev'] . '>' . $myrow['country'] . ' ' . $myrow['currency'] . '&nbsp;(' . $myrow['currabrev'] . ')'. '</option>';
 				} else {
-					echo '<option value=' . $myrow['currabrev'] . '>' . $myrow['country'] . ' ' . $myrow['currency'] . '&nbsp;(' . $myrow['currabrev'] . ')';
+					echo '<option value=' . $myrow['currabrev'] . '>' . $myrow['country'] . ' ' . $myrow['currency'] . '&nbsp;(' . $myrow['currabrev'] . ')'. '</option>';
 				}
 			}
 		}

Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php	2011-04-18 07:49:36 UTC (rev 4554)
+++ trunk/FixedAssetCategories.php	2011-04-19 10:18:49 UTC (rev 4555)
@@ -154,7 +154,7 @@
 				FROM fixedassetcategories';
 	$result = DB_query($sql,$db);
 
-	echo "<br /><table class=selection>\n";
+	echo '<br /><table class=selection>';
 	echo '<tr><th>' . _('Cat Code') . '</th>
 			<th>' . _('Description') . '</th>
 			<th>' . _('Cost GL') . '</th>
@@ -172,15 +172,15 @@
 			echo '<tr class="OddTableRows">';
 			$k=1;
 		}
-		printf("<td>%s</td>
+		printf('<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</td>
-					<td><a href=\"%sSelectedCategory=%s\">" . _('Edit') . "</td>
-					<td><a href=\"%sSelectedCategory=%s&delete=yes\" onclick=\"return confirm('" . _('Are you sure you wish to delete this fixed asset category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . "');\">" . _('Delete') . "</td>
-					</tr>",
+					<td class="number">%s</td>
+					<td class="number">%s</td>
+					<td class="number">%s</td>
+					<td class="number">%s</td>
+					<td><a href="%sSelectedCategory=%s">' . _('Edit') . '</td>
+					<td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm("' . _('Are you sure you wish to delete this fixed asset category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '");">' . _('Delete') . '</td>
+					</tr>',
 					$myrow['categoryid'],
 					$myrow['categorydescription'],
 					$myrow['costact'],
@@ -199,7 +199,7 @@
 //end of ifs and buts!
 
 if (isset($SelectedCategory)) {
-	echo "<br /><div class='centre'><a href='" . $_SERVER['PHP_SELF'] . '?' . SID . ">" ._('Show All Fixed Asset Categories') . "</a></div>";
+	echo '<br /><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '">' ._('Show All Fixed Asset Categories') . '</a></div>';
 }
 
 echo '<form name="CategoryForm" method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '">';
@@ -273,11 +273,10 @@
 while ($myrow = DB_fetch_array($BSAccountsResult)){
 
 	if (isset($_POST['CostAct']) and $myrow['accountcode']==$_POST['CostAct']) {
-		echo '<option selected value=';
+		echo '<option selected value='.$myrow['accountcode'] . '>' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
 	} else {
-		echo '<option value=';
+		echo '<option value='.$myrow['accountcode'] . '>' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
 	}
-	echo $myrow['accountcode'] . '>' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')';
 } //end while loop
 echo '</select></td></tr>';
 
@@ -286,11 +285,10 @@
 
 while ($myrow = DB_fetch_array($PnLAccountsResult)) {
 	if (isset($_POST['DepnAct']) and $myrow['accountcode']==$_POST['DepnAct']) {
-		echo '<option selected value=';
+		echo '<option selected value='.$myrow['accountcode'] . '>' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
 	} else {
-		echo '<option value=';
+		echo '<option value='.$myrow['accountcode'] . '>' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
 	}
-	echo $myrow['accountcode'] . '>' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>';
 } //end while loop
 echo '</select></td></tr>';
 
@@ -298,11 +296,10 @@
 echo '<tr><td>' .  _('Profit or Loss on Disposal GL Code:') . '</td><td><select name="DisposalAct">';
 while ($myrow = DB_fetch_array($PnLAccountsResult)) {
 	if (isset($_POST['DisposalAct']) and $myrow['accountcode']==$_POST['DisposalAct']) {
-		echo '<option selected value=';
+		echo '<option selected value='.$myrow['accountcode'] . '>' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
 	} else {
-		echo '<option value=';
+		echo '<option value='.$myrow['accountcode'] . '>' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
 	}
-	echo $myrow['accountcode'] . '>' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
 } //end while loop
 echo '</select></td></tr>';
 
@@ -313,11 +310,10 @@
 while ($myrow = DB_fetch_array($BSAccountsResult)) {
 
 	if (isset($_POST['AccumDepnAct']) and $myrow['accountcode']==$_POST['AccumDepnAct']) {
-		echo '<option selected value=';
+		echo '<option selected value='.$myrow['accountcode'] . '>' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
 	} else {
-		echo '<option value=';
+		echo '<option value='.$myrow['accountcode'] . '>' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
 	}
-	echo $myrow['accountcode'] . '>' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>';
 
 } //end while loop
 

Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php	2011-04-18 07:49:36 UTC (rev 4554)
+++ trunk/GLAccountInquiry.php	2011-04-19 10:18:49 UTC (rev 4555)
@@ -25,14 +25,14 @@
 
 echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple periods') . '</div><br>';
 
-echo "<form method='POST' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+echo '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '">';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 /*Dates in SQL format for the last day of last month*/
 $DefaultPeriodDate = Date ('Y-m-d', Mktime(0,0,0,Date('m'),0,Date('Y')));
 
 /*Show a form to allow input of criteria for TB to show */
-echo '<table class=selection><tr><td>'._('Account').":</td><td><select Name='Account'>";
+echo '<table class=selection><tr><td>'._('Account').':</td><td><select Name="Account">';
 $sql = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
 $Account = DB_query($sql,$db);
 while ($myrow=DB_fetch_array($Account,$db)){
@@ -55,7 +55,7 @@
 $result=DB_query($SQL,$db);
 echo '<option value=0>0 - '._('All tags');
 while ($myrow=DB_fetch_array($result)){
-	if (isset($_POST['tag']) and $_POST['tag']==$myrow["tagref"]){
+	if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
 		echo '<option selected value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'];
 	} else {
 		echo '<option value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'];
@@ -75,8 +75,8 @@
 		echo '<option value=' . $myrow['periodno'] . '>' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period']));
 	}
 }
-echo "</select></td></tr><table>";
-echo "<p><div class='centre'><input type=submit name='Show' value='"._('Show Account Transactions')."'></div></form>";
+echo '</select></td></tr><table>';
+echo '<p><div class="centre"><input type=submit name="Show" value="'._('Show Account Transactions').'"></div></form>';
 
 /* End of the Form  rest of script is what happens if the show button is hit*/
 
@@ -148,16 +148,16 @@
 	echo '<br><table class=selection>';
 
 	echo '<tr><th colspan=8><b>' ._('Transactions for account').' '.$SelectedAccount. ' - '. $SelectedAccountName.'</b></th></tr>';
-	$TableHeader = "<tr>
-			<th>" . _('Type') . "</th>
-			<th>" . _('Number') . "</th>
-			<th>" . _('Date') . "</th>
-			<th>" . _('Debit') . "</th>
-			<th>" . _('Credit') . "</th>
-			<th>" . _('Narrative') . "</th>
-			<th>" . _('Balance') . "</th>
-			<th>" . _('Tag') . "</th>
-			</tr>";
+	$TableHeader = '<tr>
+			<th>' . _('Type') . '</th>
+			<th>' . _('Number') . '</th>
+			<th>' . _('Date') . '</th>
+			<th>' . _('Debit') . '</th>
+			<th>' . _('Credit') . '</th>
+			<th>' . _('Narrative') . '</th>
+			<th>' . _('Balance') . '</th>
+			<th>' . _('Tag') . '</th>
+			</tr>';
 
 	echo $TableHeader;
 
@@ -179,15 +179,15 @@
 
 		$RunningTotal =$ChartDetailRow['bfwd'];
 		if ($RunningTotal < 0 ){ //its a credit balance b/fwd
-			echo "<tr bgcolor='#FDFEEF'>
-				<td colspan=3><b>" . _('Brought Forward Balance') . '</b><td>
+			echo '<tr bgcolor="#FDFEEF">
+				<td colspan=3><b>' . _('Brought Forward Balance') . '</b><td>
 				</td></td>
 				<td class=number><b>' . number_format(-$RunningTotal,2) . '</b></td>
 				<td></td>
 				</tr>';
 		} else { //its a debit balance b/fwd
-			echo "<tr bgcolor='#FDFEEF'>
-				<td colspan=3><b>" . _('Brought Forward Balance') . '</b></td>
+			echo '<tr bgcolor="#FDFEEF">
+				<td colspan=3><b>' . _('Brought Forward Balance') . '</b></td>
 				<td class=number><b>' . number_format($RunningTotal,2) . '</b></td>
 				<td colspan=2></td>
 				</tr>';
@@ -215,8 +215,8 @@
 				$ChartDetailsResult = DB_query($sql,$db,$ErrMsg);
 				$ChartDetailRow = DB_fetch_array($ChartDetailsResult);
 
-				echo "<tr bgcolor='#FDFEEF'>
-					<td colspan=3><b>" . _('Total for period') . ' ' . $PeriodNo . '</b></td>';
+				echo '<tr bgcolor="#FDFEEF">
+					<td colspan=3><b>' . _('Total for period') . ' ' . $PeriodNo . '</b></td>';
 				if ($PeriodTotal < 0 ){ //its a credit balance b/fwd
 					if ($PandLAccount==True) {
 						$RunningTotal = 0;
@@ -271,15 +271,15 @@
 		if ($tagrow['tagdescription']=='') {
 			$tagrow['tagdescription']=_('None');
 		}
-		printf("<td>%s</td>
-			<td class=number><a href='%s'>%s</a></td>
+		printf('<td>%s</td>
+			<td class=number><a href="%s">%s</a></td>
 			<td>%s</td>
 			<td class=number>%s</td>
 			<td class=number>%s</td>
 			<td>%s</td>
 			<td class=number><b>%s</b></td>
 			<td>%s</td>
-			</tr>",
+			</tr>',
 			$myrow['typename'],
 			$URL_to_TransDetail,
 			$myrow['typeno'],
@@ -292,7 +292,7 @@
 
 	}
 
-	echo "<tr bgcolor='#FDFEEF'><td colspan=3><b>";
+	echo '<tr bgcolor="#FDFEEF"><td colspan=3><b>';
 	if ($PandLAccount==True){
 		echo _('Total Period Movement');
 	} else { /*its a balance sheet account*/

Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php	2011-04-18 07:49:36 UTC (rev 4554)
+++ trunk/GLBalanceSheet.php	2011-04-19 10:18:49 UTC (rev 4555)
@@ -24,9 +24,9 @@
 	. _('The balance sheet has three parts: assets, liabilities and ownership equity. The main categories of assets are listed first and are followed by the liabilities. The difference between the assets and the liabilities is known as equity or the net assets or the net worth or capital of the company and according to the accounting equation, net worth must equal assets minus liabilities.') . '<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=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+	echo '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '">';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-	echo '<p><table class="selection"><tr><td>'._('Select the balance date').":</td><td><select Name='BalancePeriodEnd'>";
+	echo '<p><table class="selection"><tr><td>'._('Select the balance date').':</td><td><select Name="BalancePeriodEnd">';
 
 	$periodno=GetPeriod(Date($_SESSION['DefaultDateFormat']), $db);
 	$sql = "SELECT lastdate_in_period FROM periods WHERE periodno='".$periodno . "'";
@@ -47,15 +47,15 @@
 
 	echo '</select></td></tr>';
 
-	echo '<tr><td>'._('Detail Or Summary').":</td><td><select Name='Detail'>";
-	echo "<option selected VALUE='Summary'>"._('Summary');
-	echo "<option selected VALUE='Detailed'>"._('All Accounts');
+	echo '<tr><td>'._('Detail Or Summary').':</td><td><select Name="Detail">';
+	echo '<option selected VALUE="Summary">'._('Summary') . '</option>';
+	echo '<option selected VALUE="Detailed">'._('All Accounts') . '</option>';
 	echo '</select></td></tr>';
 
 	echo '</table>';
 
-	echo "<br><div class='centre'><input type=submit Name='ShowBalanceSheet' Value='"._('Show on Screen (HTML)')."'</div>";
-	echo "<br><div class='centre'><input type=submit Name='PrintPDF' Value='"._('Produce PDF Report')."'></div>";
+	echo '<br><div class="centre"><input type=submit Name="ShowBalanceSheet" Value="'._('Show on Screen (HTML)').'"></div>';
+	echo '<br><div class="centre"><input type=submit Name="PrintPDF" Value="'._('Produce PDF Report').'"></div>';
 
 	/*Now do the posting while the user is thinking about the period to select */
 	include ('includes/GLPostings.inc');
@@ -301,9 +301,9 @@
 	exit;
 } else {
 	include('includes/header.inc');
-	echo "<form method='POST' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+	echo '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '">';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-	echo "<input type=hidden name='BalancePeriodEnd' VALUE=" . $_POST['BalancePeriodEnd'] . '>';
+	echo '<input type=hidden name="BalancePeriodEnd" VALUE="' . $_POST['BalancePeriodEnd'] . '">';
 
 	$RetainedEarningsAct = $_SESSION['CompanyRecord']['retainedearnings'];
 
@@ -354,17 +354,17 @@
 		_('Balance Sheet as at') . ' ' . $BalanceDate .'</b></font></div></th></tr>';
 
 	if ($_POST['Detail']=='Detailed'){
-		$TableHeader = "<tr>
-				<th>"._('Account')."</td>
-				<th>"._('Account Name')."</td>
+		$TableHeader = '<tr>
+				<th>'._('Account').'</td>
+				<th>'._('Account Name').'</td>
 				<th colspan=2>$BalanceDate</th>
-				<th colspan=2>"._('Last Year').'</th>
+				<th colspan=2>'._('Last Year').'</th>
 				</tr>';
 	} else { /*summary */
-		$TableHeader = "<tr>
+		$TableHeader = '<tr>
 				<th colspan=2></th>
 				<th colspan=2>$BalanceDate</th>
-				<th colspan=2>"._('Last Year').'</th>
+				<th colspan=2>'._('Last Year').'</th>
 				</tr>';
 	}
 
@@ -533,7 +533,7 @@
 				$k++;
 			}
 
-			$ActEnquiryURL = "<a href='$rootpath/GLAccountInquiry.php?" . SID . "Period=" . $_POST['BalancePeriodEnd'] . '&Account=' . $myrow['accountcode'] . "'>" . $myrow['accountcode'] . '<a>';
+			$ActEnquiryURL = '<a href="' . $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['BalancePeriodEnd'] . '&Account=' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . '</a>';
 
 			$PrintString = '<td>%s</td>
 					<td>%s</td>
@@ -658,7 +658,7 @@
 		</tr>';
 
 	echo '</table>';
-	echo "<br><div class='centre'><input type=submit Name='SelectADifferentPeriod' Value='"._('Select A Different Balance Date')."'></div>";
+	echo '<br><div class="centre"><input type=submit Name="SelectADifferentPeriod" Value="'._('Select A Different Balance Date').'"></div>';
 }
 
 echo '</form>';

Modified: trunk/GLBudgets.php
===================================================================
--- trunk/GLBudgets.php	2011-04-18 07:49:36 UTC (rev 4554)
+++ trunk/GLBudgets.php	2011-04-19 10:18:49 UTC (rev 4555)
@@ -24,7 +24,7 @@
 	prnMsg(_('Budget updated successfully'), 'success');
 }
 
-//If an account hasn't been selected then select one here.
+//If an account has not been selected then select one here.
 echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>';
 echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post" name="selectaccount">';
 echo '<input type="hidden" name="F...
 
[truncated message content]

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

Accounting & Best Practice Business Administration System

web-erp-svn