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

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

Revision: 6241
          http://sourceforge.net/p/web-erp/reponame/6241
Author:   daintree
Date:     2013-08-17 08:07:47 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
html5 table sorting

Modified Paths:
--------------
    trunk/AccountGroups.php
    trunk/AccountSections.php
    trunk/BankMatching.php
    trunk/ConfirmDispatch_Invoice.php
    trunk/POReport.php
    trunk/PO_AuthoriseMyOrders.php
    trunk/PO_Header.php
    trunk/PO_Items.php
    trunk/PO_OrderDetails.php
    trunk/PO_SelectPurchOrder.php
    trunk/PricesByCost.php
    trunk/Prices_Customer.php
    trunk/PurchData.php
    trunk/SalesCategories.php
    trunk/SuppTransGLAnalysis.php
    trunk/TaxAuthorityRates.php

Modified: trunk/AccountGroups.php
===================================================================

--- trunk/AccountGroups.php	2013-08-16 10:17:58 UTC (rev 6240)
+++ trunk/AccountGroups.php	2013-08-17 08:07:47 UTC (rev 6241)
@@ -287,11 +287,11 @@
 
 	echo '<table class="selection">
 			<tr>
-				<th>' . _('Group Name') . '</th>
-				<th>' . _('Section') . '</th>
-				<th>' . _('Sequence In TB') . '</th>
-				<th>' . _('Profit and Loss') . '</th>
-				<th>' . _('Parent Group') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Group Name') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Section') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Sequence In TB') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Profit and Loss') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Parent Group') . '</th>
 			</tr>';
 
 	$k=0; //row colour counter
@@ -471,4 +471,4 @@
 
 } //end if record deleted no point displaying form to add record
 include('includes/footer.inc');
-?>
\ No newline at end of file
+?>

Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php	2013-08-16 10:17:58 UTC (rev 6240)
+++ trunk/AccountSections.php	2013-08-17 08:07:47 UTC (rev 6241)
@@ -173,8 +173,8 @@
 
 	echo '<table class="selection">
 			<tr>
-				<th>' . _('Section Number') . '</th>
-				<th>' . _('Section Description') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Section Number') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Section Description') . '</th>
 			</tr>';
 
 	$k=0; //row colour counter
@@ -276,4 +276,4 @@
 } //end if record deleted no point displaying form to add record
 
 include('includes/footer.inc');
-?>
\ No newline at end of file
+?>

Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php	2013-08-16 10:17:58 UTC (rev 6240)
+++ trunk/BankMatching.php	2013-08-17 08:07:47 UTC (rev 6241)
@@ -272,12 +272,12 @@
 
 	echo '<table cellpadding="2" class="selection">
 			<tr>
-				<th>'. _('Cheque No') . '</th>
-				<th>' . _('Ref') . '</th>
-				<th>' . $TypeName . '</th>
-				<th>' . _('Date') . '</th>
-				<th>' . _('Amount') . '</th>
-				<th>' . _('Outstanding') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">'. _('Cheque No') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Ref') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . $TypeName . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Date') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Amount') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Outstanding') . '</th>
 				<th colspan="3">' . _('Clear') . ' / ' . _('Unclear') . '</th>
 			</tr>';
 

Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php	2013-08-16 10:17:58 UTC (rev 6240)
+++ trunk/ConfirmDispatch_Invoice.php	2013-08-17 08:07:47 UTC (rev 6241)
@@ -1095,12 +1095,12 @@
 														'" . $_SESSION['Items'.$identifier]->Branch . "',
 														'" . $LocalCurrencyPrice . "',
 														'" . $PeriodNo . "',
-														'" . $_SESSION['ProcessingOrder'] . "',
+														'" . DB_escape_string($_SESSION['ProcessingOrder']) . "',
 														'" . -$OrderLine->QtyDispatched . "',
 														'" . $OrderLine->DiscountPercent . "',
 														'" . $OrderLine->StandardCost . "',
 														'" . ($QtyOnHandPrior - $OrderLine->QtyDispatched) . "',
-														'" . $OrderLine->Narrative . "' )";
+														'" . DB_escape_string($OrderLine->Narrative) . "' )";
 			} else {
             // its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch  so new qty on hand will be nil
 				if (empty($OrderLine->StandardCost)) {
@@ -1133,7 +1133,7 @@
 												'" . -$OrderLine->QtyDispatched . "',
 												'" . $OrderLine->DiscountPercent . "',
 												'" . $OrderLine->StandardCost . "',
-												'" . $OrderLine->Narrative . "')";
+												'" . DB_escape_striing($OrderLine->Narrative) . "')";
 			}
 
 

Modified: trunk/POReport.php
===================================================================
--- trunk/POReport.php	2013-08-16 10:17:58 UTC (rev 6240)
+++ trunk/POReport.php	2013-08-17 08:07:47 UTC (rev 6241)
@@ -1498,124 +1498,153 @@
 
 	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
     echo '<div>';
-	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
-	echo '<table class="selection">';
-
-	echo '<tr><td>' . _('Report Type') . ':</td>';
-	echo '<td><select name="ReportType">';
-	echo '<option selected="selected" value="Detail">' . _('Detail') . '</option>';
-	echo '<option value="Summary">' . _('Summary') . '</option>';
-	echo '</select></td><td>&nbsp;</td></tr>';
-
-	echo '<tr><td>' . _('Date Type') . ':</td>';
-	echo '<td><select name="DateType">';
-	echo '<option selected="selected" value="Order">' . _('Order Date') . '</option>';
-	echo '<option value="Delivery">' . _('Delivery Date') . '</option>';
-	echo '</select></td><td>&nbsp;</td></tr>';
-
-	echo '<tr>
-		<td>' . _('Date Range') . ':</td>
-		<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" size="10" maxlength="10" value="' . $_POST['FromDate'] .'" /> ' . _('To') . ':&nbsp;&nbsp;
-        <input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" size="10" maxlength="10" value="' . $_POST['ToDate'] . '" /></td>
-		</tr>';
-
-	echo '<tr><td>' . _('Part Number') . ':</td>';
-	echo '<td><select name="PartNumberOp">';
-	echo '<option selected="selected" value="Equals">' . _('Equals') . '</option>';
-	echo '<option value="LIKE">' . _('Begins With') . '</option>';
-	echo '</select>';
-	echo '&nbsp;&nbsp;<input type="text" name="PartNumber" size="20" maxlength="20" value="';
+	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+		<table class="selection">
+		<tr>
+			<td>' . _('Report Type') . ':</td>
+			<td><select required="required" autofocus="autofocus" name="ReportType">
+				<option selected="selected" value="Detail">' . _('Detail') . '</option>
+				<option value="Summary">' . _('Summary') . '</option>
+				</select></td>
+			<td>&nbsp;</td>
+		</tr>
+		<tr>
+			<td>' . _('Date Type') . ':</td>
+			<td><select required="required" name="DateType">
+				<option selected="selected" value="Order">' . _('Order Date') . '</option>
+				<option value="Delivery">' . _('Delivery Date') . '</option>
+				</select></td>
+			<td>&nbsp;</td>
+		</tr>
+		<tr>
+			<td>' . _('Date Range') . ':</td>
+			<td><input type="text" required="required" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" size="10" maxlength="10" value="' . $_POST['FromDate'] .'" /> ' . _('To') . ':&nbsp;&nbsp;
+        <input type="text" required="required" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" size="10" maxlength="10" value="' . $_POST['ToDate'] . '" /></td>
+		</tr>
+		<tr>
+			<td>' . _('Part Number') . ':</td>
+			<td><select name="PartNumberOp">
+				<option selected="selected" value="Equals">' . _('Equals') . '</option>
+				<option value="LIKE">' . _('Begins With') . '</option>
+				</select>
+				&nbsp;&nbsp;
+				<input type="text" name="PartNumber" size="20" maxlength="20" value="';
     if (isset($_POST['PartNumber'])) {
-        echo $_POST['PartNumber'] . '" /></td></tr>';
+        echo $_POST['PartNumber'] . '" /></td>
+			</tr>';
 	} else {
-		echo '" /></td></tr>';
+		echo '" /></td>
+			</tr>';
 	}
 
-	echo '<tr><td>' . _('Supplier Number') . ':</td>';
-	echo '<td><select name="SupplierIdOp">';
-	echo '<option selected="selected" value="Equals">' . _('Equals') . '</option>';
-	echo '<option value="LIKE">' . _('Begins With') . '</option>';
-	echo '</select>';
-	echo '&nbsp;&nbsp;<input type="text" name="SupplierId" size="10" maxlength="10" value="';
+	echo '<tr>
+			<td>' . _('Supplier Number') . ':</td>
+			<td><select name="SupplierIdOp">
+				<option selected="selected" value="Equals">' . _('Equals') . '</option>
+				<option value="LIKE">' . _('Begins With') . '</option>
+				</select>
+				&nbsp;&nbsp;
+				<input type="text" name="SupplierId" size="10" maxlength="10" value="';
     if (isset($_POST['SupplierId'])) {
-        echo $_POST['SupplierId'] . '" /></td></tr>';
+        echo $_POST['SupplierId'] . '" /></td>
+				</tr>';
 	} else {
-		echo  '" /></td></tr>';
+		echo  '" /></td>
+			</tr>';
 	}
 
-	echo '<tr><td>' . _('Supplier Name') . ':</td>';
-	echo '<td><select name="SupplierNameOp">';
-	echo '<option selected="selected" value="LIKE">' . _('Begins With') . '</option>';
-	echo '<option value="Equals">' . _('Equals') . '</option>';
-	echo '</select>';
-	echo '&nbsp;&nbsp;<input type="text" name="SupplierName" size="30" maxlength="30" value="';
+	echo '<tr>
+			<td>' . _('Supplier Name') . ':</td>
+			<td><select name="SupplierNameOp">
+				<option selected="selected" value="LIKE">' . _('Begins With') . '</option>
+				<option value="Equals">' . _('Equals') . '</option>
+				</select>
+				&nbsp;&nbsp;
+				<input type="text" name="SupplierName" size="30" maxlength="30" value="';
 	if (isset($_POST['SupplierName'])) {
-		echo $_POST['SupplierName'] . '" /></td></tr>';
+		echo $_POST['SupplierName'] . '" /></td>
+			</tr>';
 	} else {
-		echo  '" /></td></tr>';
+		echo  '" /></td>
+			</tr>';
 	}
 
-	echo '<tr><td>' . _('Order Number') . ':</td>';
-	echo '<td>'._('Equals').':&nbsp;&nbsp;';
-	echo '<input type="text" name="OrderNo" size="10" maxlength="10" value="';
+	echo '<tr>
+			<td>' . _('Order Number') . ':</td>
+			<td>'._('Equals').':&nbsp;&nbsp;<input type="text" name="OrderNo" size="10" maxlength="10" value="';
     if (isset($_POST['OrderNo'])) {
-        echo $_POST['OrderNo'] . '" /></td></tr>';
+        echo $_POST['OrderNo'] . '" /></td>
+				</tr>';
 	} else {
-		echo  '" /></td></tr>';
+		echo  '" /></td>
+				</tr>';
 	}
 
-	echo '<tr><td>' . _('Line Item Status') . ':</td>';
-	echo '<td><select name="LineStatus">';
-	echo '<option selected="selected" value="All">' . _('All') . '</option>';
-	echo '<option value="Completed">' . _('Completed') . '</option>';
-	echo '<option value="Open">' . _('Not Completed') . '</option>';
-	echo '</select></td><td>&nbsp;</td></tr>';
-
-	echo '<tr><td>' . _('Stock Categories') . ':</td><td><select name="Category">';
+	echo '<tr>
+			<td>' . _('Line Item Status') . ':</td>
+			<td><select name="LineStatus">
+				<option selected="selected" value="All">' . _('All') . '</option>
+				<option value="Completed">' . _('Completed') . '</option>
+				<option value="Open">' . _('Not Completed') . '</option>
+				</select></td>
+			<td>&nbsp;</td>
+		</tr>
+		<tr>
+			<td>' . _('Stock Categories') . ':</td>
+			<td><select name="Category">';
 	$sql="SELECT categoryid, categorydescription FROM stockcategory";
 	$CategoryResult= DB_query($sql,$db);
 	echo '<option selected="selected" value="All">' . _('All Categories') . '</option>';
 	While ($myrow = DB_fetch_array($CategoryResult)){
 		echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
 	}
