|
From: <dai...@us...> - 2012-04-29 04:21:13
|
Revision: 5295
http://web-erp.svn.sourceforge.net/web-erp/?rev=5295&view=rev
Author: daintree
Date: 2012-04-29 04:21:07 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Klaus-optp changes
Modified Paths:
--------------
trunk/SelectWorkOrder.php
trunk/doc/Change.log
Modified: trunk/SelectWorkOrder.php
===================================================================
--- trunk/SelectWorkOrder.php 2012-04-29 03:45:59 UTC (rev 5294)
+++ trunk/SelectWorkOrder.php 2012-04-29 04:21:07 UTC (rev 5295)
@@ -251,7 +251,8 @@
stockmaster.decimalplaces,
woitems.qtyreqd,
woitems.qtyrecd,
- workorders.requiredby
+ workorders.requiredby,
+ workorders.startdate
FROM workorders
INNER JOIN woitems ON workorders.wo=woitems.wo
INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
@@ -269,7 +270,8 @@
stockmaster.decimalplaces,
woitems.qtyreqd,
woitems.qtyrecd,
- workorders.requiredby
+ workorders.requiredby,
+ workorders.startdate
FROM workorders
INNER JOIN woitems ON workorders.wo=woitems.wo
INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
@@ -285,7 +287,8 @@
stockmaster.decimalplaces,
woitems.qtyreqd,
woitems.qtyrecd,
- workorders.requiredby
+ workorders.requiredby,
+ workorders.startdate
FROM workorders
INNER JOIN woitems ON workorders.wo=woitems.wo
INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
@@ -315,6 +318,7 @@
<th>' . _('Quantity Required') . '</th>
<th>' . _('Quantity Received') . '</th>
<th>' . _('Quantity Outstanding') . '</th>
+ <th>' . _('Start Date') . '</th>
<th>' . _('Required Date') . '</th>
</tr>';
@@ -339,6 +343,7 @@
$Costing_WO =$rootpath . '/WorkOrderCosting.php?WO=' .$myrow['wo'];
$FormatedRequiredByDate = ConvertSQLDate($myrow['requiredby']);
+ $FormatedStartDate = ConvertSQLDate($myrow['startdate']);
printf('<td><a href="%s">%s</a></td>
@@ -351,6 +356,7 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td>%s</td>
+ <td>%s</td>
</tr>',
$ModifyPage,
$myrow['wo'],
@@ -363,6 +369,7 @@
locale_number_format($myrow['qtyreqd'],$myrow['decimalplaces']),
locale_number_format($myrow['qtyrecd'],$myrow['decimalplaces']),
locale_number_format($myrow['qtyreqd']-$myrow['qtyrecd'],$myrow['decimalplaces']),
+ $FormatedStartDate,
$FormatedRequiredByDate);
$j++;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-04-29 03:45:59 UTC (rev 5294)
+++ trunk/doc/Change.log 2012-04-29 04:21:07 UTC (rev 5295)
@@ -1,4 +1,5 @@
webERP Change Log
+29/4/12 Opto/Klaus: SelectWorkOrder.php added start date for the work order to the work orders displayed for selection
29/4/12 David Short: Added EDISendInvoices_Reece.php to send Reece format EDI invoices - approved by Reece (Australian Plumbing retailer)
28/4/2012 Exson: Fixed bugs in MRPCalendar.php which caused working days cannot be calculated correctly.
06/4/2012 Exson: Fixed PO header that does not display user's default warehous when iusse a new PO in PO_Header.php.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|