[Weberp-svn] SF.net SVN: weberp:[5199] trunk

[<tim...@us...>]

Revision: 5199
          http://weberp.svn.sourceforge.net/weberp/?rev=5199&view=rev
Author:   tim_schofield
Date:     2011-04-18 07:36:59 +0000 (Mon, 18 Apr 2011)

Log Message:
-----------
XHTML and quoting changes

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/geo_displaymap_customers.php
    trunk/geo_displaymap_suppliers.php

Modified: trunk/DebtorsAtPeriodEnd.php
===================================================================
--- trunk/DebtorsAtPeriodEnd.php	2011-04-18 07:26:11 UTC (rev 5198)
+++ trunk/DebtorsAtPeriodEnd.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -142,7 +142,7 @@
 
 	/*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>";

Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php	2011-04-18 07:26:11 UTC (rev 5198)
+++ trunk/DeliveryDetails.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -1013,18 +1013,17 @@
 
 	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>';
+				echo '<option value=' . $p . ' selected>';
 			} else {
-				echo '>';
+				echo '<option value=' . $p . '>';
 			}
 			switch ($p) {
 				case 2:
-					echo _('Hide Company Details/Logo');
+					echo _('Hide Company Details/Logo').'</option>';
 			break;
 				default:
-					echo _('Show Company Details/Logo');
+					echo _('Show Company Details/Logo').'</option>';
 			break;
 			}
 		}

Modified: trunk/DiscountCategories.php
===================================================================
--- trunk/DiscountCategories.php	2011-04-18 07:26:11 UTC (rev 5198)
+++ trunk/DiscountCategories.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -67,7 +67,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,9 +79,9 @@
 
 		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>';
 		}
@@ -90,7 +90,7 @@
 		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="selectchoice" value="'.$_POST['selectchoice'].'">';
@@ -99,11 +99,11 @@
 		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,15 +115,15 @@
 		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']=='')
@@ -154,7 +154,7 @@
 			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>';
 
@@ -183,9 +183,9 @@
 		$result = DB_query($sql,$db);
 
 		echo '<br><table class=selection>';
-		echo "<tr>
-			<th>". _('Discount Category') ."</th>
-			<th>". _('Item') .'</th></tr>';
+		echo '<tr>
+			<th>'. _('Discount Category') .'</th>
+			<th>'. _('Item') .'</th></tr>';
 
 		$k=0; //row colour counter
 
@@ -199,9 +199,9 @@
 			}
 			$DeleteURL = $_SERVER['PHP_SELF'] . '?' . SID . '&Delete=yes&StockID=' . $myrow['stockid'] . '&DiscountCategory=' . $myrow['discountcategory'];
 
-			printf("<td>%s</td>
+			printf('<td>%s</td>
 				<td>%s - %s</td>
-				<td><a href='%s'>". _('Delete') .'</td>
+				<td><a href="%s">'. _('Delete') .'</td>
 				</tr>',
 				$myrow['discountcategory'],
 				$myrow['stockid'],
@@ -220,7 +220,7 @@
 }
 
 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 '<tr><td>'._('Update discount category for').'</td>';
@@ -232,4 +232,4 @@
 }
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/DiscountMatrix.php
===================================================================
--- trunk/DiscountMatrix.php	2011-04-18 07:26:11 UTC (rev 5198)
+++ trunk/DiscountMatrix.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -83,7 +83,7 @@
 	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'] . '" />';
 
 
@@ -97,13 +97,13 @@
 
 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,9 +118,9 @@
 
 	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>';
 	}
@@ -129,16 +129,16 @@
 	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 '<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,
 		salestype,
@@ -154,10 +154,10 @@
 $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
 
@@ -171,11 +171,11 @@
 	}
 	$DeleteURL = $_SERVER['PHP_SELF'] . '?' . SID . '&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:26:11 UTC (rev 5198)
+++ trunk/EDIMessageFormat.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -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');
 ?>

Modified: trunk/EmailCustTrans.php
===================================================================
--- trunk/EmailCustTrans.php	2011-04-18 07:26:11 UTC (rev 5198)
+++ trunk/EmailCustTrans.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -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:26:11 UTC (rev 5198)
+++ trunk/ExchangeRateTrend.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -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>';
 				}
 			}
 		}
@@ -71,4 +71,4 @@
 
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php	2011-04-18 07:26:11 UTC (rev 5198)
+++ trunk/FixedAssetCategories.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -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:26:11 UTC (rev 5198)
+++ trunk/GLAccountInquiry.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -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:26:11 UTC (rev 5198)
+++ trunk/GLBalanceSheet.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -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:26:11 UTC (rev 5198)
+++ trunk/GLBudgets.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -26,7 +26,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="FormID" value="' . $_SESSION['FormID'] . '" />';

Modified: trunk/GLTags.php
===================================================================
--- trunk/GLTags.php	2011-04-18 07:26:11 UTC (rev 5198)
+++ trunk/GLTags.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -31,7 +31,7 @@
 echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' .
 		_('Print') . '" alt="" />' . ' ' . $title . '</p>';
 
-echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . ' name="form">';
+echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . ' name="form">';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 echo '<br><table><tr>';
 

Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php	2011-04-18 07:26:11 UTC (rev 5198)
+++ trunk/GLTrialBalance.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -53,22 +53,22 @@
 	while ($myrow=DB_fetch_array($Periods,$db)){
 		if(isset($_POST['FromPeriod']) AND $_POST['FromPeriod']!=''){
 			if( $_POST['FromPeriod']== $myrow['periodno']){
-				echo '<option selected VALUE="' . $myrow['periodno'] . '">' .MonthAndYearFromSQLDate($myrow['lastdate_in_period']);
+				echo '<option selected VALUE="' . $myrow['periodno'] . '">' .MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
 			} else {
-				echo '<option VALUE="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']);
+				echo '<option VALUE="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
 			}
 		} else {
 			if($myrow['lastdate_in_period']==$DefaultFromDate){
-				echo '<option selected VALUE="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']);
+				echo '<option selected VALUE="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
 			} else {
-				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>';
 	if (!isset($_POST['ToPeriod']) OR $_POST['ToPeriod']==''){
-		$lastDate = date("Y-m-d",mktime(0,0,0,Date('m')+1,0,Date('Y')));
+		$lastDate = date('Y-m-d',mktime(0,0,0,Date('m')+1,0,Date('Y')));
 		$sql = "SELECT periodno
 				FROM periods
 				WHERE lastdate_in_period = '" . $lastDate . "'";
@@ -87,15 +87,15 @@
 	while ($myrow=DB_fetch_array($Periods,$db)){
 
 		if($myrow['periodno']==$DefaultToPeriod){
-			echo '<option selected value="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']);
+			echo '<option selected value="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
 		} else {
-			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></table><br>';
 
 	echo '<div class="centre"><input type=submit Name="ShowTB" Value="' . _('Show Trial Balance') .'">';
-	echo "<input type=submit Name='PrintPDF' Value='"._('PrintPDF')."'></div>";
+	echo '<input type=submit Name="PrintPDF" Value="'._('PrintPDF').'"></div>';
 
 /*Now do the posting while the user is thinking about the period to select */
 
