Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4707] trunk
|
From: <dai...@us...> - 2011-10-01 06:41:00
|
Revision: 4707
http://web-erp.svn.sourceforge.net/web-erp/?rev=4707&view=rev
Author: daintree
Date: 2011-10-01 06:40:49 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
number_formats
Modified Paths:
--------------
trunk/AuditTrail.php
trunk/GetStockImage.php
trunk/PO_Items.php
trunk/PrintCustTrans.php
trunk/RecurringSalesOrders.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectCreditItems.php
trunk/SelectCustomer.php
trunk/SelectGLAccount.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
trunk/doc/Change.log
trunk/includes/LanguagesArray.php
trunk/includes/footer.inc
trunk/index.php
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2011-09-25 09:15:03 UTC (rev 4706)
+++ trunk/AuditTrail.php 2011-10-01 06:40:49 UTC (rev 4707)
@@ -22,6 +22,12 @@
unset($_POST['View']);
}
+if (isset($_POST['ContainingText'])){
+ $ContainingText = trim(mb_strtoupper($_POST['ContainingText']));
+} elseif (isset($_GET['ContainingText'])){
+ $ContainingText = trim(mb_strtoupper($_GET['ContainingText']));
+}
+
// Get list of tables
$TableResult = DB_show_tables($db);
@@ -63,6 +69,14 @@
}
echo '</select></td></tr>';
+if(!isset($_POST['ContainingText'])){
+ $_POST['ContainingText']='';
+}
+// Show the text
+echo '<tr><td>' . _('Containing text') . ':</td>';
+echo '<td><input type="text" name="ContainingText" size=20 maxlength=20 value="'. $_POST['ContainingText'] . '"></td></tr>';
+
+
echo '</table><br />';
echo '<div class="centre"><input tabindex="5" type="submit" name="View" value="' . _('View') . '"></div>';
echo '</form>';
@@ -122,21 +136,26 @@
$_SESSION['SQLString']['fields'][0] = $Assigment[0];
$_SESSION['SQLString']['values'][0] = $Assigment[1];
}
+
+ if (mb_strlen($ContainingText) > 0) {
+ $ContainingText = " AND querystring LIKE '%" . $ContainingText . "%' ";
+ }else{
+ $ContainingText = "";
+ }
if ($_POST['SelectedUser'] == 'ALL') {
$sql="SELECT transactiondate,
userid,
querystring
FROM audittrail
- WHERE transactiondate
- BETWEEN '". $FromDate."' AND '".$ToDate."'";
+ WHERE transactiondate BETWEEN '". $FromDate."' AND '".$ToDate."'" . $ContainingText;
} else {
$sql="SELECT transactiondate,
userid,
querystring
FROM audittrail
WHERE userid='".$_POST['SelectedUser']."'
- AND transactiondate BETWEEN '".$FromDate."' AND '".$ToDate."'";
+ AND transactiondate BETWEEN '".$FromDate."' AND '".$ToDate."'" . $ContainingText;
}
$result = DB_query($sql,$db);
Modified: trunk/GetStockImage.php
===================================================================
--- trunk/GetStockImage.php 2011-09-25 09:15:03 UTC (rev 4706)
+++ trunk/GetStockImage.php 2011-10-01 06:40:49 UTC (rev 4707)
@@ -58,15 +58,7 @@
}
$DefaultImage = 'webERPsmall.png';
-// FOR APACHE
-if ( $_SERVER['PATH_TRANSLATED'][0] == '/' OR $_SERVER['PATH_TRANSLATED'][0]=='') {
- //*nix
- $pathsep = '/';
-} else {
- //Windows
- $pathsep = "\\";
-}
-$FilePath = $_SESSION['part_pics_dir'] . $pathsep;
+$FilePath = $_SESSION['part_pics_dir'] . '/';
$StockID = trim(mb_strtoupper($_GET['StockID']));
if( isset($_GET['bgcolor']) )
@@ -90,13 +82,15 @@
if( isset($_GET['transcolor'])) {
$doTrans = true;
$TranspColour = $_GET['transcolor'];
+} else {
+ $doTrans = false;
}
if( isset($_GET['bevel']) ) {
$bevel = $_GET['bevel'];
+} else {
+ $bevel = false;
}
-if( isset($_GET['useblank']) ) {
- $useblank = $_GET['useblank'];
-}
+
if( isset($_GET['fontsize']) ) {
$fontsize = $_GET['fontsize'];
} else {
@@ -104,6 +98,8 @@
}
if( isset($_GET['notextbg']) ) {
$notextbg = true;
+} else {
+ $notextbg = false;
}
@@ -157,7 +153,7 @@
}
// See if we need to automake this image
-if( $automake && !isset($FileName) || $useblank ) {
+if( $automake AND !isset($FileName) ) {
// Have we got height and width specs
if( !isset($width) )
$width = 64;
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-09-25 09:15:03 UTC (rev 4706)
+++ trunk/PO_Items.php 2011-10-01 06:40:49 UTC (rev 4707)
@@ -47,7 +47,7 @@
if (!is_numeric(filter_number_format($_POST['SuppPrice'.$POLine->LineNo]))){
prnMsg(_('The supplier price is expected to be numeric. Please re-enter as a number'),'error');
} else { //ok to update the PO object variables
- $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Price=filter_number_format((filter_number_format($_POST['SuppPrice'.$POLine->LineNo])/filter_number_format($_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor));
+ $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Price=filter_number_format(filter_number_format($_POST['SuppPrice'.$POLine->LineNo])/filter_number_format($_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor));
}
$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ReqDelDate=$_POST['ReqDelDate'.$POLine->LineNo];
}
@@ -610,7 +610,7 @@
$ItemCode,
0, /*Serialised */
0, /*Controlled */
- filter_number_format((filter_number_format($Quantity)*$ConversionFactor), /* Qty */
+ filter_number_format($Quantity*$ConversionFactor), /* Qty */
$SupplierDescription,
$PurchPrice,
$ItemRow['units'],
@@ -626,8 +626,7 @@
$SuppliersUnitOfMeasure,
$ConversionFactor,
$LeadTime,
- $SuppliersPartNo
- );
+ $SuppliersPartNo);
} else { //no rows returned by the SQL to get the item
prnMsg (_('The item code') . ' ' . $ItemCode . ' ' . _('does not exist in the database and therefore cannot be added to the order'),'error');
if ($debug==1){
@@ -701,9 +700,9 @@
<td>' . $POLine->Units . '</td>
<td class="number">' . $DisplayPrice . '</td>
<td><input type="text" class="number" name="ConversionFactor' . $POLine->LineNo .'" size="8" value="' . $POLine->ConversionFactor . '"></td>
- <td><input type="text" class="number" name="SuppQty' . $POLine->LineNo .'" size="10" value="' . locale_locale_format(round($POLine->Quantity/$POLine->ConversionFactor,$POLine->DecimalPlaces),$POLine->DecimalPlaces) . '"></td>
+ <td><input type="text" class="number" name="SuppQty' . $POLine->LineNo .'" size="10" value="' . locale_number_format(round($POLine->Quantity/$POLine->ConversionFactor,$POLine->DecimalPlaces),$POLine->DecimalPlaces) . '"></td>
<td>' . $POLine->SuppliersUnit . '</td>
- <td><input type="text" class="number" name="SuppPrice' . $POLine->LineNo . '" size="10" value="' . locale_money_format(round(($POLine->Price *$POLine->ConversionFactor),$_SESSION['PO'.$identifier]->CurrDecimalPlaces),,$_SESSION['PO'.$identifier]->CurrDecimalPlaces) .'"></td>
+ <td><input type="text" class="number" name="SuppPrice' . $POLine->LineNo . '" size="10" value="' . locale_money_format(round(($POLine->Price *$POLine->ConversionFactor),$_SESSION['PO'.$identifier]->CurrDecimalPlaces),$_SESSION['PO'.$identifier]->CurrDecimalPlaces) .'"></td>
<td class="number">' . $DisplayLineTotal . '</td>
<td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'].'" name="ReqDelDate' . $POLine->LineNo.'" size="10" value="' .$POLine->ReqDelDate .'"></td>';
if ($POLine->QtyReceived !=0 AND $POLine->Completed!=1){
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2011-09-25 09:15:03 UTC (rev 4706)
+++ trunk/PrintCustTrans.php 2011-10-01 06:40:49 UTC (rev 4707)
@@ -147,7 +147,7 @@
WHERE debtortrans.type=10
AND debtortrans.transno='" . $FromTransNo . "'";
- if (isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No') {
+ if (isset($_POST['PrintEDI']) AND $_POST['PrintEDI']=='No') {
$sql = $sql . " AND debtorsmaster.ediinvoices=0";
}
} else {
@@ -200,7 +200,7 @@
WHERE debtortrans.type=11
AND debtortrans.transno='" . $FromTransNo . "'";
- if ($_POST['PrintEDI']=='No') {
+ if (isset($_POST['PrintEDI']) AND $_POST['PrintEDI']=='No') {
$sql = $sql . " AND debtorsmaster.ediinvoices=0";
}
} // end else
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2011-09-25 09:15:03 UTC (rev 4706)
+++ trunk/RecurringSalesOrders.php 2011-10-01 06:40:49 UTC (rev 4707)
@@ -255,8 +255,6 @@
$ErrMsg = _('The recurring order cannot be added because');
$DbgMsg = _('The SQL that failed was');
$InsertQryResult = DB_query($HeaderSQL,$db,$ErrMsg,$DbgMsg,true);
-
- echo '<br/>' . $HeaderSQL;
$RecurrOrderNo = DB_Last_Insert_ID($db,'recurringsalesorders','recurrorderno');
echo 'xxx'.$RecurrOrderNo;
@@ -279,8 +277,6 @@
'" . $StockItem->Narrative . "')";
$Ins_LineItemResult = DB_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg,true);
- echo '<br/>' . $LineItemsSQL;
-
} /* inserted line items into sales order details */
$result = DB_Txn_Commit($db);
Modified: trunk/SelectAsset.php
===================================================================
--- trunk/SelectAsset.php 2011-09-25 09:15:03 UTC (rev 4706)
+++ trunk/SelectAsset.php 2011-10-01 06:40:49 UTC (rev 4707)
@@ -12,7 +12,7 @@
$_POST['Select'] = $_GET['AssetID'];
}
-if (isset($_GET['NewSearch']) or isset($_POST['Next']) or isset($_POST['Previous']) or isset($_POST['Go'])) {
+if (isset($_GET['NewSearch']) OR isset($_POST['Next']) OR isset($_POST['Previous']) OR isset($_POST['Go'])) {
unset($AssetID);
unset($_SESSION['SelectedAsset']);
unset($_POST['Select']);
@@ -28,13 +28,13 @@
$_POST['AssetCode'] = trim(mb_strtoupper($_POST['AssetCode']));
}
// Always show the search facilities
-$SQL = 'SELECT categoryid,
+$SQL = "SELECT categoryid,
categorydescription
FROM fixedassetcategories
- ORDER BY categorydescription';
+ ORDER BY categorydescription";
$result = DB_query($SQL, $db);
if (DB_num_rows($result) == 0) {
- echo '<p><font size=4 color=red>' . _('Problem Report') . ':</font><br />' . _('There are no asset categories currently defined please use the link below to set them up');
+ echo '<p><font size="4" color="red">' . _('Problem Report') . ':</font><br />' . _('There are no asset categories currently defined please use the link below to set them up');
echo '<br /><a href="' . $rootpath . '/FixedAssetCategories.php">' . _('Define Asset Categories') . '</a>';
exit;
}
@@ -48,7 +48,7 @@
echo '<select name="AssetCategory">';
if (!isset($_POST['AssetCategory'])) {
- $_POST['AssetCategory'] = "";
+ $_POST['AssetCategory'] = '';
}
if ($_POST['AssetCategory']=='ALL'){
echo '<option selected value="ALL">' . _('Any asset category') . '</option>';
@@ -58,9 +58,9 @@
while ($myrow = DB_fetch_array($result)) {
if ($myrow['categoryid'] == $_POST['AssetCategory']) {
- echo '<option selected VALUE="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'];
+ echo '<option selected value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
} else {
- echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'];
+ echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
}
}
echo '</select>';
@@ -84,9 +84,9 @@
while ($myrow = DB_fetch_array($result)) {
if ($myrow['locationid'] == $_POST['AssetLocation']) {
- echo '<option selected VALUE="' . $myrow['locationid'] . '">' . $myrow['locationdescription'];
+ echo '<option selected value="' . $myrow['locationid'] . '">' . $myrow['locationdescription'] . '</option>';
} else {
- echo '<option value="' . $myrow['locationid'] . '">' . $myrow['locationdescription'];
+ echo '<option value="' . $myrow['locationid'] . '">' . $myrow['locationdescription'] . '</option>';
}
}
echo '</select>';
@@ -114,12 +114,12 @@
if ($_POST['Keywords'] AND $_POST['AssetCode']) {
prnMsg( _('Asset description keywords have been used in preference to the asset code extract entered'), 'info' );
}
- $SQL = 'SELECT assetid,
+ $SQL = "SELECT assetid,
description,
datepurchased,
fixedassetlocations.locationdescription
FROM fixedassets INNER JOIN fixedassetlocations
- ON fixedassets.assetlocation=fixedassetlocations.locationid ';
+ ON fixedassets.assetlocation=fixedassetlocations.locationid ";
if ($_POST['Keywords']) {
//insert wildcard characters in spaces
@@ -127,7 +127,7 @@
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
if ($_POST['AssetCategory'] == 'ALL') {
if ($_POST['AssetLocation']=='ALL'){
- $SQL .= 'WHERE description ' . LIKE . "'" . $SearchString . "'
+ $SQL .= "WHERE description " . LIKE . "'" . $SearchString . "'
ORDER BY fixedassets.assetid";
} else {
$SQL .= "WHERE fixedassets.assetlocation='" . $_POST['AssetLocation'] . "'
@@ -136,7 +136,7 @@
}
} else {
if ($_POST['AssetLocation']=='ALL'){
- $SQL .= 'WHERE description ' . LIKE . "'" . $SearchString . "'
+ $SQL .= "WHERE description " . LIKE . "'" . $SearchString . "'
AND assetcategoryid='" . $_POST['AssetCategory'] . "'
ORDER BY fixedassets.assetid";
} else {
@@ -149,7 +149,7 @@
} elseif (isset($_POST['AssetCode'])) {
if ($_POST['AssetCategory'] == 'ALL') {
if ($_POST['AssetLocation']=='ALL'){
- $SQL .= 'WHERE fixedassets.assetid ' . LIKE . " '%" . $_POST['AssetCode'] . "%'
+ $SQL .= "WHERE fixedassets.assetid " . LIKE . " '%" . $_POST['AssetCode'] . "%'
ORDER BY fixedassets.assetid";
} else {
$SQL .= "WHERE fixedassets.assetlocation='" . $_POST['AssetLocation'] . "'
@@ -158,7 +158,7 @@
}
} else {
if ($_POST['AssetLocation']=='ALL'){
- $SQL .= 'WHERE fixedassets.assetid ' . LIKE . " '%" . $_POST['AssetCode'] . "%'
+ $SQL .= "WHERE fixedassets.assetid " . LIKE . " '%" . $_POST['AssetCode'] . "%'
AND assetcategoryid='" . $_POST['AssetCategory'] . "'
ORDER BY fixedassets.assetid";
} else {
@@ -199,7 +199,7 @@
/* end query for list of records */
/* display list if there is more than one record */
if (isset($searchresult) AND !isset($_POST['Select'])) {
- echo '<form action="FixedAssetItems.php" method=post>';
+ echo '<form action="FixedAssetItems.php" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$ListCount = DB_num_rows($searchresult);
if ($ListCount > 0) {
@@ -219,7 +219,7 @@
$_POST['PageOffset'] = $ListPageMax;
}
if ($ListPageMax > 1) {
- echo "<div class='centre'><p> " . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
+ echo '<div class="centre"><p> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
echo '<select name="PageOffset">';
$ListPage = 1;
while ($ListPage <= $ListPageMax) {
Modified: trunk/SelectCompletedOrder.php
===================================================================
--- trunk/SelectCompletedOrder.php 2011-09-25 09:15:03 UTC (rev 4706)
+++ trunk/SelectCompletedOrder.php 2011-10-01 06:40:49 UTC (rev 4707)
@@ -28,9 +28,9 @@
$SelectedStockItem = $_POST['SelectedStockItem'];
}
if (isset($_GET['OrderNumber'])){
- $OrderNumber = $_GET['OrderNumber'];
+ $OrderNumber = filter_number_format($_GET['OrderNumber']);
} elseif (isset($_POST['OrderNumber'])){
- $OrderNumber = $_POST['OrderNumber'];
+ $OrderNumber = filter_number_format($_POST['OrderNumber']);
}
if (isset($_GET['CustomerRef'])){
$CustomerRef = $_GET['CustomerRef'];
@@ -43,16 +43,16 @@
$SelectedCustomer = $_POST['SelectedCustomer'];
}
-if (isset($SelectedStockItem) and $SelectedStockItem==''){
+if (isset($SelectedStockItem) AND $SelectedStockItem==''){
unset($SelectedStockItem);
}
-if (isset($OrderNumber) and $OrderNumber==''){
+if (isset($OrderNumber) AND $OrderNumber==''){
unset($OrderNumber);
}
-if (isset($CustomerRef) and $CustomerRef==''){
+if (isset($CustomerRef) AND $CustomerRef==''){
unset($CustomerRef);
}
-if (isset($SelectedCustomer) and $SelectedCustomer==''){
+if (isset($SelectedCustomer) AND $SelectedCustomer==''){
unset($SelectedCustomer);
}
if (isset($_POST['ResetPart'])) {
@@ -70,23 +70,23 @@
echo _('Customer Ref') . ' - ' . $CustomerRef;
if (mb_strlen($_SESSION['UserBranch'])>1){
echo ' ' . _('and for customer') . ': ' . $SelectedCustomer .' ' . _('and') . ' ';
- echo '<input type=hidden name="SelectedCustomer" value="' .$SelectedCustomer .'" />';
+ echo '<input type="hidden" name="SelectedCustomer" value="' .$SelectedCustomer .'" />';
}
} else {
if (isset($SelectedCustomer)) {
echo _('For customer') . ': ' . $SelectedCustomer .' ' . _('and') . ' ';
- echo '<input type=hidden name="SelectedCustomer" value="'.$SelectedCustomer.'" />';
+ echo '<input type="hidden" name="SelectedCustomer" value="'.$SelectedCustomer.'" />';
}
if (isset($SelectedStockItem)) {
$PartString = _('for the part') . ': <b>' . $SelectedStockItem . '</b> ' . _('and') . ' ' .
- '<input type=hidden name="SelectedStockItem" value="'.$SelectedStockItem.'" />';
+ '<input type="hidden" name="SelectedStockItem" value="'.$SelectedStockItem.'" />';
}
}
-if (isset($_POST['SearchParts']) and $_POST['SearchParts']!=''){
+if (isset($_POST['SearchParts']) AND $_POST['SearchParts']!=''){
if ($_POST['Keywords']!='' AND $_POST['StockCode']!='') {
echo _('Stock description keywords have been used in preference to the Stock code extract entered');
@@ -97,109 +97,121 @@
if (isset($_POST['completed'])) {
$SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- SUM(locstock.quantity) AS qoh,
- SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo,
- stockmaster.units,
- SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qdem
- FROM (((stockmaster LEFT JOIN salesorderdetails on stockmaster.stockid = salesorderdetails.stkcode)
- LEFT JOIN locstock ON stockmaster.stockid=locstock.stockid)
- LEFT JOIN purchorderdetails on stockmaster.stockid = purchorderdetails.itemcode)
- WHERE salesorderdetails.completed =1
- AND stockmaster.description " . LIKE . " '" . $SearchString. "'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
- ORDER BY stockmaster.stockid";
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ SUM(locstock.quantity) AS qoh,
+ SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo,
+ stockmaster.units,
+ SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qdem
+ FROM (((stockmaster LEFT JOIN salesorderdetails on stockmaster.stockid = salesorderdetails.stkcode)
+ LEFT JOIN locstock ON stockmaster.stockid=locstock.stockid)
+ LEFT JOIN purchorderdetails on stockmaster.stockid = purchorderdetails.itemcode)
+ WHERE salesorderdetails.completed =1
+ AND stockmaster.description " . LIKE . " '" . $SearchString. "'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ stockmaster.units
+ ORDER BY stockmaster.stockid";
} else {
$SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- SUM(locstock.quantity) AS qoh,
- SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo,
- stockmaster.units,
- SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qdem
- FROM (((stockmaster LEFT JOIN salesorderdetails on stockmaster.stockid = salesorderdetails.stkcode)
- LEFT JOIN locstock ON stockmaster.stockid=locstock.stockid)
- LEFT JOIN purchorderdetails on stockmaster.stockid = purchorderdetails.itemcode)
- WHERE stockmaster.description " . LIKE . " '" . $SearchString. "'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
- ORDER BY stockmaster.stockid";
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ SUM(locstock.quantity) AS qoh,
+ SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo,
+ stockmaster.units,
+ SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qdem
+ FROM (((stockmaster LEFT JOIN salesorderdetails on stockmaster.stockid = salesorderdetails.stkcode)
+ LEFT JOIN locstock ON stockmaster.stockid=locstock.stockid)
+ LEFT JOIN purchorderdetails on stockmaster.stockid = purchorderdetails.itemcode)
+ WHERE stockmaster.description " . LIKE . " '" . $SearchString. "'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ stockmaster.units
+ ORDER BY stockmaster.stockid";
}
} elseif ($_POST['StockCode']!=''){
if (isset($_POST['completed'])) {
$SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- SUM(locstock.quantity) AS qoh,
- SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo,
- SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qdem,
- stockmaster.units
- FROM (((stockmaster LEFT JOIN salesorderdetails on stockmaster.stockid = salesorderdetails.stkcode)
- LEFT JOIN locstock ON stockmaster.stockid=locstock.stockid)
- LEFT JOIN purchorderdetails on stockmaster.stockid = purchorderdetails.itemcode)
- WHERE salesorderdetails.completed =1
- AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
- ORDER BY stockmaster.stockid";
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ SUM(locstock.quantity) AS qoh,
+ SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo,
+ SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qdem,
+ stockmaster.units
+ FROM (((stockmaster LEFT JOIN salesorderdetails on stockmaster.stockid = salesorderdetails.stkcode)
+ LEFT JOIN locstock ON stockmaster.stockid=locstock.stockid)
+ LEFT JOIN purchorderdetails on stockmaster.stockid = purchorderdetails.itemcode)
+ WHERE salesorderdetails.completed =1
+ AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ stockmaster.units
+ ORDER BY stockmaster.stockid";
} else {
$SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- SUM(locstock.quantity) AS qoh,
- SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo,
- SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qdem,
- stockmaster.units
- FROM (((stockmaster LEFT JOIN salesorderdetails on stockmaster.stockid = salesorderdetails.stkcode)
- LEFT JOIN locstock ON stockmaster.stockid=locstock.stockid)
- LEFT JOIN purchorderdetails on stockmaster.stockid = purchorderdetails.itemcode)
- WHERE stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
- ORDER BY stockmaster.stockid";
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ SUM(locstock.quantity) AS qoh,
+ SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo,
+ SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qdem,
+ stockmaster.units
+ FROM (((stockmaster LEFT JOIN salesorderdetails on stockmaster.stockid = salesorderdetails.stkcode)
+ LEFT JOIN locstock ON stockmaster.stockid=locstock.stockid)
+ LEFT JOIN purchorderdetails on stockmaster.stockid = purchorderdetails.itemcode)
+ WHERE stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ stockmaster.units
+ ORDER BY stockmaster.stockid";
}
} elseif ($_POST['StockCode']=='' AND $_POST['Keywords']=='' AND $_POST['StockCat']!='') {
if (isset($_POST['completed'])) {
$SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- SUM(locstock.quantity) AS qoh,
- SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo,
- SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qdem,
- stockmaster.units
- FROM (((stockmaster LEFT JOIN salesorderdetails on stockmaster.stockid = salesorderdetails.stkcode)
- LEFT JOIN locstock ON stockmaster.stockid=locstock.stockid)
- LEFT JOIN purchorderdetails on stockmaster.stockid = purchorderdetails.itemcode)
- WHERE salesorderdetails.completed=1
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
- ORDER BY stockmaster.stockid";
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ SUM(locstock.quantity) AS qoh,
+ SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo,
+ SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qdem,
+ stockmaster.units
+ FROM (((stockmaster LEFT JOIN salesorderdetails on stockmaster.stockid = salesorderdetails.stkcode)
+ LEFT JOIN locstock ON stockmaster.stockid=locstock.stockid)
+ LEFT JOIN purchorderdetails on stockmaster.stockid = purchorderdetails.itemcode)
+ WHERE salesorderdetails.completed=1
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ stockmaster.units
+ ORDER BY stockmaster.stockid";
} else {
$SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- SUM(locstock.quantity) AS qoh,
- SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo,
- SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qdem,
- stockmaster.units
- FROM (((stockmaster LEFT JOIN salesorderdetails on stockmaster.stockid = salesorderdetails.stkcode)
- LEFT JOIN locstock ON stockmaster.stockid=locstock.stockid)
- LEFT JOIN purchorderdetails on stockmaster.stockid = purchorderdetails.itemcode)
- WHERE stockmaster.categoryid='" . $_POST['StockCat'] . "'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
- ORDER BY stockmaster.stockid";
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ SUM(locstock.quantity) AS qoh,
+ SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo,
+ SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qdem,
+ stockmaster.units
+ FROM (((stockmaster LEFT JOIN salesorderdetails on stockmaster.stockid = salesorderdetails.stkcode)
+ LEFT JOIN locstock ON stockmaster.stockid=locstock.stockid)
+ LEFT JOIN purchorderdetails on stockmaster.stockid = purchorderdetails.itemcode)
+ WHERE stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ stockmaster.units
+ ORDER BY stockmaster.stockid";
}
}
@@ -225,117 +237,129 @@
if (isset($OrderNumber)) {
if (isset($SelectedCustomer)) {
$SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
- FROM salesorders,
- salesorderdetails,
- debtorsmaster,
- custbranch
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.branchcode = custbranch.branchcode
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.debtorno = custbranch.debtorno
- AND salesorders.debtorno='" . $SelectedCustomer ."'
- AND salesorders.orderno='". $OrderNumber ."'
- AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
- } else { //Set order number and SelectedCustomer not set
+ debtorsmaster.name,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto,
+ currencies.decimalplaces AS currdecimalplaces, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN debtorsmaster
+ ON salesorders.debtorno = debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON salesorders.branchcode = custbranch.branchcode
+ AND salesorders.debtorno = custbranch.debtorno
+ INNER JOIN currencies
+ ON debtorsmaster.currcode = currencies.currabrev
+ WHERE salesorders.debtorno='" . $SelectedCustomer ."'
+ AND salesorders.orderno='". $OrderNumber ."'
+ AND salesorders.quotation=0
+ AND salesorderdetails.completed".$Completed."
+ GROUP BY salesorders.orderno,
+ debtorsmaster.name,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ currencies.decimalplaces,
+ salesorders.deliverto
+ ORDER BY salesorders.orderno";
+ } else { //Set order number and SelectedCustomer not set
$SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
- FROM salesorders,
- salesorderdetails,
- debtorsmaster,
- custbranch
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.branchcode = custbranch.branchcode
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.debtorno = custbranch.debtorno
- AND salesorders.orderno='". $OrderNumber ."'
- AND salesorders.quotation=0
- AND salesorderdetails.completed " . $Completed ."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
- }
+ debtorsmaster.name,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto,
+ currencies.decimalplaces AS currdecimalplaces, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN debtorsmaster
+ ON salesorders.debtorno = debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON salesorders.branchcode = custbranch.branchcode
+ AND salesorders.debtorno = custbranch.debtorno
+ INNER JOIN currencies
+ ON debtorsmaster.currcode = currencies.currabrev
+ WHERE salesorders.orderno='". $OrderNumber ."'
+ AND salesorders.quotation=0
+ AND salesorderdetails.completed " . $Completed ."
+ GROUP BY salesorders.orderno,
+ debtorsmaster.name,
+ currencies.decimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto
+ ORDER BY salesorders.orderno";
+ }
} elseif (isset($CustomerRef)) {
- if (isset($SelectedCustomer)) {
+ if (isset($SelectedCustomer)) {
$SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
- FROM salesorders,
- salesorderdetails,
- debtorsmaster,
- custbranch
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.branchcode = custbranch.branchcode
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.debtorno = custbranch.debtorno
- AND salesorders.debtorno='" . $SelectedCustomer ."'
- AND salesorders.customerref like '%". $CustomerRef."%'
- AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
- } else { //customer not selected
- $SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
- FROM salesorders,
- salesorderdetails,
- debtorsmaster,
- custbranch
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.branchcode = custbranch.branchcode
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.debtorno = custbranch.debtorno
- AND salesorders.customerref like '%". $CustomerRef."%'
- AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
- }
+ debtorsmaster.name,
+ currencies.decimalplaces AS currdecimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN debtorsmaster
+ ON salesorders.debtorno = debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON salesorders.branchcode = custbranch.branchcode
+ AND salesorders.debtorno = custbranch.debtorno
+ INNER JOIN currencies
+ ON debtorsmaster.currcode = currencies.currabrev
+ WHERE salesorders.debtorno='" . $SelectedCustomer ."'
+ AND salesorders.customerref like '%". $CustomerRef."%'
+ AND salesorders.quotation=0
+ AND salesorderdetails.completed".$Completed."
+ GROUP BY salesorders.orderno,
+ debtorsmaster.name,
+ currencies.decimalplaces
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto
+ ORDER BY salesorders.orderno";
+ } else { //customer not selected
+ $SQL = "SELECT salesorders.orderno,
+ debtorsmaster.name,
+ currencies.decimalplaces AS currdecimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN debtorsmaster
+ ON salesorders.debtorno = debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON salesorders.branchcode = custbranch.branchcode
+ AND salesorders.debtorno = custbranch.debtorno
+ INNER JOIN currencies
+ ON debtorsmaster.currcode = currencies.currabrev
+ WHERE salesorders.customerref " . LIKE . " '%". $CustomerRef . "%'
+ AND salesorders.quotation=0
+ AND salesorderdetails.completed" . $Completed . "
+ GROUP BY salesorders.orderno,
+ debtorsmaster.name,
+ currencies.decimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto
+ ORDER BY salesorders.orderno";
+ }
} else {
$DateAfterCriteria = FormatDateforSQL($_POST['OrdersAfterDate']);
@@ -344,118 +368,130 @@
if (isset($SelectedStockItem)) {
$SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
- FROM salesorders,
- salesorderdetails,
- debtorsmaster,
- custbranch
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.branchcode = custbranch.branchcode
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.debtorno = custbranch.debtorno
- AND salesorderdetails.stkcode='". $SelectedStockItem ."'
- AND salesorders.debtorno='" . $SelectedCustomer ."'
- AND salesorders.orddate >= '" . $DateAfterCriteria ."'
- AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ debtorsmaster.name,
+ currencies.decimalplaces AS currdecimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN debtorsmaster
+ ON salesorders.debtorno = debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON salesorders.branchcode = custbranch.branchcode
+ AND salesorders.debtorno = custbranch.debtorno
+ INNER JOIN currencies
+ ON debtorsmaster.currcode = currencies.currabrev
+ WHERE salesorderdetails.stkcode='". $SelectedStockItem ."'
+ AND salesorders.debtorno='" . $SelectedCustomer ."'
+ AND salesorders.orddate >= '" . $DateAfterCriteria ."'
+ AND salesorders.quotation=0
+ AND salesorderdetails.completed".$Completed."
+ GROUP BY salesorders.orderno,
+ debtorsmaster.name,
+ currencies.decimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto
+ ORDER BY salesorders.orderno";
} else {
$SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto,
- salesorders.deliverydate, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
- FROM salesorders,
- salesorderdetails,
- debtorsmaster,
- custbranch
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND salesorders.branchcode = custbranch.branchcode
- AND debtorsmaster.debtorno = custbranch.debtorno
- AND salesorders.debtorno='" . $SelectedCustomer . "'
- AND salesorders.orddate >= '" . $DateAfterCriteria . "'
- AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ debtorsmaster.name,
+ currencies.decimalplaces AS currdecimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverto,
+ salesorders.deliverydate, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN debtorsmaster
+ ON salesorders.debtorno = debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON salesorders.branchcode = custbranch.branchcode
+ AND salesorders.debtorno = custbranch.debtorno
+ INNER JOIN currencies
+ ON debtorsmaster.currcode = currencies.currabrev
+ WHERE salesorders.debtorno='" . $SelectedCustomer . "'
+ AND salesorders.orddate >= '" . $DateAfterCriteria . "'
+ AND salesorders.quotation=0
+ AND salesorderdetails.completed".$Completed."
+ GROUP BY salesorders.orderno,
+ debtorsmaster.name,
+ currencies.decimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto
+ ORDER BY salesorders.orderno";
}
} else { //no customer selected
if (isset($SelectedStockItem)) {
$SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto,
- salesorders.deliverydate, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
- FROM salesorders,
- salesorderdetails,
- debtorsmaster,
- custbranch
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND salesorders.branchcode = custbranch.branchcode
- AND debtorsmaster.debtorno = custbranch.debtorno
- AND salesorderdetails.stkcode='". $SelectedStockItem ."'
- AND salesorders.orddate >= '" . $DateAfterCriteria . "'
- AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ debtorsmaster.name,
+ currencies.decimalplaces AS currdecimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverto,
+ salesorders.deliverydate, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN debtorsmaster
+ ON salesorders.debtorno = debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON salesorders.branchcode = custbranch.branchcode
+ AND salesorders.debtorno = custbranch.debtorno
+ INNER JOIN currencies
+ ON debtorsmaster.currcode = currencies.currabrev
+ WHERE salesorderdetails.stkcode='". $SelectedStockItem ."'
+ AND salesorders.orddate >= '" . $DateAfterCriteria . "'
+ AND salesorders.quotation=0
+ AND salesorderdetails.completed".$Completed."
+ GROUP BY salesorders.orderno,
+ debtorsmaster.name,
+ currencies.decimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto
+ ORDER BY salesorders.orderno";
} else {
$SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto,
- salesorders.deliverydate, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
- FROM salesorders,
- salesorderdetails,
- debtorsmaster,
- custbranch
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND salesorders.branchcode = custbranch.branchcode
- AND debtorsmaster.debtorno = custbranch.debtorno
- AND salesorders.orddate >= '".$DateAfterCriteria . "'
- AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
+ debtorsmaster.name,
+ currencies.decimalplaces AS currdecimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverto,
+ salesorders.deliverydate, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN debtorsmaster
+ ON salesorders.debtorno = debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON salesorders.branchcode = custbranch.branchcode
+ AND salesorders.debtorno = custbranch.debtorno
+ INNER JOIN currencies
+ ON debtorsmaster.currcode = currencies.currabrev
+ WHERE salesorders.orddate >= '".$DateAfterCriteria . "'
+ AND salesorders.quotation=0
+ AND salesorderdetails.completed".$Completed."
+ GROUP BY salesorders.orderno,
+ debtorsmaster.name,
+ currencies.decimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto
+ ORDER BY salesorders.orderno";
}
} //end selected customer
} //end not order number selected
@@ -464,7 +500,7 @@
if (DB_error_no($db) !=0) {
prnMsg( _('No orders were returned by the SQL because') . ' ' . DB_error_msg($db), 'info');
- echo "<br />$SQL";
+ echo '<br /> ' . $SQL;
}
}//end of which button clicked options
@@ -479,16 +515,20 @@
} else {
echo '<tr><td></td>';
}
-
+if (!isset($_POST['OrderNumber'])){
+ $_POST['OrderNumber']='';
+}
echo '<td>' . _('Order Number') . ':</td>
<td><input type="text" name="OrderNumber" maxlength =8 size=9 value ="' . $_POST['OrderNumber'] . '"></td>
<td>' . _('for all orders placed after') . ': </td>
- <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] .'" name="OrdersAfterDate" maxlength =10 size=11 value="' . $_POST['OrdersAfterDate'] . '"></td>
- <td><input type="submit" name="SearchOrders" value="' . _('Search Orders') . '"></td></tr>';
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] .'" name="OrdersAfterDate" maxlength="10" size="11" value="' . $_POST['OrdersAfterDate'] . '" /></td>
+ <td><input type="submit" name="SearchOrders" value="' . _('Search Orders') . '" /></td>
+ </tr>';
echo '<tr>
<td></td>
- <td>' . _('Customer Ref') . ':</td><td><input type="text" name="CustomerRef" maxlength =8 size=9></td>
- <td></td><td colspan=2><input type="checkbox" ' . $ShowChecked . ' name="completed" />' . _('Show Completed orders only') . '</td></tr>';
+ <td>' . _('Customer Ref') . ':</td><td><input type="text" name="CustomerRef" maxlength="8" size="9" /></td>
+ <td></td>
+ <td colspan="2"><input type="checkbox" ' . $ShowChecked . ' name="completed" />' . _('Show Completed orders only') . '</td></tr>';
echo '</table>';
@@ -500,12 +540,13 @@
echo '<br />';
echo '<div class="page_help_text"><font size=1>' . _('To search for sales orders for a specific part use the part selection facilities below') . ' </font></div>';
- echo '<br /><table class=selection>';
+ echo '<br />
+ <table class="selection">';
echo '<tr><td><font size=1>' . _('Select a stock category') . ':</font>';
echo '<select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
- if (isset($_POST['StockCat']) and $myrow1['categoryid'] == $_POST['StockCat']){
+ if (isset($_POST['StockCat']) AND $myrow1['categoryid'] == $_POST['StockCat']){
echo '<option selected value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
} else {
echo '<option value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
@@ -514,15 +555,15 @@
echo '</select>';
echo '<td><font size=1>' . _('Enter text extracts in the description') . ':</font></td>';
- echo '<td><input type="text" name="Keywords" size=20 maxlength=25></td></tr>';
+ echo '<td><input type="text" name="Keywords" size="20" maxlength="25"></td></tr>';
echo '<tr><td></td>';
echo '<td><font size=3><b> ' ._('OR') . ' </b></font><font size=1>' . _('Enter extract of the Stock Code') . ':</font></td>';
- echo '<td><input type="text" name="StockCode" size=15 maxlength=18></td>';
+ echo '<td><input type="text" name="StockCode" size="15" maxlength="18"></td>';
echo '</tr>';
- echo '<tr><td colspan=4><div class=centre><input type="submit" name="SearchParts" value="' . _('Search Parts Now') . '">';
+ echo '<tr><td colspan=4><div class="centre"><input type="submit" name="SearchParts" value="' . _('Search Parts Now') . '" />';
if (count($_SESSION['AllowedPageSecurityTokens'])>1){
- echo '<input type=submit name="ResetPart" value="' . _('Show All') . '"></div>';
+ echo '<input type="submit" name="ResetPart" value="' . _('Show All') . '" /></div>';
}
echo '</td></tr></table>';
@@ -530,7 +571,8 @@
If (isset($StockItemsResult)) {
- echo '<br /><table cellpadding=2 colspan=7 class=selection>';
+ echo '<br />
+ <table cellpadding="2" colspan="7" class="selection">';
$TableHeadings = '<tr><th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
@@ -556,15 +598,15 @@
printf('<td><font size=1><input type="submit" name="SelectedStockItem" value="%s" /></font></td>
<td><font size=1>%s</font></td>
- <td class=number><font size=1>%s</font></td>
- <td class=number><font size=1>%s</font></td>
- <td class=number><font size=1>%s</font></td>
+ <td class="number"><font size=1>%s</font></td>
+ <td class="number"><font size=1>%s</font></td>
+ <td class="number"><font size=1>%s</font></td>
<td><font size=1>%s</font></td></tr>',
$myrow['stockid'],
$myrow['description'],
- $myrow['qoh'],
- $myrow['qoo'],
- $myrow['qdem'],
+ locale_number_format($myrow['qoh'],$myrow['decimalplaces']),
+ locale_number_format($myrow['qoo'],$myrow['decimalplaces']),
+ locale_number_format($myrow['qdem'],$myrow['decimalplaces']),
$myrow['units']);
//end of page full new headings if
@@ -580,7 +622,7 @@
/*show a table of the orders returned by the SQL */
- echo '<br /><table cellpadding=2 colspan=6 width=90% class=selection>';
+ echo '<br /><table cellpadding="2" colspan="6" width="90%" class="selection">';
$tableheader = '<tr><th>' . _('Order') . ' #</th>
<th>' . _('Customer') . '</th>
@@ -609,7 +651,7 @@
$ViewPage = $rootpath . '/OrderDetails.php?OrderNumber=' . $myrow['orderno'];
$FormatedDelDate = ConvertSQLDate($myrow['deliverydate']);
$FormatedOrderDate = ConvertSQLDate($myrow['orddate']);
- $FormatedOrderValue = locale_number_format($myrow['ordervalue'],2);
+ $FormatedOrderValue = locale_money_format($myrow['ordervalue'],$myrow['currdecimalplaces']);
printf('<td><a href="%s">%s</a></td>
<td>%s</td>
@@ -618,7 +660,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td class=number>%s</td>
+ <td class="number">%s</td>
</tr>',
$ViewPage,
$myrow['orderno'],
@@ -635,7 +677,6 @@
//end of while loop
echo '</table>';
-
}
echo '</form>';
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2011-09-25 09:15:03 UTC (rev 4706)
+++ trunk/SelectCreditItems.php 2011-10-01 06:40:49 UTC (rev 4707)
@@ -125,7 +125,7 @@
if (isset($_POST['JustSelectedACustomer']) AND !isset($SelectedCustomer)){
/*Need to figure out the number of the form variable that the user clicked on */
- for ($i=1;$i<count($_POST);$i++){ //loop through the returned customers
+ for ($i=1; $i < count($_POST); $i++){ //loop through the returned customers
if(isset($_POST['SubmitCustomerSelection'.$i])){
break;
}
@@ -215,16 +215,19 @@
_('Search') . '" alt="" />' . ' ' . _('Select Customer For Credit Note').'</p>';
echo '<table cellpadding="3" colspan="4" class="selection">';
- echo '<tr><th colspan="5"><font size="3" color="navy"><b> ' . _('Customer Selection') . '</b></font></th></tr>';
- echo '<tr>';
- echo '<td><font size="1">' . _('Enter text in the customer name') . ':</font></td>';
- echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>';
- echo '<td><font size="3"><b>' . _('OR') . '</b></font></td>';
- echo '<td><font size="1">' . _('Enter text extract in the customer code') . ':</font></td>';
- echo '<td><input type="text" name="CustCode" size="15" maxlength="18" /></td>';
- echo '</tr>';
- echo '</table>';
- echo '<br /><div class="centre"><input type="submit" name="SearchCust" value="' . _('Search Now') . '"></div>';
+ echo '<tr><th colspan="5"><font size="3" color="navy"><b> ' . _('Customer Selection') .'</b></font></th></tr>';
+ echo '<tr>
+ <td><font size="1">' . _('Enter text in the customer name') . ':</font></td>
+ <td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
+ <td><font size="3"><b>' . _('OR') . '</b></font></td>
+ <td><font size="1">' . _('Enter text extract in the customer code') . ':</font></td>
+ <td><input type="text" name="CustCode" size="15" maxlength="18" /></td>
+ </tr>';
+ echo '</table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="SearchCust" value="' . _('Search Now') . '" />
+ </div>';
if (isset($result_CustSelect)) {
@@ -252,19 +255,19 @@
echo '<tr class="OddTableRows">';
$k=1;
}
- echo '<form action="' . $_SERVER['PHP_SELF'] . '?identifier='.$identifier . '" name="SelectParts" method="post">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
if ($LastCustomer != $myrow['name']) {
echo '<td>'.$myrow['name'].'</td>';
} else {
echo '<td></td>';
}
- echo '<td><input tabindex='.($j+5).' type=submit name="SubmitCustomerSelection' . $j .'" value="' . htmlentities($myrow['brname'], ENT_QUOTES,'UTF-8'). '"></td>
- <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].'"><input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" />
- <td>'.$myrow['contactname'].'</td>
- <td>'.$myrow['phoneno'].'</td>
- <td>'.$myrow['faxno'].'</td>
- </tr>';
+ echo '<td><input tabindex='.($j+5).' type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlentities($myrow['brname'], ENT_QUOTES,'UTF-8'). '"></td>
+ <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].'">
+ <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" />
+ <td>'.$myrow['contactname'].'</td>
+ <td>'.$myrow['phoneno'].'</td>
+ <td>'.$myrow['faxno'].'</td>
+ </tr>';
$LastCustomer=$myrow['name'];
$j++;
//end of page full new headings if
@@ -395,7 +398,7 @@
/*Always do the stuff below if not looking for a customerid
Set up the form for the credit note display and entry*/
- echo '<form action="' . $_SERVER['PHP_SELF'] . '?identifier='.$identifier . '" method="post">';
+ echo '<form name="MainForm" action="' . $_SERVER['PHP_SELF'] . '?identifier='.$identifier . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -409,10 +412,13 @@
$QuickEntryCode = 'part_' . $i;
$QuickEntryQty = 'qty_' . $i;
$i++;
- } while (!is_numeric($_POST[$QuickEntryQty]) AND $_POST[$QuickEntryQty] <=0 AND mb_strlen($_POST[$QuickEntryCode])!=0 AND $i<=$QuickEntires);
+ } while (!is_numeric(filter_number_format($_POST[$QuickEntryQty]))
+ AND filter_number_format($_POST[$QuickEntryQty]) <=0
+ AND mb_strlen($_POST[$QuickEntryCode])!=0
+ AND $i<=$QuickEntires);
$_POST['NewItem'] = trim($_POST[$QuickEntryCode]);
- $NewItemQty = trim($_POST[$QuickEntryQty]);
+ $NewItemQty = filter_number_format($_POST[$QuickEntryQty]);
if (mb_strlen($_POST['NewItem'])==0){
break; /* break out of the loop if nothing in the quick entry fields*/
@@ -425,7 +431,7 @@
/* do a loop round the items on the credit note to see that the item
is not already on this credit note */
- if ($_SESSION['SO_AllowSameItemMultipleTimes']==0 && strcasecmp($OrderItem->StockID, $_POST['NewItem']) == 0) {
+ if ($_SESSION['SO_AllowSameItemMultipleTimes']==0 AND strcasecmp($OrderItem->StockID, $_POST['NewItem']) == 0) {
$AlreadyOnThisCredit = 1;
prnMsg($_POST['NewItem'] . ' ' . _('is already on this credit - the system will not allow the same item on the credit note more than once. However you can change the quantity credited of the existing line if necessary'),'warn');
}
@@ -509,10 +515,11 @@
}
if (isset($_POST['ChargeFreightCost'])){
- $_SESSION['CreditItems'.$identifier]->FreightCost = $_POST['ChargeFreightCost'];
+ $_SESSION['CreditItems'.$identifier]->FreightCost = filter_number_format($_POST['ChargeFreightCost']);
}
- if (isset($_POST['Location']) AND $_POST['Location'] != $_SESSION['CreditItems'.$identifier]->Location){
+ if (isset($_POST['Location'])
+ AND $_POST['Location'] != $_SESSION['CreditItems'.$identifier]->Location){
$_SESSION['CreditItems'.$identifier]->Location = $_POST['Location'];
@@ -530,11 +537,11 @@
if (isset($_POST['Quantity_' . $LineItem->LineNumber])){
- $Quantity = $_POST['Quantity_' . $LineItem->LineNumber];
+ $Quantity = filter_number_format($_POST['Quantity_' . $LineItem->LineNumber]);
$Narrative = $_POST['Narrative_' . $LineItem->LineNumber];
if (isset($_POST['Price_' . $LineItem->LineNumber])){
- if (isset($_POST['Gross']) and $_POST['Gross']==True){
+ if (isset($_POST['Gross']) AND $_POST['Gross']==True){
$TaxTotalPercent =0;
foreach ($LineItem->Taxes AS $Tax) {
if ($Tax->TaxOnTax ==1){
@@ -545,14 +552,14 @@
}
$Price = round($_POST['Price_' . $LineItem->LineNumber]/($TaxTotalP...
[truncated message content] |
