Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4548] trunk
|
From: <dai...@us...> - 2011-04-12 10:33:53
|
Revision: 4548
http://web-erp.svn.sourceforge.net/web-erp/?rev=4548&view=rev
Author: daintree
Date: 2011-04-12 10:33:45 +0000 (Tue, 12 Apr 2011)
Log Message:
-----------
tim launchpad fork
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/POReport.php
trunk/Stocks.php
trunk/TaxProvinces.php
trunk/UnitsOfMeasure.php
trunk/UpgradeDatabase.php
trunk/WOSerialNos.php
trunk/WorkOrderIssue.php
trunk/Z_Upgrade3.10.php
trunk/Z_Upgrade_3.09-3.10.php
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-04-11 10:49:45 UTC (rev 4547)
+++ trunk/DeliveryDetails.php 2011-04-12 10:33:45 UTC (rev 4548)
@@ -1,7 +1,6 @@
<?php
/* $Id$ */
-/* $Revision: 1.76 $ */
/*
This is where the delivery details are confirmed/entered/modified and the order committed to the database once the place order/modify order button is hit.
@@ -81,13 +80,13 @@
/* If (strlen($_POST['BrAdd3'])==0 OR !isset($_POST['BrAdd3'])){
$InputErrors =1;
- echo "<br>A region or city must be entered.<br>";
+ echo "<br />A region or city must be entered.<br />";
}
Maybe appropriate in some installations but not here
If (strlen($_POST['BrAdd2'])<=1){
$InputErrors =1;
- echo "<br>You should enter the suburb in the box provided. Orders cannot be accepted without a valid suburb being entered.<br>";
+ echo "<br />You should enter the suburb in the box provided. Orders cannot be accepted without a valid suburb being entered.<br />";
}
*/
@@ -111,7 +110,7 @@
elseif (Date1GreaterThanDate2(Date($_SESSION['DefaultDateFormat'],$EarliestDispatch), $_POST['DeliveryDate'])){
$InputErrors =1;
- echo '<br><b>' . _('The delivery details cannot be updated because you are attempting to set the date the order is to be dispatched earlier than is possible. No dispatches are made on Saturday and Sunday. Also, the dispatch cut off time is') . $_SESSION['DispatchCutOffTime'] . _(':00 hrs. Orders placed after this time will be dispatched the following working day.');
+ echo '<br /><b>' . _('The delivery details cannot be updated because you are attempting to set the date the order is to be dispatched earlier than is possible. No dispatches are made on Saturday and Sunday. Also, the dispatch cut off time is') . $_SESSION['DispatchCutOffTime'] . _(':00 hrs. Orders placed after this time will be dispatched the following working day.');
}
*/
@@ -153,7 +152,7 @@
prnMsg(_('The branch details for branch code') . ': ' . $_SESSION['Items'.$identifier]->Branch . ' ' . _('against customer code') . ': ' . $_POST['Select'] . ' ' . _('could not be retrieved') . '. ' . _('Check the set up of the customer and branch'),'error');
if ($debug==1){
- echo '<br>' . _('The SQL that failed to get the branch details was') . ':<br>' . $sql;
+ echo '<br />' . _('The SQL that failed to get the branch details was') . ':<br />' . $sql;
}
include('includes/footer.inc');
exit;
@@ -280,7 +279,7 @@
}
If ($_POST['FreightCost'] != $OldFreightCost && $_SESSION['DoFreightCalc']==True){
$OK_to_PROCESS = 0;
- prnMsg(_('The freight charge has been updated') . '. ' . _('Please reconfirm that the order and the freight charges are acceptable and then confirm the order again if OK') .' <br> '. _('The new freight cost is') .' ' . $_POST['FreightCost'] . ' ' . _('and the previously calculated freight cost was') .' '. $OldFreightCost,'warn');
+ prnMsg(_('The freight charge has been updated') . '. ' . _('Please reconfirm that the order and the freight charges are acceptable and then confirm the order again if OK') .' <br /> '. _('The new freight cost is') .' ' . $_POST['FreightCost'] . ' ' . _('and the previously calculated freight cost was') .' '. $OldFreightCost,'warn');
} else {
/*check the customer's payment terms */
@@ -417,7 +416,7 @@
AND $_SESSION['AutoCreateWOs']==1
AND $_SESSION['Items'.$identifier]->Quotation!=1){ //oh yeah its all on!
- echo '<br>';
+ echo '<br />';
//now get the data required to test to see if we need to make a new WO
$QOHResult = DB_query("SELECT SUM(quantity) FROM locstock WHERE stockid='" . $StockItem->StockID . "'",$db);
@@ -559,7 +558,7 @@
} /* end inserted line items into sales order details */
$result = DB_Txn_Commit($db);
- echo '<br>';
+ echo '<br />';
if ($_SESSION['Items'.$identifier]->Quotation==1){
prnMsg(_('Quotation Number') . ' ' . $OrderNo . ' ' . _('has been entered'),'success');
} else {
@@ -571,19 +570,44 @@
if ($_POST['Quotation']==0) { /*then its not a quotation its a real order */
- echo '<br><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td><td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Preprinted 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=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td></tr>';
+ echo '<br /><table class=selection>
+ <tr>
+ <td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td>
+ <td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Preprinted 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=' . $OrderNo . '">'. _('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=' . $OrderNo .'">'. _('Confirm Dispatch and Produce Invoice') .'</a></td></tr>';
- //Add option to Print Sales Orders or Proforma invoice
- echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/pdf.png" title="' . _('Sales Order') . '" alt=""></td><td>' . ' ' . '<a href="' . $rootpath . '/PrintSalesOrder_generic.php?identifier='.$identifier . '&TransNo=' . $OrderNo .'">'. _('Print Sales Order / Pro-forma Invoice') .'</a></td></tr></table>';
+ 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=' . $OrderNo .'">'. _('Confirm Dispatch and Produce Invoice') .'</a></td>
+ </tr>';
+
+ echo '</table>';
} else {
/*link to print the quotation */
- echo '<br><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt=""></td><td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotation.php?' . SID .'identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation (Landscape)') .'</a></td></tr></table>';
- echo '<br><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt=""></td><td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotationPortrait.php?' . SID .'identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation (Portrait)') .'</a></td></tr></table>';
+ echo '<br /><table class=selection>
+ <tr>
+ <td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt=""></td>
+ <td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotation.php?' . SID .'identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation (Landscape)') .'</a></td>
+ </tr>
+ </table>';
+ echo '<br /><table class=selection>
+ <tr>
+ <td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt=""></td>
+ <td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotationPortrait.php?' . SID .'identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation (Portrait)') .'</a></td>
+ </tr>
+ </table>';
}
- echo '<br><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt=""></td><td>' . ' ' . '<a href="'. $rootpath .'/SelectOrderItems.php?identifier='.$identifier . '&NewOrder=Yes">'. _('Add Another Sales Order') .'</a></td></tr></table>';
+ echo '<br /><table class=selection>
+ <tr>
+ <td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt=""></td>
+ <td>' . ' ' . '<a href="'. $rootpath .'/SelectOrderItems.php?identifier='.$identifier . '&NewOrder=Yes">'. _('Add Another Sales Order') .'</a></td>
+ </tr>
+ </table>';
} else {
/*its a customer logon so thank them */
prnMsg(_('Thank you for your business'),'success');
@@ -747,7 +771,7 @@
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 '<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>';
@@ -833,7 +857,7 @@
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
- echo '<br><table><tr class="EvenTableRows">
+ echo '<br /><table><tr class="EvenTableRows">
<td>'. _('Total Weight') .':</td>
<td>'.$DisplayWeight.'</td>
<td>'. _('Total Volume') .':</td>
@@ -903,7 +927,7 @@
}
-echo '<br><table class=selection><tr>
+echo '<br /><table class=selection><tr>
<td>'. _('Deliver To') .':</td>
<td><input type=text size=42 maxlength=40 name="DeliverTo" value="' . $_SESSION['Items'.$identifier]->DeliverTo . '"></td>
</tr>';
@@ -1082,13 +1106,13 @@
echo '</table>';
-echo '<br><div class="centre"><input type=submit name="BackToLineDetails" value="' . _('Modify Order Lines') . '"><br>';
+echo '<br /><div class="centre"><input type=submit name="BackToLineDetails" value="' . _('Modify Order Lines') . '"><br />';
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="ProcessOrder" value="' . _('Place 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/POReport.php
===================================================================
--- trunk/POReport.php 2011-04-11 10:49:45 UTC (rev 4547)
+++ trunk/POReport.php 2011-04-12 10:33:45 UTC (rev 4548)
@@ -40,9 +40,9 @@
$SupplierNameOp = $_POST['SupplierNameOp'];
- // Save $_POST['SummaryType'] in $savesummarytype because change $_POST['SummaryType'] when
+ // Save $_POST['SummaryType'] in $SaveSummaryType because change $_POST['SummaryType'] when
// create $sql
- $savesummarytype = $_POST['SummaryType'];
+ $SaveSummaryType = $_POST['SummaryType'];
}
if (isset($_POST['SupplierName'])){
@@ -60,11 +60,11 @@
if (isset($_POST['submit'])) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
'" alt="" />' . ' ' . $title.'</p>';
- submit($db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$savesummarytype);
+ submit($db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType);
} else if (isset($_POST['submitcsv'])) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
'" alt="" />' . ' ' . $title.'</p>';
- submitcsv($db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$savesummarytype);
+ submitcsv($db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType);
} else {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
'" alt="" />' . '</img>' . $title.'</p>';
@@ -73,7 +73,7 @@
//####_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT####
-function submit(&$db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$savesummarytype)
+function submit(&$db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType)
{
//initialize no input errors
@@ -94,71 +94,71 @@
}
# Add more to WHERE statement, if user entered something for the part number,supplierid, name
- $wherepart = ' ';
+ $WherePart = ' ';
if (strlen($PartNumber) > 0 && $PartNumberOp == 'LIKE') {
$PartNumber = $PartNumber . '%';
} else {
$PartNumberOp = '=';
}
if (strlen($PartNumber) > 0) {
- $wherepart = " AND purchorderdetails.itemcode " . $PartNumberOp . " '" . $PartNumber . "' ";
+ $WherePart = " AND purchorderdetails.itemcode " . $PartNumberOp . " '" . $PartNumber . "' ";
} else {
- $wherepart=' ';
+ $WherePart=' ';
}
- $wheresupplierid = ' ';
+ $WhereSupplierID = ' ';
if ($SupplierIdOp == 'LIKE') {
$SupplierId = $SupplierId . '%';
} else {
$SupplierIdOp = '=';
}
if (strlen($SupplierId) > 0) {
- $wheresupplierid = " AND purchorders.supplierno " . $SupplierIdOp . " '" . $SupplierId . "' ";
+ $WhereSupplierID = " AND purchorders.supplierno " . $SupplierIdOp . " '" . $SupplierId . "' ";
} else {
- $wheresupplierid=' ';
+ $WhereSupplierID=' ';
}
- $wheresuppliername = ' ';
+ $WhereSupplierName = ' ';
if (strlen($SupplierName) > 0 && $SupplierNameOp == 'LIKE') {
$SupplierName = $SupplierName . '%';
} else {
$SupplierNameOp = '=';
}
if (strlen($SupplierName) > 0) {
- $wheresuppliername = " AND suppliers.suppname " . $SupplierNameOp . " '" . $SupplierName . "' ";
+ $WhereSupplierName = " AND suppliers.suppname " . $SupplierNameOp . " '" . $SupplierName . "' ";
} else {
- $wheresuppliername=' ';
+ $WhereSupplierName=' ';
}
if (strlen($_POST['OrderNo']) > 0) {
- $whereorderno = ' AND purchorderdetails.orderno = ' . " '" . $_POST['OrderNo'] . "' ";
+ $WhereOrderNo = ' AND purchorderdetails.orderno = ' . " '" . $_POST['OrderNo'] . "' ";
} else {
- $whereorderno=' ';
+ $WhereOrderNo=' ';
}
- $wherelinestatus = ' ';
+ $WhereLineStatus = ' ';
# Had to use IF statement instead of comparing 'linestatus' to $_POST['LineStatus']
#in WHERE clause because the WHERE clause didn't recognize
# that had used the IF statement to create a field called linestatus
if ($_POST['LineStatus'] != 'All') {
if ($_POST['DateType'] == 'Order') {
- $wherelinestatus = " AND IF(purchorderdetails.quantityord = purchorderdetails.qtyinvoiced ||
+ $WhereLineStatus = " AND IF(purchorderdetails.quantityord = purchorderdetails.qtyinvoiced ||
purchorderdetails.completed = 1,'Completed','Open') = '" . $_POST['LineStatus'] . "'";
} else {
- $wherelinestatus = " AND IF(grns.qtyrecd - grns.quantityinv <> 0,'Open','Completed') = '"
+ $WhereLineStatus = " AND IF(grns.qtyrecd - grns.quantityinv <> 0,'Open','Completed') = '"
. $_POST['LineStatus'] . "'";
}
}
- $wherecategory = ' ';
+ $WhereCategory = ' ';
if ($_POST['Category'] != 'All') {
- $wherecategory = " AND stockmaster.categoryid = '" . $_POST['Category'] . "'";
+ $WhereCategory = " AND stockmaster.categoryid = '" . $_POST['Category'] . "'";
}
if ($InputError !=1) {
- $fromdate = FormatDateForSQL($_POST['FromDate']);
- $todate = FormatDateForSQL($_POST['ToDate']);
+ $FromDate = FormatDateForSQL($_POST['FromDate']);
+ $ToDate = FormatDateForSQL($_POST['ToDate']);
if ($_POST['ReportType'] == 'Detail') {
if ($_POST['DateType'] == 'Order') {
$sql = "SELECT purchorderdetails.orderno,
@@ -179,14 +179,14 @@
LEFT JOIN purchorders ON purchorders.orderno=purchorderdetails.orderno
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
- WHERE purchorders.orddate >='$fromdate'
- AND purchorders.orddate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE purchorders.orddate >='$FromDate'
+ AND purchorders.orddate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
ORDER BY " . $_POST['SortBy'];
} else {
// Selects by delivery date from grns
@@ -208,14 +208,14 @@
LEFT JOIN purchorders ON purchorders.orderno=purchorderdetails.orderno
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
- WHERE grns.deliverydate >='$fromdate'
- AND grns.deliverydate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE grns.deliverydate >='$FromDate'
+ AND grns.deliverydate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
ORDER BY " . $_POST['SortBy'];
}
} else {
@@ -242,14 +242,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE purchorders.orddate >='$fromdate'
- AND purchorders.orddate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE purchorders.orddate >='$FromDate'
+ AND purchorders.orddate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
',stockmaster.decimalplaces,
stockmaster.description
@@ -267,14 +267,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE purchorders.orddate >='$fromdate'
- AND purchorders.orddate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE purchorders.orddate >='$FromDate'
+ AND purchorders.orddate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
',purchorders.supplierno,
suppliers.suppname
@@ -291,14 +291,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE purchorders.orddate >='$fromdate'
- AND purchorders.orddate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE purchorders.orddate >='$FromDate'
+ AND purchorders.orddate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
',purchorders.supplierno,
suppliers.suppname
@@ -315,14 +315,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE purchorders.orddate >='$fromdate'
- AND purchorders.orddate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE purchorders.orddate >='$FromDate'
+ AND purchorders.orddate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
', monthname
ORDER BY ' . $orderby;
@@ -338,14 +338,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE purchorders.orddate >='$fromdate'
- AND purchorders.orddate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE purchorders.orddate >='$FromDate'
+ AND purchorders.orddate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
', categorydescription
ORDER BY ' . $orderby;
@@ -365,14 +365,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE grns.deliverydate >='$fromdate'
- AND grns.deliverydate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE grns.deliverydate >='$FromDate'
+ AND grns.deliverydate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
', stockmaster.description
ORDER BY ' . $orderby;
@@ -390,14 +390,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE grns.deliverydate >='$fromdate'
- AND grns.deliverydate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE grns.deliverydate >='$FromDate'
+ AND grns.deliverydate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
', purchorders.supplierno,
suppliers.suppname
@@ -415,14 +415,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE grns.deliverydate >='$fromdate'
- AND grns.deliverydate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE grns.deliverydate >='$FromDate'
+ AND grns.deliverydate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
', purchorders.supplierno,
suppliers.suppname
@@ -440,14 +440,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE grns.deliverydate >='$fromdate'
- AND grns.deliverydate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE grns.deliverydate >='$FromDate'
+ AND grns.deliverydate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
',monthname
ORDER BY ' . $orderby;
@@ -464,14 +464,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE grns.deliverydate >='$fromdate'
- AND grns.deliverydate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE grns.deliverydate >='$FromDate'
+ AND grns.deliverydate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
',categorydescription
ORDER BY ' . $orderby;
@@ -482,35 +482,35 @@
$ErrMsg = _('The SQL to find the parts selected failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$ctr = 0;
- $totalqty = 0;
- $totalextcost = 0;
- $totalextprice = 0;
- $totalinvqty = 0;
+ $TotalQty = 0;
+ $TotalExtCost = 0;
+ $TotalExtPrice = 0;
+ $TotalInvQty = 0;
- // Create array for summary type to display in header. Access it with $savesummarytype
- $summary_array["orderno"] = _('Order Number');
- $summary_array["itemcode"] = _('Part Number');
- $summary_array["extprice"] = _('Extended Price');
- $summary_array["supplierno"] = _('Customer Number');
- $summary_array["suppname"] = _('Customer Name');
- $summary_array["month"] = _('Month');
- $summary_array["categoryid"] = _('Stock Category');
+ // Create array for summary type to display in header. Access it with $SaveSummaryType
+ $Summary_Array["orderno"] = _('Order Number');
+ $Summary_Array["itemcode"] = _('Part Number');
+ $Summary_Array["extprice"] = _('Extended Price');
+ $Summary_Array["supplierno"] = _('Customer Number');
+ $Summary_Array["suppname"] = _('Customer Name');
+ $Summary_Array["month"] = _('Month');
+ $Summary_Array["categoryid"] = _('Stock Category');
// Create array for sort for detail report to display in header
- $detail_array['purchorderdetails.orderno'] = _('Order Number');
- $detail_array['purchorderdetails.itemcode'] = _('Part Number');
- $detail_array['suppliers.supplierid,purchorderdetails.orderno'] = _('Supplier Number');
- $detail_array['suppliers.suppname,suppliers.supplierid,purchorderdetails.orderno'] = _('Supplier Name');
+ $Detail_Array['purchorderdetails.orderno'] = _('Order Number');
+ $Detail_Array['purchorderdetails.itemcode'] = _('Part Number');
+ $Detail_Array['suppliers.supplierid,purchorderdetails.orderno'] = _('Supplier Number');
+ $Detail_Array['suppliers.suppname,suppliers.supplierid,purchorderdetails.orderno'] = _('Supplier Name');
// Display Header info
echo '<table class=selection>';
if ($_POST['ReportType'] == 'Summary') {
- $sortby_display = $summary_array[$savesummarytype];
+ $SortBy_Display = $Summary_Array[$SaveSummaryType];
} else {
- $sortby_display = $detail_array[$_POST['SortBy']];
+ $SortBy_Display = $Detail_Array[$_POST['SortBy']];
}
echo '<tr><th colspan=2><font size=3 color=navy>'._('Header Details').'</font></th></tr>';
- echo '<tr><td>' . _('Purchase Order Report') . '</td><td>' . $_POST['ReportType'] . ' By '.$sortby_display .'</td></tr>';
+ echo '<tr><td>' . _('Purchase Order Report') . '</td><td>' . $_POST['ReportType'] . ' By '.$SortBy_Display .'</td></tr>';
echo '<tr><td>' . _('Date Type') . '</td><td>' . $_POST['DateType'] . '</tr>';
echo '<tr><td>' . _('Date Range') . '</td><td>' . $_POST['FromDate'] . _(' To ') . $_POST['ToDate'] . '</td></tr>';
if (strlen(trim($PartNumber)) > 0) {
@@ -567,11 +567,11 @@
$myrow['linestatus'],
ConvertSQLDate($myrow['deliverydate']),
$myrow['description']);
- $lastdecimalplaces = $myrow['decimalplaces'];
- $totalqty += $myrow['quantityord'];
- $totalextcost += $myrow['extcost'];
- $totalextprice += $myrow['extprice'];
- $totalinvqty += $myrow['qtyinvoiced'];
+ $LastDecimalPlaces = $myrow['decimalplaces'];
+ $TotalQty += $myrow['quantityord'];
+ $TotalExtCost += $myrow['extcost'];
+ $TotalExtPrice += $myrow['extprice'];
+ $TotalInvQty += $myrow['qtyinvoiced'];
} //END WHILE LIST LOOP
// Print totals
printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td class=number>%s</td><td class=number>%s</td>
@@ -581,10 +581,10 @@
' ',
' ',
' ',
- number_format($totalqty,2),
- number_format($totalextcost,2),
- number_format($totalextprice,2),
- number_format($totalinvqty,2),
+ number_format($TotalQty,2),
+ number_format($TotalExtCost,2),
+ number_format($TotalExtPrice,2),
+ number_format($TotalInvQty,2),
' ',
' ');
} else {
@@ -629,11 +629,11 @@
$myrow['linestatus'],
ConvertSQLDate($myrow['deliverydate']),
$myrow['description']);
- $lastdecimalplaces = $myrow['decimalplaces'];
- $totalqty += $myrow['quantityord'];
- $totalextcost += $myrow['extcost'];
- $totalextprice += $myrow['extprice'];
- $totalinvqty += $myrow['qtyinvoiced'];
+ $LastDecimalPlaces = $myrow['decimalplaces'];
+ $TotalQty += $myrow['quantityord'];
+ $TotalExtCost += $myrow['extcost'];
+ $TotalExtPrice += $myrow['extprice'];
+ $TotalInvQty += $myrow['qtyinvoiced'];
} //END WHILE LIST LOOP
// Print totals
printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td class=number>%s</td><td class=number>
@@ -643,10 +643,10 @@
' ',
' ',
' ',
- number_format($totalqty,$lastdecimalplaces),
- number_format($totalextcost,2),
- number_format($totalextprice,2),
- number_format($totalinvqty,$lastdecimalplaces),
+ number_format($TotalQty,$LastDecimalPlaces),
+ number_format($TotalExtCost,2),
+ number_format($TotalExtPrice,2),
+ number_format($TotalInvQty,$LastDecimalPlaces),
' ',
' ');
}
@@ -724,23 +724,23 @@
number_format($myrow['extprice'],2),
$myrow['qtyinvoiced'],
$suppname);
- $totalqty += $myrow['quantityord'];
- $totalextcost += $myrow['extcost'];
- $totalextprice += $myrow['extprice'];
- $totalinvqty += $myrow['qtyinvoiced'];
+ $TotalQty += $myrow['quantityord'];
+ $TotalExtCost += $myrow['extcost'];
+ $TotalExtPrice += $myrow['extprice'];
+ $TotalInvQty += $myrow['qtyinvoiced'];
} //END WHILE LIST LOOP
// Print totals
printf("<tr><td>%s</td><td>%s</td><td class=number>%s</td><td class=number>%s</td><td class=number>%s</td><td class=number>%s</td></tr>",
'Totals',
_('Lines - ') . $linectr,
- $totalqty,
- number_format($totalextcost,2),
- number_format($totalextprice,2),
- $totalinvqty,
+ $TotalQty,
+ number_format($TotalExtCost,2),
+ number_format($TotalExtPrice,2),
+ $TotalInvQty,
' ');
} // End of if ($_POST['ReportType']
echo '</table>';
- echo "<form action=" . $_SERVER['PHP_SELF'] . "?" . SID ." method=post>";
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo "<input type=hidden name='ReportType' value=".$_POST['ReportType'].">";
echo "<input type=hidden name='DateType' value=".$_POST['DateType'].">";
@@ -758,13 +758,19 @@
echo "<input type=hidden name='SortBy' value=".$_POST['SortBy'].">";
echo "<input type=hidden name='SummaryType' value=".$_POST['SummaryType'].">";
echo "<br><div class=centre><input type='submit' name='submitcsv' value='" . _('Export as csv file') . "'></div></td>";
- echo "</form>";
+ echo '</form>';
} // End of if inputerror != 1
} // End of function submit()
//####_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT####
-function submitcsv(&$db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$savesummarytype)
-{
+function submitcsv(&$db,
+ $PartNumber,
+ $PartNumberOp,
+ $SupplierId,
+ $SupplierIdOp,
+ $SupplierName,
+ $SupplierNameOp,
+ $SaveSummaryType) {
//initialize no input errors
$InputError = 0;
@@ -784,71 +790,71 @@
}
# Add more to WHERE statement, if user entered something for the part number,supplierid, name
- $wherepart = ' ';
+ $WherePart = ' ';
if (strlen($PartNumber) > 0 && $PartNumberOp == 'LIKE') {
$PartNumber = $PartNumber . '%';
} else {
$PartNumberOp = '=';
}
if (strlen($PartNumber) > 0) {
- $wherepart = " AND purchorderdetails.itemcode " . $PartNumberOp . " '" . $PartNumber . "' ";
+ $WherePart = " AND purchorderdetails.itemcode " . $PartNumberOp . " '" . $PartNumber . "' ";
} else {
- $wherepart=' ';
+ $WherePart=' ';
}
- $wheresupplierid = ' ';
+ $WhereSupplierID = ' ';
if ($SupplierIdOp == 'LIKE') {
$SupplierId = $SupplierId . '%';
} else {
$SupplierIdOp = '=';
}
if (strlen($SupplierId) > 0) {
- $wheresupplierid = " AND purchorders.supplierno " . $SupplierIdOp . " '" . $SupplierId . "' ";
+ $WhereSupplierID = " AND purchorders.supplierno " . $SupplierIdOp . " '" . $SupplierId . "' ";
} else {
- $wheresupplierid=' ';
+ $WhereSupplierID=' ';
}
- $wheresuppliername = ' ';
+ $WhereSupplierName = ' ';
if (strlen($SupplierName) > 0 && $SupplierNameOp == 'LIKE') {
$SupplierName = $SupplierName . '%';
} else {
$SupplierNameOp = '=';
}
if (strlen($SupplierName) > 0) {
- $wheresuppliername = " AND suppliers.suppname " . $SupplierNameOp . " '" . $SupplierName . "' ";
+ $WhereSupplierName = " AND suppliers.suppname " . $SupplierNameOp . " '" . $SupplierName . "' ";
} else {
- $wheresuppliername=' ';
+ $WhereSupplierName=' ';
}
if (strlen($_POST['OrderNo']) > 0) {
- $whereorderno = ' AND purchorderdetails.orderno = ' . " '" . $_POST['OrderNo'] . "' ";
+ $WhereOrderNo = ' AND purchorderdetails.orderno = ' . " '" . $_POST['OrderNo'] . "' ";
} else {
- $whereorderno=' ';
+ $WhereOrderNo=' ';
}
- $wherelinestatus = ' ';
+ $WhereLineStatus = ' ';
# Had to use IF statement instead of comparing 'linestatus' to $_POST['LineStatus']
#in WHERE clause because the WHERE clause didn't recognize
# that had used the IF statement to create a field called linestatus
if ($_POST['LineStatus'] != 'All') {
if ($_POST['DateType'] == 'Order') {
- $wherelinestatus = " AND IF(purchorderdetails.quantityord = purchorderdetails.qtyinvoiced ||
+ $WhereLineStatus = " AND IF(purchorderdetails.quantityord = purchorderdetails.qtyinvoiced ||
purchorderdetails.completed = 1,'Completed','Open') = '" . $_POST['LineStatus'] . "'";
} else {
- $wherelinestatus = " AND IF(grns.qtyrecd - grns.quantityinv <> 0,'Open','Completed') = '"
+ $WhereLineStatus = " AND IF(grns.qtyrecd - grns.quantityinv <> 0,'Open','Completed') = '"
. $_POST['LineStatus'] . "'";
}
}
- $wherecategory = ' ';
+ $WhereCategory = ' ';
if ($_POST['Category'] != 'All') {
- $wherecategory = " AND stockmaster.categoryid = '" . $_POST['Category'] . "'";
+ $WhereCategory = " AND stockmaster.categoryid = '" . $_POST['Category'] . "'";
}
if ($InputError !=1) {
- $fromdate = FormatDateForSQL($_POST['FromDate']);
- $todate = FormatDateForSQL($_POST['ToDate']);
+ $FromDate = FormatDateForSQL($_POST['FromDate']);
+ $ToDate = FormatDateForSQL($_POST['ToDate']);
if ($_POST['ReportType'] == 'Detail') {
if ($_POST['DateType'] == 'Order') {
$sql = "SELECT purchorderdetails.orderno,
@@ -869,14 +875,14 @@
LEFT JOIN purchorders ON purchorders.orderno=purchorderdetails.orderno
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
- WHERE purchorders.orddate >='$fromdate'
- AND purchorders.orddate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE purchorders.orddate >='$FromDate'
+ AND purchorders.orddate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
ORDER BY " . $_POST['SortBy'];
} else {
// Selects by delivery date from grns
@@ -898,14 +904,14 @@
LEFT JOIN purchorders ON purchorders.orderno=purchorderdetails.orderno
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
- WHERE grns.deliverydate >='$fromdate'
- AND grns.deliverydate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE grns.deliverydate >='$FromDate'
+ AND grns.deliverydate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
ORDER BY " . $_POST['SortBy'];
}
} else {
@@ -932,14 +938,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE purchorders.orddate >='$fromdate'
- AND purchorders.orddate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE purchorders.orddate >='$FromDate'
+ AND purchorders.orddate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
',stockmaster.decimalplaces,
stockmaster.description
@@ -957,14 +963,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE purchorders.orddate >='$fromdate'
- AND purchorders.orddate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE purchorders.orddate >='$FromDate'
+ AND purchorders.orddate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
',purchorders.supplierno,
suppliers.suppname
@@ -981,14 +987,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE purchorders.orddate >='$fromdate'
- AND purchorders.orddate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE purchorders.orddate >='$FromDate'
+ AND purchorders.orddate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
',purchorders.supplierno,
suppliers.suppname
@@ -1005,14 +1011,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE purchorders.orddate >='$fromdate'
- AND purchorders.orddate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE purchorders.orddate >='$FromDate'
+ AND purchorders.orddate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
', monthname
ORDER BY ' . $orderby;
@@ -1028,14 +1034,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE purchorders.orddate >='$fromdate'
- AND purchorders.orddate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE purchorders.orddate >='$FromDate'
+ AND purchorders.orddate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
', categorydescription
ORDER BY ' . $orderby;
@@ -1055,14 +1061,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE grns.deliverydate >='$fromdate'
- AND grns.deliverydate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE grns.deliverydate >='$FromDate'
+ AND grns.deliverydate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
', stockmaster.description
ORDER BY ' . $orderby;
@@ -1080,14 +1086,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE grns.deliverydate >='$fromdate'
- AND grns.deliverydate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE grns.deliverydate >='$FromDate'
+ AND grns.deliverydate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
', purchorders.supplierno,
suppliers.suppname
@@ -1105,14 +1111,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE grns.deliverydate >='$fromdate'
- AND grns.deliverydate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE grns.deliverydate >='$FromDate'
+ AND grns.deliverydate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
', purchorders.supplierno,
suppliers.suppname
@@ -1130,14 +1136,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE grns.deliverydate >='$fromdate'
- AND grns.deliverydate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE grns.deliverydate >='$FromDate'
+ AND grns.deliverydate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
',monthname
ORDER BY ' . $orderby;
@@ -1154,14 +1160,14 @@
LEFT JOIN suppliers ON purchorders.supplierno = suppliers.supplierid
LEFT JOIN stockmaster ON purchorderdetails.itemcode = stockmaster.stockid
LEFT JOIN stockcategory ON stockcategory.categoryid = stockmaster.categoryid
- WHERE grns.deliverydate >='$fromdate'
- AND grns.deliverydate <='$todate'
- $wherepart
- $wheresupplierid
- $wheresuppliername
- $whereorderno
- $wherelinestatus
- $wherecategory
+ WHERE grns.deliverydate >='$FromDate'
+ AND grns.deliverydate <='$ToDate'
+ $WherePart
+ $WhereSupplierID
+ $WhereSupplierName
+ $WhereOrderNo
+ $WhereLineStatus
+ $WhereCategory
GROUP BY " . $_POST['SummaryType'] .
',categorydescription
ORDER BY ' . $orderby;
@@ -1172,34 +1178,34 @@
$ErrMsg = _('The SQL to find the parts selected failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$ctr = 0;
- $totalqty = 0;
- $totalextcost = 0;
- $totalextprice = 0;
- $totalinvqty = 0;
+ $TotalQty = 0;
+ $TotalExtCost = 0;
+ $TotalExtPrice = 0;
+ $TotalInvQty = 0;
$FileName = $_SESSION['reports_dir'] .'/POReport.csv';
$FileHandle = fopen($FileName, 'w');
- // Create array for summary type to display in header. Access it with $savesummarytype
- $summary_array["orderno"] = _('Order Number');
- $summary_array["itemcode"] = _('Part Number');
- $summary_array["extprice"] = _('Extended Price');
- $summary_array["supplierno"] = _('Customer Number');
- $summary_array["suppname"] = _('Customer Name');
- $summary_array["month"] = _('Month');
- $summary_array["categoryid"] = _('Stock Category');
+ // Create array for summary type to display in header. Access it with $SaveSummaryType
+ $Summary_Array['orderno'] = _('Order Number');
+ $Summary_Array['itemcode'] = _('Part Number');
+ $Summary_Array['extprice'] = _('Extended Price');
+ $Summary_Array['supplierno'] = _('Customer Number');
+ $Summary_Array['suppname'] = _('Customer Name');
+ $Summary_Array['month'] = _('Month');
+ $Summary_Array['categoryid'] = _('Stock Category');
// Create array for sort for detail report to display in header
- $detail_array['purchorderdetails.orderno'] = _('Order Number');
- $detail_array['purchorderdetails.itemcode'] = _('Part Number');
- $detail_array['suppliers.supplierid,purchorderdetails.orderno'] = _('Supplier Number');
- $detail_array['suppliers.suppname,suppliers.supplierid,purchorderdetails.orderno'] = _('Supplier Name');
+ $Detail_Array['purchorderdetails.orderno'] = _('Order Number');
+ $Detail_Array['purchorderdetails.itemcode'] = _('Part Number');
+ $Detail_Array['suppliers.supplierid,purchorderdetails.orderno'] = _('Supplier Number');
+ $Detail_Array['suppliers.suppname,suppliers.supplierid,purchorderdetails.orderno'] = _('Supplier Name');
// Display Header info
if ($_POST['ReportType'] == 'Summary') {
- $sortby_display = $summary_array[$savesummarytype];
+ $SortBy_Display = $Summary_Array[$SaveSummaryType];
} else {
- $sortby_display = $detail_array[$_POST['SortBy']];
+ $SortBy_Display = $Detail_Array[$_POST['SortBy']];
}
- fprintf($FileHandle, '"'. _('Purchase Order Report') . '","' . $_POST['ReportType'] . ' '._('By').' '.$sortby_display ."\n");
+ fprintf($FileHandle, '"'. _('Purchase Order Report') . '","' . $_POST['ReportType'] . ' '._('By').' '.$SortBy_Display ."\n");
fprintf($FileHandle, '"'. _('Date Type') . '","' . $_POST['DateType'] . '"'. "\n");
fprintf($FileHandle, '"'. _('Date Range') . '","' . $_POST['FromDate'] . _(' To ') . $_POST['ToDate'] . '"'."\n");
if (strlen(trim($PartNumber)) > 0) {
@@ -1246,11 +1252,11 @@
$myrow['linestatus'],
ConvertSQLDate($myrow['deliverydate']),
$myrow['description']);
- $lastdecimalplaces = $myrow['decimalplaces'];
- $totalqty += $myrow['quantityord'];
- $totalextcost += $myrow['extcost'];
- $totalextprice += $myrow['extprice'];
- $totalinvqty += $myrow['qtyinvoiced'];
+ $LastDecimalPlaces = $myrow['decimalplaces'];
+ $TotalQty += $myrow['quantityord'];
+ $TotalExtCost += $myrow['extcost'];
+ $TotalExtPrice += $myrow['extprice'];
+ $TotalInvQty += $myrow['qtyinvoiced'];
} //END WHILE LIST LOOP
// Print totals
fprintf($FileHandle, '"%s","%s","%s","%s","%s",%s,%s,%s,%s,"%s","%s"'."\n",
@@ -1259,10 +1265,10 @@
' ',
' ',
' ',
- number_format($totalqty,2),
- number_format($totalextcost,2),
- number_format($totalextprice,2),
- number_format($totalinvqty,2),
+ number_format($TotalQty,2),
+ number_format($TotalExtCost,2),
+ number_format($TotalExtPrice,2),
+ number_format($TotalInvQty,2),
' ',
' ');
} else {
@@ -1298,11 +1304,11 @@
$myrow['linestatus'],
ConvertSQLDate($myrow['deliverydate']),
$myrow['description']);
- $lastdecimalplaces = $myrow['decimalplaces'];
- $totalqty += $myrow['quantityord'];
- $totalextcost += $myrow['extcost'];
- $totalextprice += $myrow['extprice'];
- $totalinvqty += $myrow['qtyinvoiced'];
+ $LastDecimalPlaces = $myrow['decimalplaces'];
+ $TotalQty += $myrow['quantityord'];
+ $TotalExtCost += $myrow['extcost'];
+ $TotalExtPrice += $myrow['extprice'];
+ $TotalInvQty += $myrow['qtyinvoiced'];
} //END WHILE LIST LOOP
// Print totals
fprintf($FileHandle, '"%s","%s","%s","%s","%s",%s,%s,%s,%s,"%s","%s"'."\n",
@@ -1311,10 +1317,10 @@
' ',
' ',
' ',
- number_format($totalqty,$lastdecimalplaces),
- number_format($totalextcost,2),
- number_format($totalextprice,2),
- number_format($totalinvqty,$lastdecimalplaces),
+ number_format($TotalQty,$LastDecimalPlaces),
+ number_format($TotalExtCost,2),
+ number_format($TotalExtPrice,2),
+ number_format($TotalInvQty,$LastDecimalPlaces),
" ",
" ");
}
@@ -1383,20 +1389,20 @@
number_format($myrow['qtyinvoiced'],$myrow['decimalplaces']),
$suppname);
print '<br/>';
- $lastdecimalplaces = $myrow['decimalplaces'];
- $totalqty += $myrow['quantityord'];
- $totalextcost += $myrow['extcost'];
- $totalextprice += $myrow['extprice'];
- $totalinvqty += $myrow['qtyinvoiced'];
+ $LastDecimalPlaces = $myrow['decimalplaces'];
+ $TotalQty += $myrow['quantityord'];
+ $TotalExtCost += $myrow['extcost'];
+ $TotalExtPrice += $myrow['extprice'];
+ $TotalInvQty += $myrow['qtyinvoiced'];
} //END WHILE LIST LOOP
// Print totals
fprintf($FileHandle, '"%s","%s",%s,%s,%s,%s,"%s"'."\n",
'Totals',
_('Lines - ') . $linectr,
- number_format($totalqty,$lastdecimalplaces),
- number_format($totalextcost,2),
- number_format($totalextprice,2),
- number_format($totalinvqty,$lastdecimalplaces),
+ number_format($TotalQty,$LastDecimalPlaces),
+ number_format($TotalExtCost,2),
+ number_format($TotalExtPrice,2),
+ number_format($TotalInvQty,$LastDecimalPlaces),
' ');
} // End of if ($_POST['ReportType']
fclose($FileHandle);
@@ -1412,7 +1418,7 @@
// Display form fields. This function is called the first time
// the page is called.
- echo "<form action=" . $_SERVER['PHP_SELF'] . "?" . SID ." method=post>";
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class=selection>';
@@ -1461,15 +1467,15 @@
}
echo '<tr><td>' . _('Supplier Name') . ':</td>';
- echo "<td><select name='SupplierNameOp'>";
- echo "<option selected value='LIKE'>" . _('Begins With');
- echo "<option value='Equals'>" . _('Equals');
+ echo '<td><select name="SupplierNameOp">';
+ echo '<option selected value="LIKE">' . _('Begins With') . '</option>';
+ echo '<option value="Equals">' . _('Equals') . '</option>';
echo '</select>';
- echo "  <input type='Text' name='SupplierName' size=30 maxlength=30 value=";
+ echo '  <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>';
@@ -1482,56 +1488,55 @@
}
echo '<tr><td>' . _('Line Item Status') . ':</td>';
- echo "<td><select name='LineStatus'>";
- echo "<option selected value='All'>" . _('All');
- echo "<option value='Completed'>" . _('Completed');
- echo "<option value='Open'>" . _('Not Completed');
+ echo '<td><select name="LineStatus">';
+ echo '<option selected value="All">' . _('All') . '</option>';
+ echo '<option value="Completed">' . _('Completed') . '</option>';
+ echo '<option value="Open">' . _('Not Completed') . '</option>';
echo '</select></td><td> </td></tr>';
- echo '<tr><td>' . _('Stock Categories') . ":</td><td><select name='Category'>";
- $sql='SELECT categoryid, categorydescription FROM stockcategory';
+ echo '<tr><td>' . _('Stock Categories') . ':</td><td><select name="Category">';
+ $sql="SELECT categoryid, categorydescription FROM stockcategory";
$CategoryResult= DB_query($sql,$db);
- echo '<option selected value="All">' . _('All Categories');
+ echo '<option selected value="All">' . _('All Categories') . '</option>';
While ($myrow = DB_fetch_array($CategoryResult)){
- echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'];
+ echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
}
echo '</select></td></tr>';
echo '<tr><td> </td></tr>';
echo '<tr><td>' . _('Sort By') . ':</td>';
- echo "<td><select name='SortBy'>";
- echo "<option selected value='purchorderdetails.orderno'>" . _('Order Number');
- echo "<option value='purchorderdetails.itemcode'>" . _('Part Number');
- echo "<option value='suppliers.supplierid,purchorderdetails.orderno'>" . _('Supplier Number');
- echo "<option value='suppliers.suppname,suppliers.supplierid,purchorderdetails.orderno'>" . _('Supplier Name');
+ echo '<td><select name="SortBy">';
+ echo '<option 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> </td></tr>';
echo '<tr><td> </td></tr>';
echo '<tr><td>' . _('Summary Type') . ':</td>';
- echo "<td><select name='SummaryType'>";
- echo "<option selected value='orderno'>" . _('Order Number');
- echo "<option value='itemcode'>" . _('Part Number');
- echo "<option value='extprice'>" . _('Extended Price');
- echo "<option value='supplierno'>" . _('Supplier Number');
- echo "<option value='suppname'>" . _('Supplier Name');
- echo "<option value='month'>" . _('Month');
- echo "<option value='categoryid'>" . _('Stock Category');
+ echo '<td><select name="SummaryType">';
+ echo '<option 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> </td></tr>';
- echo "
- <tr><td> </td></tr>
- <tr>
- <td colspan=4><div class=centre><input type='submit' name='submit' value='" . _('Run Inquiry') . "'></div></td>
+ echo '<tr><td> </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>
+ <td colspan=4><div class=centre><input type="submit" name="submitcsv" value="' . _('Export as csv file') . '"></div></td>
</tr>
</table>
- <br/>";
+ <br/>';
echo '</form>';
} // End of function display()
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2011-04-11 10:49:45 UTC (rev 4547)
+++ trunk/Stocks.php 2011-04-12 10:33:45 UTC (rev 4548)
@...
[truncated message content] |
