From: <tim...@us...> - 2012-01-19 10:15:35
|
Revision: 4807 http://web-erp.svn.sourceforge.net/web-erp/?rev=4807&view=rev Author: tim_schofield Date: 2012-01-19 10:15:26 +0000 (Thu, 19 Jan 2012) Log Message: ----------- Merge Tims branch into trunk: Fix xhtml errors Modified Paths: -------------- trunk/MRPPlannedWorkOrders.php Modified: trunk/MRPPlannedWorkOrders.php =================================================================== --- trunk/MRPPlannedWorkOrders.php 2012-01-19 10:10:43 UTC (rev 4806) +++ trunk/MRPPlannedWorkOrders.php 2012-01-19 10:15:26 UTC (rev 4807) @@ -38,7 +38,7 @@ (stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost ) as computedcost FROM mrpplannedorders, stockmaster - WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . " + WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . " AND stockmaster.mbflag = 'M' ORDER BY mrpplannedorders.part,mrpplannedorders.duedate"; } elseif ($_POST['Consolidation'] == 'Weekly') { @@ -56,7 +56,7 @@ (stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost ) as computedcost FROM mrpplannedorders, stockmaster - WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . " + WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . " AND stockmaster.mbflag = 'M' GROUP BY mrpplannedorders.part, weekindex, @@ -85,7 +85,7 @@ (stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost ) as computedcost FROM mrpplannedorders, stockmaster - WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . " + WHERE mrpplannedorders.part = stockmaster.stockid " . $WhereDate . " AND stockmaster.mbflag = 'M' GROUP BY mrpplannedorders.part, yearmonth, @@ -243,8 +243,8 @@ $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 '<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 '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; @@ -287,7 +287,7 @@ <td class=number>' . locale_number_format($myrow['supplyquantity'],$myrow['decimalplaces']) . '</td> <td class=number>' . locale_number_format($myrow['computedcost'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td> <td class=number>' . locale_number_format($myrow['supplyquantity'] * $myrow['computedcost'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>'; - + if ($_POST['Consolidation']!='None') { echo '<td class="number">' . $myrow['consolidatedcount'] . '</td>'; } @@ -314,27 +314,27 @@ $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 '<p class="page_title_text"> + <img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . $title . '</p>'; echo '<br /><br /><form action="' . htmlspecialchars($_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>'; 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') . '</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']).'"></td> + <td><input type ="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" name="cutoffdate" size="10" value="' .date($_SESSION['DefaultDateFormat']).'" /></td> </tr>'; - echo '</table><p><div class="centre"><input type="submit" name="Review" value="' . _('Review') . '"> <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '"></div>'; + echo '</table><div class="centre"><input type="submit" name="Review" value="' . _('Review') . '"> <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>'; include('includes/footer.inc'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |