Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4529] trunk
|
From: <dai...@us...> - 2011-04-01 09:52:57
|
Revision: 4529
http://web-erp.svn.sourceforge.net/web-erp/?rev=4529&view=rev
Author: daintree
Date: 2011-04-01 09:52:49 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/InventoryValuation.php
trunk/MRPCreateDemands.php
trunk/MRPDemandTypes.php
trunk/MRPDemands.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReport.php
trunk/includes/PO_PDFOrderPageHeader.inc
Modified: trunk/InventoryValuation.php
===================================================================
--- trunk/InventoryValuation.php 2011-03-31 09:12:09 UTC (rev 4528)
+++ trunk/InventoryValuation.php 2011-04-01 09:52:49 UTC (rev 4529)
@@ -1,9 +1,7 @@
<?php
-/* $Revision: 1.17 $ */
/* $Id$ */
-//$PageSecurity = 2;
include('includes/session.inc');
if (isset($_POST['PrintPDF'])
@@ -76,9 +74,9 @@
$title = _('Inventory Valuation') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg( _('The inventory valuation 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>';
+ echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo "<br>$SQL";
+ echo '<br />' . $SQL;
}
include('includes/footer.inc');
exit;
@@ -87,7 +85,7 @@
$title = _('Print Inventory Valuation Error');
include('includes/header.inc');
prnMsg(_('There were no items with any value to print out for the location specified'),'info');
- echo "<br><a href='" . $rootpath . "/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
}
@@ -116,9 +114,9 @@
$DisplayCatTotVal = number_format($CatTot_Val,2);
$DisplayCatTotQty = number_format($CatTot_Qty,0);
- $LeftOvers = $pdf->addTextWrap(500,$YPos,60,$FontSize,$DisplayCatTotVal, 'right');
- $LeftOvers = $pdf->addTextWrap(380,$YPos,60,$FontSize,$DisplayCatTotQty, 'right');
- $YPos -=$line_height;
+ $LeftOvers = $pdf->addTextWrap(500,$YPos,60,$FontSize,$DisplayCatTotVal, 'right');
+ $LeftOvers = $pdf->addTextWrap(380,$YPos,60,$FontSize,$DisplayCatTotQty, 'right');
+ $YPos -=$line_height;
If ($_POST['DetailedReport']=='Yes'){
/*draw a line under the CATEGORY TOTAL*/
@@ -206,10 +204,10 @@
echo '<tr><td>' . _('From Inventory Category Code') . ':</font></td><td><select name=FromCriteria>';
- $sql='SELECT categoryid, categorydescription FROM stockcategory WHERE stocktype<>"A" ORDER BY categoryid';
+ $sql="SELECT categoryid, categorydescription FROM stockcategory WHERE stocktype<>'A' 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'] . '</option>';
}
echo '</select></td></tr>';
@@ -219,27 +217,27 @@
DB_data_seek($CatResult,0);
While ($myrow = DB_fetch_array($CatResult)){
- echo "<option value='" . $myrow['categoryid'] . "'>" . $myrow['categoryid'] . ' - ' . $myrow['categorydescription'];
+ echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categoryid'] . ' - ' . $myrow['categorydescription'] . '</option>';
}
echo '</select></td></tr>';
- echo '<tr><td>' . _('For Inventory in Location') . ":</td><td><select name='Location'>";
+ echo '<tr><td>' . _('For Inventory in Location') . ':</td><td><select name="Location">';
$sql = 'SELECT loccode, locationname FROM locations';
$LocnResult=DB_query($sql,$db);
- echo "<option value='All'>" . _('All Locations');
+ echo '<option value="All">' . _('All Locations') . '</option>';
while ($myrow=DB_fetch_array($LocnResult)){
- echo "<option Value='" . $myrow['loccode'] . "'>" . $myrow['locationname'];
- }
+ echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ }
echo '</select></td></tr>';
- echo '<tr><td>' . _('Summary or Detailed Report') . ":</td><td><select name='DetailedReport'>";
- echo "<option selected Value='No'>" . _('Summary Report');
- echo "<option Value='Yes'>" . _('Detailed Report');
+ echo '<tr><td>' . _('Summary or Detailed Report') . ':</td><td><select name="DetailedReport">';
+ echo '<option selected Value="No">' . _('Summary Report') . '</option>';
+ echo '<option Value="Yes">' . _('Detailed Report') . '</option>';
echo '</select></td></tr>';
- echo "</table><br><div class='centre'><input type=Submit Name='PrintPDF' Value='" . _('Print PDF') . "'></div>";
+ echo '</table><br /><div class="centre"><input type="Submit" name="PrintPDF" value="' . _('Print PDF') . '"></div>';
}
include('includes/footer.inc');
Modified: trunk/MRPCreateDemands.php
===================================================================
--- trunk/MRPCreateDemands.php 2011-03-31 09:12:09 UTC (rev 4528)
+++ trunk/MRPCreateDemands.php 2011-04-01 09:52:49 UTC (rev 4529)
@@ -1,10 +1,7 @@
<?php
-/* $Revision: 1.8 $ */
/* $Id$*/
// MRPCreateDemands.php - Create mrpdemands based on sales order history
-//$PageSecurity=9;
-
include('includes/session.inc');
$title = _('MRP Create Demands');
include('includes/header.inc');
@@ -32,8 +29,7 @@
unset($_POST['FromoDate']);
}
if (isset($_POST['DistDate']) AND !Is_Date($_POST['DistDate'])){
- $msg = _('The distribution start date must be specified in the format') . ' ' .
- $_SESSION['DefaultDateFormat'];
+ $msg = _('The distribution start date must be specified in the format') . ' ' . $_SESSION['DefaultDateFormat'];
$InputError=1;
unset($_POST['DistDate']);
}
@@ -42,13 +38,13 @@
prnMsg($msg,'error');
}
-$wherecategory = " ";
+$WhereCategory = " ";
if ($_POST['CategoryID']!='All') {
- $wherecategory = " AND stockmaster.categoryid ='" . $_POST['CategoryID'] . "' ";
+ $WhereCategory = " AND stockmaster.categoryid ='" . $_POST['CategoryID'] . "' ";
}
-$wherelocation = " ";
+$WhereLocation = " ";
if ($_POST['Location']!='All') {
- $wherelocation = " AND salesorders.fromstkloc ='" . $_POST['Location'] . "' ";
+ $WhereLocation = " AND salesorders.fromstkloc ='" . $_POST['Location'] . "' ";
}
$sql= "SELECT salesorderdetails.stkcode,
@@ -60,11 +56,11 @@
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";
+ WHERE orddate >='" . FormatDateForSQL($_POST['FromDate']) ."'
+ AND orddate <='" . FormatDateForSQL($_POST['ToDate']) . "'
+ " . $WhereLocation . "
+ " . $WhereCategory . "
+ 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
@@ -114,11 +110,11 @@
$date = date("Y-m-d",mktime(0,0,0,$mm,$dd,$yyyy));
for ($i = 1; $i <= ( $_POST['PeriodNumber'] - 1); $i++) {
if ($_POST['Period'] == 'weekly') {
- $date = strtotime(date("Y-m-d", strtotime($date)) . " + 1 week");
+ $date = strtotime(date('Y-m-d', strtotime($date)) . ' + 1 week');
} else {
- $date = strtotime(date("Y-m-d", strtotime($date)) . " + 1 month");
+ $date = strtotime(date('Y-m-d', strtotime($date)) . ' + 1 month');
}
- $datearray[$i] = date("Y-m-d",$date);
+ $datearray[$i] = date('Y-m-d',$date);
// Following sql finds daynumber for the calculated date and finds
// a valid manufacturing date for the daynumber. There is only one valid manufacturing date
// for each daynumber, but there could be several non-manufacturing dates for the
@@ -136,30 +132,30 @@
if ($myrowdate[0] != 0){
$datearray[$i] = $myrowdate[1];
}
- $date = date("Y-m-d",$date);
+ $date = date('Y-m-d',$date);
}
-$totalrecords = 0;
+$TotalRecords = 0;
while ($myrow = DB_fetch_array($result)) {
if (($myrow['totqty'] >= $excludeqty) and ($myrow['totextqty'] >= $excludeamt)) {
- unset($periodqty);
- $periodqty[] = " ";
- $totalqty = $myrow['totqtyinvoiced'] * $multiplier;
- $wholenumber = floor($totalqty / $_POST['PeriodNumber']);
- $remainder = ($totalqty % $_POST['PeriodNumber']);
- if ($wholenumber > 0) {
+ unset($PeriodQty);
+ $PeriodQty[] = ' ';
+ $TotalQty = $myrow['totqtyinvoiced'] * $multiplier;
+ $WholeNumber = floor($TotalQty / $_POST['PeriodNumber']);
+ $Remainder = ($TotalQty % $_POST['PeriodNumber']);
+ if ($WholeNumber > 0) {
for ($i = 0; $i <= ($_POST['PeriodNumber'] - 1); $i++) {
- $periodqty[$i] = $wholenumber;
+ $PeriodQty[$i] = $WholeNumber;
}
}
- if ($remainder > 0) {
- for ($i = 0; $i <= ($remainder - 1); $i++) {
- $periodqty[$i] += 1;
+ if ($Remainder > 0) {
+ for ($i = 0; $i <= ($Remainder - 1); $i++) {
+ $PeriodQty[$i] += 1;
}
}
$i = 0;
- foreach ($periodqty as $demandqty) {
+ foreach ($PeriodQty as $demandqty) {
$sql = "INSERT INTO mrpdemands (stockid,
mrpdemandtype,
quantity,
@@ -170,14 +166,14 @@
'" . $datearray[$i] . "')";
$insertresult = DB_query($sql,$db);
$i++;
- $totalrecords++;
+ $TotalRecords++;
} // end of foreach for INSERT
} // end of if that checks exludeqty, excludeamt
} //end while loop
-prnMsg( $totalrecords . ' ' . _('records have been created'),'success');
+prnMsg( $TotalRecords . ' ' . _('records have been created'),'success');
} else { // if submit has not been pressed
@@ -185,7 +181,7 @@
} // End of else to create form
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
_('Inventory') . '" alt="" />' . ' ' . $title . '</p>';
- echo '<form action=' . $_SERVER['PHP_SELF'] . '?' . SID .' method="post"><b><br></b>';
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post"><b><br /></b>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class=selection>';
echo '<tr><td>' . _('Demand Type') . ':</td><td><select name="MRPDemandtype">';
@@ -210,13 +206,13 @@
} //end while loop
echo '</select></td></tr>';
echo '<tr><td>' . _('Inventory Location') . ':</td><td><select name="Location">';
- echo '<option selected value="All">' . _('All Locations');
+ echo '<option selected value="All">' . _('All Locations') . '</option>';
$result= DB_query('SELECT loccode,
locationname
FROM locations',$db);
while ($myrow=DB_fetch_array($result)){
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
echo '</select></td></tr>';
if (!isset($_POST['FromDate'])) {
@@ -246,7 +242,7 @@
":</td><td><input type ='text' class=number name='Excludeamt' size='8' value='0'>";
echo '<tr><td>' . _('Multiplier') .
":</td><td><input type ='text' class=number name='Multiplier' size='2' value=1><tr><td></td></tr></table>";
- echo "<br><div class=centre><input type=submit name='submit' value='" . _('Submit') . "'</div>";
+ echo "<br /><div class=centre><input type=submit name='submit' value='" . _('Submit') . "'</div>";
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/MRPDemandTypes.php
===================================================================
--- trunk/MRPDemandTypes.php 2011-03-31 09:12:09 UTC (rev 4528)
+++ trunk/MRPDemandTypes.php 2011-04-01 09:52:49 UTC (rev 4529)
@@ -1,14 +1,12 @@
<?php
-/* $Revision: 1.3 $ */
+
/* $Id$*/
-//$PageSecurity=9;
-
include('includes/session.inc');
$title = _('MRP Demand Types');
include('includes/header.inc');
-//SelectedDT is the Selected mrpdemandtype
+//SelectedDT is the Selected MRPDemandType
if (isset($_POST['SelectedDT'])){
$SelectedDT = trim(strtoupper($_POST['SelectedDT']));
} elseif (isset($_GET['SelectedDT'])){
@@ -28,13 +26,13 @@
//first off validate inputs sensible
- if (trim(strtoupper($_POST['mrpdemandtype']) == "WO") or
- trim(strtoupper($_POST['mrpdemandtype']) == "SO")) {
+ if (trim(strtoupper($_POST['MRPDemandType']) == 'WO') or
+ trim(strtoupper($_POST['MRPDemandType']) == 'SO')) {
$InputError = 1;
prnMsg(_('The Demand Type is reserved for the system'),'error');
}
- if (strlen($_POST['mrpdemandtype']) < 1) {
+ if (strlen($_POST['MRPDemandType']) < 1) {
$InputError = 1;
prnMsg(_('The Demand Type code must be at least 1 character long'),'error');
}
@@ -59,7 +57,7 @@
$sql = "INSERT INTO mrpdemandtypes (mrpdemandtype,
description)
- VALUES ('" . trim(strtoupper($_POST['mrpdemandtype'])) . "',
+ VALUES ('" . trim(strtoupper($_POST['MRPDemandType'])) . "',
'" . $_POST['Description'] . "'
)";
$msg = _('The new demand type has been added to the database');
@@ -69,9 +67,9 @@
if ($InputError !=1){
$result = DB_query($sql,$db,_('The update/addition of the demand type failed because'));
prnMsg($msg,'success');
- echo '<br>';
+ echo '<br />';
unset ($_POST['Description']);
- unset ($_POST['mrpdemandtype']);
+ unset ($_POST['MRPDemandType']);
unset ($SelectedDT);
}
@@ -81,17 +79,17 @@
// PREVENT DELETES IF DEPENDENT RECORDS IN 'MRPDemands'
$sql= "SELECT COUNT(*) FROM mrpdemands
- WHERE mrpdemands.mrpdemandtype='$SelectedDT'
+ WHERE mrpdemands.mrpdemandtype='" . $SelectedDT . "'
GROUP BY mrpdemandtype";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0]>0) {
prnMsg(_('Cannot delete this demand type because MRP Demand records exist for this type') . '<br>' . _('There are') . ' ' . $myrow[0] . ' ' ._('MRP Demands referring to this type'),'warn');
} else {
- $sql="DELETE FROM mrpdemandtypes WHERE mrpdemandtype='$SelectedDT'";
+ $sql="DELETE FROM mrpdemandtypes WHERE mrpdemandtype='" . $SelectedDT . "'";
$result = DB_query($sql,$db);
prnMsg(_('The selected demand type record has been deleted'),'succes');
- echo '<br>';
+ echo '<br />';
} // end of MRPDemands test
}
@@ -110,22 +108,22 @@
$result = DB_query($sql,$db);
- echo "<table class=selection>
- <tr BGCOLOR =#800000><th>" . _('Demand Type') . "</th>
- <th>" . _('Description') . "</th>
- </tr></font>";
+ echo '<table class=selection>
+ <tr BGCOLOR =#800000><th>' . _('Demand Type') . '</th>
+ <th>' . _('Description') . '</th>
+ </tr></font>';
while ($myrow = DB_fetch_row($result)) {
printf("<tr><td>%s</td>
<td>%s</td>
- <td><a href=\"%s&SelectedDT=%s\">" . _('Edit') . "</td>
- <td><a href=\"%s&SelectedDT=%s&delete=yes\">" . _('Delete') ."</td>
+ <td><a href=\"%sSelectedDT=%s\">" . _('Edit') . "</td>
+ <td><a href=\"%sSelectedDT=%s&delete=yes\">" . _('Delete') ."</td>
</tr>",
$myrow[0],
$myrow[1],
- $_SERVER['PHP_SELF'] . '?' . SID,
- $myrow[0], $_SERVER['PHP_SELF'] . '?' . SID,
+ $_SERVER['PHP_SELF'] . '?',
+ $myrow[0], $_SERVER['PHP_SELF'] . '?',
$myrow[0]);
}
@@ -136,10 +134,10 @@
//end of ifs and buts!
if (isset($SelectedDT) and !isset($_GET['delete'])) {
- echo "<div class='centre'><a href='" . $_SERVER['PHP_SELF'] . '?' . SID . "'>" . _('Show all Demand Types') . '</a></div>';
+ echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Show all Demand Types') . '</a></div>';
}
-echo "<p><form method='post' action='" . $_SERVER['PHP_SELF'] . '?' . SID . "'>";
+echo '<p><form method="post" action="' . $_SERVER['PHP_SELF'] .'">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedDT) and !isset($_GET['delete'])) {
@@ -148,25 +146,25 @@
$sql = "SELECT mrpdemandtype,
description
FROM mrpdemandtypes
- WHERE mrpdemandtype='$SelectedDT'";
+ WHERE mrpdemandtype='" . $SelectedDT . "'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
- $_POST['mrpdemandtype'] = $myrow['mrpdemandtype'];
+ $_POST['MRPDemandType'] = $myrow['mrpdemandtype'];
$_POST['Description'] = $myrow['description'];
echo '<input type=hidden name=SelectedDT value=' . $SelectedDT . '>';
- echo "<input type=hidden name=mrpdemandtype value='" . $_POST['mrpdemandtype'] . "'>";
- echo '<table class=selection><tr><td>' ._('Demand Type') . ':</td><td>' . $_POST['mrpdemandtype'] . '</td></tr>';
+ echo "<input type=hidden name=MRPDemandType value='" . $_POST['MRPDemandType'] . "'>";
+ echo '<table class=selection><tr><td>' ._('Demand Type') . ':</td><td>' . $_POST['MRPDemandType'] . '</td></tr>';
} else { //end of if $SelectedDT only do the else when a new record is being entered
- if (!isset($_POST['mrpdemandtype'])) {
- $_POST['mrpdemandtype'] = '';
+ if (!isset($_POST['MRPDemandType'])) {
+ $_POST['MRPDemandType'] = '';
}
echo '<table class=selection><tr>
<td>' . _('Demand Type') . ":</td>
- <td><input type='Text' name='mrpdemandtype' size=6 maxlength=5 value='" . $_POST['mrpdemandtype'] . "'></td>
+ <td><input type='Text' name='MRPDemandType' size=6 maxlength=5 value='" . $_POST['MRPDemandType'] . "'></td>
</tr>" ;
}
Modified: trunk/MRPDemands.php
===================================================================
--- trunk/MRPDemands.php 2011-03-31 09:12:09 UTC (rev 4528)
+++ trunk/MRPDemands.php 2011-04-01 09:52:49 UTC (rev 4529)
@@ -6,8 +6,6 @@
// to pass values of $db and $StockID to functions. - when just used $db as variable,
// got error: Catchable fatal error: Object of class mysqli could not be converted to string
-//$PageSecurity=9;
-
include('includes/session.inc');
$title = _('MRP Demands');
include('includes/header.inc');
@@ -32,11 +30,11 @@
} elseif (isset($_POST['submit'])) {
submit($db,$StockID,$DemandID);
} elseif (isset($_GET['delete'])) {
- delete($db,$DemandID,"",$StockID);
+ delete($db,$DemandID,'',$StockID);
} elseif (isset($_POST['deletesome'])) {
- delete($db,"",$_POST['MRPDemandtype'],$StockID);
+ delete($db,'',$_POST['MRPDemandtype'],$StockID);
} elseif (isset($_GET['listall'])) {
- listall($db,"","");
+ listall($db,'','');
} elseif (isset($_POST['listsome'])) {
listall($db,$StockID,$_POST['MRPDemandtype']);
} else {
@@ -85,12 +83,12 @@
// If the SELECT found records, display them
if (DB_num_rows($result) > 0) {
- 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 cellpadding=2 colspan=7 class=selection>';
$TableHeader = '<tr><th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- </tr>';
+ <th>' . _('Description') . '</th>
+ </tr>';
echo $TableHeader;
$j = 1;
@@ -149,7 +147,7 @@
prnMsg(_('Invalid due date'),'error');
}
$sql = "SELECT * FROM mrpdemandtypes
- WHERE mrpdemandtype='" . $_POST['MRPDemandtype'] . "'";
+ WHERE mrpdemandtype='" . $_POST['MRPDemandtype'] . "'";
$result = DB_query($sql, $db);
if (DB_num_rows($result) == 0){
@@ -159,7 +157,7 @@
// Check if valid part number - Had done a Select Count(*), but that returned a 1 in DB_num_rows
// even if there was no record.
$sql = "SELECT * FROM stockmaster
- WHERE stockid='" . $StockID . "'";
+ WHERE stockid='" . $StockID . "'";
$result = DB_query($sql, $db);
if (DB_num_rows($result) == 0){
@@ -236,18 +234,18 @@
// edit/delete or deletes all of a particular demand type if press Delete Demand Type button.
$where = " ";
if ($demandtype) {
- $where = ' WHERE mrpdemandtype =' . "'" . $demandtype . "'";
+ $where = " WHERE mrpdemandtype ='" . $demandtype . "'";
}
if ($DemandID) {
- $where = ' WHERE demandid =' . "'" . $DemandID . "'";
+ $where = " WHERE demandid ='" . $DemandID . "'";
}
$sql="DELETE FROM mrpdemands
$where";
$result = DB_query($sql,$db);
if ($DemandID) {
- prnMsg(_("The MRP demand record for") ." ". $StockID ." ". _("has been deleted"),'succes');
+ prnMsg(_('The MRP demand record for') .' '. $StockID .' '. _('has been deleted'),'succes');
} else {
- prnMsg(_("All records for demand type") ." ". $demandtype ." " . _("have been deleted"),'succes');
+ prnMsg(_('All records for demand type') .' '. $demandtype .' ' . _('have been deleted'),'succes');
}
unset ($DemandID);
unset ($StockID);
@@ -262,14 +260,14 @@
// Lists some in hit List Selection submit button, and uses part number if it is entered or
// demandtype
- 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'] . '" />';
$where = " ";
if ($demandtype) {
- $where = ' WHERE mrpdemandtype =' . "'" . $demandtype . "'";
+ $where = " WHERE mrpdemandtype ='" . $demandtype . "'";
}
if ($part) {
- $where = ' WHERE mrpdemands.stockid =' . "'" . $part . "'";
+ $where = " WHERE mrpdemands.stockid ='" . $part . "'";
}
// If part is entered, it overrides demandtype
$sql = 'SELECT mrpdemands.demandid,
@@ -287,27 +285,28 @@
echo "<table class=selection>
<tr bgcolor =#800000><th>" . _('Part Number') . "</th>
- <th>" . _('Description') . "</th>
- <th>" . _('Demand Type') . "</th>
- <th>" . _('Quantity') . "</th>
- <th>" . _('Due Date') . "</th>
- </tr>";
+ <th>" . _('Description') . "</th>
+ <th>" . _('Demand Type') . "</th>
+ <th>" . _('Quantity') . "</th>
+ <th>" . _('Due Date') . "</th>
+ </tr>";
$ctr = 0;
while ($myrow = DB_fetch_row($result)) {
$displaydate = ConvertSQLDate($myrow[4]);
$ctr++;
- echo "<tr><td>".$myrow[1]."</td>
- <td>".$myrow[5]."</td>
- <td>".$myrow[2]."</td>
- <td>".$myrow[3]."</td>
- <td>".$displaydate."</td>
- <td><a href=\"".$_SERVER['PHP_SELF'] . '?' . SID."&DemandID=".$myrow[0]."&StockID=".$myrow[1]."\">" . _('Edit') . "</td>
- <td><a href=\"".$_SERVER['PHP_SELF'] . '?' . SID."&DemandID=".$myrow[0]."&StockID=".$myrow[1]."&delete=yes\">" . _('Delete') ."</td>
- </tr>";
+ echo '<tr><td>' . $myrow[1] . '</td>
+ <td>' . $myrow[5] . '</td>
+ <td>' . $myrow[2] . '</td>
+ <td>' . $myrow[3] . '</td>
+ <td>' . $displaydate . '</td>
+ <td><a href="' .$_SERVER['PHP_SELF'] .'DemandID=' . $myrow[0] . '&StockID=' . $myrow[1] . '">' . _('Edit') . '</td>
+ <td><a href="' . $_SERVER['PHP_SELF'] . 'DemandID=' . $myrow[0] . '&StockID=' . $myrow[1].'&delete=yes">' . _('Delete') .'</td>
+ </tr>';
}
//END WHILE LIST LOOP
- echo '<tr><td>' . _('Number of Records') . "</td><td>".$ctr."</td></tr>";
+ echo '<tr><td>' . _('Number of Records') . '</td>
+ <td>' . $ctr . '</td></tr>';
echo '</table>';
echo '</form><br/><br/><br/><br/>';
unset ($StockID);
@@ -321,7 +320,7 @@
// Display Seach fields at top and Entry form below that. This function is called the first time
// the page is called, and is also invoked at the end of all of the other functions.
// echo "<br/>DISPLAY - DemandID = $DemandID<br/>";
- 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'] . '" />';
if (!isset($StockID)) {
echo'</font><table cellpadding=3 colspan=4 class=selection><tr>
@@ -331,7 +330,7 @@
<td><font size=1>' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</font></td>
<td><input tabindex="2" type="Text" name="StockCode" size="15" maxlength="20"></td>
<td><font size=3><b>' . _('OR') . '</b></font></td>
- <td><a href="'. $_SERVER['PHP_SELF'] . '?&listall=yes"><font size=3>' . _('List All Demands') .'</font></a></td></tr>
+ <td><a href="'. $_SERVER['PHP_SELF'] . '?listall=yes"><font size=3>' . _('List All Demands') .'</font></a></td></tr>
<tr><td colspan=7><div class="centre"><input tabindex="3" type="submit" name="Search" value="' . _('Search Now') .
'"></div></td></tr></table>';
} else {
@@ -394,7 +393,7 @@
} else {
echo '<option value="';
}
- echo $myrow['mrpdemandtype'] . '">' . $myrow['mrpdemandtype'] . ' - ' .$myrow['description'];
+ echo $myrow['mrpdemandtype'] . '">' . $myrow['mrpdemandtype'] . ' - ' .$myrow['description'] . '</option>';
} //end while loop
echo '</select></td></tr>';
Modified: trunk/MRPPlannedPurchaseOrders.php
===================================================================
--- trunk/MRPPlannedPurchaseOrders.php 2011-03-31 09:12:09 UTC (rev 4528)
+++ trunk/MRPPlannedPurchaseOrders.php 2011-04-01 09:52:49 UTC (rev 4529)
@@ -1,13 +1,13 @@
<?php
-/* $Revision: 1.5 $ */
+
/* $Id$*/
// MRPPlannedPurchaseOrders.php - Report of purchase parts that MRP has determined should have
// purchase orders created for them
include('includes/session.inc');
-//maybe not ansi sql ??
-$sql='SHOW TABLES WHERE Tables_in_'.$_SESSION['DatabaseName'].'="mrprequirements"';
+//Maybe not ANSI SQL??
+$sql="SHOW TABLES WHERE Tables_in_" . $_SESSION['DatabaseName'] . "='mrprequirements'";
$result=DB_query($sql,$db);
if (DB_num_rows($result)==0) {
@@ -29,15 +29,15 @@
$line_height=12;
$Xpos = $Left_Margin+1;
- $wheredate = " ";
- $reportdate = " ";
+ $WhereDate = ' ';
+ $ReportDate = ' ';
if (Is_Date($_POST['cutoffdate'])) {
- $formatdate = FormatDateForSQL($_POST['cutoffdate']);
- $wheredate = ' AND duedate <= "' . $formatdate . '" ';
- $reportdate = _(' Through ') . Format_Date($_POST['cutoffdate']);
+ $FormatDate = FormatDateForSQL($_POST['cutoffdate']);
+ $WhereDate = " AND duedate <= '" . $FormatDate . "' ";
+ $ReportDate = _(' Through ') . Format_Date($_POST['cutoffdate']);
}
if ($_POST['Consolidation'] == 'None') {
- $sql = 'SELECT mrpplannedorders.*,
+ $sql = "SELECT mrpplannedorders.*,
stockmaster.stockid,
stockmaster.description,
stockmaster.mbflag,
@@ -46,11 +46,11 @@
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
- WHERE mrpplannedorders.part = stockmaster.stockid ' . "$wheredate" .
- ' AND stockmaster.mbflag IN ("B","P")
- ORDER BY mrpplannedorders.part,mrpplannedorders.duedate';
+ WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
+ AND stockmaster.mbflag IN ('B','P')
+ ORDER BY mrpplannedorders.part,mrpplannedorders.duedate";
} elseif ($_POST['Consolidation'] == 'Weekly') {
- $sql = 'SELECT mrpplannedorders.part,
+ $sql = "SELECT mrpplannedorders.part,
SUM(mrpplannedorders.supplyquantity) as supplyquantity,
TRUNCATE(((TO_DAYS(duedate) - TO_DAYS(CURRENT_DATE)) / 7),0) AS weekindex,
MIN(mrpplannedorders.duedate) as duedate,
@@ -64,8 +64,8 @@
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
- WHERE mrpplannedorders.part = stockmaster.stockid ' . "$wheredate" .
- ' AND stockmaster.mbflag IN ("B","P")
+ WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
+ AND stockmaster.mbflag IN ('B','P')
GROUP BY mrpplannedorders.part,
weekindex,
stockmaster.stockid,
@@ -77,9 +77,9 @@
stockmaster.labourcost,
stockmaster.overheadcost,
computedcost
- ORDER BY mrpplannedorders.part,weekindex';
+ ORDER BY mrpplannedorders.part,weekindex";
} else { // This else consolidates by month
- $sql = 'SELECT mrpplannedorders.part,
+ $sql = "SELECT mrpplannedorders.part,
SUM(mrpplannedorders.supplyquantity) as supplyquantity,
EXTRACT(YEAR_MONTH from duedate) AS yearmonth,
MIN(mrpplannedorders.duedate) as duedate,
@@ -93,8 +93,8 @@
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
- WHERE mrpplannedorders.part = stockmaster.stockid ' . "$wheredate" .
- ' AND stockmaster.mbflag IN ("B","P")
+ WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
+ AND stockmaster.mbflag IN ('B','P')
GROUP BY mrpplannedorders.part,
yearmonth,
stockmaster.stockid,
@@ -106,15 +106,15 @@
stockmaster.labourcost,
stockmaster.overheadcost,
computedcost
- ORDER BY mrpplannedorders.part,yearmonth ';
- };
+ ORDER BY mrpplannedorders.part,yearmonth ";
+ }
$result = DB_query($sql,$db,'','',false,true);
if (DB_error_no($db) !=0) {
$title = _('MRP Planned Purchase Orders') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg( _('The MRP planned purchase orders could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
- echo '<br><a href="' .$rootpath .'/index.php?">' . _('Back to the menu') . '</a>';
+ echo '<br><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $sql;
}
@@ -125,23 +125,23 @@
$title = _('Print MRP Planned Purchase Orders Error');
include('includes/header.inc');
prnMsg(_('There were no items with planned purchase orders'),'info');
- echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
}
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,
- $Page_Width,$Right_Margin,$_POST['Consolidation'],$reportdate);
+ $Page_Width,$Right_Margin,$_POST['Consolidation'],$ReportDate);
$Total_Shortage=0;
$Partctr = 0;
$fill = false;
$pdf->SetFillColor(224,235,255); // Defines color to make alternating lines highlighted
$FontSize=8;
- $holdpart = " ";
- $holddescription = " ";
- $holdmbflag = " ";
- $holdcost = " ";
+ $holdpart = ' ';
+ $holddescription = ' ';
+ $holdmbflag = ' ';
+ $holdcost = ' ';
$holddecimalplaces = 0;
$totalpartqty = 0;
$totalpartcost = 0;
@@ -169,7 +169,7 @@
list($lastdate,$lastsupplier,$preferredsupplier) = GetPartInfo($db,$holdpart);
$displaydate = $lastdate;
if (!Is_Date($lastdate)) {
- $displaydate = " ";
+ $displaydate = ' ';
}
$YPos -= $line_height;
$pdf->addTextWrap(50,$YPos,80,$FontSize,_('Last Purchase Date: '),'left',0,$fill);
@@ -215,7 +215,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$_POST['Consolidation'],$reportdate);
+ $Right_Margin,$_POST['Consolidation'],$ReportDate);
}
} /*end while loop */
@@ -232,7 +232,7 @@
list($lastdate,$lastsupplier,$preferredsupplier) = GetPartInfo($db,$holdpart);
$displaydate = $lastdate;
if (!Is_Date($lastdate)) {
- $displaydate = " ";
+ $displaydate = ' ';
}
$YPos -= $line_height;
$pdf->addTextWrap(50,$YPos,80,$FontSize,_('Last Purchase Date: '),'left',0,$fill);
@@ -246,7 +246,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$_POST['Consolidation'],$reportdate);
+ $Right_Margin,$_POST['Consolidation'],$ReportDate);
// include('includes/MRPPlannedPurchaseOrdersPageHeader.inc');
}
/*Print out the grand totals */
@@ -266,7 +266,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
_('Inventory') . '" alt="" />' . ' ' . $title . '</p>';
- echo '<form action=' . $_SERVER['PHP_SELF'] . ' method="post"><table class=selection>';
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post"><table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<tr><td>' . _('Consolidation') . ':</td><td><select name="Consolidation">';
echo '<option selected value="None">' . _('None') . '</option>';
@@ -286,7 +286,7 @@
} /*end of else not PrintPDF */
function PrintHeader(&$pdf,&$YPos,&$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,
- $Page_Width,$Right_Margin,$consolidation,$reportdate) {
+ $Page_Width,$Right_Margin,$consolidation,$ReportDate) {
/*PDF page header for MRP Planned Work Orders report */
if ($PageNumber>1){
@@ -301,7 +301,7 @@
$YPos -=$line_height;
$pdf->addTextWrap($Left_Margin,$YPos,150,$FontSize,_('MRP Planned Purchase Orders Report'));
- $pdf->addTextWrap(190,$YPos,100,$FontSize,$reportdate);
+ $pdf->addTextWrap(190,$YPos,100,$FontSize,$ReportDate);
$pdf->addTextWrap($Page_Width-$Right_Margin-150,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
$YPos -= $line_height;
@@ -340,32 +340,32 @@
function GetPartInfo(&$db,$part) {
// Get last purchase order date and supplier for part, and also preferred supplier
// Printed when there is a part break
- $sql = 'SELECT orddate as maxdate,
+ $sql = "SELECT orddate as maxdate,
purchorders.orderno
FROM purchorders,
purchorderdetails
WHERE purchorders.orderno = purchorderdetails.orderno
- AND purchorderdetails.itemcode = "'.$part .'"
- ORDER BY orddate DESC LIMIT 1';
+ AND purchorderdetails.itemcode = '" . $part ."'
+ ORDER BY orddate DESC LIMIT 1";
$result = DB_query($sql,$db);
if (DB_num_rows($result)>0) {
$myrow = DB_fetch_array($result,$db);
- $partinfo[] = ConvertSQLDate($myrow['maxdate']);
- $orderno = $myrow['orderno'];
- $sql = 'SELECT supplierno
- FROM purchorders
- WHERE purchorders.orderno = "'.$orderno . '"';
+ $PartInfo[] = ConvertSQLDate($myrow['maxdate']);
+ $OrderNo= $myrow['orderno'];
+ $sql = "SELECT supplierno
+ FROM purchorders
+ WHERE purchorders.orderno = '" .$OrderNo. "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_array($result,$db);
- $partinfo[] = $myrow['supplierno'];
- $sql = 'SELECT supplierno
+ $PartInfo[] = $myrow['supplierno'];
+ $sql = "SELECT supplierno
FROM purchdata
- WHERE stockid = "' . $part . '"
- AND preferred="1"';
+ WHERE stockid = '" . $part . "'
+ AND preferred='1'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_array($result,$db);
- $partinfo[] = $myrow['supplierno'];
- return $partinfo;
+ $PartInfo[] = $myrow['supplierno'];
+ return $PartInfo;
} else {
return array('','','');
}
Modified: trunk/MRPPlannedWorkOrders.php
===================================================================
--- trunk/MRPPlannedWorkOrders.php 2011-03-31 09:12:09 UTC (rev 4528)
+++ trunk/MRPPlannedWorkOrders.php 2011-04-01 09:52:49 UTC (rev 4529)
@@ -1,33 +1,34 @@
<?php
-/* $Revision: 1.6 $ */
+
/* $Id$*/
// MRPPlannedWorkOrders.php - Report of manufactured parts that MRP has determined should have
// work orders created for them
-//$PageSecurity = 2;
+
include('includes/session.inc');
-$sql='show tables where Tables_in_'.$_SESSION['DatabaseName'].'="mrprequirements"';
+
+$sql="SHOW TABLES WHERE Tables_in_" . $_SESSION['DatabaseName'] . "='mrprequirements'";
$result=DB_query($sql,$db);
if (DB_num_rows($result)==0) {
- $title='MRP error';
+ $title=_('MRP error');
include('includes/header.inc');
- echo '<br>';
- prnMsg( _('The MRP calculation must be run before you can run this report').'<br>'.
- _('To run the MRP calculation click').' '.'<a href='.$rootpath .'/MRP.php?' . SID .'>'._('here').'</a>', 'error');
+ echo '<br />';
+ prnMsg( _('The MRP calculation must be run before you can run this report').'<br />'.
+ _('To run the MRP calculation click').' '.'<a href="' . $rootpath . '/MRP.php">'._('here').'</a>', 'error');
include('includes/footer.inc');
exit;
}
if ( isset($_POST['PrintPDF']) OR isset($_POST['Review']) ) {
- $wheredate = " ";
- $reportdate = " ";
+ $WhereDate = ' ';
+ $ReportDate = ' ';
if (Is_Date($_POST['cutoffdate'])) {
- $formatdate = FormatDateForSQL($_POST['cutoffdate']);
- $wheredate = ' AND duedate <= "' . $formatdate . '" ';
- $reportdate = _(' Through ') . $_POST['cutoffdate'];
+ $FormatDate = FormatDateForSQL($_POST['cutoffdate']);
+ $WhereDate = " AND duedate <= '" . $FormatDate . "' ";
+ $ReportDate = ' ' . _('Through') . ' ' . $_POST['cutoffdate'];
}
if ($_POST['Consolidation'] == 'None') {
- $sql = 'SELECT mrpplannedorders.*,
+ $sql = "SELECT mrpplannedorders.*,
stockmaster.stockid,
stockmaster.description,
stockmaster.mbflag,
@@ -36,11 +37,11 @@
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
- WHERE mrpplannedorders.part = stockmaster.stockid ' . "$wheredate" .
- ' AND stockmaster.mbflag = "M"
- ORDER BY mrpplannedorders.part,mrpplannedorders.duedate';
+ WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
+ AND stockmaster.mbflag = 'M'
+ ORDER BY mrpplannedorders.part,mrpplannedorders.duedate";
} elseif ($_POST['Consolidation'] == 'Weekly') {
- $sql = 'SELECT mrpplannedorders.part,
+ $sql = "SELECT mrpplannedorders.part,
SUM(mrpplannedorders.supplyquantity) as supplyquantity,
TRUNCATE(((TO_DAYS(duedate) - TO_DAYS(CURRENT_DATE)) / 7),0) AS weekindex,
MIN(mrpplannedorders.duedate) as duedate,
@@ -54,8 +55,8 @@
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
- WHERE mrpplannedorders.part = stockmaster.stockid ' . "$wheredate" .
- ' AND stockmaster.mbflag = "M"
+ WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
+ AND stockmaster.mbflag = 'M'
GROUP BY mrpplannedorders.part,
weekindex,
stockmaster.stockid,
@@ -67,10 +68,9 @@
stockmaster.labourcost,
stockmaster.overheadcost,
computedcost
- ORDER BY mrpplannedorders.part,weekindex
- ';
+ ORDER BY mrpplannedorders.part,weekindex";
} else {
- $sql = 'SELECT mrpplannedorders.part,
+ $sql = "SELECT mrpplannedorders.part,
SUM(mrpplannedorders.supplyquantity) as supplyquantity,
EXTRACT(YEAR_MONTH from duedate) AS yearmonth,
MIN(mrpplannedorders.duedate) as duedate,
@@ -82,10 +82,10 @@
stockmaster.decimalplaces,
stockmaster.actualcost,
(stockmaster.materialcost + stockmaster.labourcost +
- stockmaster.overheadcost ) as computedcost,
+ stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
- WHERE mrpplannedorders.part = stockmaster.stockid ' . "$wheredate" .
- ' AND stockmaster.mbflag = "M"
+ WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . "
+ AND stockmaster.mbflag = 'M'
GROUP BY mrpplannedorders.part,
yearmonth,
stockmaster.stockid,
@@ -97,17 +97,17 @@
stockmaster.labourcost,
stockmaster.overheadcost,
computedcost
- ORDER BY mrpplannedorders.part,yearmonth ';
- };
+ ORDER BY mrpplannedorders.part,yearmonth";
+ }
$result = DB_query($sql,$db,'','',false,true);
if (DB_error_no($db) !=0) {
$title = _('MRP Planned Work Orders') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg( _('The MRP planned work orders 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>';
+ echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo "<br>$sql";
+ echo '<br />' . $sql;
}
include('includes/footer.inc');
exit;
@@ -116,13 +116,11 @@
$title = _('MRP Planned Work Orders');
include('includes/header.inc');
prnMsg(_('There were no items with demand greater than supply'),'info');
- echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
}
-
-
if (isset($_POST['PrintPDF'])) { // Print planned work orders
include('includes/PDFStarter.php');
@@ -136,17 +134,17 @@
$Xpos = $Left_Margin+1;
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,
- $Page_Width,$Right_Margin,$_POST['Consolidation'],$reportdate);
+ $Page_Width,$Right_Margin,$_POST['Consolidation'],$ReportDate);
$Total_EXTcost=0;
$Partctr = 0;
$fill = false;
$pdf->SetFillColor(224,235,255); // Defines color to make alternating lines highlighted
$FontSize=8;
- $holdpart = " ";
- $holddescription = " ";
- $holdmbflag = " ";
- $holdcost = " ";
+ $holdpart = ' ';
+ $holddescription = ' ';
+ $holdmbflag = ' ';
+ $holdcost = ' ';
$holddecimalplaces = 0;
$totalpartqty = 0;
$totalpartcost = 0;
@@ -207,7 +205,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$_POST['Consolidation'],$reportdate);
+ $Right_Margin,$_POST['Consolidation'],$ReportDate);
// include('includes/MRPPlannedWorkOrdersPageHeader.inc');
}
@@ -226,7 +224,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$_POST['Consolidation'],$reportdate);
+ $Right_Margin,$_POST['Consolidation'],$ReportDate);
// include('includes/MRPPlannedWorkOrdersPageHeader.inc');
}
/*Print out the grand totals */
@@ -248,21 +246,21 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
_('Inventory') . '" alt="" />' . ' ' . $title . '</p>';
- echo "<form action='MRPConvertWorkOrders.php' method='post'>";
+ echo '<form action="MRPConvertWorkOrders.php" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo "<table class=selection>";
- echo "<tr><th colspan=9><font size=3 color=blue>Consolidation: " . $_POST['Consolidation'] .
- " Cutoff Date: " . $_POST['cutoffdate'] . "</font></th></tr>";
- echo "<tr><th></th>
- <th>" . _('Code') . "</th>
- <th>" . _('Description') . "</th>
- <th>" . _('MRP Date') . "</th>
- <th>" . _('Due Date') . "</th>
- <th>" . _('Quantity') . "</th>
- <th>" . _('Unit Cost') . "</th>
- <th>" . _('Ext. Cost') . "</th>
- <th>" . _('Consolidations') . "</th>
- </tr>";
+ echo '<table class="selection">';
+ echo '<tr><th colspan="9"><font size="3" color="blue">' . _('Consolidation') . ': ' . $_POST['Consolidation'] .
+ " " . _('Cutoff Date') . ': ' . $_POST['cutoffdate'] . '</font></th></tr>';
+ echo '<tr><th></th>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('MRP Date') . '</th>
+ <th>' . _('Due Date') . '</th>
+ <th>' . _('Quantity') . '</th>
+ <th>' . _('Unit Cost') . '</th>
+ <th>' . _('Ext. Cost') . '</th>
+ <th>' . _('Consolidations') . '</th>
+ </tr>';
$totalpartqty = 0;
$totalpartcost = 0;
@@ -315,13 +313,11 @@
number_format($Total_Extcost,2)
);
- echo "<br /><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
}
-
-
} else { /*The option to print PDF was not hit so display form */
$title=_('MRP Planned Work Orders Reporting');
@@ -329,17 +325,20 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
_('Inventory') . '" alt="" />' . ' ' . $title . '</p>';
- echo '</br></br><form action=' . $_SERVER['PHP_SELF'] . " method='post'><table class=selection>";
+ echo '</br></br><form action="' . $_SERVER['PHP_SELF'] . '" method="post"><table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<tr><td>' . _('Consolidation') . ":</td><td><select name='Consolidation'>";
- echo "<option selected value='None'>" . _('None');
- echo "<option value='Weekly'>" . _('Weekly');
- echo "<option value='Monthly'>" . _('Monthly');
+
+ echo '<tr><td>' . _('Consolidation') . ':</td><td><select name="Consolidation">';
+ echo '<option selected value="None">' . _('None') . '</option>';
+ echo '<option value="Weekly">' . _('Weekly') . '</option>';
+ echo '<option value="Monthly">' . _('Monthly') . '</option>';
echo '</select></td></tr>';
- echo '<tr><td>' . _('Print Option') . ":</td><td><select name='Fill'>";
- echo "<option selected value='yes'>" . _('Print With Alternating Highlighted Lines');
- echo "<option value='no'>" . _('Plain Print');
+
+ echo '<tr><td>' . _('Print Option') . ':</td><td><select name="Fill">';
+ echo '<option selected value="yes">' . _('Print With Alternating Highlighted Lines') . '</option>';
+ echo '<option value="no">' . _('Plain Print') . '</option>';
echo '</select></td></tr>';
+
echo '<tr><td>' . _('Cut Off Date') . ":</td><td><input type ='text' class=date alt='".$_SESSION['DefaultDateFormat'] ."' name='cutoffdate' size='10' value='".date($_SESSION['DefaultDateFormat'])."'></tr>";
echo "</table><p><div class='centre'><input type=submit name='Review' value='" . _('Review') . "'> <input type=submit name='PrintPDF' value='" . _('Print PDF') . "'></div>";
@@ -348,7 +347,7 @@
} /*end of else not PrintPDF */
function PrintHeader(&$pdf,&$YPos,&$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,
- $Page_Width,$Right_Margin,$consolidation,$reportdate) {
+ $Page_Width,$Right_Margin,$consolidation,$ReportDate) {
/*PDF page header for MRP Planned Work Orders report */
if ($PageNumber>1){
@@ -363,7 +362,7 @@
$YPos -=$line_height;
$pdf->addTextWrap($Left_Margin,$YPos,150,$FontSize,_('MRP Planned Work Orders Report'));
- $pdf->addTextWrap(190,$YPos,100,$FontSize,$reportdate);
+ $pdf->addTextWrap(190,$YPos,100,$FontSize,$ReportDate);
$pdf->addTextWrap($Page_Width-$Right_Margin-150,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
$YPos -= $line_height;
Modified: trunk/MRPReport.php
===================================================================
--- trunk/MRPReport.php 2011-03-31 09:12:09 UTC (rev 4528)
+++ trunk/MRPReport.php 2011-04-01 09:52:49 UTC (rev 4529)
@@ -2,10 +2,8 @@
/* $Id$*/
-/* $Revision: 1.5 $ */
-
// MRPReport.php - Shows supply and demand for a part as determined by MRP
-//$PageSecurity = 2;
+
include('includes/session.inc');
if (isset($_POST['Select'])) {
@@ -22,7 +20,7 @@
$PageNumber=1;
$line_height=10 ;
- // Load mrprequirements into $requirements array
+ // Load mrprequirements into $Requirements array
// Use weekindex to assign supplies, requirements, and planned orders to weekly buckets
$sql = "SELECT mrprequirements.*,
TRUNCATE(((TO_DAYS(daterequired) - TO_DAYS(CURRENT_DATE)) / 7),0) AS weekindex,
@@ -38,7 +36,7 @@
$title = _('Print MRP Report Error');
include('includes/header.inc');
prnMsg(_('The MRP calculation must be run before this report will have any output. MRP requires set up of many parameters, including, EOQ, lead times, minimums, bills of materials, demand types, master schedule etc'),'error');
- echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
}
@@ -49,65 +47,67 @@
$title = _('Print MRP Report Warning');
include('includes/header.inc');
prnMsg(_('The MRP calculation must be run before this report will have any output. MRP requires set up of many parameters, including, EOQ, lead times, minimums, bills of materials, demand types, master schedule, etc'), 'warn');
- echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
}
- $requirements = array();
- $weeklyreq = array();
+ $Requirements = array();
+ $WeeklyReq = array();
for ($i=0;$i<28;$i++) {
- $weeklyreq[$i]=0;
+ $WeeklyReq[$i]=0;
}
- $pastduereq = 0;
- $futurereq = 0;
- $grossreq = 0;
+ $PastDueReq = 0;
+ $FutureReq = 0;
+ $GrossReq = 0;
while ($myrow=DB_fetch_array($result)) {
- array_push($requirements,$myrow);
- $grossreq += $myrow['quantity'];
+ array_push($Requirements,$myrow);
+ $GrossReq += $myrow['quantity'];
if ($myrow['datediff'] < 0) {
- $pastduereq += $myrow['quantity'];
+ $PastDueReq += $myrow['quantity'];
} elseif ($myrow['weekindex'] > 27) {
- $futurereq += $myrow['quantity'];
+ $FutureReq += $myrow['quantity'];
} else {
- $weeklyreq[$myrow['weekindex']] += $myrow['quantity'];
+ $WeeklyReq[$myrow['weekindex']] += $myrow['quantity'];
}
} //end of while loop
- // Load mrpsupplies into $supplies array
+ // Load mrpsupplies into $Supplies array
$sql = "SELECT mrpsupplies.*,
TRUNCATE(((TO_DAYS(duedate) - TO_DAYS(CURRENT_DATE)) / 7),0) AS weekindex,
TO_DAYS(duedate) - TO_DAYS(CURRENT_DATE) AS datediff
- FROM mrpsupplies WHERE part = '" . $_POST['Part'] . "' ORDER BY mrpdate";
+ FROM mrpsupplies
+ WHERE part = '" . $_POST['Part'] . "'
+ ORDER BY mrpdate";
$result = DB_query($sql,$db,'','',false,true);
if (DB_error_no($db) !=0) {
$errors = 1;
$holddb = $db;
}
- $supplies = array();
- $weeklysup = array();
+ $Supplies = array();
+ $WeeklySup = array();
for ($i=0;$i<28;$i++) {
- $weeklysup[$i]=0;
+ $WeeklySup[$i]=0;
}
- $pastduesup = 0;
- $futuresup = 0;
+ $PastDueSup = 0;
+ $FutureSup = 0;
$qoh = 0; // Get quantity on Hand to display
- $openord = 0;
+ $OpenOrd = 0;
while ($myrow=DB_fetch_array($result)) {
if ($myrow['ordertype'] == 'QOH') {
$qoh += $myrow['supplyquantity'];
} else {
- $openord += $myrow['supplyquantity'];
+ $OpenOrd += $myrow['supplyquantity'];
if ($myrow['datediff'] < 0) {
- $pastduesup += $myrow['supplyquantity'];
+ $PastDueSup += $myrow['supplyquantity'];
} elseif ($myrow['weekindex'] > 27) {
- $futuresup += $myrow['supplyquantity'];
+ $FutureSup += $myrow['supplyquantity'];
} else {
- $weeklysup[$myrow['weekindex']] += $myrow['supplyquantity'];
+ $WeeklySup[$myrow['weekindex']] += $myrow['supplyquantity'];
}
}
- array_push($supplies,$myrow);
+ array_push($Supplies,$myrow);
} //end of while loop
$sql = "SELECT mrpplannedorders.*,
@@ -128,7 +128,7 @@
$pastdueplan = 0;
$futureplan = 0;
while ($myrow=DB_fetch_array($result)) {
- array_push($supplies,$myrow);
+ array_push($Supplies,$myrow);
if ($myrow['datediff'] < 0) {
$pastdueplan += $myrow['supplyquantity'];
} elseif ($myrow['weekindex'] > 27) {
@@ -137,9 +137,9 @@
$weeklyplan[$myrow['weekindex']] += $myrow['supplyquantity'];
}
} //end of while loop
- // The following sorts the $supplies array by mrpdate. Have to sort because are loading
+ // The following sorts the $Supplies array by mrpdate. Have to sort because are loading
// mrpsupplies and mrpplannedorders into same array
- foreach ($supplies as $key => $row) {
+ foreach ($Supplies as $key => $row) {
$mrpdate[$key] = $row['mrpdate'];
}
@@ -147,16 +147,16 @@
$title = _('MRP Report') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg( _('The MRP Report could not be retrieved by the SQL because') . ' ' . DB_error_msg($holddb),'error');
- echo "<br><a href='" .$rootpath .'/index.php?' . SID . "'>" . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo "<br>$sql";
+ echo '<br />' . $sql;
}
include('includes/footer.inc');
exit;
}
- if (count($supplies)) {
- array_multisort($mrpdate, SORT_ASC, $supplies);
+ if (count($Supplies)) {
+ array_multisort($mrpdate, SORT_ASC, $Supplies);
}
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
$Right_Margin);
@@ -188,14 +188,14 @@
$pdf->addTextWrap(245,$YPos,40,$FontSize,_('Pan Size:'),'right');
$pdf->addTextWrap(285,$YPos,45,$FontSize,number_format($myrow['pansize'],$myrow['decimalplaces']),'right');
$pdf->addTextWrap(360,$YPos,50,$FontSize,_('On Order:'),'right');
- $pdf->addTextWrap(410,$YPos,50,$FontSize,number_format($openord,$myrow['decimalplaces']),'right');
+ $pdf->addTextWrap(410,$YPos,50,$FontSize,number_format($OpenOrd,$myrow['decimalplaces']),'right');
$YPos -=$line_height;
$pdf->addTextWrap($Left_Margin,$YPos,30,$FontSize,'M/B:','');
$pdf->addTextWrap(70,$YPos,150,$FontSize,$myrow['mbflag'],'');
$pdf->addTextWrap(225,$YPos,60,$FontSize,'Shrinkage:','right');
$pdf->addTextWrap(300,$YPos,30,$FontSize,number_format($myrow['shrinkfactor'],$myrow['decimalplaces']),'right');
$pdf->addTextWrap(360,$YPos,50,$FontSize,_('Gross Req:'),'right');
- $pdf->addTextWrap(410,$YPos,50,$FontSize,number_format($grossreq,$myrow['decimalplaces']),'right');
+ $pdf->addTextWrap(410,$YPos,50,$FontSize,number_format($GrossReq,$myrow['decimalplaces']),'right');
$YPos -=$line_height;
$pdf->addTextWrap(225,$YPos,60,$FontSize,'Lead Time:','right');
$pdf->addTextWrap(300,$YPos,30,$FontSize,$myrow['leadtime'],'right');
@@ -204,13 +204,13 @@
$YPos -= (2*$line_height);
// Calculate fields for prjected available weekly buckets
- $pastdueavail = ($qoh + $pastduesup + $pastdueplan) - $pastduereq;
+ $pastdueavail = ($qoh + $PastDueSup + $pastdueplan) - $PastDueReq;
$weeklyavail = array();
- $weeklyavail[0] = ($pastdueavail + $weeklysup[0] + $weeklyplan[0]) - $weeklyreq[0];
+ $weeklyavail[0] = ($pastdueavail + $WeeklySup[0] + $weeklyplan[0]) - $WeeklyReq[0];
for ($i = 1; $i < 28; $i++) {
- $weeklyavail[$i] = ($weeklyavail[$i - 1] + $weeklysup[$i] + $weeklyplan[$i]) - $weeklyreq[$i];
+ $weeklyavail[$i] = ($weeklyavail[$i - 1] + $WeeklySup[$i] + $weeklyplan[$i]) - $WeeklyReq[$i];
}
- $futureavail = ($weeklyavail[27] + $futuresup + $futureplan) - $futurereq;
+ $futureavail = ($weeklyavail[27] + $FutureSup + $futureplan) - $FutureReq;
// Headers for Weekly Buckets
$FontSize =7;
@@ -218,39 +218,39 @@
$today = date("$dateformat");
$pdf->addTextWrap($Left_Margin+40,$YPos,45,$FontSize,_('Past Due'),'right');
$pdf->addTextWrap(130,$YPos,45,$FontSize,$today,'right');
- $pdf->addTextWrap(175,$YPos,45,$FontSize,DateAdd($today,"w",1),'right');
- $pdf->addTextWrap(220,$YPos,45,$FontSize,DateAdd($today,"w",2),'right');
- $pdf->addTextWrap(265,$YPos,45,$FontSize,DateAdd($today,"w",3),'right');
- $pdf->addTextWrap(310,$YPos,45,$FontSize,DateAdd($today,"w",4),'right');
- $pdf->addTextWrap(355,$YPos,45,$FontSize,DateAdd($today,"w",5),'right');
- $pdf->addTextWrap(400,$YPos,45,$FontSize,DateAdd($today,"w",6),'right');
- $pdf->addTextWrap(445,$YPos,45,$FontSize,DateAdd($today,"w",7),'right');
- $pdf->addTextWrap(490,$YPos,45,$FontSize,DateAdd($today,"w",8),'right');
+ $pdf->addTextWrap(175,$YPos,45,$FontSize,DateAdd($today,'w',1),'right');
+ $pdf->addTextWrap(220,$YPos,45,$FontSize,DateAdd($today,'w',2),'right');
+ $pdf->addTextWrap(265,$YPos,45,$FontSize,DateAdd($today,'w',3),'right');
+ $pdf->addTextWrap(310,$YPos,45,$FontSize,DateAdd($today,'w',4),'right');
+ $pdf->addTextWrap(355,$YPos,45,$FontSize,DateAdd($today,'w',5),'right');
+ $pdf->addTextWrap(400,$YPos,45,$FontSize,DateAdd($today,'w',6),'right');
+ $pdf->addTextWrap(445,$YPos,45,$FontSize,DateAdd($today,'w',7),'right');
+ $pdf->addTextWrap(490,$YPos,45,$FontSize,DateAdd($today,'w',8),'right');
$YPos -=$line_height;
$pdf->addTextWrap($Left_Margin,$YPos,40,$FontSize,_('Gross Reqts'));
- $pdf->addTextWrap($Left_Margin+40,$YPos,45,$FontSize,number_format($pastduereq,0),'right');
- $pdf->addTextWrap(130,$YPos,45,$FontSize,number_format($weeklyreq[0],0),'right');
- $pdf->addTextWrap(175,$YPos,45,$FontSize,number_format($weeklyreq[1],0),'right');
- $pdf->addTextWrap(220,$YPos,45,$FontSize,number_format($weeklyreq[2],0),'right');
- $pdf->addTextWrap(265,$YPos,45,$FontSize,number_format($weeklyreq[3],0),'right');
- $pdf->addTextWrap(310,$YPos,45,$FontSize,number_format($weeklyreq[4],0),'right');
- $pdf->addTextWrap(355,$YPos,45,$FontSize,number_format($weeklyreq[5],0),'right');
- $pdf->addTextWrap(400,$YPos,45,$FontSize,number_format($weeklyreq[6],0),'right');
- $pdf->addTextWrap(445,$YPos,45,$FontSize,number_format($weeklyreq[7],0),'right');
- $pdf->addTextWrap(490,$YPos,45,$FontSize,number_format($weeklyreq[8],0),'right');
+ $pdf->addTextWrap($Left_Margin+40,$YPos,45,$FontSize,number_format($PastDueReq,0),'right');
+ $pdf->addTextWrap(130,$YPos,45,$FontSize,number_format($WeeklyReq[0],0),'right');
+ $pdf->addTextWrap(175,$YPos,45,$FontSize,number_format($WeeklyReq[1],0),'right');
+ $pdf->addTextWrap(220,$YPos,45,$FontSize,number_format($WeeklyReq[2],0),'right');
+ $pdf->addTextWrap(265,$YPos,45,$FontSize,number_format($WeeklyReq[3],0),'right');
+ $pdf->addTextWrap(310,$YPos,45,$FontSize,number_format($WeeklyReq[4],0),'right');
+ $pdf->addTextWrap(355,$YPos,45,$FontSize,number_format($WeeklyReq[5],0),'right');
+ $pdf->addTextWrap(400,$YPos,45,$FontSize,number_format($WeeklyReq[6],0),'right');
+ $pdf->addTextWrap(445,$YPos,45,$FontSize,number_format($WeeklyReq[7],0),'right');
+ $pdf->addTextWrap(490,$YPos,45,$FontSize,number_format($WeeklyReq[8],0),'right');
$YPos -=$line_height;
$pdf->addTextWrap($Left_Margin,$YPos,40,$FontSize,_('Open Order'));
- $pdf->addTextWrap($Left_Margin+40,$YPos,45,$FontSize,number_format($pastduesup,0),'right');
- $pdf->addTextWrap(130,$YPos,45,$FontSize,number_format($weeklysup[0],0),'right');
- $pdf->addTextWrap(175,$YPos,45,$FontSize,number_format($weeklysup[1],0),'right');
- $pdf->addTextWrap(220,$YPos,45,$FontSize,number_format($weeklysup[2],0),'right');
- $pdf->addTextWrap(265,$YPos,45,$FontSize,number_format($weeklysup[3],0),'right');
- $pdf->addTextWrap(310,$YPos,45,$FontSize,number_format($weeklysup[4],0),'right');
- $pdf->addTextWrap(355,$YPos,45,$FontSize,number_format($weeklysup[5],0),'right');
- $pdf->addTextWrap(400,$YPos,45,$FontSize,number_format($weeklysup[6],0),'right');
- $pdf->addTextWrap(445,$YPos,45,$FontSize,number_format($weeklysup[7],0),'right');
- $pdf->addTextWrap(490,$YPos,45,$FontSize,number_format($weeklysup[8],0),'right');
+ $pdf->addTextWrap($Left_Margin+40,$YPos,45,$FontSize,number_format($PastDueSup,0),'right');
+ $pdf->addTextWrap(130,$YPos,45,$FontSize,number_format($WeeklySup[0],0),'right');
+ $pdf->addTextWrap(175,$YPos,45,$FontSize,number_format($WeeklySup[1],0),'right');
+ $pdf->addTextWrap(220,$YPos,45,$FontSize,number_format($WeeklySup[2],0),'right');
+ $pdf->addTextWrap(265,$YPos,45,$FontSize,number_format($WeeklySup[3],0),'right');
+ $pdf->addTextWrap(310,$YPos,45,$FontSize,number_format($WeeklySup[4],0),'right');
+ $pdf->addTextWrap(355,$YPos,45,$FontSize,number_format($WeeklySup[5],0),'right');
+ $pdf->addTextWrap(400,$YPos,45,$FontSize,number_format($WeeklySup[6],0),'right');
+ $pdf->addTextWrap(445,$YPos,45,$FontSize,number_format($WeeklySup[7],0),'right');
+ $pdf->addTextWrap(490,$YPos,45,$FontSize,number_format($WeeklySup[8],0),'right');
$YPos -=$line_height;
$pdf->addTextWrap($Left_Margin,$YPos,40,$FontSize,_('Planned'));
$pdf->addTextWrap($Left_Margin+40,$YPos,45,$FontSize,number_format($pastdueplan,0),'right');
@@ -278,41 +278,41 @@
$YPos -= 2 * $line_height;
// Second Group of Weeks
- $pdf->addTextWrap($Left_Margin+40,$YPos,45,$FontSize,DateAdd($today,"w",9),'right');
- $pdf->addTextWrap(130,$YPos,45,$FontSize,DateAdd($today,"w",10),'right');
- $pdf->addTextWrap(175,$YPos,45,$FontSize,DateAdd($today,"w",11),'right');
- $pdf->addTextWrap(220,$YPos,45,$FontSize,DateAdd($today,"w",12),'right');
- $pdf->addTextWrap(265,$YP...
[truncated message content] |