-	echo '</select></td></tr>';
-
-	echo '<tr><td>&nbsp;</td></tr>';
-	echo '<tr><td>' . _('Sort By') . ':</td>';
-	echo '<td><select name="SortBy">';
-	echo '<option selected="selected" value="purchorderdetails.orderno">' . _('Order Number') . '</option>';
-	echo '<option value="purchorderdetails.itemcode">' . _('Part Number') . '</option>';
-	echo '<option value="suppliers.supplierid,purchorderdetails.orderno">' . _('Supplier Number') . '</option>';
-	echo '<option value="suppliers.suppname,suppliers.supplierid,purchorderdetails.orderno">' . _('Supplier Name') . '</option>';
-	echo '</select></td><td>&nbsp;</td></tr>';
-
-	echo '<tr><td>&nbsp;</td></tr>';
-	echo '<tr><td>' . _('Summary Type') . ':</td>';
-	echo '<td><select name="SummaryType">';
-	echo '<option selected="selected" value="orderno">' . _('Order Number') . '</option>';
-	echo '<option value="itemcode">' . _('Part Number') . '</option>';
-	echo '<option value="extprice">' . _('Extended Price') . '</option>';
-	echo '<option value="supplierno">' . _('Supplier Number') . '</option>';
-	echo '<option value="suppname">' . _('Supplier Name') . '</option>';
-	echo '<option value="month">' . _('Month') . '</option>';
-	echo '<option value="categoryid">' . _('Stock Category') . '</option>';
-	echo '</select></td><td>&nbsp;</td></tr>';
-
-	echo '<tr><td>&nbsp;</td></tr>
+	echo '</select></td>
+		</tr>
 		<tr>
-		<td colspan="4"><div class="centre"><input type="submit" name="submit" value="' . _('Run Inquiry') . '" /></div></td>
-	</tr>
-	<tr>
-		<td colspan="4"><div class="centre"><input type="submit" name="submitcsv" value="' . _('Export as csv file') . '" /></div></td>
-	</tr>
+			<td>&nbsp;</td>
+		</tr>
+		<tr>
+			<td>' . _('Sort By') . ':</td>
+			<td><select name="SortBy">
+				<option selected="selected" value="purchorderdetails.orderno">' . _('Order Number') . '</option>
+				<option value="purchorderdetails.itemcode">' . _('Part Number') . '</option>
+				<option value="suppliers.supplierid,purchorderdetails.orderno">' . _('Supplier Number') . '</option>
+				<option value="suppliers.suppname,suppliers.supplierid,purchorderdetails.orderno">' . _('Supplier Name') . '</option>
+				</select></td>
+			<td>&nbsp;</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+		</tr>
+		<tr>
+			<td>' . _('Summary Type') . ':</td>
+			<td><select name="SummaryType">
+				<option selected="selected" value="orderno">' . _('Order Number') . '</option>
+				<option value="itemcode">' . _('Part Number') . '</option>
+				<option value="extprice">' . _('Extended Price') . '</option>
+				<option value="supplierno">' . _('Supplier Number') . '</option>
+				<option value="suppname">' . _('Supplier Name') . '</option>
+				<option value="month">' . _('Month') . '</option>
+				<option value="categoryid">' . _('Stock Category') . '</option>
+				</select></td>
+			<td>&nbsp;</td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+		</tr>
+		<tr>
+			<td colspan="4"><div class="centre"><input type="submit" name="submit" value="' . _('Run Inquiry') . '" /></div></td>
+		</tr>
+		<tr>
+			<td colspan="4"><div class="centre"><input type="submit" name="submitcsv" value="' . _('Export as csv file') . '" /></div></td>
+		</tr>
 	</table>
-	<br/>';
-   echo '</div>
-         </form>';
+	<br/>
+	</div>
+   </form>';
 
 } // End of function display()
 
 
 include('includes/footer.inc');
-?>
\ No newline at end of file
+?>

