From: <dai...@us...> - 2011-04-11 10:49:51
|
Revision: 4547 http://web-erp.svn.sourceforge.net/web-erp/?rev=4547&view=rev Author: daintree Date: 2011-04-11 10:49:45 +0000 (Mon, 11 Apr 2011) Log Message: ----------- Exson fix to xhtml Modified Paths: -------------- trunk/WorkOrderStatus.php Modified: trunk/WorkOrderStatus.php =================================================================== --- trunk/WorkOrderStatus.php 2011-04-11 10:33:34 UTC (rev 4546) +++ trunk/WorkOrderStatus.php 2011-04-11 10:49:45 UTC (rev 4547) @@ -1,8 +1,6 @@ <?php /* $Id$*/ -//$PageSecurity = 11; - include('includes/session.inc'); $title = _('Work Order Status Inquiry'); include('includes/header.inc'); @@ -36,13 +34,13 @@ } $WORow = DB_fetch_array($WOResult); - echo '<a href="'. $rootpath . '/SelectWorkOrder.php?' . SID . '">' . _('Back to Work Orders'). '</a><br>'; - echo '<a href="'. $rootpath . '/WorkOrderCosting.php?' . SID . '&WO=' . $_REQUEST['WO'] . '">' . _('Back to Costing'). '</a><br>'; + echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a><br>'; + echo '<a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Back to Costing'). '</a><br>'; echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' . - _('Search') . '" alt="" />' . ' ' . $title.'</p'; + _('Search') . '" alt="" />' . ' ' . $title.'</p>'; - echo '<table cellpadding=2 class=selection> + echo '<table cellpadding="2" class="selection"> <tr><td class="label">' . _('Issue to work order') . ':</td><td>' . $_REQUEST['WO'] .'</td><td class="label">' . _('Item') . ':</td><td>' . $_REQUEST['StockID'] . ' - ' . $WORow['description'] . '</td></tr> <tr><td class="label">' . _('Manufactured at') . ':</td><td>' . $WORow['locationname'] . '</td><td class="label">' . _('Required By') . ':</td><td>' . ConvertSQLDate($WORow['requiredby']) . '</td></tr> <tr><td class="label">' . _('Quantity Ordered') . ':</td><td class=number>' . number_format($WORow['qtyreqd'],$WORow['decimalplaces']) . '</td><td colspan=2>' . $WORow['units'] . '</td></tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2011-04-11 10:49:53
|
Revision: 4547 http://web-erp.svn.sourceforge.net/web-erp/?rev=4547&view=rev Author: daintree Date: 2011-04-11 10:49:45 +0000 (Mon, 11 Apr 2011) Log Message: ----------- Exson fix to xhtml Modified Paths: -------------- trunk/WorkOrderStatus.php Modified: trunk/WorkOrderStatus.php =================================================================== --- trunk/WorkOrderStatus.php 2011-04-11 10:33:34 UTC (rev 4546) +++ trunk/WorkOrderStatus.php 2011-04-11 10:49:45 UTC (rev 4547) @@ -1,8 +1,6 @@ <?php /* $Id$*/ -//$PageSecurity = 11; - include('includes/session.inc'); $title = _('Work Order Status Inquiry'); include('includes/header.inc'); @@ -36,13 +34,13 @@ } $WORow = DB_fetch_array($WOResult); - echo '<a href="'. $rootpath . '/SelectWorkOrder.php?' . SID . '">' . _('Back to Work Orders'). '</a><br>'; - echo '<a href="'. $rootpath . '/WorkOrderCosting.php?' . SID . '&WO=' . $_REQUEST['WO'] . '">' . _('Back to Costing'). '</a><br>'; + echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a><br>'; + echo '<a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Back to Costing'). '</a><br>'; echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' . - _('Search') . '" alt="" />' . ' ' . $title.'</p'; + _('Search') . '" alt="" />' . ' ' . $title.'</p>'; - echo '<table cellpadding=2 class=selection> + echo '<table cellpadding="2" class="selection"> <tr><td class="label">' . _('Issue to work order') . ':</td><td>' . $_REQUEST['WO'] .'</td><td class="label">' . _('Item') . ':</td><td>' . $_REQUEST['StockID'] . ' - ' . $WORow['description'] . '</td></tr> <tr><td class="label">' . _('Manufactured at') . ':</td><td>' . $WORow['locationname'] . '</td><td class="label">' . _('Required By') . ':</td><td>' . ConvertSQLDate($WORow['requiredby']) . '</td></tr> <tr><td class="label">' . _('Quantity Ordered') . ':</td><td class=number>' . number_format($WORow['qtyreqd'],$WORow['decimalplaces']) . '</td><td colspan=2>' . $WORow['units'] . '</td></tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2012-05-22 09:35:38
|
Revision: 5388 http://web-erp.svn.sourceforge.net/web-erp/?rev=5388&view=rev Author: daintree Date: 2012-05-22 09:35:27 +0000 (Tue, 22 May 2012) Log Message: ----------- added start date to work order status Modified Paths: -------------- trunk/WorkOrderStatus.php Modified: trunk/WorkOrderStatus.php =================================================================== --- trunk/WorkOrderStatus.php 2012-05-22 09:27:54 UTC (rev 5387) +++ trunk/WorkOrderStatus.php 2012-05-22 09:35:27 UTC (rev 5388) @@ -44,7 +44,7 @@ echo '<table cellpadding="2" class="selection"> <tr> - <td class="label">' . _('Issue to work order') . ':</td> + <td class="label">' . _('Work order Number') . ':</td> <td>' . $_REQUEST['WO'] .'</td> <td class="label">' . _('Item') . ':</td> <td>' . $_REQUEST['StockID'] . ' - ' . $WORow['description'] . '</td> @@ -65,6 +65,10 @@ <td class="number">' . locale_number_format($WORow['qtyrecd'],$WORow['decimalplaces']) . '</td> <td colspan="2">' . $WORow['units'] . '</td> </tr> + <tr> + <td class="label">' . _('Start Date') . ':</td> + <td>' . ConvertSQLDate($WORow['startdate']) . '</td> + </tr> </table> <br />'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dai...@us...> - 2012-05-22 09:35:38
|
Revision: 5388 http://web-erp.svn.sourceforge.net/web-erp/?rev=5388&view=rev Author: daintree Date: 2012-05-22 09:35:27 +0000 (Tue, 22 May 2012) Log Message: ----------- added start date to work order status Modified Paths: -------------- trunk/WorkOrderStatus.php Modified: trunk/WorkOrderStatus.php =================================================================== --- trunk/WorkOrderStatus.php 2012-05-22 09:27:54 UTC (rev 5387) +++ trunk/WorkOrderStatus.php 2012-05-22 09:35:27 UTC (rev 5388) @@ -44,7 +44,7 @@ echo '<table cellpadding="2" class="selection"> <tr> - <td class="label">' . _('Issue to work order') . ':</td> + <td class="label">' . _('Work order Number') . ':</td> <td>' . $_REQUEST['WO'] .'</td> <td class="label">' . _('Item') . ':</td> <td>' . $_REQUEST['StockID'] . ' - ' . $WORow['description'] . '</td> @@ -65,6 +65,10 @@ <td class="number">' . locale_number_format($WORow['qtyrecd'],$WORow['decimalplaces']) . '</td> <td colspan="2">' . $WORow['units'] . '</td> </tr> + <tr> + <td class="label">' . _('Start Date') . ':</td> + <td>' . ConvertSQLDate($WORow['startdate']) . '</td> + </tr> </table> <br />'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ex...@us...> - 2014-03-19 03:54:46
|
Revision: 6618 http://sourceforge.net/p/web-erp/reponame/6618 Author: exsonqu Date: 2014-03-19 03:54:43 +0000 (Wed, 19 Mar 2014) Log Message: ----------- 19/3/2014 Tim: Fixed the bug Items Other than those in BOM are not listed in Status of Work Order even if issued. Exson made a little revision to keep SQL query only once for those additional issued materials. Reported by newuesr990 from weberp forum. Modified Paths: -------------- trunk/WorkOrderStatus.php Modified: trunk/WorkOrderStatus.php =================================================================== --- trunk/WorkOrderStatus.php 2014-03-18 05:21:41 UTC (rev 6617) +++ trunk/WorkOrderStatus.php 2014-03-19 03:54:43 UTC (rev 6618) @@ -109,6 +109,15 @@ WHERE wo='" . $SelectedWO . "' AND worequirements.parentstockid='" . $StockID . "'", $db); + $IssuedAlreadyResult = DB_query("SELECT stockid, + SUM(-qty) AS total + FROM stockmoves + WHERE stockmoves.type=28 + AND reference='".$SelectedWO."' + GROUP BY stockid",$db); + while ($IssuedRow = DB_fetch_array($IssuedAlreadyResult)){ + $IssuedAlreadyRow[$IssuedRow['stockid']] = $IssuedRow['total']; + } while ($RequirementsRow = DB_fetch_array($RequirmentsResult)){ if ($RequirementsRow['autoissue']==0){ @@ -120,19 +129,40 @@ <td class="notavailable">' . _('Auto Issue') . '</td> <td class="notavailable">' .$RequirementsRow['stockid'] . ' - ' . $RequirementsRow['description'] . '</td>'; } - $IssuedAlreadyResult = DB_query("SELECT SUM(-qty) FROM stockmoves - WHERE stockmoves.type=28 - AND stockid='" . $RequirementsRow['stockid'] . "' - AND reference='" . $SelectedWO . "'", - $db); - $IssuedAlreadyRow = DB_fetch_row($IssuedAlreadyResult); - - echo '<td align="right">' . locale_number_format($WORow['qtyreqd']*$RequirementsRow['qtypu'],$RequirementsRow['decimalplaces']) . '</td> - <td align="right">' . locale_number_format($IssuedAlreadyRow[0],$RequirementsRow['decimalplaces']) . '</td></tr>'; + if (isset($IssuedAlreadyRow[$RequirementsRow['stockid']])){ + $Issued = $IssuedAlreadyRow[$RequirementsRow['stockid']]; + unset($IssuedAlreadyRow[$RequirementsRow['stockid']]); + }else{ + $Issued = 0; + } + echo '<td class="number">'.locale_number_format($WORow['qtyreqd']*$RequirementsRow['qtypu'],$RequirementsRow['decimalplaces']).'</td> + <td class="number">'.locale_number_format($Issued,$RequirementsRow['decimalplaces']).'</td></tr>'; } - + /* Now do any additional issues of items not in the BOM */ + if(count($IssuedAlreadyRow)>0){ + $AdditionalStockIDs = array_keys($IssuedAlreadyRow); + $AdditionalStocks = implode(',',$AdditionalStockIDs); + $RequirementsSQL = "SELECT stockid, + stockmaster.description, + stockmaster.decimalplaces + FROM stockmaster WHERE stockid IN ('".$AdditionalStocks."')"; + $RequirementsResult = DB_query($RequirementsSQL,$db); + $AdditionalStocks = array(); + while($myrow = DB_fetch_array($RequirementsResult)){ + $AdditionalStocks[$myrow['stockid']]['description'] = $myrow['description']; + $AdditionalStocks[$myrow['stockid']]['decimalplaces'] = $myrow['decimalplaces']; + } + foreach ($IssuedAlreadyRow as $StockID=>$Issued) { + echo '<tr> + <td>'._('Additional Issue').'</td> + <td>'.$StockID . ' - '.$AdditionalStocks[$StockID]['description'].'</td>'; + echo '<td class="number">0</td> + <td class="number">'.locale_number_format($Issued,$AdditionalStocks[$StockID]['decimalplaces']).'</td> + </tr>'; + } + } + echo '</table>'; + include('includes/footer.inc'); -include('includes/footer.inc'); - -?> \ No newline at end of file +?> |
From: <ex...@us...> - 2016-09-04 06:12:50
|
Revision: 7611 http://sourceforge.net/p/web-erp/reponame/7611 Author: exsonqu Date: 2016-09-04 06:12:47 +0000 (Sun, 04 Sep 2016) Log Message: ----------- 04/09/16 Exson: Fixed the undefined noise in WorkOrderStatus.php. Modified Paths: -------------- trunk/WorkOrderStatus.php Modified: trunk/WorkOrderStatus.php =================================================================== --- trunk/WorkOrderStatus.php 2016-09-04 06:03:20 UTC (rev 7610) +++ trunk/WorkOrderStatus.php 2016-09-04 06:12:47 UTC (rev 7611) @@ -138,7 +138,7 @@ <td class="number">'.locale_number_format($Issued,$RequirementsRow['decimalplaces']).'</td></tr>'; } /* Now do any additional issues of items not in the BOM */ - if(count($IssuedAlreadyRow)>0){ + if(isset($IssuedAlreadyRow) AND count($IssuedAlreadyRow)>0){ $AdditionalStocks = implode("','",array_keys($IssuedAlreadyRow)); $RequirementsSQL = "SELECT stockid, description, @@ -163,4 +163,4 @@ echo '</table>'; include('includes/footer.inc'); -?> \ No newline at end of file +?> |