Thread: [Web-erp-svn] SF.net SVN: web-erp:[7373] trunk (Page 59)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7373
          http://sourceforge.net/p/web-erp/reponame/7373
Author:   exsonqu
Date:     2015-10-30 12:12:52 +0000 (Fri, 30 Oct 2015)
Log Message:
-----------
30/10/15 Exson: Allow user input supplier's delivery note during goods receiving and make the inquiry script for it. So users can search corresponding GRN, PO and invoice with it.  

Modified Paths:
--------------
    trunk/GoodsReceived.php
    trunk/PDFGrn.php
    trunk/ReverseGRN.php
    trunk/SelectSupplier.php
    trunk/SuppInvGRNs.php
    trunk/SupplierInvoice.php
    trunk/companies/weberpdemo/FormDesigns/GoodsReceived.xml
    trunk/includes/DefineSuppTransClass.php
    trunk/includes/PDFGrnHeader.inc
    trunk/sql/mysql/upgrade4.12.3-4.13.sql

Added Paths:
-----------
    trunk/SupplierGRNAndInvoiceInquiry.php

Modified: trunk/GoodsReceived.php
===================================================================

--- trunk/GoodsReceived.php	2015-10-29 13:04:36 UTC (rev 7372)
+++ trunk/GoodsReceived.php	2015-10-30 12:12:52 UTC (rev 7373)
@@ -71,21 +71,40 @@
 
 echo '<p class="page_title_text">
 		<img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Receive') . '" alt="" />' . ' ' . _('Receive Purchase Order') . ' : '. $_SESSION['PO'.$identifier]->OrderNo .' '. _('from'). ' ' . $_SESSION['PO'.$identifier]->SupplierName . '</p>';
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" id="form1" method="post">';
 echo '<div>';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 if (!isset($_POST['ProcessGoodsReceived'])) {
-	if (!isset($_POST['DefaultReceivedDate'])){
+	if (!isset($_POST['DefaultReceivedDate']) AND !isset($_SESSION['PO' . $identifier]->DefaultReceivedDate)){
 		/* This is meant to be the date the goods are received - it does not make sense to set this to the date that we requested delivery in the purchase order - I have not applied your change here Tim for this reason - let me know if I have it wrong - Phil */
 		$_POST['DefaultReceivedDate'] = Date($_SESSION['DefaultDateFormat']);
+		$_SESSION['PO' . $identifier]->DefaultReceivedDate = $_POST['DefaultReceivedDate'];
+	} else {
+		if (isset($_POST['DefaultReceivedDate']) AND is_date($_POST['DefaultReceivedDate'])) {
+			$_SESSION['PO' . $identifier]->DefaultReceivedDate = $_POST['DefaultReceivedDate'];
+		} elseif(isset($_POST['DefaultReceivedDate']) AND !is_date($_POST['DefaultReceivedDate'])) {
+			prnMsg(_('The default received date is not a date format'),'error');
+			$_POST['DefaultReceivedDate'] = Date($_SESSION['DefaultDateFormat']);
+		}
 	}
+	if (!isset($_POST['SupplierReference'])) {
+		$_POST['SupplierReference'] = '';
+	} else {
+		if (isset($_POST['SupplierReference']) AND mb_strlen(trim($_POST['SupplierReference']))>30) {
+			prnMsg(_('The supplier\'s delivery note no should not be more than 30 characters'),'error');
+		} else {
+			$_SESSION['PO' . $identifier]->SupplierReference = $_POST['SupplierReference'];
+		}
+	}
 
 	echo '<table class="selection">
 			<tr>
 				<td>' .  _('Date Goods/Service Received'). ':</td>
 				<td><input type="text" class="date" alt="'. $_SESSION['DefaultDateFormat'] .'" maxlength="10" size="10" onchange="return isDate(this, this.value, '."'".
-			$_SESSION['DefaultDateFormat']."'".')" name="DefaultReceivedDate" value="' . $_POST['DefaultReceivedDate'] . '" /></td>
+			$_SESSION['DefaultDateFormat']."'".')" name="DefaultReceivedDate" value="' . $_SESSION['PO' . $identifier]->DefaultReceivedDate . '" /></td>
+				<td>' . _("Supplier's Reference") . ':</td>
+				<td><input type="text" name="SupplierReference" value="' . $_SESSION['PO' . $identifier]->SupplierReference. '" maxlength="30" size="20"  onchange="ReloadForm(form1.Update)"/></td>
 			</tr>
 		</table>
 		<br />';
@@ -228,6 +247,17 @@
 $NegativesFound = false;
 $InputError = false;
 
+if (isset($_POST['DefaultReceivedDate']) AND !is_date($_POST['DefaultReceivedDate'])) {
+	$InputError = true;
+	prnMsg(_('The goods received date is not a date format'),'error');
+
+} else {
+}
+
+if (isset($_POST['SupplierReference']) AND mb_strlen(trim($_POST['SupplierReference']))>30) {
+	$InputError = true;
+	prnMsg(_('The delivery note of suppliers should not be more than 30 characters'),'error');
+}
 if (count($_SESSION['PO'.$identifier]->LineItems)>0){
 
 	foreach ($_SESSION['PO'.$identifier]->LineItems as $OrderLine) {
@@ -474,7 +504,8 @@
 									deliverydate,
 									qtyrecd,
 									supplierid,
-									stdcostunit)
+									stdcostunit,
+									supplierref)
 							VALUES ('" . $GRN . "',
 								'" . $OrderLine->PODetailRec . "',
 								'" . $OrderLine->StockID . "',
@@ -482,7 +513,8 @@
 								'" . $_POST['DefaultReceivedDate'] . "',
 								'" . $OrderLine->ReceiveQty . "',
 								'" . $_SESSION['PO'.$identifier]->SupplierID . "',
-								'" . $CurrentStandardCost . "')";
+								'" . $CurrentStandardCost . "',
+								'" . trim($_POST['SupplierReference']) ."')";
 
 			$ErrMsg =  _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('A GRN record could not be inserted') . '. ' . _('This receipt of goods has not been processed because');
 			$DbgMsg =  _('The following SQL to insert the GRN record was used');

Modified: trunk/PDFGrn.php
===================================================================
--- trunk/PDFGrn.php	2015-10-29 13:04:36 UTC (rev 7372)
+++ trunk/PDFGrn.php	2015-10-30 12:12:52 UTC (rev 7373)
@@ -46,6 +46,7 @@
 				grns.itemdescription,
 				grns.qtyrecd,
 				grns.supplierid,
+				grns.supplierref,
 				purchorderdetails.suppliersunit,
 				purchorderdetails.conversionfactor,
 				stockmaster.units,
@@ -77,6 +78,9 @@
 	}
 } // get data to print
 if ($NoOfGRNs >0){
+	$SupplierRef = DB_fetch_array($GRNResult);
+	$SupplierRef = $SupplierRef['supplierref'];
+	DB_data_seek($GRNResult,0);
 	include ('includes/PDFGrnHeader.inc'); //head up the page
 
 	$FooterPrintedInPage= 0;

Modified: trunk/ReverseGRN.php
===================================================================
--- trunk/ReverseGRN.php	2015-10-29 13:04:36 UTC (rev 7372)
+++ trunk/ReverseGRN.php	2015-10-30 12:12:52 UTC (rev 7373)
@@ -39,6 +39,7 @@
 					grns.itemcode,
 					grns.itemdescription,
 					grns.deliverydate,
+					grns.supplierref,
 					purchorderdetails.glcode,
 					purchorderdetails.assetid,
 					grns.qtyrecd,
@@ -370,6 +371,7 @@
 						grns.itemcode,
 						grns.itemdescription,
 						grns.deliverydate,
+						grns.supplierref,
 						qtyrecd,
 						quantityinv,
 						qtyrecd-quantityinv AS qtytoreverse
@@ -393,6 +395,7 @@
 			$TableHeader = '<tr>
 								<th>' . _('GRN') . ' #</th>
 								<th>' . _('GRN Batch') . '</th>
+								<th>' . _('Supplier\' Ref') . '</th>
 								<th>' . _('Item Code') . '</th>
 								<th>' . _('Description') . '</th>
 								<th>' . _('Date') . '<br />' . _('Received') . '</th>
