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

SourceForge Headquarters 1320 Columbia Street Suite 310 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 ty...
 
[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