Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[3386] trunk
|
From: <tim...@us...> - 2010-03-16 08:23:42
|
Revision: 3386
http://web-erp.svn.sourceforge.net/web-erp/?rev=3386&view=rev
Author: tim_schofield
Date: 2010-03-16 08:23:36 +0000 (Tue, 16 Mar 2010)
Log Message:
-----------
Tim: PO_SelecOSPurchOrder.php - Change option from Printed to Print in case where order is not yet printed
Modified Paths:
--------------
trunk/PO_SelectOSPurchOrder.php
trunk/doc/Change.log.html
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2010-03-15 19:42:18 UTC (rev 3385)
+++ trunk/PO_SelectOSPurchOrder.php 2010-03-16 08:23:36 UTC (rev 3386)
@@ -65,57 +65,57 @@
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- SUM(locstock.quantity) AS qoh,
- stockmaster.units,
- SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qord
- FROM stockmaster INNER JOIN locstock
- ON stockmaster.stockid = locstock.stockid
- INNER JOIN purchorderdetails
- ON stockmaster.stockid=purchorderdetails.itemcode
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ SUM(locstock.quantity) AS qoh,
+ stockmaster.units,
+ SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qord
+ FROM stockmaster INNER JOIN locstock
+ ON stockmaster.stockid = locstock.stockid
+ INNER JOIN purchorderdetails
+ ON stockmaster.stockid=purchorderdetails.itemcode
WHERE $completed
- AND stockmaster.description " . LIKE . " '$SearchString'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
+ AND stockmaster.description " . LIKE . " '$SearchString'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
ORDER BY stockmaster.stockid";
-
-
+
+
} elseif ($_POST['StockCode']){
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- SUM(locstock.quantity) AS qoh,
- SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qord,
- stockmaster.units
- FROM stockmaster INNER JOIN locstock
- ON stockmaster.stockid = locstock.stockid
- INNER JOIN purchorderdetails
- ON stockmaster.stockid=purchorderdetails.itemcode
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ SUM(locstock.quantity) AS qoh,
+ SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qord,
+ stockmaster.units
+ FROM stockmaster INNER JOIN locstock
+ ON stockmaster.stockid = locstock.stockid
+ INNER JOIN purchorderdetails
+ ON stockmaster.stockid=purchorderdetails.itemcode
WHERE $completed
- AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
+ AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
ORDER BY stockmaster.stockid";
-
+
} elseif (!$_POST['StockCode'] AND !$_POST['Keywords']) {
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- SUM(locstock.quantity) AS qoh,
- stockmaster.units,
- SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qord
- FROM stockmaster INNER JOIN locstock
- ON stockmaster.stockid = locstock.stockid
- INNER JOIN purchorderdetails
- ON stockmaster.stockid=purchorderdetails.itemcode
- WHERE $completed
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ SUM(locstock.quantity) AS qoh,
+ stockmaster.units,
+ SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qord
+ FROM stockmaster INNER JOIN locstock
+ ON stockmaster.stockid = locstock.stockid
+ INNER JOIN purchorderdetails
+ ON stockmaster.stockid=purchorderdetails.itemcode
+ WHERE $completed
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
ORDER BY stockmaster.stockid";
}
@@ -268,11 +268,11 @@
/* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
if (isset($SelectedSupplier)) {
-
+
if (!isset($_POST['StockLocation'])) {
$_POST['StockLocation']='';
}
-
+
if (isset($SelectedStockItem)) {
$SQL = "SELECT purchorders.realorderno,
purchorders.orderno,
@@ -405,7 +405,7 @@
'</th><th>' . _('Order Date') .
'</th><th>' . _('Initiated by') .
'</th><th>' . _('Supplier') .
- '</th><th>' . _('Currency') .
+ '</th><th>' . _('Currency') .
'</th><th>' . _('Order Total') .
'</th><th>' . _('Status') .
'</th><th>' . _('Modify') .
@@ -444,7 +444,7 @@
if ($myrow['status'] == PurchOrder::STATUS_AUTHORISED) {
$PrintPurchOrder = '
<a target="_blank" href="' . $rootpath . '/PO_PDFPurchOrder.php?' . SID . '&OrderNo=' . $myrow['orderno'] . '&realorderno=' . $myrow['realorderno'] . '&ViewingOnly=2">
- ' . _(PurchOrder::STATUS_PRINTED) . '
+ ' . _('Print') . '
</a>';
} else {
$PrintPurchOrder = _(PurchOrder::STATUS_PRINTED);
@@ -461,10 +461,10 @@
// the tailed two column
// <td>%s</font></td>
// <td class=number>%s</font></td>
-// $myrow['requisitionno'],
+// $myrow['requisitionno'],
// $myrow['initiator']);
// '</td><td class="tableheader">' . _('Requisition') .
-// '</td><td class="tableheader">' . _('Initiator') .
+// '</td><td class="tableheader">' . _('Initiator') .
// <td><a href='%s'>" . _('Receive') . "</a></td>
printf("<td>%s</font></td>
<td>%s</td>
@@ -477,12 +477,12 @@
<td>%s</font></td>
<td>%s</font></td>
</tr>",
- $myrow["orderno"],
- $FormatedOrderDate,
+ $myrow["orderno"],
+ $FormatedOrderDate,
$myrow['initiator'],
$myrow['suppname'],
$myrow['currcode'],
- $FormatedOrderValue,
+ $FormatedOrderValue,
_($myrow['status']),
$ModifyPage,
$PrintPurchOrder,
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-15 19:42:18 UTC (rev 3385)
+++ trunk/doc/Change.log.html 2010-03-16 08:23:36 UTC (rev 3386)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Change option from Printed to Print in case where order is not yet printed</p>
<p>15/03/10 Tim: Layout changes to make SelectCustomer.php SelectProduct.php and SelectSupplier.php have a similar look and feel to them</p>
<p>14/03/10 Tim: Various layout improvements</p>
<p>13/03/10 Tim: report_runner.php - Remove deprecated split() function</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