@@ -426,6 +429,7 @@
 						<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>
@@ -433,6 +437,7 @@
 						</tr>',
 						$myrow['grnno'],
 						$myrow['grnbatch'],
+						$myrow['supplierref'],
 						$myrow['itemcode'],
 						$myrow['itemdescription'],
 						$DisplayDateDel,

Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php	2015-10-29 13:04:36 UTC (rev 7372)
+++ trunk/SelectSupplier.php	2015-10-30 12:12:52 UTC (rev 7373)
@@ -170,6 +170,8 @@
 	echo '<tr><td valign="top" class="select">'; /* Inquiry Options */
 	echo '<a href="' . $RootPath . '/SupplierInquiry.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Supplier Account Inquiry') . '</a>
 		<br />
+		<a href="' . $RootPath . '/SupplierGRNAndInvoiceInquiry.php?SelectedSupplier=' . $_SESSION['SupplierID'] . '&amp;SupplierName='.urlencode($SupplierName).'">' . _('Supplier Delivery Note AND GRN inquiry') . '</a>
+		<br />
 		<br />';
 
 	echo '<br /><a href="' . $RootPath . '/PO_SelectOSPurchOrder.php?SelectedSupplier=' . $_SESSION['SupplierID'] . '">' . _('Add / Receive / View Outstanding Purchase Orders') . '</a>';

Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php	2015-10-29 13:04:36 UTC (rev 7372)
+++ trunk/SuppInvGRNs.php	2015-10-30 12:12:52 UTC (rev 7373)
@@ -95,7 +95,8 @@
 														$_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->ShiptRef,
 														$_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->JobRef,
 														$_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->GLCode,
-														$Hold);
+														$Hold,
+														$_SESSION['SuppTrans']->GRNs[$_POST['GRNNo'.$i]]->SupplierRef);
 		}
 	}
 }
@@ -116,6 +117,7 @@
 		</tr>
 		<tr>
 			<th>' . _('Sequence') . ' #</th>
+			<th>' . _("Supplier's Ref") . '</th>
 			<th>' . _('Item Code') . '</th>
 			<th>' . _('Description') . '</th>
 			<th>' . _('Quantity Yet To Inv') . '</th>
@@ -137,6 +139,7 @@
 	
 	echo '<tr>
 			<td>' . $EnteredGRN->GRNNo . '</td>
+			<td>' . $EnteredGRN->SupplierRef . '</td>
 			<td>' . $EnteredGRN->ItemCode . '</td>
 			<td>' . $EnteredGRN->ItemDescription . '</td>
 			<td class="number">' . locale_number_format($EnteredGRN->QtyRecd - $EnteredGRN->Prev_QuantityInv,'Variable') . '</td>
@@ -177,6 +180,7 @@
 				grns.qtyrecd,
 				grns.quantityinv,
 				grns.stdcostunit,
+				grns.supplierref,
 				purchorderdetails.glcode,
 				purchorderdetails.shiptref,
 				purchorderdetails.jobref,
@@ -235,7 +239,8 @@
 														$myrow['assetid'],
 														0,
 														$myrow['decimalplaces'],
-														$myrow['grnbatch']);
+														$myrow['grnbatch'],
+														$myrow['supplierref']);
 		}
 	}
 }
@@ -253,6 +258,7 @@
 						<th class="ascending">' . _('Select') . '</th>
 						<th class="ascending">' . _('Sequence') . ' #</th>
 						<th class="ascending">' . _('GRN Number') . '</th>
+						<th class="ascending">' . _('Supplier\'s Ref') . '</th>
 						<th class="ascending">' . _('Order') . '</th>
 						<th class="ascending">' . _('Item Code') . '</th>
 						<th class="ascending">' . _('Description') . '</th>
