Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5525] trunk
|
From: <dai...@us...> - 2012-07-21 23:37:47
|
Revision: 5525
http://web-erp.svn.sourceforge.net/web-erp/?rev=5525&view=rev
Author: daintree
Date: 2012-07-21 23:37:38 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
make sure qty demand calculated without quotations
Modified Paths:
--------------
trunk/CounterSales.php
trunk/DeliveryDetails.php
trunk/InternalStockRequest.php
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
trunk/MRP.php
trunk/MRPCreateDemands.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/StockCheck.php
trunk/StockLocStatus.php
trunk/StockStatus.php
trunk/doc/Change.log
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/CounterSales.php 2012-07-21 23:37:38 UTC (rev 5525)
@@ -93,7 +93,7 @@
$_SESSION['Items'.$identifier]->Branch = $myrow['cashsalebranch'];
$_SESSION['Items'.$identifier]->DebtorNo = $myrow['cashsalecustomer'];
}
-
+
$_SESSION['Items'.$identifier]->LocationName = $myrow['locationname'];
$_SESSION['Items'.$identifier]->Location = $_SESSION['UserStockLocation'];
$_SESSION['Items'.$identifier]->DispatchTaxProvince = $myrow['taxprovinceid'];
@@ -109,14 +109,14 @@
currencies.decimalplaces
FROM debtorsmaster INNER JOIN holdreasons
ON debtorsmaster.holdreason=holdreasons.reasoncode
- INNER JOIN salestypes
+ INNER JOIN salestypes
ON debtorsmaster.salestype=salestypes.typeabbrev
- INNER JOIN paymentterms
- ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN currencies
+ INNER JOIN paymentterms
+ ON debtorsmaster.paymentterms=paymentterms.termsindicator
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtorsmaster.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "'";
-
+
$ErrMsg = _('The details of the customer selected') . ': ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the customer details and failed was') . ':';
// echo $sql;
@@ -241,7 +241,7 @@
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units,
- stockmaster.decimalplaces
+ stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
@@ -254,7 +254,7 @@
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units,
- stockmaster.decimalplaces
+ stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
@@ -317,7 +317,7 @@
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.units,
- stockmaster.decimalplaces
+ stockmaster.decimalplaces
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
@@ -390,10 +390,10 @@
$Discount = 0;
$AlreadyWarnedAboutCredit = false;
$i=1;
- while ($i<=$_SESSION['QuickEntries']
- AND isset($_POST['part_' . $i])
+ while ($i<=$_SESSION['QuickEntries']
+ AND isset($_POST['part_' . $i])
AND $_POST['part_' . $i]!='') {
-
+
$QuickEntryCode = 'part_' . $i;
$QuickEntryQty = 'qty_' . $i;
$QuickEntryPOLine = 'poline_' . $i;
@@ -429,7 +429,7 @@
$NewItemDue = DateAdd (Date($_SESSION['DefaultDateFormat']),'d', $_SESSION['Items'.$identifier]->DeliveryDays);
}
/*Now figure out if the item is a kit set - the field MBFlag='K'*/
- $sql = "SELECT stockmaster.mbflag,
+ $sql = "SELECT stockmaster.mbflag,
stockmaster.controlled
FROM stockmaster
WHERE stockmaster.stockid='". $NewItem ."'";
@@ -488,22 +488,22 @@
foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine) {
if (isset($_POST['Quantity_' . $OrderLine->LineNumber])){
-
+
$Quantity = round(filter_number_format($_POST['Quantity_' . $OrderLine->LineNumber]),$OrderLine->DecimalPlaces);
if (ABS($OrderLine->Price - filter_number_format($_POST['Price_' . $OrderLine->LineNumber]))>0.01){
/*There is a new price being input for the line item */
-
+
$Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]);
$_POST['GPPercent_' . $OrderLine->LineNumber] = (($Price*(1-(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100))) - $OrderLine->StandardCost*$ExRate)/($Price *(1-filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))/100);
-
+
} elseif (ABS($OrderLine->GPPercent - filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]))>=0.01) {
/* A GP % has been input so need to do a recalculation of the price at this new GP Percentage */
-
-
+
+
prnMsg(_('Recalculated the price from the GP % entered - the GP % was') . ' ' . $OrderLine->GPPercent . ' the new GP % is ' . filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]),'info');
-
-
+
+
$Price = ($OrderLine->StandardCost*$ExRate)/(1 -((filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]) + filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))/100));
} else {
$Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]);
@@ -546,7 +546,7 @@
if (isset($_POST['Recalculate'])) {
foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine) {
$NewItem=$OrderLine->StockID;
- $sql = "SELECT stockmaster.mbflag,
+ $sql = "SELECT stockmaster.mbflag,
stockmaster.controlled
FROM stockmaster
WHERE stockmaster.stockid='". $OrderLine->StockID."'";
@@ -562,7 +562,7 @@
WHERE bom.parent='" . $OrderLine->StockID. "'
AND bom.effectiveto > '" . Date('Y-m-d') . "'
AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
-
+
$ErrMsg = _('Could not retrieve kitset components from the database because');
$KitResult = DB_query($sql,$db,$ErrMsg);
@@ -591,7 +591,7 @@
* controlled items and ghost/phantom items cannot be selected because the SQL to show items to select doesn't show 'em
* */
$AlreadyWarnedAboutCredit = false;
-
+
$sql = "SELECT stockmaster.mbflag,
stockmaster.taxcatid
FROM stockmaster
@@ -612,7 +612,7 @@
WHERE bom.parent='" . $NewItem . "'
AND bom.effectiveto > '" . Date('Y-m-d') . "'
AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
-
+
$ErrMsg = _('Could not retrieve kitset components from the database because');
$KitResult = DB_query($sql,$db,$ErrMsg);
@@ -642,7 +642,7 @@
/* get the item details from the database and hold them in the cart object make the quantity 1 by default then add it to the cart */
/*Now figure out if the item is a kit set - the field MBFlag='K'*/
$AlreadyWarnedAboutCredit = false;
-
+
foreach($NewItemArray as $NewItem => $NewItemQty) {
if($NewItemQty > 0) {
$sql = "SELECT stockmaster.mbflag
@@ -727,7 +727,7 @@
} /* end of discount matrix lookup code */
-if (count($_SESSION['Items'.$identifier]->LineItems)>0
+if (count($_SESSION['Items'.$identifier]->LineItems)>0
AND !isset($_POST['ProcessSale'])){ /*only show order lines if there are any */
/*
// *************************************************************************
@@ -1107,22 +1107,26 @@
$QOH = $QOHRow[0];
$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
- FROM salesorderdetails
- WHERE salesorderdetails.stkcode = '" . $StockItem->StockID . "'
- AND salesorderdetails.completed = 0";
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorderfetails.orderno=salesorders.orderno
+ WHERE salesorderdetails.stkcode = '" . $StockItem->StockID . "'
+ AND salesorderdetails.completed = 0
+ AND salesorders.quotation = 0";
$DemandResult = DB_query($SQL,$db);
$DemandRow = DB_fetch_row($DemandResult);
$QuantityDemand = $DemandRow[0];
$SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
- FROM salesorderdetails,
- bom,
- stockmaster
- WHERE salesorderdetails.stkcode=bom.parent
- AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorderdetails.orderno=salesorders.orderno
+ INNER JOIN bom
+ ON salesorderdetails.stkcode=bom.parent
+ INNER JOIN stockmaster
+ stockmaster.stockid=bom.parent
+ WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
AND bom.component='" . $StockItem->StockID . "'
- AND stockmaster.stockid=bom.parent
- AND salesorderdetails.completed=0";
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0";
$AssemblyDemandResult = DB_query($SQL,$db);
$AssemblyDemandRow = DB_fetch_row($AssemblyDemandResult);
$QuantityAssemblyDemand = $AssemblyDemandRow[0];
@@ -1132,6 +1136,7 @@
ON purchorderdetails.orderno = purchorders.orderno
WHERE purchorderdetails.itemcode = '" . $StockItem->StockID . "'
AND purchorderdetails.completed = 0
+ AND purchorders.status<>'Cancelled'
AND purchorders.status<>'Rejected'
AND purchorders.status<>'Pending'
AND purchorders.status<>'Completed'";
@@ -1823,7 +1828,7 @@
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
}
}
-
+
EnsureGLEntriesBalance(10,$InvoiceNo,$db);
/*Also if GL is linked to debtors need to process the debit to bank and credit to debtors for the payment */
@@ -1868,9 +1873,9 @@
$ErrMsg = _('Cannot insert a GL transaction for the debtors account credit');
$result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
}//amount paid we not zero
-
+
EnsureGLEntriesBalance(12,$ReceiptNumber,$db);
-
+
} /*end of if Sales and GL integrated */
if ($_POST['AmountPaid']!=0){
if (!isset($ReceiptNumber)){
@@ -1879,7 +1884,7 @@
//Now need to add the receipt banktrans record
//First get the account currency that it has been banked into
$result = DB_query("SELECT rate FROM currencies
- INNER JOIN bankaccounts
+ INNER JOIN bankaccounts
ON currencies.currabrev=bankaccounts.currcode
WHERE bankaccounts.accountcode='" . $_POST['BankAccount'] . "'",$db);
$myrow = DB_fetch_row($result);
@@ -2056,22 +2061,21 @@
$ImageSource = _('No Image');
// Find the quantity in stock at location
$QohSql = "SELECT sum(quantity)
- FROM locstock
- WHERE stockid='" .$myrow['stockid'] . "' AND
- loccode = '" . $_SESSION['Items'.$identifier]->Location . "'";
+ FROM locstock
+ WHERE stockid='" .$myrow['stockid'] . "' AND
+ loccode = '" . $_SESSION['Items'.$identifier]->Location . "'";
$QohResult = DB_query($QohSql,$db);
$QohRow = DB_fetch_row($QohResult);
$QOH = $QohRow[0];
// Find the quantity on outstanding sales orders
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
- FROM salesorderdetails,
- salesorders
- WHERE salesorders.orderno = salesorderdetails.orderno AND
- salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "' AND
- salesorderdetails.completed=0 AND
- salesorders.quotation=0 AND
- salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0
+ AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The demand for this product from') . ' ' . $_SESSION['Items'.$identifier]->Location . ' ' .
_('cannot be retrieved because');
@@ -2085,11 +2089,11 @@
}
// Find the quantity on purchase orders
$sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS QOO
- FROM purchorderdetails INNER JOIN purchorders
- WHERE purchorderdetails.completed=0
- AND purchorders.status<>'Cancelled'
- AND purchorders.status<>'Rejected'
- AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
+ FROM purchorderdetails INNER JOIN purchorders
+ WHERE purchorderdetails.completed=0
+ AND purchorders.status<>'Cancelled'
+ AND purchorders.status<>'Rejected'
+ AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
$PurchResult = DB_query($sql,$db,$ErrMsg);
@@ -2103,8 +2107,8 @@
// Find the quantity on works orders
$sql = "SELECT SUM(woitems.qtyreqd - woitems.qtyrecd) AS dedm
- FROM woitems
- WHERE stockid='" . $myrow['stockid'] ."'";
+ FROM woitems
+ WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
$WoResult = DB_query($sql,$db,$ErrMsg);
$WoRow = DB_fetch_row($WoResult);
@@ -2124,7 +2128,7 @@
$OnOrder = $PurchQty + $WoQty;
$Available = $QOH - $DemandQty + $OnOrder;
-
+
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -2188,7 +2192,7 @@
echo '</select></td>
<td><b>' . _('Enter partial Description') . ':</b>
<input tabindex="2" type="text" name="Keywords" size="20" maxlength="25" value="';
- if (isset($_POST['Keywords'])) echo $_POST['Keywords'];
+ if (isset($_POST['Keywords'])) echo $_POST['Keywords'];
echo '" /></td>
<td align="right"><b> ' . _('OR') . ' </b><b>' . _('Enter extract of the Stock Code') . ':</b>
@@ -2271,11 +2275,12 @@
// Find the quantity on purchase orders
$sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS QOO
- FROM purchorderdetails INNER JOIN purchorders
- WHERE purchorderdetails.completed=0
- AND purchorders.status <>'Cancelled'
- AND purchorders.status <>'Rejected'
- AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
+ FROM purchorderdetails INNER JOIN purchorders
+ WHERE purchorderdetails.completed=0
+ AND purchorders.status <>'Cancelled'
+ AND purchorders.status <>'Rejected'
+ AND purchorders.status <>'Completed'
+ AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
$PurchResult = DB_query($sql,$db,$ErrMsg);
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/DeliveryDetails.php 2012-07-21 23:37:38 UTC (rev 5525)
@@ -423,21 +423,23 @@
$QOH = $QOHRow[0];
$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
- FROM salesorderdetails
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorderdetails.orderno=salesorders.orderno
WHERE salesorderdetails.stkcode = '" . $StockItem->StockID . "'
- AND salesorderdetails.completed = 0";
+ AND salesorderdetails.completed = 0
+ AND salesorders.quotation=0";
$DemandResult = DB_query($SQL,$db);
$DemandRow = DB_fetch_row($DemandResult);
$QuantityDemand = $DemandRow[0];
$SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
- FROM salesorderdetails,
- bom,
- stockmaster
- WHERE salesorderdetails.stkcode=bom.parent
- AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorderdetails.orderno=salesorders.orderno
+ INNER JOIN bom ON salesorderdetails.stkcode=bom.parent
+ INNER JOIN stockmaster ON stockmaster.stockid=bom.parent
+ WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
AND bom.component='" . $StockItem->StockID . "'
- AND stockmaster.stockid=bom.parent
+ AND salesorders.quotation=0
AND stockmaster.mbflag='A'
AND salesorderdetails.completed=0";
$AssemblyDemandResult = DB_query($SQL,$db);
Modified: trunk/InternalStockRequest.php
===================================================================
--- trunk/InternalStockRequest.php 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/InternalStockRequest.php 2012-07-21 23:37:38 UTC (rev 5525)
@@ -296,7 +296,7 @@
echo '<table class="selection">
<tr>
<td>' . _('In Stock Category') . ':<select name="StockCat">';
-
+
if (!isset($_POST['StockCat'])) {
$_POST['StockCat'] = '';
}
@@ -636,13 +636,12 @@
// Find the quantity on outstanding sales orders
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
- FROM salesorderdetails,
- salesorders
- WHERE salesorders.orderno = salesorderdetails.orderno AND
- salesorders.fromstkloc='" . $_SESSION['Request']->Location . "' AND
- salesorderdetails.completed=0 AND
- salesorders.quotation=0 AND
- salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorders.fromstkloc='" . $_SESSION['Request']->Location . "'
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0
+ AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The demand for this product from') . ' ' . $_SESSION['Request']->Location . ' ' . _('cannot be retrieved because');
$DemandResult = DB_query($sql,$db,$ErrMsg);
@@ -655,12 +654,13 @@
// Find the quantity on purchase orders
$sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd)*purchorderdetails.conversionfactor AS dem
- FROM purchorderdetails LEFT JOIN purchorders
- ON purchorderdetails.orderno=purchorders.orderno
- WHERE purchorderdetails.completed=0
- AND purchorders.status<>'Cancelled'
- AND purchorders.status<>'Rejected'
- AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
+ FROM purchorderdetails LEFT JOIN purchorders
+ ON purchorderdetails.orderno=purchorders.orderno
+ WHERE purchorderdetails.completed=0
+ AND purchorders.status<>'Cancelled'
+ AND purchorders.status<>'Rejected'
+ AND purchorders.status<>'Completed'
+ AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
$PurchResult = DB_query($sql,$db,$ErrMsg);
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/InventoryPlanning.php 2012-07-21 23:37:38 UTC (rev 5525)
@@ -275,7 +275,8 @@
AND purchorderdetails.completed = 0
AND purchorders.status <> 'Cancelled'
AND purchorders.status <> 'Rejected'
- AND purchorders.status <> 'Pending'";
+ AND purchorders.status <> 'Pending'
+ AND purchorders.status <> 'Completed'";
} else {
$SQL = "SELECT SUM(purchorderdetails.quantityord - purchorderdetails.quantityrecd) as qtyonorder
FROM purchorderdetails INNER JOIN purchorders
@@ -285,7 +286,8 @@
AND purchorders.intostocklocation= '" . $_POST['Location'] . "'
AND purchorders.status <> 'Cancelled'
AND purchorders.status <> 'Rejected'
- AND purchorders.status <> 'Pending'";
+ AND purchorders.status <> 'Pending'
+ AND purchorders.status <> 'Completed'";
}
$DemandRow = DB_fetch_array($DemandResult);
Modified: trunk/InventoryPlanningPrefSupplier.php
===================================================================
--- trunk/InventoryPlanningPrefSupplier.php 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/InventoryPlanningPrefSupplier.php 2012-07-21 23:37:38 UTC (rev 5525)
@@ -368,7 +368,8 @@
AND purchorderdetails.completed = 0
AND purchorders.status <> 'Cancelled'
AND purchorders.status <> 'Rejected'
- AND purchorders.status <> 'Pending'";
+ AND purchorders.status <> 'Pending'
+ AND purchorders.status <> 'Completed'";
} else {
$SQL = "SELECT SUM(purchorderdetails.quantityord - purchorderdetails.quantityrecd) as qtyonorder
FROM purchorderdetails
@@ -382,7 +383,8 @@
AND purchorders.intostocklocation= '" . $_POST['Location'] . "'
AND purchorders.status <> 'Cancelled'
AND purchorders.status <> 'Rejected'
- AND purchorders.status <> 'Pending'";
+ AND purchorders.status <> 'Pending'
+ AND purchorders.status <> 'Completed'";
}
$DemandRow = DB_fetch_array($DemandResult);
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/MRP.php 2012-07-21 23:37:38 UTC (rev 5525)
@@ -45,7 +45,7 @@
$sql = "INSERT INTO passbom (part, sortpart)
SELECT bom.component AS part,
CONCAT(bom.parent,'%',bom.component) AS sortpart
- FROM bom LEFT JOIN bom as bom2
+ FROM bom LEFT JOIN bom as bom2
ON bom.parent = bom2.component
WHERE bom2.component IS NULL";
$result = DB_query($sql,$db);
@@ -247,9 +247,9 @@
stkcode
FROM salesorders, salesorderdetails
WHERE salesorders.orderno = salesorderdetails.orderno
- AND (quantity - qtyinvoiced) > 0
- AND salesorderdetails.completed = 0
- AND salesorders.quotation = 0";
+ AND (quantity - qtyinvoiced) > 0
+ AND salesorderdetails.completed = 0
+ AND salesorders.quotation = 0";
$result = DB_query($sql,$db);
prnMsg(_('Loading requirements from work orders'),'info');
@@ -435,7 +435,7 @@
prnMsg(_('Creating planned orders table'),'info');
flush();
$result = DB_query("DROP TABLE IF EXISTS mrpplannedorders",$db);
- $sql = "CREATE TABLE mrpplannedorders (id int(11) NOT NULL auto_increment,
+ $sql = "CREATE TABLE mrpplannedorders (id int(11) NOT NULL auto_increment,
part char(20),
duedate date,
supplyquantity double,
@@ -754,8 +754,8 @@
// Calculate required date by subtracting leadtime from top part's required date
$PartRequiredDate=$Requirement['daterequired'];
- if ((int)$LeadTime>0) {
-
+ if ((int)$LeadTime>0) {
+
$CalendarSQL = "SELECT COUNT(*),cal2.calendardate
FROM mrpcalendar
LEFT JOIN mrpcalendar as cal2
Modified: trunk/MRPCreateDemands.php
===================================================================
--- trunk/MRPCreateDemands.php 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/MRPCreateDemands.php 2012-07-21 23:37:38 UTC (rev 5525)
@@ -8,9 +8,9 @@
if (isset($_POST['submit'])) {
// Create mrpdemands based on sales order history
-
+
$InputError=0;
-
+
if (isset($_POST['FromDate']) AND !Is_Date($_POST['FromDate'])){
$msg = _('The date from must be specified in the format') . ' ' . $_SESSION['DefaultDateFormat'];
$InputError=1;
@@ -41,11 +41,11 @@
$msg = _('The multiplier is expected to be a positive number');
$InputError=1;
}
-
+
if ($InputError==1){
prnMsg($msg,'error');
}
-
+
$WhereCategory = " ";
if ($_POST['CategoryID']!='All') {
$WhereCategory = " AND stockmaster.categoryid ='" . $_POST['CategoryID'] . "' ";
@@ -54,21 +54,21 @@
if ($_POST['Location']!='All') {
$WhereLocation = " AND salesorders.fromstkloc ='" . $_POST['Location'] . "' ";
}
-
+
$sql= "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.quantity) AS totqty,
- SUM(salesorderdetails.qtyinvoiced) AS totqtyinvoiced,
- SUM(salesorderdetails.quantity * salesorderdetails.unitprice ) AS totextqty
- FROM salesorders
- INNER JOIN salesorderdetails
- ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN stockmaster
- ON salesorderdetails.stkcode = stockmaster.stockid
- WHERE orddate >='" . FormatDateForSQL($_POST['FromDate']) ."'
- AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'
- " . $WhereLocation . "
- " . $WhereCategory . "
- GROUP BY salesorderdetails.stkcode";
+ SUM(salesorderdetails.quantity) AS totqty,
+ SUM(salesorderdetails.qtyinvoiced) AS totqtyinvoiced,
+ SUM(salesorderdetails.quantity * salesorderdetails.unitprice ) AS totextqty
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN stockmaster
+ ON salesorderdetails.stkcode = stockmaster.stockid
+ WHERE orddate >='" . FormatDateForSQL($_POST['FromDate']) ."'
+ AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'
+ " . $WhereLocation . "
+ " . $WhereCategory . "
+ AND salesorders.quotation=0
+ GROUP BY salesorderdetails.stkcode";
//echo "<br />$sql<br />";
$result = DB_query($sql,$db);
// To get the quantity per period, get the whole number amount of the total quantity divided
@@ -76,25 +76,25 @@
// number quantity into each entry of the periodqty array, and add 1 to the periodqty array
// until the remainder number is used up. Then create an mrpdemands records for everything
// in the array
-
+
if (filter_number_format($_POST['Multiplier']) < 1) {
$Multiplier = 1;
} else {
$Multiplier = filter_number_format($_POST['Multiplier']);
}
-
+
if ($_POST['ExcludeQuantity'] < 1) {
$ExcludeQty = 1;
} else {
$ExcludeQty = filter_number_format($_POST['ExcludeQuantity']);
}
-
+
if ($_POST['ExcludeAmount'] < 1) {
$ExcludeAmount = 0;
} else {
$ExcludeAmount = filter_number_format($_POST['ExcludeAmount']);
}
-
+
// Create array of dates based on DistDate and adding either weeks or months
$FormatedDistdate = FormatDateForSQL($_POST['DistDate']);
if (mb_strpos($FormatedDistdate,"/")) {
@@ -104,7 +104,7 @@
} else if (mb_strpos($FormatedDistdate,".")) {
list($yyyy,$mm,$dd) = explode(".",$FormatedDistdate);
}
-
+
$datearray[0] = $FormatedDistdate;
// Set first date to valid manufacturing date
$calendarsql = "SELECT COUNT(*),cal2.calendardate
@@ -120,7 +120,7 @@
if ($myrowdate[0] != 0){
$datearray[0] = $myrowdate[1];
}
-
+
$date = date('Y-m-d',mktime(0,0,0,$mm,$dd,$yyyy));
for ($i = 1; $i <= ( $_POST['PeriodNumber'] - 1); $i++) {
if ($_POST['Period'] == 'weekly') {
@@ -148,7 +148,7 @@
}
$date = date('Y-m-d',$date);
}
-
+
$TotalRecords = 0;
while ($myrow = DB_fetch_array($result)) {
if (($myrow['totqty'] >= $ExcludeQty) AND ($myrow['totextqty'] >= $ExcludeAmount)) {
@@ -167,7 +167,7 @@
$PeriodQty[$i] += 1;
}
}
-
+
$i = 0;
foreach ($PeriodQty as $demandqty) {
$sql = "INSERT INTO mrpdemands (stockid,
@@ -181,12 +181,12 @@
$insertresult = DB_query($sql,$db);
$i++;
$TotalRecords++;
-
+
} // end of foreach for INSERT
} // end of if that checks exludeqty, ExcludeAmount
-
+
} //end while loop
-
+
prnMsg( $TotalRecords . ' ' . _('records have been created'),'success');
} // end if submit has been pressed
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/SelectOrderItems.php 2012-07-21 23:37:38 UTC (rev 5525)
@@ -211,12 +211,12 @@
stockmaster.decimalplaces,
stockmaster.materialcost+stockmaster.labourcost+stockmaster.overheadcost AS standardcost,
salesorderdetails.completed
- FROM salesorderdetails INNER JOIN stockmaster
- ON salesorderdetails.stkcode = stockmaster.stockid
- INNER JOIN locstock ON locstock.stockid = stockmaster.stockid
- WHERE locstock.loccode = '" . $myrow['fromstkloc'] . "'
- AND salesorderdetails.orderno ='" . $_GET['ModifyOrderNumber'] . "'
- ORDER BY salesorderdetails.orderlineno";
+ FROM salesorderdetails INNER JOIN stockmaster
+ ON salesorderdetails.stkcode = stockmaster.stockid
+ INNER JOIN locstock ON locstock.stockid = stockmaster.stockid
+ WHERE locstock.loccode = '" . $myrow['fromstkloc'] . "'
+ AND salesorderdetails.orderno ='" . $_GET['ModifyOrderNumber'] . "'
+ ORDER BY salesorderdetails.orderlineno";
$ErrMsg = _('The line items of the order cannot be retrieved because');
$LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
@@ -671,9 +671,9 @@
if($_SESSION['ExistingOrder' . $identifier]!=0) { //need to check that not already dispatched
$sql = "SELECT qtyinvoiced
- FROM salesorderdetails
- WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'
- AND qtyinvoiced>0";
+ FROM salesorderdetails
+ WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'
+ AND qtyinvoiced>0";
$InvQties = DB_query($sql,$db);
@@ -1528,8 +1528,8 @@
$ImageSource = _('No Image');
// Find the quantity in stock at location
$QOHSQL = "SELECT sum(locstock.quantity) AS qoh
- FROM locstock
- WHERE stockid='" .$myrow['stockid'] . "'
+ FROM locstock
+ WHERE stockid='" .$myrow['stockid'] . "'
AND loccode = '" . $_SESSION['Items'.$identifier]->Location . "'";
$QOHResult = DB_query($QOHSQL,$db);
$QOHRow = DB_fetch_array($QOHResult);
@@ -1560,6 +1560,7 @@
WHERE purchorderdetails.completed=0
AND purchorders.status<> 'Completed'
AND purchorders.status<> 'Rejected'
+ AND purchorders.status<> 'Cancelled'
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
@@ -1748,6 +1749,7 @@
AND purchorders.status<>'Cancelled'
AND purchorders.status<>'Rejected'
AND purchorders.status<>'Pending'
+ AND purchorders.status<>'Completed'
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
@@ -1875,20 +1877,20 @@
<input type="submit" name="PartSearch" value="' . _('Search Parts') . '" /></div>';
echo '</div></form>';
-
+
} //end of if it is a Quick Entry screen/part search or asset selection form to display
-
+
if ($_SESSION['Items'.$identifier]->ItemsOrdered >=1){
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier .
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier .
'" method="post" name="deleteform">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br /><div class="centre"><input type="submit" name="CancelOrder" value="' . _('Cancel Whole Order') . '" onclick="return confirm(\'' . _('Are you sure you wish to cancel this entire order?') . '\');" /></div></form>';
}
}#end of else not selecting a customer
-
+
if (isset($_GET['NewOrder']) and $_GET['NewOrder']!='') {
echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectCustomer.CustKeywords);}</script>';
}
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/SelectProduct.php 2012-07-21 23:37:38 UTC (rev 5525)
@@ -314,15 +314,12 @@
$DemRow = DB_fetch_row($DemResult);
$Demand = $DemRow[0];
$DemAsComponentResult = DB_query("SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
- FROM salesorderdetails,
- salesorders,
- bom,
- stockmaster
- WHERE salesorderdetails.stkcode=bom.parent
- AND salesorders.orderno = salesorderdetails.orderno
- AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN bom ON salesorderdetails.stkcode=bom.parent
+ INNER JOIN stockmaster stockmaster.stockid=bom.parent
+ WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
AND bom.component='" . $StockID . "'
- AND stockmaster.stockid=bom.parent
AND stockmaster.mbflag='A'
AND salesorders.quotation=0", $db);
$DemAsComponentRow = DB_fetch_row($DemAsComponentResult);
@@ -342,13 +339,19 @@
$DemandRow = DB_fetch_row($DemandResult);
$Demand+= $DemandRow[0];
}
-echo '<tr><th class="number" style="width:15%">' . _('Quantity On Hand') . ':</th>
- <td style="width:17%" class="select">' . $QOH . '</td></tr>';
-echo '<tr><th class="number" style="width:15%">' . _('Quantity Demand') . ':</th>
- <td style="width:17%" class="select">' . locale_number_format($Demand, $myrow['decimalplaces']) . '</td></tr>';
-echo '<tr><th class="number" style="width:15%">' . _('Quantity On Order') . ':</th>
- <td style="width:17%" class="select">' . $QOO . '</td></tr>
- </table>'; //end of nested table
+echo '<tr>
+ <th class="number" style="width:15%">' . _('Quantity On Hand') . ':</th>
+ <td style="width:17%" class="select">' . $QOH . '</td>
+ </tr>';
+echo '<tr>
+ <th class="number" style="width:15%">' . _('Quantity Demand') . ':</th>
+ <td style="width:17%" class="select">' . locale_number_format($Demand, $myrow['decimalplaces']) . '</td>
+ </tr>';
+echo '<tr>
+ <th class="number" style="width:15%">' . _('Quantity On Order') . ':</th>
+ <td style="width:17%" class="select">' . $QOO . '</td>
+ </tr>
+ </table>'; //end of nested table
echo '</td>'; //end cell of master table
if (($myrow['mbflag'] == 'B' OR ($myrow['mbflag'] == 'M'))
@@ -571,8 +574,7 @@
stockmaster.mbflag,
stockmaster.discontinued,
stockmaster.decimalplaces
- FROM stockmaster
- LEFT JOIN stockcategory
+ FROM stockmaster LEFT JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid,
locstock
WHERE stockmaster.stockid=locstock.stockid
@@ -594,10 +596,9 @@
stockmaster.mbflag,
stockmaster.discontinued,
stockmaster.decimalplaces
- FROM stockmaster,
- locstock
- WHERE stockmaster.stockid=locstock.stockid
- AND description " . LIKE . " '$SearchString'
+ FROM stockmaster INNER JOIN locstock
+ ON stockmaster.stockid=locstock.stockid
+ WHERE description " . LIKE . " '$SearchString'
AND categoryid='" . $_POST['StockCat'] . "'
GROUP BY stockmaster.stockid,
stockmaster.description,
@@ -621,10 +622,9 @@
stockmaster.decimalplaces
FROM stockmaster
INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid,
- locstock
- WHERE stockmaster.stockid=locstock.stockid
- AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
+ ON stockmaster.categoryid=stockcategory.categoryid
+ INNER JOIN locstock ON stockmaster.stockid=locstock.stockid
+ WHERE stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
GROUP BY stockmaster.stockid,
stockmaster.description,
stockmaster.longdescription,
@@ -642,10 +642,9 @@
sum(locstock.quantity) as qoh,
stockmaster.units,
stockmaster.decimalplaces
- FROM stockmaster,
- locstock
- WHERE stockmaster.stockid=locstock.stockid
- AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
+ FROM stockmaster INNER JOIN locstock
+ ON stockmaster.stockid=locstock.stockid
+ WHERE stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
AND categoryid='" . $_POST['StockCat'] . "'
GROUP BY stockmaster.stockid,
stockmaster.description,
@@ -688,10 +687,9 @@
SUM(locstock.quantity) AS qoh,
stockmaster.units,
stockmaster.decimalplaces
- FROM stockmaster,
- locstock
- WHERE stockmaster.stockid=locstock.stockid
- AND categoryid='" . $_POST['StockCat'] . "'
+ FROM stockmaster INNER JOIN locstock
+ ON stockmaster.stockid=locstock.stockid
+ WHERE categoryid='" . $_POST['StockCat'] . "'
GROUP BY stockmaster.stockid,
stockmaster.description,
stockmaster.longdescription,
Modified: trunk/StockCheck.php
===================================================================
--- trunk/StockCheck.php 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/StockCheck.php 2012-07-21 23:37:38 UTC (rev 5525)
@@ -37,7 +37,7 @@
stockmaster.mbflag!='A' AND
stockmaster.mbflag!='K' AND
stockmaster.mbflag!='D'";
-
+
$result = DB_query($sql, $db,'','',false,false);
if (DB_error_no($db) !=0) {
$title = _('Stock Count Sheets - Problem Report');
@@ -53,11 +53,11 @@
}
if ($_POST['MakeStkChkData']=='AddUpdate'){
- $sql = "DELETE stockcheckfreeze
+ $sql = "DELETE stockcheckfreeze
FROM stockcheckfreeze
INNER JOIN stockmaster ON stockcheckfreeze.stockid=stockmaster.stockid
- WHERE stockmaster.categoryid >='" . $_POST['FromCriteria'] . "'
- AND stockmaster.categoryid<='" . $_POST['ToCriteria'] . "'
+ WHERE stockmaster.categoryid >='" . $_POST['FromCriteria'] . "'
+ AND stockmaster.categoryid<='" . $_POST['ToCriteria'] . "'
AND stockcheckfreeze.loccode='" . $_POST['Location'] . "'";
$result = DB_query($sql,$db,'','',false,false);
@@ -83,12 +83,12 @@
'" . Date('Y-m-d') . "'
FROM locstock INNER JOIN stockmaster
ON locstock.stockid=stockmaster.stockid
- WHERE locstock.loccode='" . $_POST['Location'] . "'
- AND stockmaster.categoryid>='" . $_POST['FromCriteria'] . "'
- AND stockmaster.categoryid<='" . $_POST['ToCriteria'] . "'
- AND stockmaster.mbflag!='A'
- AND stockmaster.mbflag!='K'
- AND stockmaster.mbflag!='G'
+ WHERE locstock.loccode='" . $_POST['Location'] . "'
+ AND stockmaster.categoryid>='" . $_POST['FromCriteria'] . "'
+ AND stockmaster.categoryid<='" . $_POST['ToCriteria'] . "'
+ AND stockmaster.mbflag!='A'
+ AND stockmaster.mbflag!='K'
+ AND stockmaster.mbflag!='G'
AND stockmaster.mbflag!='D'";
$result = DB_query($sql, $db,'','',false,false);
@@ -120,12 +120,12 @@
stockcategory.categorydescription,
stockcheckfreeze.qoh
FROM stockcheckfreeze INNER JOIN stockmaster
- ON stockcheckfreeze.stockid=stockmaster.stockid
- INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- WHERE stockmaster.categoryid >= '" . $_POST['FromCriteria'] . "'
- AND stockmaster.categoryid <= '" . $_POST['ToCriteria'] . "'
- AND (stockmaster.mbflag='B' OR mbflag='M')
+ ON stockcheckfreeze.stockid=stockmaster.stockid
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ WHERE stockmaster.categoryid >= '" . $_POST['FromCriteria'] . "'
+ AND stockmaster.categoryid <= '" . $_POST['ToCriteria'] . "'
+ AND (stockmaster.mbflag='B' OR mbflag='M')
AND stockcheckfreeze.loccode = '" . $_POST['Location'] . "'";
if (isset($_POST['NonZerosOnly']) and $_POST['NonZerosOnly']==true){
$SQL .= " AND stockcheckfreeze.qoh<>0";
@@ -180,10 +180,11 @@
$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
FROM salesorderdetails INNER JOIN salesorders
- ON salesorderdetails.orderno=salesorders.orderno
- WHERE salesorders.fromstkloc ='" . $_POST['Location'] . "'
- AND salesorderdetails.stkcode = '" . $InventoryCheckRow['stockid'] . "'
- AND salesorderdetails.completed = 0";
+ ON salesorderdetails.orderno=salesorders.orderno
+ WHERE salesorders.fromstkloc ='" . $_POST['Location'] . "'
+ AND salesorderdetails.stkcode = '" . $InventoryCheckRow['stockid'] . "'
+ AND salesorderdetails.completed = 0
+ AND salesorders.quotation=0";
$DemandResult = DB_query($SQL,$db,'','',false, false);
@@ -204,16 +205,17 @@
//Also need to add in the demand for components of assembly items
$sql = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
- FROM salesorderdetails INNER JOIN salesorders
+ FROM salesorderdetails INNER JOIN salesorders
ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN bom
+ INNER JOIN bom
ON salesorderdetails.stkcode=bom.parent
- INNER JOIN stockmaster
+ INNER JOIN stockmaster
ON stockmaster.stockid=bom.parent
- WHERE salesorders.fromstkloc='" . $_POST['Location'] . "'
- AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
- AND bom.component='" . $InventoryCheckRow['stockid'] . "'
- AND stockmaster.mbflag='A'";
+ WHERE salesorders.fromstkloc='" . $_POST['Location'] . "'
+ AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
+ AND bom.component='" . $InventoryCheckRow['stockid'] . "'
+ AND stockmaster.mbflag='A'
+ AND salesorders.quotation=0";
$DemandResult = DB_query($sql,$db,'','',false,false);
if (DB_error_no($db) !=0) {
Modified: trunk/StockLocStatus.php
===================================================================
--- trunk/StockLocStatus.php 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/StockLocStatus.php 2012-07-21 23:37:38 UTC (rev 5525)
@@ -185,7 +185,8 @@
ON salesorders.orderno = salesorderdetails.orderno
WHERE salesorders.fromstkloc='" . $myrow['loccode'] . "'
AND salesorderdetails.completed=0
- AND salesorderdetails.stkcode='" . $StockID . "'";
+ AND salesorderdetails.stkcode='" . $StockID . "'
+ AND salesorders.quotation=0";
$ErrMsg = _('The demand for this product from') . ' ' . $myrow['loccode'] . ' ' . _('cannot be retrieved because');
$DemandResult = DB_query($sql,$db,$ErrMsg);
@@ -201,14 +202,15 @@
$sql = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
FROM salesorderdetails INNER JOIN salesorders
ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN bom
+ INNER JOIN bom
ON salesorderdetails.stkcode=bom.parent
INNER JOIN stockmaster
ON stockmaster.stockid=bom.parent
WHERE salesorders.fromstkloc='" . $myrow['loccode'] . "'
AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
AND bom.component='" . $StockID . "'
- AND stockmaster.mbflag='A'";
+ AND stockmaster.mbflag='A'
+ AND salesorders.quotation=0";
$ErrMsg = _('The demand for this product from') . ' ' . $myrow['loccode'] . ' ' . _('cannot be retrieved because');
$DemandResult = DB_query($sql,$db, $ErrMsg);
@@ -220,7 +222,7 @@
$sql = "SELECT SUM((woitems.qtyreqd-woitems.qtyrecd)*bom.quantity) AS dem
FROM workorders INNER JOIN woitems
ON woitems.wo = workorders.wo
- INNER JOIN bom
+ INNER JOIN bom
ON woitems.stockid = bom.parent
WHERE workorders.closed=0
AND bom.component = '". $StockID . "'
@@ -241,7 +243,8 @@
AND purchorderdetails.itemcode='" . $StockID . "'
AND purchorders.status <> 'Cancelled'
AND purchorders.status <> 'Rejected'
- AND purchorders.status <> 'Pending'";
+ AND purchorders.status <> 'Pending'
+ AND purchorders.status <> 'Completed'";
$ErrMsg = _('The quantity on order for this product to be received into') . ' ' . $myrow['loccode'] . ' ' . _('cannot be retrieved because');
$QOOResult = DB_query($sql,$db,$ErrMsg);
Modified: trunk/StockStatus.php
===================================================================
--- trunk/StockStatus.php 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/StockStatus.php 2012-07-21 23:37:38 UTC (rev 5525)
@@ -176,7 +176,9 @@
WHERE purchorderdetails.itemcode='" . $StockID . "'
AND purchorders.intostocklocation='" . $myrow['loccode'] . "'
AND (purchorders.status<>'Cancelled'
- AND purchorders.status<>'Pending')";
+ AND purchorders.status<>'Pending'
+ AND purchorders.status<>'Rejected'
+ AND purchorders.status<>'Completed')";
$ErrMsg = _('The quantity on order for this product to be received into') . ' ' . $myrow['loccode'] . ' ' . _('cannot be retrieved because');
$QOOResult = DB_query($sql,$db,$ErrMsg, $DbgMsg);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-07-21 22:15:38 UTC (rev 5524)
+++ trunk/doc/Change.log 2012-07-21 23:37:38 UTC (rev 5525)
@@ -1,5 +1,7 @@
webERP Change Log
+22/7/2012 Phil/Bob Thomas: Fix all scripts where demand was calculated including salesorder quotations (to exclude quotations). CounterSales.php DeliveryDetails.php SelectOrderItems.php StockCheck.php StockLocStatus.php
+22/7/2012 Phil: Fixed on order quantities to exclude purchase orders with status completed and cancelled CounterSales.php SelectOrderItems.php DeliveryDetails.php StockLocStatus.php
21/7/2012 Hindra: Fix Aguapop theme and table and div nesting of index.php header.inc and footer.inc - and other themes table style width: 95%;
21/7/2012 Phil: Fix api function for POS prices includes/Z_POSDataCreation.php
21/7/2012 Ricard: sorting products by discontinued then stockid to ensure obsolete items at the end of the list
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
