[Weberp-svn] SF.net SVN: weberp:[7714] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[7714] trunk
|
From: <tim...@us...> - 2011-08-09 19:26:06
|
Revision: 7714
http://weberp.svn.sourceforge.net/weberp/?rev=7714&view=rev
Author: tim_schofield
Date: 2011-08-09 18:59:43 +0000 (Tue, 09 Aug 2011)
Log Message:
-----------
Provide link to the purchase order depending on its status
Modified Paths:
--------------
trunk/POReport.php
trunk/PO_Header.php
Modified: trunk/POReport.php
===================================================================
--- trunk/POReport.php 2011-08-09 18:59:23 UTC (rev 7713)
+++ trunk/POReport.php 2011-08-09 18:59:43 UTC (rev 7714)
@@ -58,7 +58,7 @@
if (isset($_POST['submit'])) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . $title.'</p>';
- submit($db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType);
+ submit($db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType, $rootpath);
} else if (isset($_POST['submitcsv'])) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . $title.'</p>';
submitcsv($db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType);
@@ -69,7 +69,7 @@
//####_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT_SUBMIT####
-function submit(&$db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType)
+function submit(&$db,$PartNumber,$PartNumberOp,$SupplierId,$SupplierIdOp,$SupplierName,$SupplierNameOp,$SaveSummaryType, $rootpath)
{
//initialize no input errors
@@ -162,6 +162,7 @@
purchorderdetails.deliverydate,
purchorders.supplierno,
purchorders.orddate,
+ purchorders.status,
purchorderdetails.quantityord,
purchorderdetails.qtyinvoiced,
(purchorderdetails.quantityord * purchorderdetails.unitprice) as extprice,
@@ -191,6 +192,7 @@
grns.deliverydate,
purchorders.supplierno,
purchorders.orddate,
+ purchorders.status,
grns.qtyrecd as quantityord,
grns.quantityinv as qtyinvoiced,
(grns.qtyrecd * purchorderdetails.unitprice) as extprice,
@@ -232,6 +234,7 @@
SUM(purchorderdetails.quantityord * purchorderdetails.unitprice) as extprice,
SUM(purchorderdetails.quantityord * purchorderdetails.stdcostunit) as extcost,
stockmaster.decimalplaces,
+ purchorders.status,
stockmaster.description
FROM purchorderdetails
LEFT JOIN purchorders ON purchorders.orderno=purchorderdetails.orderno
@@ -257,6 +260,7 @@
SUM(purchorderdetails.qtyinvoiced) as qtyinvoiced,
SUM(purchorderdetails.quantityord * purchorderdetails.unitprice) as extprice,
SUM(purchorderdetails.quantityord * purchorderdetails.stdcostunit) as extcost,
+ purchorders.status,
suppliers.suppname
FROM purchorderdetails
LEFT JOIN purchorders ON purchorders.orderno=purchorderdetails.orderno
@@ -281,6 +285,7 @@
SUM(purchorderdetails.qtyinvoiced) as qtyinvoiced,
SUM(purchorderdetails.quantityord * purchorderdetails.unitprice) as extprice,
SUM(purchorderdetails.quantityord * purchorderdetails.stdcostunit) as extcost,
+ purchorders.status,
suppliers.suppname
FROM purchorderdetails
LEFT JOIN purchorders ON purchorders.orderno=purchorderdetails.orderno
@@ -302,6 +307,7 @@
} elseif ($_POST['SummaryType'] == 'month') {
$sql = "SELECT EXTRACT(YEAR_MONTH from purchorders.orddate) as month,
CONCAT(MONTHNAME(purchorders.orddate),' ',YEAR(purchorders.orddate)) as monthname,
+ purchorders.status,
SUM(purchorderdetails.quantityord) as quantityord,
SUM(purchorderdetails.qtyinvoiced) as qtyinvoiced,
SUM(purchorderdetails.quantityord * purchorderdetails.unitprice) as extprice,
@@ -354,6 +360,7 @@
SUM(grns.quantityinv) as qtyinvoiced,
SUM(grns.qtyrecd * purchorderdetails.unitprice) as extprice,
SUM(grns.qtyrecd * grns.stdcostunit) as extcost,
+ purchorders.status,
stockmaster.description
FROM grns
LEFT JOIN purchorderdetails ON grns.podetailitem = purchorderdetails.podetailitem
@@ -379,6 +386,7 @@
SUM(grns.quantityinv) as qtyinvoiced,
SUM(grns.qtyrecd * purchorderdetails.unitprice) as extprice,
SUM(grns.qtyrecd * grns.stdcostunit) as extcost,
+ purchorders.status,
suppliers.suppname
FROM grns
LEFT JOIN purchorderdetails ON grns.podetailitem = purchorderdetails.podetailitem
@@ -404,6 +412,7 @@
SUM(grns.quantityinv) as qtyinvoiced,
SUM(grns.qtyrecd * purchorderdetails.unitprice) as extprice,
SUM(grns.qtyrecd * grns.stdcostunit) as extcost,
+ purchorders.status,
suppliers.suppname
FROM grns
LEFT JOIN purchorderdetails ON grns.podetailitem = purchorderdetails.podetailitem
@@ -429,6 +438,7 @@
SUM(grns.qtyrecd) as quantityord,
SUM(grns.quantityinv) as qtyinvoiced,
SUM(grns.qtyrecd * purchorderdetails.unitprice) as extprice,
+ purchorders.status,
SUM(grns.qtyrecd * grns.stdcostunit) as extcost
FROM grns
LEFT JOIN purchorderdetails ON grns.podetailitem = purchorderdetails.podetailitem
@@ -453,6 +463,7 @@
SUM(grns.qtyrecd) as quantityord,
SUM(grns.quantityinv) as qtyinvoiced,
SUM(grns.qtyrecd * purchorderdetails.unitprice) as extprice,
+ purchorders.status,
SUM(grns.qtyrecd * grns.stdcostunit) as extcost
FROM grns
LEFT JOIN purchorderdetails ON grns.podetailitem = purchorderdetails.podetailitem
@@ -549,7 +560,13 @@
}
$linectr++;
// Detail for both DateType of Order
- printf('<td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td class="number">%s</td>
+ if ($myrow['status']=='Completed' or $myrow['status']=='Cancelled' or $myrow['status']=='Rejected') {
+ $ViewPurchOrder = $rootpath . '/PO_OrderDetails.php?OrderNo=' . $myrow['orderno'];
+ } else {
+ $ViewPurchOrder = $rootpath . '/PO_Header.php?ModifyOrderNumber=' . $myrow['orderno'];
+ }
+ printf('<td><a href="' . $ViewPurchOrder . '">%s</td>
+ <td>%s</td><td>%s</td><td>%s</td><td>%s</td><td class="number">%s</td>
<td class="number">%s</td><td class="number">%s</td><td class="number">%s</td><td>%s</td><td>%s</td><td>%s</td></tr>',
$myrow['orderno'],
$myrow['itemcode'],
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-08-09 18:59:23 UTC (rev 7713)
+++ trunk/PO_Header.php 2011-08-09 18:59:43 UTC (rev 7714)
@@ -99,7 +99,17 @@
}
}
+ if ($_POST['Status'] == 'Completed') {
+ if ($AuthorityLevel > $OrderTotal) {
+ $_SESSION['PO'.$identifier]->StatComments = date($_SESSION['DefaultDateFormat']) . ' - ' . _('Completed by') . $UserChangedStatus . $_POST['StatusComments'] . '<br />' . html_entity_decode($_POST['StatusCommentsComplete']);
+ $_SESSION['PO'.$identifier]->AllowPrintPO=1;
+ } else {
+ $OKToUpdateStatus=0;
+ prnMsg( _('You do not have permission to complete this purchase order').'.<br />', 'error');
+ }
+ }
+
if ($_POST['Status'] == 'Rejected' OR $_POST['Status'] == 'Cancelled' ) {
if(!isset($_SESSION['ExistingOrder']) OR $_SESSION['ExistingOrder']!=0) {
/* need to check that not already dispatched or invoiced by the supplier */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
