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

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

Revision: 6193
          http://sourceforge.net/p/web-erp/reponame/6193
Author:   tehonu
Date:     2013-08-12 06:08:49 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
Rollback revision 6192

Revision Links:
--------------
    http://sourceforge.net/p/web-erp/reponame/6192

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 05:39:07 UTC (rev 6192)
+++ trunk/ConfirmDispatch_Invoice.php	2013-08-12 06:08:49 UTC (rev 6193)
@@ -786,7 +786,6 @@
 									invtext,
 									shipvia,
 									consignment,
-									trackingnumber,
 									packages,
 									salesperson )
 								VALUES (
@@ -807,7 +806,6 @@
 									'" . $_POST['InvoiceText'] . "',
 									'" . $_SESSION['Items'.$identifier]->ShipVia . "',
 									'" . $_POST['Consignment'] . "',
-									'" . $_POST['ShipmentTrackingNumber'] . "',
 									'" . $_POST['Packages'] . "',
 									'" . $_SESSION['Items'.$identifier]->SalesPerson . "' )";
 
@@ -1648,9 +1646,6 @@
 	if (!isset($_POST['Consignment'])) {
 		$_POST['Consignment']='';
 	}
-	if (!isset($_POST['ShipmentTrackingNumber'])) {
-		$_POST['ShipmentTrackingNumber']='';
-	}
 	if (!isset($_POST['Packages'])) {
 		$_POST['Packages']='1';
 	}
@@ -1670,11 +1665,6 @@
 		</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 05:39:07 UTC (rev 6192)
+++ trunk/sql/mysql/upgrade4.10-4.11.sql	2013-08-12 06:08:49 UTC (rev 6193)
@@ -185,7 +185,5 @@
 
 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';