Modified: trunk/PO_AuthoriseMyOrders.php
===================================================================
--- trunk/PO_AuthoriseMyOrders.php	2013-08-16 10:17:58 UTC (rev 6240)
+++ trunk/PO_AuthoriseMyOrders.php	2013-08-17 08:07:47 UTC (rev 6241)
@@ -17,9 +17,9 @@
 
 if (isset($_POST['UpdateAll'])) {
 	foreach ($_POST as $key => $value) {
-		if (mb_substr($key,0,6)=='status') {
+		if (mb_substr($key,0,6)=='Status') {
 			$OrderNo=mb_substr($key,6);
-			$Status=$_POST['status'.$OrderNo];
+			$Status=$_POST['Status'.$OrderNo];
 			$Comment=date($_SESSION['DefaultDateFormat']).' - '._('Authorised by').' <a href="mailto:' . $EmailRow['email'].'">'.$_SESSION['UserID'].'</a><br />' . html_entity_decode($_POST['comment'],ENT_QUOTES,'UTF-8');
 			$sql="UPDATE purchorders
 					SET status='".$Status."',
@@ -49,18 +49,18 @@
 $result=DB_query($sql, $db);
 
 echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
-echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<table class="selection">';
+echo '<div>
+	<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+	<table class="selection">';
 
 /* Create the table for the purchase order header */
 echo '<tr>
-		<th>'._('Order Number').'</th>
-		<th>'._('Supplier').'</th>
-		<th>'._('Date Ordered').'</th>
-		<th>'._('Initiator').'</th>
-		<th>'._('Delivery Date').'</th>
-		<th>'._('Status').'</th>
+		<th class="ascending" onClick="SortSelect(this)">'._('Order Number').'</th>
+		<th class="ascending" onClick="SortSelect(this)">'._('Supplier').'</th>
+		<th class="ascending" onClick="SortSelect(this)">'._('Date Ordered').'</th>
+		<th class="ascending" onClick="SortSelect(this)">'._('Initiator').'</th>
+		<th class="ascending" onClick="SortSelect(this)">'._('Delivery Date').'</th>
+		<th class="ascending" onClick="SortSelect(this)">'._('Status').'</th>
 	</tr>';
 
 while ($myrow=DB_fetch_array($result)) {
@@ -88,7 +88,7 @@
 				<td>'.ConvertSQLDate($myrow['orddate']).'</td>
 				<td><a href="mailto:'.$myrow['email'].'">'.$myrow['realname'].'</td>
 				<td>'.ConvertSQLDate($myrow['deliverydate']).'</td>
-				<td><select name="status'.$myrow['orderno'].'">
+				<td><select name="Status'.$myrow['orderno'].'">
 					<option selected="selected" value="Pending">'._('Pending').'</option>
 					<option value="Authorised">'._('Authorised').'</option>
 					<option value="Rejected">'._('Rejected').'</option>
@@ -110,11 +110,11 @@
 				<td colspan="5" align="left">
 					<table class="selection" align="left">
 					<tr>
-						<th>'._('Product').'</th>
-						<th>'._('Quantity Ordered').'</th>
-						<th>'._('Currency').'</th>
-						<th>'._('Price').'</th>
-						<th>'._('Line Total').'</th>
+						<th class="ascending" onClick="SortSelect(this)">'._('Product').'</th>
+						<th class="ascending" onClick="SortSelect(this)">'._('Quantity Ordered').'</th>
+						<th class="ascending" onClick="SortSelect(this)">'._('Currency').'</th>
+						<th class="ascending" onClick="SortSelect(this)">'._('Price').'</th>
+						<th class="ascending" onClick="SortSelect(this)">'._('Line Total').'</th>
 					</tr>';
 
 		while ($LineRow=DB_fetch_array($LineResult)) {
@@ -144,4 +144,4 @@
         </div>
 		</form>';
 include('includes/footer.inc');
-?>
\ No newline at end of file
+?>

Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php	2013-08-16 10:17:58 UTC (rev 6240)
+++ trunk/PO_Header.php	2013-08-17 08:07:47 UTC (rev 6241)
@@ -253,7 +253,7 @@
 
 if (isset($_GET['ModifyOrderNumber'])) {
 	include('includes/PO_ReadInOrder.inc');
-} //isset($_GET['ModifyOrderNumber'])
+} 
 
 
 if (!isset($_SESSION['PO' . $identifier])) {
@@ -552,15 +552,12 @@
 	if (isset($result_SuppSelect)) {
 		echo '<br /><table cellpadding="3" class="selection">';
 
-		$tableheader = '<tr>
-							<th>' . _('Code') . '</th>
-							<th>' . _('Supplier Name') . '</th>
-							<th>' . _('Address') . '</th>
-							<th>' . _('Currency') . '</th>
-						</tr>';
-
-		echo $tableheader;
-
+		echo '<tr>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Code') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Supplier Name') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Address') . '</th>
+				<th class="ascending" onClick="SortSelect(this)">' . _('Currency') . '</th>
+			</tr>';
 		$j = 1;
 		$k = 0;
 		/*row counter to determine background colour */
@@ -664,7 +661,26 @@
 			$PurchItemRow['leadtime'] = 1;
 		}
 
-		$_SESSION['PO' . $identifier]->add_to_order(1, $Purch_Item, $PurchItemRow['serialised'], $PurchItemRow['controlled'], $Qty * $PurchItemRow['conversionfactor'], $PurchItemRow['description'], $PurchItemRow['price'] / $PurchItemRow['conversionfactor'], $PurchItemRow['units'], $PurchItemRow['stockact'], $_SESSION['PO' . $identifier]->DeliveryDate, 0, 0, '', 0, 0, '', $PurchItemRow['decimalplaces'], $PurchItemRow['suppliersuom'], $PurchItemRow['conversionfactor'], $PurchItemRow['leadtime'], $PurchItemRow['suppliers_partno']);
+		$_SESSION['PO' . $identifier]->add_to_order(1,
+													$Purch_Item,
+													$PurchItemRow['serialised'],
+													$PurchItemRow['controlled'],
+													$Qty * $PurchItemRow['conversionfactor'],
+													$PurchItemRow['description'],
+													$PurchItemRow['price'] / $PurchItemRow['conversionfactor'],
+													$PurchItemRow['units'],
+													$PurchItemRow['stockact'],
+													$_SESSION['PO' . $identifier]->DeliveryDate, 0,
+													0,
+													'',
+													0,
+													0,
+													'',
+													$PurchItemRow['decimalplaces'],
+													$PurchItemRow['suppliersuom'],
+													$PurchItemRow['conversionfactor'],
+													$PurchItemRow['leadtime'],
+													$PurchItemRow['suppliers_partno']);
 
 		echo '<meta http-equiv="refresh" content="0; url=' . $RootPath . '/PO_Items.php?identifier=' . $identifier . '">';
 	}
@@ -698,7 +714,8 @@
 		$_POST['InitiatorName'] = $myrow['realname'];
 	}
 
-	echo '<br /><table width="80%">
+	echo '<br />
+		<table width="80%">
 		<tr>
 			<th><h3>' . _('Order Initiation Details') . '</h3></th>
 			<th><h3>' . _('Order Status') . '</h3></th>
@@ -837,9 +854,9 @@
 						<option value="Pending">' . _('Pending') . '</option>';
 				break;
 		}
-		echo '</select></td></tr>';
-
-		echo '<tr>
+		echo '</select></td>
+			</tr>
+			<tr>
 				<td>' . _('Status Comment') . ':</td>
 				<td><input type="text" name="StatusComments" size="50" /></td>
 			</tr>
@@ -853,9 +870,8 @@
 	} //end its not a new order
 
 	echo '</table></td>
-		</tr>';
-
-	echo '<tr>
+		</tr>
+		<tr>
 			<th><h3>' . _('Warehouse Info') . '</h3></th>
 		<!--    <th><h3>' . _('Delivery To') . '</h3></th> -->
 			<th><h3>' . _('Supplier Info') . '</h3></th>

Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php	2013-08-16 10:17:58 UTC (rev 6240)
+++ trunk/PO_Items.php	2013-08-17 08:07:47 UTC (rev 6241)
@@ -714,17 +714,17 @@
 	echo '<br /><b>'._(' Order Summary') . '</b></p>';
 	echo '<table cellpadding="2" class="selection">';
 	echo '<tr>
-			<th>' . _('Item Code') . '</th>
-			<th>' . _('Description') . '</th>
-			<th>' . _('Quantity Our Units') . '</th>
+			<th class="ascending" onClick="SortSelect(this)">' . _('Item Code') . '</th>
+			<th class="ascending" onClick="SortSelect(this)">' . _('Description') . '</th>
+			<th class="ascending" onClick="SortSelect(this)">' . _('Quantity Our Units') . '</th>
 			<th>' . _('Our Unit') .'</th>
-			<th>' . _('Price Our Units') .' (' . $_SESSION['PO'.$identifier]->CurrCode .  ')</th>
+			<th class="ascending" onClick="SortSelect(this)">' . _('Price Our Units') .' (' . $_SESSION['PO'.$identifier]->CurrCode .  ')</th>
 			<th>' . _('Unit Conversion Factor') . '</th>