@@ -285,6 +291,7 @@
 		}
 		echo '<td>' . $GRNTmp->GRNNo . '</td>
 			<td>' . $GRNTmp->GRNBatchNo . '</td>
+			<td>' . $GRNTmp->SupplierRef . '</td>
 			<td>' . $GRNTmp->PONo . '</td>
 			<td>' . $GRNTmp->ItemCode . '</td>
 			<td>' . $GRNTmp->ItemDescription . '</td>

Added: trunk/SupplierGRNAndInvoiceInquiry.php
===================================================================
--- trunk/SupplierGRNAndInvoiceInquiry.php	                        (rev 0)
+++ trunk/SupplierGRNAndInvoiceInquiry.php	2015-10-30 12:12:52 UTC (rev 7373)
@@ -0,0 +1,97 @@
+<?php
+include('includes/session.inc');
+$Title = _('Supplier Invoice and GRN inquiry');
+include('includes/header.inc');
+if (isset($_GET['SelectedSupplier'])) {
+	$SupplierID= $_GET['SelectedSupplier'];
+} elseif (isset($_POST['SelectedSupplier'])){
+	$SupplierID = $_POST['SelectedSupplier'];
+} else {
+	prnMsg(_('The page must be called from suppliers selected interface, please click following link to select the supplier'),'error');
+	echo '<a href="' . $RootPath . '/SelectSupplier.php">'. _('Select Supplier') . '</a>';
+	include('includes/footer.inc');
+	exit;
+}
+if (isset($_GET['SupplierName'])) {
+	$SupplierName = $_GET['SupplierName'];
+} 
+if (!isset($_POST['SupplierRef']) OR trim($_POST['SupplierRef'])=='') {
+	$_POST['SupplierRef'] = '';
+	if (empty($_POST['GRNBatchNo']) AND empty($_POST['InvoiceNo'])) {
+		$_POST['GRNBatchNo'] = '';
+		$_POST['InvoiceNo'] = '';
+	} elseif (!empty($_POST['GRNBatchNo']) AND !empty($_POST['InvoiceNo'])) {
+		$_POST['InvoiceNo'] = '';
+	}
+} elseif (isset($_POST['GRNBatchNo']) OR isset($_POST['InvoiceNo'])) {
+	$_POST['GRNBatchNo'] = '';
+	$_POST['InvoiceNo'] = '';
+}
+echo '<p class="page_title_text">' . _('Supplier Invoice and Delivery Note Inquiry') . '<img src="' . $RootPath . '/css/' . $Theme . '/images/transactions.png" alt="" />' . _('Supplier') . ': ' . $SupplierName . '</p>';
+echo '<div class="page_help_text">' . _('The supplier\'s delivery note is prefer to GRN No, and GRN No is prefered to Invoice No').'</div>';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+	<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+	<input type="hidden" name="SelectedSupplier" value="' . $SupplierID . '" />';
+	
+echo '<table class="selection">
+	<tr>
+	<td class="label">' . _('Part of Supplier\'s Delivery Note') . ':</td><td><input type="text" name="SupplierRef" value="' . $_POST['SupplierRef'] . '" size="20" maxlength="30" ></td>
+	<td class="label">' . _('GRN No') . ':</td><td><input type="text" name="GRNBatchNo" value="' . $_POST['GRNBatchNo'] . '" size="6" maxlength="6" /></td>
+	<td class="label">' . _('Invoice No') . ':</td><td><input type="text" name="InvoiceNo" value="' . $_POST['InvoiceNo'] . '" size="11" maxlength="11" /></td>
+	
+	</tr>
+	</table>';
+echo '<div class="center">
+		<input type="submit" name="Submit" value="' . _('Submit') . '" />
+		</div>';
+if (isset($_POST['Submit'])) {
+	$Where = '';
+	if (isset($_POST['SupplierRef']) AND trim($_POST['SupplierRef']) != '') {
+		$SupplierRef = trim($_POST['SupplierRef']);
+		$WhereSupplierRef = " AND grns.supplierref LIKE '%" . $SupplierRef . "%'";
+		$Where .= $WhereSupplierRef;
+	} elseif (isset($_POST['GRNBatchNo']) AND trim($_POST['GRNBatchNo']) != '') {
+		$GRNBatchNo = trim($_POST['GRNBatchNo']);
+		$WhereGRN = " AND grnbatch LIKE '%" . $GRNBatchNo . "%'";
+		$Where .= $WhereGRN;
+	} elseif (isset($_POST['InvoiceNo']) AND (trim($_POST['InvoiceNo']) != '')) {
+		$InvoiceNo = trim($_POST['InvoiceNo']);
+		$WhereInvoiceNo = " AND suppinv LIKE '%" . $InvoiceNo . "%'";
+		$Where .= $WhereInvoiceNo;
+	}
+	$sql = "SELECT grnbatch, grns.supplierref, suppinv,purchorderdetails.orderno 
+		FROM grns INNER JOIN purchorderdetails ON grns.podetailitem=purchorderdetails.podetailitem 
+		LEFT JOIN suppinvstogrn ON grns.grnno=suppinvstogrn.grnno 
+		WHERE supplierid='" . $SupplierID . "'" . $Where;
+	$ErrMsg = _('Failed to retrieve supplier invoice and grn data');
+	$result = DB_query($sql,$ErrMsg);
+	if (DB_num_rows($result)>0) {
+		echo '<table class="selection">
+			<tr>
+				<th>' . _('Supplier Delivery Note') . '</th>
+				<th>' . _('GRN Batch No') . '</th>
+				<th>' . _('PO No') . '</th>
+				<th>' . _('Invoice No') . '</th>
+			</tr>';
+		$k = 0;
+		while ($myrow = DB_fetch_array($result)){
+			if ($k == 0) {
+				echo '<tr class="EvenTableRows">';
+				$k = 1;
+			} else{
+				echo '<tr class="OddTableRows">';
+				$k = 0;
+			}
+			echo '<td class="ascending">' . $myrow['supplierref'] . '</td>
+				<td class="ascending"><a href="' . $RootPath .'/PDFGrn.php?GRNNo=' . $myrow['grnbatch'] . '&amp;PONo=' . $myrow['orderno'] . '">' . $myrow['grnbatch']. '</td>
+				<td class="ascending">' . $myrow['orderno'] . '</td>
+				<td class="ascending">' . $myrow['suppinv'] . '</td></tr>';
+
+		}
+		echo '</table><br/>';
+
+	}
+
+}
+include('includes/footer.inc');
+?>

Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php	2015-10-29 13:04:36 UTC (rev 7372)
+++ trunk/SupplierInvoice.php	2015-10-30 12:12:52 UTC (rev 7373)
@@ -662,6 +662,8 @@
 			</tr>';
 		$tableheader = '<tr style="background-color:#800000">
 							<th>' . _('Seq') . ' #</th>
