[Web-erp-svn] SF.net SVN: web-erp:[6192] trunk

[<te...@us...>]

Revision: 6192
          http://sourceforge.net/p/web-erp/reponame/6192
Author:   tehonu
Date:     2013-08-12 05:39:07 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
Added Tracking Number field as described in http://www.weberp.org/forum/showthread.php?tid=99

Modified Paths:
--------------
    trunk/ConfirmDispatch_Invoice.php
    trunk/sql/mysql/upgrade4.10-4.11.sql

Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php	2013-08-12 02:18:38 UTC (rev 6191)
+++ trunk/ConfirmDispatch_Invoice.php	2013-08-12 05:39:07 UTC (rev 6192)
@@ -786,6 +786,7 @@
 									invtext,
 									shipvia,
 									consignment,
+									trackingnumber,
 									packages,
 									salesperson )
 								VALUES (
@@ -806,6 +807,7 @@
 									'" . $_POST['InvoiceText'] . "',
 									'" . $_SESSION['Items'.$identifier]->ShipVia . "',
 									'" . $_POST['Consignment'] . "',
+									'" . $_POST['ShipmentTrackingNumber'] . "',
 									'" . $_POST['Packages'] . "',
 									'" . $_SESSION['Items'.$identifier]->SalesPerson . "' )";
 
@@ -1646,6 +1648,9 @@
 	if (!isset($_POST['Consignment'])) {
 		$_POST['Consignment']='';
 	}
+	if (!isset($_POST['ShipmentTrackingNumber'])) {
+		$_POST['ShipmentTrackingNumber']='';
+	}
 	if (!isset($_POST['Packages'])) {
 		$_POST['Packages']='1';
 	}
@@ -1665,6 +1670,11 @@
 		</tr>';
 	$j++;
 	echo '<tr>
+			<td>' . _('Shipment Tracking Number'). ':</td>
+			<td><input tabindex="'.$j.'" type="text" pattern="[a-zA-Z0-9_\-\ ]*" title="' . _('Enter the tracking number issued by the freight company to track the shipment to the customer') . '" maxlength="40" size="40" name="ShipmentTrackingNumber" value="' . $_POST['ShipmentTrackingNumber'] . '" /></td>
+		</tr>';
+	$j++;
+	echo '<tr>
 			<td>' . _('No Of Packages in Delivery'). ':</td>
 			<td><input tabindex="'.$j.'" type="number" maxlength="6" size="6" class="integer" name="Packages" value="' . $_POST['Packages'] . '" /></td>
 		</tr>';

Modified: trunk/sql/mysql/upgrade4.10-4.11.sql
===================================================================
--- trunk/sql/mysql/upgrade4.10-4.11.sql	2013-08-12 02:18:38 UTC (rev 6191)
+++ trunk/sql/mysql/upgrade4.10-4.11.sql	2013-08-12 05:39:07 UTC (rev 6192)
@@ -185,5 +185,7 @@
 
 INSERT INTO config VALUES ('ShopManagerEmail','');
 
+ALTER TABLE  `debtortrans` ADD  `trackingnumber` VARCHAR( 40 ) NOT NULL AFTER  `consignment`;
+
 UPDATE config SET confvalue='4.11.0' WHERE confname='VersionNumber';