-			<th>' . _('Order Quantity') . '<br />' . _('Supplier Units') . '</th>
+			<th class="ascending" onClick="SortSelect(this)">' . _('Order Quantity') . '<br />' . _('Supplier Units') . '</th>
 			<th>' .  _('Supplier Unit') . '</th>
-			<th>' . _('Order Price') . '<br />' . _('Supp Units') . ' ('.$_SESSION['PO'.$identifier]->CurrCode.  ')</th>
-			<th>' . _('Sub-Total') .' ('.$_SESSION['PO'.$identifier]->CurrCode.  ')</th>
-			<th>' . _('Deliver By') .'</th>
+			<th class="ascending" onClick="SortSelect(this)">' . _('Order Price') . '<br />' . _('Supp Units') . ' ('.$_SESSION['PO'.$identifier]->CurrCode.  ')</th>
+			<th class="ascending" onClick="SortSelect(this)">' . _('Sub-Total') .' ('.$_SESSION['PO'.$identifier]->CurrCode.  ')</th>
+			<th class="ascending" onClick="SortSelect(this)">' . _('Deliver By') .'</th>
 			</tr>';
 
 	$_SESSION['PO'.$identifier]->Total = 0;
@@ -792,8 +792,8 @@
 				<td>' . _('Item Description') . '</td>';
 	echo '<td><input type="text" name="ItemDescription" size="40" /></td></tr>';
 	echo '<tr>
-			<td>' . _('General Ledger Code') . '</td>';
-	echo '<td><select name="GLCode">';
+			<td>' . _('General Ledger Code') . '</td>
+			<td><select name="GLCode">';
 	$sql="SELECT accountcode,
 				  accountname
 				FROM chartmaster
@@ -807,7 +807,12 @@
 	echo '<tr>
 			<td>'._('OR Asset ID'). '</td>
 			<td><select name="AssetID">';