+							<th>' . _('GRN Batch') . '</th>
+							<th>' . _('Supplier Ref') . '</th>
 							<th>' . _('Item Code') . '</th>
 							<th>' . _('Description') . '</th>
 							<th>' . _('Quantity Charged') . '</th>
@@ -674,6 +676,8 @@
 
 			echo '<tr>
 					<td>' . $EnteredGRN->GRNNo . '</td>
+					<td>' . $EnteredGRN->GRNBatchNo . '</td>
+					<td>' . $EnteredGRN->SupplierRef . '</td>
 					<td>' . $EnteredGRN->ItemCode .	'</td>
 					<td>' . $EnteredGRN->ItemDescription . '</td>
 					<td class="number">' . locale_number_format($EnteredGRN->This_QuantityInv,$EnteredGRN->DecimalPlaces) . '</td>
@@ -1547,7 +1551,8 @@
 			$Result = DB_query($SQL, $ErrMsg, $DbgMsg, True);
 
 			$SQL = "INSERT INTO suppinvstogrn VALUES ('" . $InvoiceNo . "',
-                                                    			'" .$EnteredGRN->GRNNo . "')";
+									'" . $EnteredGRN->GRNNo . "',
+									'" . $EnteredGRN->SupplierRef . "')";
 			$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The invoice could not be mapped to the
 					goods received record because');
 			$DbgMsg = _('The following SQL to map the invoice to the GRN was used');