@@ -429,7 +429,7 @@
 				 _('The SQL that failed was:'));
 
 	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' .
-		_('Trial Balance') . '" alt="" />' . ' ' . _('Trial Balance Report') . '</p';
+		_('Trial Balance') . '" alt="" />' . ' ' . _('Trial Balance Report') . '</p>';
 
 	/*show a table of the accounts info returned by the SQL
 	Account Code ,   Account Name , Month Actual, Month Budget, Period Actual, Period Budget */

Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php	2011-04-18 07:26:11 UTC (rev 5198)
+++ trunk/GoodsReceived.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -184,7 +184,7 @@
 		}
 		echo '</tr>';
 	}//foreach(LineItem)
-	echo "<script>defaultControl(document.forms[0].RecvQty_$LnItm->LineNo);</script>";
+	echo '<script>defaultControl(document.forms[0].RecvQty_'.$LnItm->LineNo.');</script>';
 $DisplayTotal = number_format($_SESSION['PO']->Total,2);
 if ($_SESSION['ShowValueOnGRN']==1) {
 	echo '<tr><td colspan=7 class=number><b>' . _('Total value of goods received'). '</b></td>
@@ -267,7 +267,7 @@
 		exit;
 	}
 
-/*Now need to check that the order details are the same as they were when they were read into the Items array. If they've changed then someone else must have altered them */
+/*Now need to check that the order details are the same as they were when they were read into the Items array. If they have changed then someone else must have altered them */
 // Otherwise if you try to fullfill item quantities separately will give error.
 	$SQL = "SELECT itemcode,
 									glcode,
