Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[3622] trunk
|
From: <tim...@us...> - 2010-07-14 10:43:43
|
Revision: 3622
http://web-erp.svn.sourceforge.net/web-erp/?rev=3622&view=rev
Author: tim_schofield
Date: 2010-07-14 10:43:37 +0000 (Wed, 14 Jul 2010)
Log Message:
-----------
Fix sql quoting errors and layout changes
Modified Paths:
--------------
trunk/MRPPlannedWorkOrders.php
trunk/doc/Change.log.html
Modified: trunk/MRPPlannedWorkOrders.php
===================================================================
--- trunk/MRPPlannedWorkOrders.php 2010-07-13 21:37:55 UTC (rev 3621)
+++ trunk/MRPPlannedWorkOrders.php 2010-07-14 10:43:37 UTC (rev 3622)
@@ -21,9 +21,9 @@
$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') {
@@ -33,70 +33,70 @@
stockmaster.mbflag,
stockmaster.decimalplaces,
stockmaster.actualcost,
- (stockmaster.materialcost + stockmaster.labourcost +
- stockmaster.overheadcost ) as computedcost
+ (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';
} elseif ($_POST['Consolidation'] == 'Weekly') {
- $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,
- MIN(mrpplannedorders.mrpdate) as mrpdate,
- COUNT(*) AS consolidatedcount,
- stockmaster.stockid,
+ $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,
+ MIN(mrpplannedorders.mrpdate) as mrpdate,
+ COUNT(*) AS consolidatedcount,
+ stockmaster.stockid,
stockmaster.description,
stockmaster.mbflag,
stockmaster.decimalplaces,
stockmaster.actualcost,
- (stockmaster.materialcost + stockmaster.labourcost +
- stockmaster.overheadcost ) as computedcost
+ (stockmaster.materialcost + stockmaster.labourcost +
+ stockmaster.overheadcost ) as computedcost
FROM mrpplannedorders, stockmaster
WHERE mrpplannedorders.part = stockmaster.stockid ' . "$wheredate" .
' AND stockmaster.mbflag = "M"
GROUP BY mrpplannedorders.part,
- weekindex,
- stockmaster.stockid,
- stockmaster.description,
- stockmaster.mbflag,
- stockmaster.decimalplaces,
- stockmaster.actualcost,
- stockmaster.materialcost,
- stockmaster.labourcost,
- stockmaster.overheadcost,
- computedcost
+ weekindex,
+ stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.mbflag,
+ stockmaster.decimalplaces,
+ stockmaster.actualcost,
+ stockmaster.materialcost,
+ stockmaster.labourcost,
+ stockmaster.overheadcost,
+ computedcost
ORDER BY mrpplannedorders.part,weekindex
- ';
+ ';
} else {
- $sql = 'SELECT mrpplannedorders.part,
- SUM(mrpplannedorders.supplyquantity) as supplyquantity,
- EXTRACT(YEAR_MONTH from duedate) AS yearmonth,
- MIN(mrpplannedorders.duedate) as duedate,
- MIN(mrpplannedorders.mrpdate) as mrpdate,
- COUNT(*) AS consolidatedcount,
- stockmaster.stockid,
+ $sql = 'SELECT mrpplannedorders.part,
+ SUM(mrpplannedorders.supplyquantity) as supplyquantity,
+ EXTRACT(YEAR_MONTH from duedate) AS yearmonth,
+ MIN(mrpplannedorders.duedate) as duedate,
+ MIN(mrpplannedorders.mrpdate) as mrpdate,
+ COUNT(*) AS consolidatedcount,
+ stockmaster.stockid,
stockmaster.description,
stockmaster.mbflag,
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"
GROUP BY mrpplannedorders.part,
- yearmonth,
- stockmaster.stockid,
- stockmaster.description,
- stockmaster.mbflag,
- stockmaster.decimalplaces,
- stockmaster.actualcost,
- stockmaster.materialcost,
- stockmaster.labourcost,
- stockmaster.overheadcost,
- computedcost
+ yearmonth,
+ stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.mbflag,
+ stockmaster.decimalplaces,
+ stockmaster.actualcost,
+ stockmaster.materialcost,
+ stockmaster.labourcost,
+ stockmaster.overheadcost,
+ computedcost
ORDER BY mrpplannedorders.part,yearmonth ';
};
$result = DB_query($sql,$db,'','',false,true);
@@ -107,7 +107,7 @@
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>';
if ($debug==1){
- echo "<br>$sql";
+ echo "<br>$sql";
}
include('includes/footer.inc');
exit;
@@ -123,7 +123,7 @@
- If (isset($_POST['PrintPDF'])) { // Print planned work orders
+ if (isset($_POST['PrintPDF'])) { // Print planned work orders
include('includes/PDFStarter.php');
@@ -150,8 +150,9 @@
$holddecimalplaces = 0;
$totalpartqty = 0;
$totalpartcost = 0;
+ $Total_Extcost = 0;
- While ($myrow = DB_fetch_array($result,$db)){
+ while ($myrow = DB_fetch_array($result,$db)){
$YPos -=$line_height;
// Use to alternate between lines with transparent and painted background
@@ -244,13 +245,14 @@
$title = _('Review/Convert MRP Planned Work Orders');
include('includes/header.inc');
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' .
+ _('Inventory') . '" alt="">' . ' ' . $title . '</p>';
- echo "
- <br /><br /><form action='MRPConvertWorkOrders.php' method='post'>";
- echo "<div class='centre'><h3>Conolidation: " . $_POST['Consolidation'] . "</h3></div>";
- echo "<div class='centre'><h3>Cutoff Date: " . $_POST['cutoffdate'] . "</h3></div>";
- echo "<table><tr>
- <th></th>
+ echo "<form action='MRPConvertWorkOrders.php' method='post'>";
+ 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>
@@ -263,6 +265,7 @@
$totalpartqty = 0;
$totalpartcost = 0;
+ $Total_Extcost = 0;
$j=1; //row ID
$k=0; //row colour counter
While ($myrow = DB_fetch_array($result,$db)){
@@ -290,7 +293,9 @@
printf("\n <td class=number>%s</td>", number_format($myrow['supplyquantity'],$myrow['decimalplaces']));
printf("\n <td class=number>%.2f</td>", number_format($myrow['computedcost'],2));
printf("\n <td class=number>%.2f</td>", number_format($myrow['supplyquantity'] * $myrow['computedcost'],2));
- printf("\n <td class=number>%s</td>", $myrow['consolidatedcount']);
+ if ($_POST['Consolidation']!='None') {
+ printf("\n <td class=number>%s</td>", $myrow['consolidatedcount']);
+ }
echo "</tr>";
$j++;
@@ -320,8 +325,10 @@
$title=_('MRP Planned Work Orders Reporting');
include('includes/header.inc');
+ 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>";
+ echo '</br></br><form action=' . $_SERVER['PHP_SELF'] . " method='post'><table class=selection>";
echo '<tr><td>' . _('Consolidation') . ":</td><td><select name='Consolidation'>";
echo "<option selected value='None'>" . _('None');
echo "<option value='Weekly'>" . _('Weekly');
@@ -332,14 +339,14 @@
echo "<option value='no'>" . _('Plain Print');
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></br><div class='centre'><input type=submit name='Review' value='" . _('Review') . "'> <input type=submit name='PrintPDF' value='" . _('Print PDF') . "'></div>";
+ echo "</table><p><div class='centre'><input type=submit name='Review' value='" . _('Review') . "'> <input type=submit name='PrintPDF' value='" . _('Print PDF') . "'></div>";
include('includes/footer.inc');
} /*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){
@@ -389,4 +396,4 @@
$YPos =$YPos - (2*$line_height);
$PageNumber++;
} // End of PrintHeader() function
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-07-13 21:37:55 UTC (rev 3621)
+++ trunk/doc/Change.log.html 2010-07-14 10:43:37 UTC (rev 3622)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></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>
<p>13/07/10 Tim: Move version number to config table in database</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