Modified: trunk/companies/weberpdemo/FormDesigns/GoodsReceived.xml
===================================================================
--- trunk/companies/weberpdemo/FormDesigns/GoodsReceived.xml	2015-10-29 13:04:36 UTC (rev 7372)
+++ trunk/companies/weberpdemo/FormDesigns/GoodsReceived.xml	2015-10-30 12:12:52 UTC (rev 7373)
@@ -53,10 +53,15 @@
 		<x>625</x>
 		<y>48</y>
 	</GRNNumber>
+	<SupplierRef type="SimpleText" name="Supplier's Ref" id="SupplierRef">
+		<FontSize>10</FontSize>
+		<x>625</x>
+		<y>60</y>
+	</SupplierRef>
 	<OrderNumber type="SimpleText" name="Order Number" id="OrderNumber">
 		<FontSize>10</FontSize>
 		<x>625</x>
-		<y>66</y>
+		<y>72</y>
 	</OrderNumber>
 	<PrintDate type="SimpleText" name="Date Printed" id="PrintDate">
 		<FontSize>10</FontSize>

Modified: trunk/includes/DefineSuppTransClass.php
===================================================================
--- trunk/includes/DefineSuppTransClass.php	2015-10-29 13:04:36 UTC (rev 7372)
+++ trunk/includes/DefineSuppTransClass.php	2015-10-30 12:12:52 UTC (rev 7373)
@@ -36,6 +36,7 @@
 	var $TaxGroupDescription;
 	var $Taxes;
 	var $Hold;
+	var $SupplierRef='';
 
 	function SuppTrans(){
 	/*Constructor function initialises a new Supplier Transaction object */
@@ -102,7 +103,8 @@
 								$AssetID=0,
 								$Hold=0,
 								$DecimalPlaces=2,
-								$GRNBatchNo){
+								$GRNBatchNo,
+								$SupplierRef){
 
 		if ($This_QuantityInv!=0 AND isset($This_QuantityInv)){
 			$this->GRNs[$GRNNo] = new GRNs($GRNNo,
@@ -123,7 +125,8 @@
 											$AssetID,
 											$Hold,
 											$DecimalPlaces,
-											$GRNBatchNo);
+											$GRNBatchNo,
+											$SupplierRef);
 			Return 1;
 		}
 		Return 0;
@@ -143,7 +146,8 @@
 									$ShiptRef,
 									$JobRef,
 									$GLCode,
-									$Hold){
+									$Hold,
+									$SupplierRef){
 
 		if ($This_QuantityInv!=0 AND isset($This_QuantityInv)){
 			$this->GRNs[$GRNNo]->Modify($PODetailItem,
@@ -159,7 +163,8 @@
 										$ShiptRef,
 										$JobRef,
 										$GLCode,
-										$Hold );
+										$Hold,
+								       		$SupplierRef);
 			Return 1;
 		}
 		Return 0;
@@ -186,7 +191,8 @@
 													$GRNSrc->AssetID,
 													$GRNSrc->Hold,
 													$GRNSrc->DecimalPlaces,
-													$GRNSrc->GRNBatchNo);
+													$GRNSrc->GRNBatchNo,
+													$GRNSrc->SupplierRef);
 			Return 1;
 		}
 		Return 0;
@@ -325,6 +331,7 @@
 	var $AssetID;
 	var $DecimalPlaces;
 	var $GRNBatchNo;
