[Weberp-svn] SF.net SVN: weberp:[5289] trunk

[<tim...@us...>]

Revision: 5289
          http://weberp.svn.sourceforge.net/weberp/?rev=5289&view=rev
Author:   tim_schofield
Date:     2011-05-12 05:17:43 +0000 (Thu, 12 May 2011)

Log Message:
-----------
Ensure that purchasing details get passed through to the order correctly, when order is made from the SelectProduct.php screen

Modified Paths:
--------------
    trunk/PO_Header.php
    trunk/SelectProduct.php

Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php	2011-05-12 05:17:02 UTC (rev 5288)
+++ trunk/PO_Header.php	2011-05-12 05:17:43 UTC (rev 5289)
@@ -180,6 +180,9 @@
 		$_SESSION['PO'.$identifier]->SupplierID = $_GET['SelectedSupplier'];
 		$_SESSION['RequireSupplierSelection'] = 0;
 		$_POST['Select'] = $_GET['SelectedSupplier'];
+		$_SESSION['PO'.$identifier]->DeliveryDate = DateAdd(date($_SESSION['DefaultDateFormat']), 'd', $_GET['LeadTime']);
+		$_SESSION['PO'.$identifier]->Initiator = $_SESSION['UserID'];
+		$_SESSION['PO'.$identifier]->StatusMessage = '';
 
 		/*
 		* the item (its item code) that should be purchased
@@ -374,6 +377,7 @@
 	$_POST['SuppDelAdd4']=$_SESSION['PO'.$identifier]->SuppDelAdd4;
 	$_POST['SuppDelAdd5']=$_SESSION['PO'.$identifier]->SuppDelAdd5;
 	$_POST['SuppDelAdd6']=$_SESSION['PO'.$identifier]->SuppDelAdd6;
+	$_POST['DeliveryDate']=$_SESSION['PO'.$identifier]->DeliveryDate;
 
 }
 
@@ -441,6 +445,7 @@
 		$_SESSION['PO'.$identifier]->SuppDelAdd6 = $_POST['SuppDelAdd6'];
 		$_SESSION['PO'.$identifier]->SuppTel = $_POST['SuppTel'];
 		$_SESSION['PO'.$identifier]->Port = $_POST['Port'];
+
 	} else {
 		prnMsg( _('You do not have the authority to raise Purchase Orders for') . ' ' . $myrow['suppname'] .'. ' . _('Please Consult your system administrator for more information.') . '<br />' . _('You can setup authorisations'). ' ' . '<a href="PO_AuthorisationLevels.php">' . _('here') . '</a>', 'warn');
 		include('includes/footer.inc');
@@ -490,7 +495,6 @@
 		$_POST['SuppTel'] = $myrow['telephone'];
 		$_POST['Port'] = $myrow['port'];
 
-
 		$_SESSION['PO'.$identifier]->SupplierID = $_POST['Select'];
 		$_SESSION['RequireSupplierSelection'] = 0;
 		$_SESSION['PO'.$identifier]->SupplierName = $_POST['SupplierName'];
@@ -652,7 +656,7 @@
 													$PurchItemRow['price'],
 													$PurchItemRow['units'],
 													$PurchItemRow['stockact'],
-													date($_SESSION['DefaultDateFormat']),
+													$_SESSION['PO'.$identifier]->DeliveryDate,
 													0,
 													0,
 													'',

Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php	2011-05-12 05:17:02 UTC (rev 5288)
+++ trunk/SelectProduct.php	2011-05-12 05:17:43 UTC (rev 5289)
@@ -381,7 +381,7 @@
 				echo '<td class="select">' . _('No') . '</td>';
 			}
 			echo '<td class="select">';
-			echo '<a href="' . $rootpath . '/PO_Header.php?&amp;NewOrder=Yes' . '&amp;SelectedSupplier=' . $SuppRow['supplierid'] . '&amp;StockID=' . $StockID . '&amp;Quantity='.$SuppRow['minorderqty'].'">' . _('Order') . ' </a></td>';
+			echo '<a href="' . $rootpath . '/PO_Header.php?&amp;NewOrder=Yes' . '&amp;SelectedSupplier=' . $SuppRow['supplierid'] . '&amp;StockID=' . $StockID . '&amp;Quantity='.$SuppRow['minorderqty'].'&amp;LeadTime='.$SuppRow['leadtime'].'">' . _('Order') . ' </a></td>';
 			echo '</tr>';
 		}
 		echo '</table></td>';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.