-	$AssetsResult = DB_query("SELECT assetid, description, datepurchased FROM fixedassets ORDER BY assetid DESC",$db);
+	$AssetsResult = DB_query("SELECT assetid,
+									description,
+									datepurchased
+								FROM fixedassets
+								ORDER BY assetid DESC",
+							$db);
 	echo '<option selected="selected" value="Not an Asset">' . _('Not an Asset') . '</option>';
 	while ($AssetRow = DB_fetch_array($AssetsResult)){
 		if ($AssetRow['datepurchased']=='0000-00-00'){
@@ -1147,8 +1152,8 @@
 	echo '<table cellpadding="1" class="selection">';
 
 	$TableHeader = '<tr>
-						<th>' . _('Code')  . '</th>
-						<th>' . _('Description') . '</th>
+						<th class="ascending" onClick="SortSelect(this)">' . _('Code')  . '</th>
+						<th class="ascending" onClick="SortSelect(this)">' . _('Description') . '</th>
 						<th>' . _('Our Units') . '</th>
 						<th>' . _('Conversion') . '<br />' ._('Factor') . '</th>
 						<th>' . _('Supplier/Order') . '<br />' .  _('Units') . '</th>
@@ -1215,4 +1220,4 @@
 echo '</div>
       </form>';
 include('includes/footer.inc');
-?>
\ No newline at end of file
+?>

Modified: trunk/PO_OrderDetails.php
===================================================================
--- trunk/PO_OrderDetails.php	2013-08-16 10:17:58 UTC (rev 6240)
+++ trunk/PO_OrderDetails.php	2013-08-17 08:07:47 UTC (rev 6241)
@@ -15,9 +15,9 @@
 if (isset($_GET['FromGRNNo'])){
 
 	$SQL= "SELECT purchorderdetails.orderno
-		FROM purchorderdetails INNER JOIN grns
-		ON purchorderdetails.podetailitem=grns.podetailitem
-		WHERE grns.grnno='" . $_GET['FromGRNNo'] ."'";
+			FROM purchorderdetails INNER JOIN grns
+			ON purchorderdetails.podetailitem=grns.podetailitem
+			WHERE grns.grnno='" . $_GET['FromGRNNo'] ."'";
 
 	$ErrMsg = _('The search of the GRNs was unsuccessful') . ' - ' . _('the SQL statement returned the error');
 	$OrderResult = DB_query($SQL, $db, $ErrMsg);
@@ -42,22 +42,22 @@
 
 $ErrMsg = _('The order requested could not be retrieved') . ' - ' . _('the SQL returned the following error');
 $OrderHeaderSQL = "SELECT purchorders.*,
-			suppliers.supplierid,
-			suppliers.suppname,
-			suppliers.currcode,
-			www_users.realname,
-			locations.locationname,
-			currencies.decimalplaces AS currdecimalplaces
-		FROM purchorders
-		INNER JOIN locations
-		ON locations.loccode=purchorders.intostocklocation
-		INNER JOIN suppliers
-		ON purchorders.supplierno = suppliers.supplierid
-		INNER JOIN currencies
-		ON suppliers.currcode = currencies.currabrev
-		LEFT JOIN www_users
-		ON purchorders.initiator=www_users.userid
-		WHERE purchorders.orderno = '" . $_GET['OrderNo'] ."'";
+						suppliers.supplierid,
+						suppliers.suppname,
+						suppliers.currcode,
+						www_users.realname,
+						locations.locationname,
+						currencies.decimalplaces AS currdecimalplaces
+					FROM purchorders
+					INNER JOIN locations
+					ON locations.loccode=purchorders.intostocklocation
+					INNER JOIN suppliers
+					ON purchorders.supplierno = suppliers.supplierid
+					INNER JOIN currencies
+					ON suppliers.currcode = currencies.currabrev
+					LEFT JOIN www_users
+					ON purchorders.initiator=www_users.userid
+					WHERE purchorders.orderno = '" . $_GET['OrderNo'] ."'";
 
 $GetOrdHdrResult = DB_query($OrderHeaderSQL,$db, $ErrMsg);
 
@@ -69,9 +69,12 @@
 		prnMsg ( _('The order requested could not be retrieved') . ' - ' . _('the SQL returned either several purchase orders'), 'error');
 	}
         echo '<table class="table_index">
-                <tr><td class="menu_group_item">
-                <li><a href="'. $RootPath . '/PO_SelectPurchOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
-                </td></tr></table>';
+                <tr>
+					<td class="menu_group_item">
+						<li><a href="'. $RootPath . '/PO_SelectPurchOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
+					</td>
+				</tr>
+				</table>';
 
 	include('includes/footer.inc');
 	exit;
@@ -84,32 +87,56 @@
 echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' .
 		_('Purchase Order') . '" alt="" />' . ' ' . $Title . '</p>';
 
-echo '<table class="selection" cellpadding="2">';
-echo '<tr><th colspan="8"><b>'. _('Order Header Details'). '</b></th></tr>';
-echo '<tr><td style="text-align:left">' . _('Supplier Code'). '</td><td><a href="SelectSupplier.php?SupplierID='.$myrow['supplierid'].'">' . $myrow['supplierid'] . '</a></td>
-	<td style="text-align:left">' . _('Supplier Name'). '</td><td><a href="SelectSupplier.php?SupplierID='.$myrow['supplierid'].'">' . $myrow['suppname'] . '</a></td></tr>';
+echo '<table class="selection" cellpadding="2">
+		<tr>
+			<th colspan="8"><b>'. _('Order Header Details'). '</b></th>
+		</tr>
+		<tr>
+			<td>' . _('Supplier Code'). '</td>
+			<td><a href="SelectSupplier.php?SupplierID='.$myrow['supplierid'].'">' . $myrow['supplierid'] . '</a></td>
+			<td>' . _('Supplier Name'). '</td>
+			<td><a href="SelectSupplier.php?SupplierID='.$myrow['supplierid'].'">' . $myrow['suppname'] . '</a></td>
+		</tr>
+		<tr>
+			<td>' . _('Ordered On'). '</td>
+			<td>' . ConvertSQLDate($myrow['orddate']) . '</td>
+			<td>' . _('Delivery Address 1'). '</td>
+			<td>' . $myrow['deladd1'] . '</td>
+		</tr>
+		<tr>
+			<td>' . _('Order Currency'). '</td>
+			<td>' . $myrow['currcode'] . '</td>
+			<td>' . _('Delivery Address 2'). '</td>
+			<td>'...
 
[truncated message content]

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

Accounting & Best Practice Business Administration System

web-erp-svn