+	var $SupplierRef;
 
 	function GRNs ($GRNNo,
 					$PODetailItem,
@@ -344,7 +351,8 @@
 					$AssetID,
 					$Hold=0,
 					$DecimalPlaces=2,
-					$GRNBatchNo){
+					$GRNBatchNo,
+					$SupplierRef=''){
 
 
 
@@ -368,6 +376,7 @@
 		$this->Hold = $Hold;
 		$this->DecimalPlaces = $DecimalPlaces;
 		$this->GRNBatchNo = $GRNBatchNo;
+		$this->SupplierRef = $SupplierRef;
 	}
 
 	function Modify ($PODetailItem,
@@ -383,7 +392,8 @@
 					$ShiptRef,
 					$JobRef,
 					$GLCode,
-					$Hold){
+					$Hold,
+					$SupplierRef){
 
 	/* Modify function to edit a GRNs object with passed params */
 		$this->PODetailItem = $PODetailItem;
@@ -400,6 +410,7 @@
 		$this->JobRef = $JobRef;
 		$this->Hold = $Hold;
 		$this->GLCode = $GLCode;
+		$this->SupplierRef = $SupplierRef;
 	}
 }
 

Modified: trunk/includes/PDFGrnHeader.inc
===================================================================
--- trunk/includes/PDFGrnHeader.inc	2015-10-29 13:04:36 UTC (rev 7372)
+++ trunk/includes/PDFGrnHeader.inc	2015-10-30 12:12:52 UTC (rev 7373)
@@ -18,6 +18,7 @@
 
 $LeftOvers = $pdf->addText($FormDesign->CompanyName->x,$Page_Height-$FormDesign->CompanyName->y,$FormDesign->CompanyName->FontSize,$_SESSION['CompanyRecord']['coyname']);
 $LeftOvers = $pdf->addText($FormDesign->GRNNumber->x,$Page_Height-$FormDesign->GRNNumber->y,$FormDesign->GRNNumber->FontSize, _('GRN number ').' ' . $GRNNo );
+$LeftOvers = $pdf->addText($FormDesign->SupplierRef->x,$Page_Height-$FormDesign->SupplierRef->y,$FormDesign->SupplierRef->FontSize,_("Supplier's Ref") . ' ' . $SupplierRef);
 $LeftOvers = $pdf->addText($FormDesign->OrderNumber->x,$Page_Height-$FormDesign->OrderNumber->y,$FormDesign->OrderNumber->FontSize, _('PO number ').' ' . $_GET['PONo'] );
 $LeftOvers = $pdf->addText($FormDesign->PrintDate->x,$Page_Height-$FormDesign->PrintDate->y,$FormDesign->PrintDate->FontSize, _('Printed').': ' . Date($_SESSION['DefaultDateFormat']) . '   '. _('Page'). ' ' . $PageNumber);
 
@@ -45,4 +46,4 @@
 $pdf->Line($FormDesign->Column5->startx, $Page_Height - $FormDesign->Column5->starty, $FormDesign->Column5->endx,$Page_Height - $FormDesign->Column5->endy);
 
 $PageNumber++;
-?>
\ No newline at end of file
+?>

Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql	2015-10-29 13:04:36 UTC (rev 7372)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql	2015-10-30 12:12:52 UTC (rev 7373)
@@ -15,6 +15,7 @@
 CREATE TABLE `suppinvstogrn` (
   `suppinv` int(11) NOT NULL,
   `grnno` int(11) NOT NULL,
+  `supplierref` varchar(30) NOT NULL DEFAULT '',
   PRIMARY KEY (`suppinv`,`grnno`),
   KEY `suppinvstogrn_ibfk_2` (`grnno`),
   CONSTRAINT `suppinvstogrn_ibfk_1` FOREIGN KEY (`suppinv`) REFERENCES
@@ -23,5 +24,8 @@
 `grns` (`grnno`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 INSERT INTO scripts VALUES('EmailCustStatements.php','3','Email customer statement to customer');
+INSERT INTO scripts VALUES('SupplierGRNAndInvoiceInquiry.php',5,'Supplier\'s delivery note and grn relationship inquiry');
+ALTER table grns ADD supplierref varchar(30) NOT NULL DEFAULT '';
+
 -- Update version number:
 UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';





Thread: [Web-erp-svn] SF.net SVN: web-erp:[7373] trunk (Page 59)

Accounting & Best Practice Business Administration System

web-erp-svn