Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[3623] trunk
|
From: <tim...@us...> - 2010-07-15 10:29:31
|
Revision: 3623
http://web-erp.svn.sourceforge.net/web-erp/?rev=3623&view=rev
Author: tim_schofield
Date: 2010-07-15 10:29:25 +0000 (Thu, 15 Jul 2010)
Log Message:
-----------
Bug fixes to show decimal places correctly and other fixes, fix sql quoting errors and layout changes
Modified Paths:
--------------
trunk/PDFStockCheckComparison.php
trunk/StockCheck.php
trunk/doc/Change.log.html
Modified: trunk/PDFStockCheckComparison.php
===================================================================
--- trunk/PDFStockCheckComparison.php 2010-07-14 10:43:37 UTC (rev 3622)
+++ trunk/PDFStockCheckComparison.php 2010-07-15 10:29:25 UTC (rev 3623)
@@ -291,7 +291,7 @@
include('includes/PDFStockComparisonPageHeader.inc');
}
} // end of loop printing count information
- $LeftOvers = $pdf->addTextWrap($LeftMargin, $YPos, 375-$LeftMargin, $FontSize, _('Total for') . ': ' . $CheckItemRow['stockid'], 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos, 375-$Left_Margin, $FontSize, _('Total for') . ': ' . $CheckItemRow['stockid'], 'right');
$LeftOvers = $pdf->addTextWrap(375, $YPos, 60, $FontSize, $TotalCount, 'right');
$LeftOvers = $pdf->addTextWrap(485, $YPos, 60, $FontSize, $TotalCount-$CheckItemRow['qoh'], 'right');
} //end of if there are counts to print
Modified: trunk/StockCheck.php
===================================================================
--- trunk/StockCheck.php 2010-07-14 10:43:37 UTC (rev 3622)
+++ trunk/StockCheck.php 2010-07-15 10:29:25 UTC (rev 3623)
@@ -22,20 +22,20 @@
$sql = 'TRUNCATE TABLE stockcheckfreeze';
$result = DB_query($sql,$db);
$sql = "INSERT INTO stockcheckfreeze (stockid,
- loccode,
- qoh)
- SELECT locstock.stockid,
- locstock.loccode,
- locstock.quantity
- FROM locstock,
- stockmaster
- WHERE locstock.stockid=stockmaster.stockid and
- 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!='D'";
+ loccode,
+ qoh)
+ SELECT locstock.stockid,
+ locstock.loccode,
+ locstock.quantity
+ FROM locstock,
+ stockmaster
+ WHERE locstock.stockid=stockmaster.stockid and
+ 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!='D'";
$result = DB_query($sql, $db,'','',false,false);
if (DB_error_no($db) !=0) {
@@ -44,7 +44,7 @@
prnMsg(_('The inventory quantities could not be added to the freeze file because') . ' ' . DB_error_msg($db),'error');
echo '<br><a href="' . $rootpath . '/index.php?' . SID . '">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br>' . $sql;
+ echo '<br>' . $sql;
}
include('includes/footer.inc');
exit;
@@ -53,10 +53,10 @@
if ($_POST['MakeStkChkData']=='AddUpdate'){
$sql = "DELETE stockcheckfreeze FROM stockcheckfreeze
- INNER JOIN stockmaster ON stockcheckfreeze.stockid=stockmaster.stockid
- WHERE stockmaster.categoryid >='" . $_POST['FromCriteria'] . "' AND
- stockmaster.categoryid<='" . $_POST['ToCriteria'] . "' AND
- stockcheckfreeze.loccode='" . $_POST['Location'] . "'";
+ INNER JOIN stockmaster ON stockcheckfreeze.stockid=stockmaster.stockid
+ WHERE stockmaster.categoryid >='" . $_POST['FromCriteria'] . "' AND
+ stockmaster.categoryid<='" . $_POST['ToCriteria'] . "' AND
+ stockcheckfreeze.loccode='" . $_POST['Location'] . "'";
$result = DB_query($sql,$db,'','',false,false);
if (DB_error_no($db) !=0) {
@@ -65,15 +65,15 @@
prnMsg(_('The old quantities could not be deleted from the freeze file because') . ' ' . DB_error_msg($db),'error');
echo '<br><a href="' . $rootpath . '/index.php?' . SID . '">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br>' . $sql;
+ echo '<br>' . $sql;
}
include('includes/footer.inc');
exit;
}
$sql = "INSERT INTO stockcheckfreeze (stockid,
- loccode,
- qoh)
+ loccode,
+ qoh)
SELECT locstock.stockid,
loccode ,
locstock.quantity
@@ -82,10 +82,10 @@
WHERE locstock.stockid=stockmaster.stockid AND
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!='D'";
+ stockmaster.categoryid<='" . $_POST['ToCriteria'] . "' AND
+ stockmaster.mbflag!='A' AND
+ stockmaster.mbflag!='K' AND
+ stockmaster.mbflag!='D'";
$result = DB_query($sql, $db,'','',false,false);
if (DB_error_no($db) !=0) {
@@ -94,7 +94,7 @@
prnMsg(_('The inventory quantities could not be added to the freeze file because') . ' ' . DB_error_msg($db),'error');
echo '<br><a href="' . $rootpath . '/index.php?' . SID . '">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br>' . $sql;
+ echo '<br>' . $sql;
}
include('includes/footer.inc');
exit;
@@ -109,26 +109,27 @@
}
- $SQL = "SELECT stockmaster.categoryid,
- stockcheckfreeze.stockid,
- stockmaster.description,
- stockcategory.categorydescription,
- stockcheckfreeze.qoh
- FROM stockcheckfreeze,
- stockmaster,
- stockcategory
- WHERE stockcheckfreeze.stockid=stockmaster.stockid AND
- stockmaster.categoryid >= '" . $_POST['FromCriteria'] . "' AND
- stockmaster.categoryid=stockcategory.categoryid AND
- stockmaster.categoryid <= '" . $_POST['ToCriteria'] . "' AND
- (stockmaster.mbflag='B' OR mbflag='M') AND
- stockcheckfreeze.loccode = '" . $_POST['Location'] . "'";
- if ($_POST['NonZerosOnly']==true){
+ $SQL = "SELECT stockmaster.categoryid,
+ stockcheckfreeze.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ stockcategory.categorydescription,
+ stockcheckfreeze.qoh
+ FROM stockcheckfreeze,
+ stockmaster,
+ stockcategory
+ WHERE stockcheckfreeze.stockid=stockmaster.stockid AND
+ stockmaster.categoryid >= '" . $_POST['FromCriteria'] . "' AND
+ stockmaster.categoryid=stockcategory.categoryid 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';
}
-
+
$SQL .= ' ORDER BY stockmaster.categoryid, stockmaster.stockid';
-
+
$InventoryResult = DB_query($SQL,$db,'','',false,false);
if (DB_error_no($db) !=0) {
@@ -137,7 +138,7 @@
prnMsg( _('The inventory quantities could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
echo '<br><a href="' . $rootpath . '/index.php?' . SID . '">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br>' . $SQL;
+ echo '<br>' . $SQL;
}
include ('includes/footer.inc');
exit;
@@ -171,15 +172,15 @@
$FontSize=10;
$YPos -=$line_height;
- if ($_POST['ShowInfo']==true){
+ if ($_POST['ShowInfo']==true){
$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
- FROM salesorderdetails,
- salesorders
- WHERE salesorderdetails.orderno=salesorders.orderno AND
- salesorders.fromstkloc ='" . $_POST['Location'] . "' AND
- salesorderdetails.stkcode = '" . $InventoryPlan['StockID'] . "' AND
- salesorderdetails.completed = 0";
+ FROM salesorderdetails,
+ salesorders
+ WHERE salesorderdetails.orderno=salesorders.orderno AND
+ salesorders.fromstkloc ='" . $_POST['Location'] . "' AND
+ salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "' AND
+ salesorderdetails.completed = 0";
$DemandResult = DB_query($SQL,$db,'','',false, false);
@@ -189,7 +190,7 @@
prnMsg( _('The sales order demand quantities could not be retrieved by the SQL because') . ' ' . DB_error_msg($db), 'error');
echo '<br><a href="' . $rootpath . '/index.php?' . SID . '">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br>' . $SQL;
+ echo '<br>' . $SQL;
}
echo '</body</html>';
exit;
@@ -200,18 +201,18 @@
//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,
- salesorders,
- bom,
- stockmaster
- WHERE salesorderdetails.stkcode=bom.parent AND
- salesorders.orderno = salesorderdetails.orderno AND
- salesorders.fromstkloc='" . $myrow['loccode'] . "' AND
- salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0 AND
- bom.component='" . $StockID . "' AND
- stockmaster.stockid=bom.parent AND
- stockmaster.mbflag='A'";
+ AS dem
+ FROM salesorderdetails,
+ salesorders,
+ bom,
+ stockmaster
+ WHERE salesorderdetails.stkcode=bom.parent AND
+ salesorders.orderno = salesorderdetails.orderno AND
+ salesorders.fromstkloc='" . $_POST['Location'] . "' AND
+ salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0 AND
+ bom.component='" . $InventoryPlan['stockid'] . "' AND
+ stockmaster.stockid=bom.parent AND
+ stockmaster.mbflag='A'";
$DemandResult = DB_query($sql,$db,'','',false,false);
if (DB_error_no($db) !=0) {
@@ -221,23 +222,23 @@
}
exit;
}
-
+
if (DB_num_rows($DemandResult)==1){
$DemandRow = DB_fetch_row($DemandResult);
$DemandQty += $DemandRow[0];
}
- $LeftOvers = $pdf->addTextWrap(350,$YPos,60,$FontSize,$InventoryPlan['qoh'], 'right');
- $LeftOvers = $pdf->addTextWrap(410,$YPos,60,$FontSize,number_format($DemandQty,0), 'right');
- $LeftOvers = $pdf->addTextWrap(470,$YPos,60,$FontSize,number_format($InventoryPlan['qoh']-$DemandQty,0), 'right');
-
+ $LeftOvers = $pdf->addTextWrap(350,$YPos,60,$FontSize,number_format($InventoryPlan['qoh'], $InventoryPlan['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap(410,$YPos,60,$FontSize,number_format($DemandQty,$InventoryPlan['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap(470,$YPos,60,$FontSize,number_format($InventoryPlan['qoh']-$DemandQty,$InventoryPlan['decimalplaces']), 'right');
+
}
-
+
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,150,$FontSize,$InventoryPlan['stockid'], 'left');
$LeftOvers = $pdf->addTextWrap(150,$YPos,200,$FontSize,$InventoryPlan['description'], 'left');
-
-
+
+
$pdf->line($Left_Margin, $YPos-2,$Page_Width-$Right_Margin, $YPos-2);
if ($YPos < $Bottom_Margin + $line_height){
@@ -254,18 +255,20 @@
$title=_('Stock Check Sheets');
include('includes/header.inc');
- if (strlen($_POST['FromCriteria'])<1 || strlen($_POST['ToCriteria'])<1) {
+ if (!isset($_POST['FromCriteria']) and !isset($_POST['ToCriteria'])) {
/*if $FromCriteria is not set then show a form to allow input */
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="'
+ . _('print') . '" alt="">' . ' ' . $title.'<br>';
- echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="POST"><table>';
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="POST"><table class=selection>';
echo '<tr><td>' . _('From Inventory Category Code') . ':</font></td><td><select name="FromCriteria">';
$sql='SELECT categoryid, categorydescription FROM stockcategory ORDER BY categoryid';
$CatResult= DB_query($sql,$db);
While ($myrow = DB_fetch_array($CatResult)){
- echo '<option VALUE="' . $myrow['categoryid'] . '">' . $myrow['categoryid'] . ' - ' . $myrow['categorydescription'];
+ echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categoryid'] . ' - ' . $myrow['categorydescription'];
}
echo '</select></td></tr>';
@@ -284,8 +287,8 @@
$LocnResult=DB_query($sql,$db);
while ($myrow=DB_fetch_array($LocnResult)){
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
- }
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
+ }
echo '</select></td></tr>';
echo '<tr><td>' . _('Action for Stock Check Freeze') . ':</td><td><select name="MakeStkChkData">';
@@ -294,42 +297,42 @@
$_POST['MakeStkChkData'] = 'PrintOnly';
}
if ($_POST['MakeStkChkData'] =='New'){
- echo '<option selected VALUE="New">' . _('Make new stock check data file');
+ echo '<option selected value="New">' . _('Make new stock check data file');
} else {
- echo '<option VALUE="New">' . _('Make new stock check data file');
+ echo '<option value="New">' . _('Make new stock check data file');
}
if ($_POST['MakeStkChkData'] =='AddUpdate'){
- echo '<option selected VALUE="AddUpdate">' . _('Add/update existing stock check file');
+ echo '<option selected value="AddUpdate">' . _('Add/update existing stock check file');
} else {
echo '<option VALUE="AddUpdate">' . _('Add/update existing stock check file');
}
if ($_POST['MakeStkChkData'] =='PrintOnly'){
- echo '<option selected VALUE="PrintOnly">' . _('Print Stock Check Sheets Only');
+ echo '<option selected value="PrintOnly">' . _('Print Stock Check Sheets Only');
} else {
- echo '<option VALUE="PrintOnly">' . _('Print Stock Check Sheets Only');
+ echo '<option value="PrintOnly">' . _('Print Stock Check Sheets Only');
}
echo '</select></td></tr>';
-
+
echo '<tr><td>' . _('Show system quantity on sheets') . ':</td><td>';
-
- if ($_POST['ShowInfo'] == false){
- echo '<input type=CHECKBOX name="ShowInfo" VALUE=FALSE>';
+
+ if (isset($_POST['ShowInfo']) and $_POST['ShowInfo'] == false){
+ echo '<input type=CHECKBOX name="ShowInfo" VALUE=FALSE>';
} else {
- echo '<input type=CHECKBOX name="ShowInfo" VALUE=TRUE>';
+ echo '<input type=CHECKBOX name="ShowInfo" VALUE=TRUE>';
}
echo '</td></tr>';
-
+
echo '<tr><td>' . _('Only print items with non zero quantities') . ':</td><td>';
- if ($_POST['NonZerosOnly'] == false){
- echo '<input type=CHECKBOX name="NonZerosOnly" VALUE=FALSE>';
+ if (isset($_POST['NonZerosOnly']) and $_POST['NonZerosOnly'] == false){
+ echo '<input type=CHECKBOX name="NonZerosOnly" VALUE=FALSE>';
} else {
- echo '<input type=CHECKBOX name="NonZerosOnly" VALUE=TRUE>';
+ echo '<input type=CHECKBOX name="NonZerosOnly" VALUE=TRUE>';
}
-
- echo '</td></tr></table><div class="centre"><input type=Submit Name="PrintPDF" Value="' . _('Print and Process') . '"></div></form>';
+
+ echo '</td></tr></table><br><div class="centre"><input type=Submit Name="PrintPDF" Value="' . _('Print and Process') . '"></div></form>';
}
include('includes/footer.inc');
-
+
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-07-14 10:43:37 UTC (rev 3622)
+++ trunk/doc/Change.log.html 2010-07-15 10:29:25 UTC (rev 3623)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>15/07/10 Tim: StockCheck.php - Bug fixes to show decimal places correctly and other fixes, fix sql quoting errors and layout changes</p>
<p>14/07/10 Tim: MRPPlannedWorkOrders.php - Fix sql quoting errors and layout changes</p>
<p>13/07/10 Tim: MRPPlannedPurchaseOrders.php - Bug fixes, correctly do the workflow, fix sql quoting errors and layout changes</p>
<p>13/07/10 Tim: Add logo.png file and select png before jpg if present</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