@@ -327,9 +327,9 @@
 					<td>' . $myrow['quantityrecd'] . '</td></tr>';
 				echo '</table>';
 			}
-			echo "<div class='centre'><a href='$rootpath/PO_SelectOSPurchOrder.php?" . SID . "'>".
+			echo '<div class="centre"><a href="'.$rootpath.'/PO_SelectOSPurchOrder.php">'.
 				_('Select a different purchase order for receiving goods against').'</a></div>';
-			echo "<div class='centre'><a href='$rootpath/GoodsReceived.php?" . SID . '&PONumber=' .
+			echo '<div class="centre"><a href="'.$rootpath.'/GoodsReceived.php?PONumber=' .
 				$_SESSION['PO']->OrderNumber . '">'. _('Re-read the updated purchase order for receiving goods against'). '</a></div>';
 			unset($_SESSION['PO']->LineItems);
 			unset($_SESSION['PO']);
@@ -357,7 +357,7 @@
 
 			$LocalCurrencyPrice = ($OrderLine->Price / $_SESSION['PO']->ExRate);
 
-			if ($OrderLine->StockID!='') { /*Its a stock item line */
+			if ($OrderLine->StockID!='') { //Its a stock item line
 				/*Need to get the current standard cost as it is now so we can process GL jorunals later*/
 				$SQL = "SELECT materialcost + labourcost + overheadcost as stdcost
 										FROM stockmaster
@@ -384,7 +384,7 @@
 				$_SESSION['PO']->LineItems[$OrderLine->LineNo]->StandardCost = $LocalCurrencyPrice;
 			}
 
-			if ($OrderLine->StockID=='') { /*Its a NOMINAL item line */
+			if ($OrderLine->StockID=='') { //Its a NOMINAL item line
 				$CurrentStandardCost = $_SESSION['PO']->LineItems[$OrderLine->LineNo]->StandardCost;
 			}
 

Modified: trunk/geo_displaymap_customers.php
===================================================================
--- trunk/geo_displaymap_customers.php	2011-04-18 07:26:11 UTC (rev 5198)
+++ trunk/geo_displaymap_customers.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -23,7 +23,7 @@
 echo '<script src="http://' . $map_host . '/maps?file=api&v=2&key=' . $api_key . '"';
 echo ' type="text/javascript"></script>';
 echo ' <script type="text/javascript">';
-echo '    //<![CDATA[ '; ?>
+echo "    //<![CDATA[ "; ?>
 
  var iconBlue = new GIcon();
     iconBlue.image = 'http://labs.google.com/ridefinder/images/mm_20_blue.png';

Modified: trunk/geo_displaymap_suppliers.php
===================================================================
--- trunk/geo_displaymap_suppliers.php	2011-04-18 07:26:11 UTC (rev 5198)
+++ trunk/geo_displaymap_suppliers.php	2011-04-18 07:36:59 UTC (rev 5199)
@@ -23,7 +23,7 @@
 echo '<script src="http://' . $map_host . '/maps?file=api&v=2&key=' . $api_key . '"';
 echo ' type="text/javascript"></script>';
 echo ' <script type="text/javascript">';
-echo '    //<![CDATA[ '; ?>
+echo "    //<![CDATA[ "; ?>
 
  var iconBlue = new GIcon();
     iconBlue.image = 'http://labs.google.com/ridefinder/images/mm_20_blue.png';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.