diff --git a/migration/i1.0a-release/oracle/201301091712_TICKET-1001758.sql b/migration/i1.0a-release/oracle/201301091712_TICKET-1001758.sql
new file mode 100644
index 0000000000..cff4eb7698
--- /dev/null
+++ b/migration/i1.0a-release/oracle/201301091712_TICKET-1001758.sql
@@ -0,0 +1,592 @@
+-- Jan 9, 2013 3:45:58 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsIdentifier='Y', IsSelectionColumn='Y', ColumnSQL=NULL,Updated=TO_DATE('2013-01-09 15:45:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202144
+;
+
+-- Jan 9, 2013 3:46:03 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_Shipper ADD Name NVARCHAR2(60) DEFAULT NULL 
+;
+
+-- Jan 9, 2013 3:46:48 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsIdentifier='Y', IsSelectionColumn='Y', ColumnSQL=NULL,Updated=TO_DATE('2013-01-09 15:46:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202148
+;
+
+-- Jan 9, 2013 3:46:51 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperLabels ADD Name NVARCHAR2(60) DEFAULT NULL 
+;
+
+-- Jan 9, 2013 3:47:11 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsIdentifier='Y', IsSelectionColumn='Y', ColumnSQL=NULL,Updated=TO_DATE('2013-01-09 15:47:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202147
+;
+
+-- Jan 9, 2013 3:47:14 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperPackaging ADD Name NVARCHAR2(60) DEFAULT NULL 
+;
+
+-- Jan 9, 2013 3:47:42 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsIdentifier='Y', IsSelectionColumn='Y', ColumnSQL=NULL,Updated=TO_DATE('2013-01-09 15:47:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202149
+;
+
+-- Jan 9, 2013 3:47:44 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperPickupTypes ADD Name NVARCHAR2(60) DEFAULT NULL 
+;
+
+-- Jan 9, 2013 3:48:04 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsIdentifier='Y', IsSelectionColumn='Y', ColumnSQL=NULL,Updated=TO_DATE('2013-01-09 15:48:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202146
+;
+
+-- Jan 9, 2013 3:48:07 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShippingProcessor ADD Name NVARCHAR2(60) DEFAULT NULL 
+;
+
+UPDATE M_Shipper ms SET Name = (
+SELECT xs.Name 
+FROM X_Shipper xs 
+WHERE xs.X_Shipper_ID=ms.X_Shipper_ID)
+WHERE ms.X_Shipper_ID > 0
+AND ms.Name IS NULL;
+
+UPDATE M_ShipperLabels ms SET Name = (
+SELECT xs.Name 
+FROM X_ShipperLabels xs 
+WHERE xs.X_ShipperLabels_ID=ms.X_ShipperLabels_ID)
+WHERE ms.X_ShipperLabels_ID > 0
+AND ms.Name IS NULL;
+
+UPDATE M_ShipperPackaging ms SET Name = (
+SELECT xs.Name 
+FROM X_ShipperPackaging xs 
+WHERE xs.X_ShipperPackaging_ID=ms.X_ShipperPackaging_ID)
+WHERE ms.X_ShipperPackaging_ID > 0
+AND ms.Name IS NULL;
+
+UPDATE M_ShipperPickupTypes ms SET Name = (
+SELECT xs.Name 
+FROM X_ShipperPickupTypes xs 
+WHERE xs.X_ShipperPickupTypes_ID=ms.X_ShipperPickupTypes_ID)
+WHERE ms.X_ShipperPickupTypes_ID > 0
+AND ms.Name IS NULL;
+
+UPDATE M_ShippingProcessor ms SET Name = (
+SELECT xs.Name 
+FROM X_ShippingProcessor xs 
+WHERE xs.X_ShippingProcessor_ID=ms.X_ShippingProcessor_ID)
+WHERE ms.X_ShippingProcessor_ID > 0
+AND ms.Name IS NULL;
+
+-- Jan 9, 2013 3:55:29 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsMandatory='Y',Updated=TO_DATE('2013-01-09 15:55:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202144
+;
+
+-- Jan 9, 2013 3:55:31 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_Shipper MODIFY Name NVARCHAR2(60)
+;
+
+-- Jan 9, 2013 3:55:31 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_Shipper MODIFY Name NOT NULL
+;
+
+-- Jan 9, 2013 3:55:42 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsMandatory='Y',Updated=TO_DATE('2013-01-09 15:55:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202148
+;
+
+-- Jan 9, 2013 3:55:46 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperLabels MODIFY Name NVARCHAR2(60)
+;
+
+-- Jan 9, 2013 3:55:46 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperLabels MODIFY Name NOT NULL
+;
+
+-- Jan 9, 2013 3:55:54 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsMandatory='Y',Updated=TO_DATE('2013-01-09 15:55:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202147
+;
+
+-- Jan 9, 2013 3:55:55 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperPackaging MODIFY Name NVARCHAR2(60)
+;
+
+-- Jan 9, 2013 3:55:55 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperPackaging MODIFY Name NOT NULL
+;
+
+-- Jan 9, 2013 3:56:04 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperPickupTypes MODIFY Name NVARCHAR2(60) DEFAULT NULL 
+;
+
+-- Jan 9, 2013 3:56:08 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsMandatory='Y',Updated=TO_DATE('2013-01-09 15:56:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202149
+;
+
+-- Jan 9, 2013 3:56:09 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperPickupTypes MODIFY Name NVARCHAR2(60)
+;
+
+-- Jan 9, 2013 3:56:09 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperPickupTypes MODIFY Name NOT NULL
+;
+
+-- Jan 9, 2013 3:56:19 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsMandatory='Y',Updated=TO_DATE('2013-01-09 15:56:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202146
+;
+
+-- Jan 9, 2013 3:56:20 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShippingProcessor MODIFY Name NVARCHAR2(60)
+;
+
+-- Jan 9, 2013 3:56:20 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShippingProcessor MODIFY Name NOT NULL
+;
+
+-- Jan 9, 2013 3:59:04 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200036,60,'N','N',202146,'Y',201647,'N','The name of an entity (record) is used as an default search option in addition to the search key. The name is up to 60 characters in length.','D','Alphanumeric identifier of the entity','Name','N','Y','200b96dd-069f-4e2b-8aad-b4295784ac28',100,0,TO_DATE('2013-01-09 15:59:02','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2013-01-09 15:59:02','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Jan 9, 2013 3:59:05 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201647 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Jan 9, 2013 3:59:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=201647
+;
+
+-- Jan 9, 2013 3:59:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=200954
+;
+
+-- Jan 9, 2013 3:59:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=200971
+;
+
+-- Jan 9, 2013 3:59:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200956
+;
+
+-- Jan 9, 2013 3:59:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=200957
+;
+
+-- Jan 9, 2013 3:59:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=201647
+;
+
+-- Jan 9, 2013 3:59:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=200954
+;
+
+-- Jan 9, 2013 3:59:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=200971
+;
+
+-- Jan 9, 2013 3:59:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=200956
+;
+
+-- Jan 9, 2013 3:59:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=200957
+;
+
+-- Jan 9, 2013 4:00:35 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=201503
+;
+
+-- Jan 9, 2013 4:00:35 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=1074
+;
+
+-- Jan 9, 2013 4:00:35 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=2588
+;
+
+-- Jan 9, 2013 4:00:35 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200953
+;
+
+-- Jan 9, 2013 4:00:35 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=201502
+;
+
+-- Jan 9, 2013 4:00:43 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=201503
+;
+
+-- Jan 9, 2013 4:00:43 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=1074
+;
+
+-- Jan 9, 2013 4:00:43 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=2588
+;
+
+-- Jan 9, 2013 4:00:43 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=200953
+;
+
+-- Jan 9, 2013 4:00:43 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=201502
+;
+
+-- Jan 9, 2013 4:01:10 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200037,60,'N','N',202147,'Y',201648,'N','The name of an entity (record) is used as an default search option in addition to the search key. The name is up to 60 characters in length.','D','Alphanumeric identifier of the entity','Name','N','Y','e6ecb888-b63b-4fc0-96d7-48091fd3cd57',100,0,TO_DATE('2013-01-09 16:01:08','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2013-01-09 16:01:08','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Jan 9, 2013 4:01:10 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201648 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Jan 9, 2013 4:01:14 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200038,60,'N','N',202148,'Y',201649,'N','The name of an entity (record) is used as an default search option in addition to the search key. The name is up to 60 characters in length.','D','Alphanumeric identifier of the entity','Name','N','Y','71923594-97e9-47a5-b997-6e74066a988b',100,0,TO_DATE('2013-01-09 16:01:13','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2013-01-09 16:01:13','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Jan 9, 2013 4:01:14 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201649 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Jan 9, 2013 4:01:18 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200039,60,'N','N',202149,'Y',201650,'N','The name of an entity (record) is used as an default search option in addition to the search key. The name is up to 60 characters in length.','D','Alphanumeric identifier of the entity','Name','N','Y','46e611b6-75d4-4e31-8e07-41e879a57ca0',100,0,TO_DATE('2013-01-09 16:01:17','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2013-01-09 16:01:17','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Jan 9, 2013 4:01:18 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201650 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Jan 9, 2013 4:01:30 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=201650
+;
+
+-- Jan 9, 2013 4:01:30 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=200995
+;
+
+-- Jan 9, 2013 4:01:30 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200997
+;
+
+-- Jan 9, 2013 4:01:36 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=201650
+;
+
+-- Jan 9, 2013 4:01:36 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=200995
+;
+
+-- Jan 9, 2013 4:01:36 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=200997
+;
+
+-- Jan 9, 2013 4:01:47 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=201649
+;
+
+-- Jan 9, 2013 4:01:47 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=200982
+;
+
+-- Jan 9, 2013 4:01:47 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200987
+;
+
+-- Jan 9, 2013 4:01:47 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=200984
+;
+
+-- Jan 9, 2013 4:01:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=201649
+;
+
+-- Jan 9, 2013 4:01:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=200982
+;
+
+-- Jan 9, 2013 4:01:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=200987
+;
+
+-- Jan 9, 2013 4:01:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=200984
+;
+
+-- Jan 9, 2013 4:02:00 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=201648
+;
+
+-- Jan 9, 2013 4:02:00 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=200972
+;
+
+-- Jan 9, 2013 4:02:00 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=201346
+;
+
+-- Jan 9, 2013 4:02:00 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=200974
+;
+
+-- Jan 9, 2013 4:02:03 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=201648
+;
+
+-- Jan 9, 2013 4:02:03 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=200972
+;
+
+-- Jan 9, 2013 4:02:03 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=201346
+;
+
+-- Jan 9, 2013 4:02:03 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=200974
+;
+
+-- Jan 9, 2013 4:03:37 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET ColumnSpan=5,Updated=TO_DATE('2013-01-09 16:03:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201503
+;
+
+-- Jan 9, 2013 4:03:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET ColumnSpan=5,Updated=TO_DATE('2013-01-09 16:03:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201648
+;
+
+-- Jan 9, 2013 4:03:59 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET ColumnSpan=5,Updated=TO_DATE('2013-01-09 16:03:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201649
+;
+
+-- Jan 9, 2013 4:04:07 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET ColumnSpan=5,Updated=TO_DATE('2013-01-09 16:04:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201650
+;
+
+-- Jan 9, 2013 4:04:59 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET ColumnSpan=5,Updated=TO_DATE('2013-01-09 16:04:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201647
+;
+
+-- Jan 9, 2013 4:07:08 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET DisplayLogic='@X_Shipper_ID@>0',Updated=TO_DATE('2013-01-09 16:07:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201502
+;
+
+-- Jan 9, 2013 4:09:32 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_DATE('2013-01-09 16:09:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202147
+;
+
+-- Jan 9, 2013 4:09:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_DATE('2013-01-09 16:09:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202144
+;
+
+-- Jan 9, 2013 4:09:59 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_DATE('2013-01-09 16:09:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202148
+;
+
+-- Jan 9, 2013 4:10:23 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_DATE('2013-01-09 16:10:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202149
+;
+
+-- Jan 9, 2013 4:10:31 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_DATE('2013-01-09 16:10:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202146
+;
+
+-- Jan 9, 2013 4:12:06 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET XPosition=2,Updated=TO_DATE('2013-01-09 16:12:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200995
+;
+
+-- Jan 9, 2013 4:12:09 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET XPosition=5,Updated=TO_DATE('2013-01-09 16:12:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200997
+;
+
+-- Jan 9, 2013 4:12:53 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET IsSameLine='N', XPosition=2,Updated=TO_DATE('2013-01-09 16:12:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200982
+;
+
+-- Jan 9, 2013 4:13:07 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET IsSameLine='N', XPosition=2,Updated=TO_DATE('2013-01-09 16:13:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200972
+;
+
+-- Jan 9, 2013 4:13:30 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET IsSameLine='N',Updated=TO_DATE('2013-01-09 16:13:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200995
+;
+
+-- Jan 9, 2013 4:16:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200984
+;
+
+-- Jan 9, 2013 4:16:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=200987
+;
+
+-- Jan 9, 2013 4:16:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=200984
+;
+
+-- Jan 9, 2013 4:16:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=200987
+;
+
+-- Jan 9, 2013 4:16:30 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET IsSameLine='Y', XPosition=5,Updated=TO_DATE('2013-01-09 16:16:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200984
+;
+
+-- Jan 9, 2013 4:16:36 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_DATE('2013-01-09 16:16:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200997
+;
+
+-- Jan 9, 2013 4:16:44 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200974
+;
+
+-- Jan 9, 2013 4:16:44 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=201346
+;
+
+-- Jan 9, 2013 4:16:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=200974
+;
+
+-- Jan 9, 2013 4:16:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=201346
+;
+
+-- Jan 9, 2013 4:16:58 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET IsSameLine='Y', XPosition=5,Updated=TO_DATE('2013-01-09 16:16:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200974
+;
+
+-- Jan 9, 2013 4:34:48 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET Callout='org.compiere.model.CalloutShippingProcessor.shippingProcessor',Updated=TO_DATE('2013-01-09 16:34:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202139
+;
+
+-- Jan 9, 2013 4:43:33 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Val_Rule (Code,AD_Val_Rule_ID,EntityType,Name,Type,AD_Val_Rule_UU,CreatedBy,UpdatedBy,Updated,Created,AD_Client_ID,IsActive,AD_Org_ID) VALUES ('X_ShipperLabels_ID IN (SELECT X_ShipperLabels_ID FROM X_ShipperLabels WHERE X_Shipper_ID IN (SELECT X_Shipper_ID FROM M_Shipper WHERE M_Shipper_ID=@M_Shipper_ID@)',200020,'D','M_ShipperLabels X_ShipperLabels_ID','S','9f005c77-9ba4-4f6a-a1c7-3da9c0bb42f1',100,100,TO_DATE('2013-01-09 16:43:31','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-01-09 16:43:31','YYYY-MM-DD HH24:MI:SS'),0,'Y',0)
+;
+
+-- Jan 9, 2013 4:43:43 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET AD_Val_Rule_ID=200020,Updated=TO_DATE('2013-01-09 16:43:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202142
+;
+
+-- Jan 9, 2013 4:46:38 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Val_Rule SET Code='X_ShipperLabels.X_ShipperLabels_ID IN (SELECT X_ShipperLabels_ID FROM X_ShipperLabels WHERE X_Shipper_ID IN (SELECT X_Shipper_ID FROM M_Shipper WHERE M_Shipper_ID=@M_Shipper_ID@))',Updated=TO_DATE('2013-01-09 16:46:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=200020
+;
+
+-- Jan 9, 2013 4:47:52 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Val_Rule (Code,AD_Val_Rule_ID,EntityType,Name,Type,AD_Val_Rule_UU,CreatedBy,UpdatedBy,Updated,Created,AD_Client_ID,IsActive,AD_Org_ID) VALUES ('X_ShipperPackaging.X_ShipperPackaging_ID IN (SELECT X_ShipperPackaging_ID FROM X_ShipperPackaging WHERE X_Shipper_ID IN (SELECT X_Shipper_ID FROM M_Shipper WHERE M_Shipper_ID=@M_Shipper_ID@))',200021,'D','M_ShipperPackaging X_ShipperPackaging_ID','S','0eda1648-695c-40e0-b421-d2fb0077c672',100,100,TO_DATE('2013-01-09 16:47:51','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-01-09 16:47:51','YYYY-MM-DD HH24:MI:SS'),0,'Y',0)
+;
+
+-- Jan 9, 2013 4:47:59 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET AD_Val_Rule_ID=200021,Updated=TO_DATE('2013-01-09 16:47:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202141
+;
+
+-- Jan 9, 2013 4:48:39 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Val_Rule (Code,AD_Val_Rule_ID,EntityType,Name,Type,AD_Val_Rule_UU,CreatedBy,UpdatedBy,Updated,Created,AD_Client_ID,IsActive,AD_Org_ID) VALUES ('X_ShipperPickupTypes.X_ShipperPickupTypes_ID IN (SELECT X_ShipperPickupTypes_ID FROM X_ShipperPickupTypes WHERE X_Shipper_ID IN (SELECT X_Shipper_ID FROM M_Shipper WHERE M_Shipper_ID=@M_Shipper_ID@))',200022,'D','M_ShipperPickupTypes X_ShipperPickupTypes_ID','S','7eb82600-c4ef-41c2-9205-4015b9b15e9c',100,100,TO_DATE('2013-01-09 16:48:38','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-01-09 16:48:38','YYYY-MM-DD HH24:MI:SS'),0,'Y',0)
+;
+
+-- Jan 9, 2013 4:48:45 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET AD_Val_Rule_ID=200022,Updated=TO_DATE('2013-01-09 16:48:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202143
+;
+
+SELECT register_migration_script('201301091712_TICKET-1001758.sql') FROM dual
+;
\ No newline at end of file
diff --git a/migration/i1.0a-release/postgresql/201301091712_TICKET-1001758.sql b/migration/i1.0a-release/postgresql/201301091712_TICKET-1001758.sql
new file mode 100644
index 0000000000..68cfd2d2d1
--- /dev/null
+++ b/migration/i1.0a-release/postgresql/201301091712_TICKET-1001758.sql
@@ -0,0 +1,592 @@
+-- Jan 9, 2013 3:45:58 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsIdentifier='Y', IsSelectionColumn='Y', ColumnSQL=NULL,Updated=TO_TIMESTAMP('2013-01-09 15:45:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202144
+;
+
+-- Jan 9, 2013 3:46:03 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_Shipper ADD COLUMN Name VARCHAR(60) DEFAULT NULL 
+;
+
+-- Jan 9, 2013 3:46:48 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsIdentifier='Y', IsSelectionColumn='Y', ColumnSQL=NULL,Updated=TO_TIMESTAMP('2013-01-09 15:46:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202148
+;
+
+-- Jan 9, 2013 3:46:51 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperLabels ADD COLUMN Name VARCHAR(60) DEFAULT NULL 
+;
+
+-- Jan 9, 2013 3:47:11 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsIdentifier='Y', IsSelectionColumn='Y', ColumnSQL=NULL,Updated=TO_TIMESTAMP('2013-01-09 15:47:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202147
+;
+
+-- Jan 9, 2013 3:47:14 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperPackaging ADD COLUMN Name VARCHAR(60) DEFAULT NULL 
+;
+
+-- Jan 9, 2013 3:47:42 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsIdentifier='Y', IsSelectionColumn='Y', ColumnSQL=NULL,Updated=TO_TIMESTAMP('2013-01-09 15:47:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202149
+;
+
+-- Jan 9, 2013 3:47:44 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShipperPickupTypes ADD COLUMN Name VARCHAR(60) DEFAULT NULL 
+;
+
+-- Jan 9, 2013 3:48:04 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsIdentifier='Y', IsSelectionColumn='Y', ColumnSQL=NULL,Updated=TO_TIMESTAMP('2013-01-09 15:48:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202146
+;
+
+-- Jan 9, 2013 3:48:07 PM SGT
+-- Ticket 1001758: FedEx & UPS
+ALTER TABLE M_ShippingProcessor ADD COLUMN Name VARCHAR(60) DEFAULT NULL 
+;
+
+UPDATE M_Shipper ms SET Name = (
+SELECT xs.Name 
+FROM X_Shipper xs 
+WHERE xs.X_Shipper_ID=ms.X_Shipper_ID)
+WHERE ms.X_Shipper_ID > 0
+AND ms.Name IS NULL;
+
+UPDATE M_ShipperLabels ms SET Name = (
+SELECT xs.Name 
+FROM X_ShipperLabels xs 
+WHERE xs.X_ShipperLabels_ID=ms.X_ShipperLabels_ID)
+WHERE ms.X_ShipperLabels_ID > 0
+AND ms.Name IS NULL;
+
+UPDATE M_ShipperPackaging ms SET Name = (
+SELECT xs.Name 
+FROM X_ShipperPackaging xs 
+WHERE xs.X_ShipperPackaging_ID=ms.X_ShipperPackaging_ID)
+WHERE ms.X_ShipperPackaging_ID > 0
+AND ms.Name IS NULL;
+
+UPDATE M_ShipperPickupTypes ms SET Name = (
+SELECT xs.Name 
+FROM X_ShipperPickupTypes xs 
+WHERE xs.X_ShipperPickupTypes_ID=ms.X_ShipperPickupTypes_ID)
+WHERE ms.X_ShipperPickupTypes_ID > 0
+AND ms.Name IS NULL;
+
+UPDATE M_ShippingProcessor ms SET Name = (
+SELECT xs.Name 
+FROM X_ShippingProcessor xs 
+WHERE xs.X_ShippingProcessor_ID=ms.X_ShippingProcessor_ID)
+WHERE ms.X_ShippingProcessor_ID > 0
+AND ms.Name IS NULL;
+
+-- Jan 9, 2013 3:55:29 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsMandatory='Y',Updated=TO_TIMESTAMP('2013-01-09 15:55:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202144
+;
+
+-- Jan 9, 2013 3:55:31 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO t_alter_column values('m_shipper','Name','VARCHAR(60)',null,null)
+;
+
+-- Jan 9, 2013 3:55:31 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO t_alter_column values('m_shipper','Name',null,'NOT NULL',null)
+;
+
+-- Jan 9, 2013 3:55:42 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsMandatory='Y',Updated=TO_TIMESTAMP('2013-01-09 15:55:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202148
+;
+
+-- Jan 9, 2013 3:55:46 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO t_alter_column values('m_shipperlabels','Name','VARCHAR(60)',null,null)
+;
+
+-- Jan 9, 2013 3:55:46 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO t_alter_column values('m_shipperlabels','Name',null,'NOT NULL',null)
+;
+
+-- Jan 9, 2013 3:55:54 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsMandatory='Y',Updated=TO_TIMESTAMP('2013-01-09 15:55:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202147
+;
+
+-- Jan 9, 2013 3:55:55 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO t_alter_column values('m_shipperpackaging','Name','VARCHAR(60)',null,null)
+;
+
+-- Jan 9, 2013 3:55:55 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO t_alter_column values('m_shipperpackaging','Name',null,'NOT NULL',null)
+;
+
+-- Jan 9, 2013 3:56:04 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO t_alter_column values('m_shipperpickuptypes','Name','VARCHAR(60)',null,'NULL')
+;
+
+-- Jan 9, 2013 3:56:08 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsMandatory='Y',Updated=TO_TIMESTAMP('2013-01-09 15:56:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202149
+;
+
+-- Jan 9, 2013 3:56:09 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO t_alter_column values('m_shipperpickuptypes','Name','VARCHAR(60)',null,null)
+;
+
+-- Jan 9, 2013 3:56:09 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO t_alter_column values('m_shipperpickuptypes','Name',null,'NOT NULL',null)
+;
+
+-- Jan 9, 2013 3:56:19 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsMandatory='Y',Updated=TO_TIMESTAMP('2013-01-09 15:56:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202146
+;
+
+-- Jan 9, 2013 3:56:20 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO t_alter_column values('m_shippingprocessor','Name','VARCHAR(60)',null,null)
+;
+
+-- Jan 9, 2013 3:56:20 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO t_alter_column values('m_shippingprocessor','Name',null,'NOT NULL',null)
+;
+
+-- Jan 9, 2013 3:59:04 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200036,60,'N','N',202146,'Y',201647,'N','The name of an entity (record) is used as an default search option in addition to the search key. The name is up to 60 characters in length.','D','Alphanumeric identifier of the entity','Name','N','Y','200b96dd-069f-4e2b-8aad-b4295784ac28',100,0,TO_TIMESTAMP('2013-01-09 15:59:02','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2013-01-09 15:59:02','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Jan 9, 2013 3:59:05 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201647 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Jan 9, 2013 3:59:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=201647
+;
+
+-- Jan 9, 2013 3:59:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=200954
+;
+
+-- Jan 9, 2013 3:59:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=200971
+;
+
+-- Jan 9, 2013 3:59:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200956
+;
+
+-- Jan 9, 2013 3:59:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=200957
+;
+
+-- Jan 9, 2013 3:59:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=201647
+;
+
+-- Jan 9, 2013 3:59:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=200954
+;
+
+-- Jan 9, 2013 3:59:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=200971
+;
+
+-- Jan 9, 2013 3:59:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=200956
+;
+
+-- Jan 9, 2013 3:59:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=200957
+;
+
+-- Jan 9, 2013 4:00:35 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=201503
+;
+
+-- Jan 9, 2013 4:00:35 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=1074
+;
+
+-- Jan 9, 2013 4:00:35 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=2588
+;
+
+-- Jan 9, 2013 4:00:35 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200953
+;
+
+-- Jan 9, 2013 4:00:35 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=201502
+;
+
+-- Jan 9, 2013 4:00:43 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=201503
+;
+
+-- Jan 9, 2013 4:00:43 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=1074
+;
+
+-- Jan 9, 2013 4:00:43 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=2588
+;
+
+-- Jan 9, 2013 4:00:43 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=200953
+;
+
+-- Jan 9, 2013 4:00:43 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=201502
+;
+
+-- Jan 9, 2013 4:01:10 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200037,60,'N','N',202147,'Y',201648,'N','The name of an entity (record) is used as an default search option in addition to the search key. The name is up to 60 characters in length.','D','Alphanumeric identifier of the entity','Name','N','Y','e6ecb888-b63b-4fc0-96d7-48091fd3cd57',100,0,TO_TIMESTAMP('2013-01-09 16:01:08','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2013-01-09 16:01:08','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Jan 9, 2013 4:01:10 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201648 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Jan 9, 2013 4:01:14 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200038,60,'N','N',202148,'Y',201649,'N','The name of an entity (record) is used as an default search option in addition to the search key. The name is up to 60 characters in length.','D','Alphanumeric identifier of the entity','Name','N','Y','71923594-97e9-47a5-b997-6e74066a988b',100,0,TO_TIMESTAMP('2013-01-09 16:01:13','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2013-01-09 16:01:13','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Jan 9, 2013 4:01:14 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201649 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Jan 9, 2013 4:01:18 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200039,60,'N','N',202149,'Y',201650,'N','The name of an entity (record) is used as an default search option in addition to the search key. The name is up to 60 characters in length.','D','Alphanumeric identifier of the entity','Name','N','Y','46e611b6-75d4-4e31-8e07-41e879a57ca0',100,0,TO_TIMESTAMP('2013-01-09 16:01:17','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2013-01-09 16:01:17','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Jan 9, 2013 4:01:18 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201650 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Jan 9, 2013 4:01:30 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=201650
+;
+
+-- Jan 9, 2013 4:01:30 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=200995
+;
+
+-- Jan 9, 2013 4:01:30 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200997
+;
+
+-- Jan 9, 2013 4:01:36 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=201650
+;
+
+-- Jan 9, 2013 4:01:36 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=200995
+;
+
+-- Jan 9, 2013 4:01:36 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=200997
+;
+
+-- Jan 9, 2013 4:01:47 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=201649
+;
+
+-- Jan 9, 2013 4:01:47 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=200982
+;
+
+-- Jan 9, 2013 4:01:47 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200987
+;
+
+-- Jan 9, 2013 4:01:47 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=200984
+;
+
+-- Jan 9, 2013 4:01:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=201649
+;
+
+-- Jan 9, 2013 4:01:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=200982
+;
+
+-- Jan 9, 2013 4:01:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=200987
+;
+
+-- Jan 9, 2013 4:01:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=200984
+;
+
+-- Jan 9, 2013 4:02:00 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=201648
+;
+
+-- Jan 9, 2013 4:02:00 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=200972
+;
+
+-- Jan 9, 2013 4:02:00 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=201346
+;
+
+-- Jan 9, 2013 4:02:00 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=200974
+;
+
+-- Jan 9, 2013 4:02:03 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=201648
+;
+
+-- Jan 9, 2013 4:02:03 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=200972
+;
+
+-- Jan 9, 2013 4:02:03 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=201346
+;
+
+-- Jan 9, 2013 4:02:03 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=200974
+;
+
+-- Jan 9, 2013 4:03:37 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET ColumnSpan=5,Updated=TO_TIMESTAMP('2013-01-09 16:03:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201503
+;
+
+-- Jan 9, 2013 4:03:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET ColumnSpan=5,Updated=TO_TIMESTAMP('2013-01-09 16:03:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201648
+;
+
+-- Jan 9, 2013 4:03:59 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET ColumnSpan=5,Updated=TO_TIMESTAMP('2013-01-09 16:03:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201649
+;
+
+-- Jan 9, 2013 4:04:07 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET ColumnSpan=5,Updated=TO_TIMESTAMP('2013-01-09 16:04:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201650
+;
+
+-- Jan 9, 2013 4:04:59 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET ColumnSpan=5,Updated=TO_TIMESTAMP('2013-01-09 16:04:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201647
+;
+
+-- Jan 9, 2013 4:07:08 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET DisplayLogic='@X_Shipper_ID@>0',Updated=TO_TIMESTAMP('2013-01-09 16:07:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201502
+;
+
+-- Jan 9, 2013 4:09:32 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_TIMESTAMP('2013-01-09 16:09:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202147
+;
+
+-- Jan 9, 2013 4:09:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_TIMESTAMP('2013-01-09 16:09:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202144
+;
+
+-- Jan 9, 2013 4:09:59 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_TIMESTAMP('2013-01-09 16:09:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202148
+;
+
+-- Jan 9, 2013 4:10:23 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_TIMESTAMP('2013-01-09 16:10:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202149
+;
+
+-- Jan 9, 2013 4:10:31 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_TIMESTAMP('2013-01-09 16:10:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202146
+;
+
+-- Jan 9, 2013 4:12:06 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET XPosition=2,Updated=TO_TIMESTAMP('2013-01-09 16:12:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200995
+;
+
+-- Jan 9, 2013 4:12:09 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET XPosition=5,Updated=TO_TIMESTAMP('2013-01-09 16:12:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200997
+;
+
+-- Jan 9, 2013 4:12:53 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET IsSameLine='N', XPosition=2,Updated=TO_TIMESTAMP('2013-01-09 16:12:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200982
+;
+
+-- Jan 9, 2013 4:13:07 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET IsSameLine='N', XPosition=2,Updated=TO_TIMESTAMP('2013-01-09 16:13:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200972
+;
+
+-- Jan 9, 2013 4:13:30 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET IsSameLine='N',Updated=TO_TIMESTAMP('2013-01-09 16:13:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200995
+;
+
+-- Jan 9, 2013 4:16:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200984
+;
+
+-- Jan 9, 2013 4:16:13 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=200987
+;
+
+-- Jan 9, 2013 4:16:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=200984
+;
+
+-- Jan 9, 2013 4:16:17 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=200987
+;
+
+-- Jan 9, 2013 4:16:30 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET IsSameLine='Y', XPosition=5,Updated=TO_TIMESTAMP('2013-01-09 16:16:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200984
+;
+
+-- Jan 9, 2013 4:16:36 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_TIMESTAMP('2013-01-09 16:16:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200997
+;
+
+-- Jan 9, 2013 4:16:44 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200974
+;
+
+-- Jan 9, 2013 4:16:44 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=201346
+;
+
+-- Jan 9, 2013 4:16:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=200974
+;
+
+-- Jan 9, 2013 4:16:50 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=201346
+;
+
+-- Jan 9, 2013 4:16:58 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Field SET IsSameLine='Y', XPosition=5,Updated=TO_TIMESTAMP('2013-01-09 16:16:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200974
+;
+
+-- Jan 9, 2013 4:34:48 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET Callout='org.compiere.model.CalloutShippingProcessor.shippingProcessor',Updated=TO_TIMESTAMP('2013-01-09 16:34:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202139
+;
+
+-- Jan 9, 2013 4:43:33 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Val_Rule (Code,AD_Val_Rule_ID,EntityType,Name,Type,AD_Val_Rule_UU,CreatedBy,UpdatedBy,Updated,Created,AD_Client_ID,IsActive,AD_Org_ID) VALUES ('X_ShipperLabels_ID IN (SELECT X_ShipperLabels_ID FROM X_ShipperLabels WHERE X_Shipper_ID IN (SELECT X_Shipper_ID FROM M_Shipper WHERE M_Shipper_ID=@M_Shipper_ID@)',200020,'D','M_ShipperLabels X_ShipperLabels_ID','S','9f005c77-9ba4-4f6a-a1c7-3da9c0bb42f1',100,100,TO_TIMESTAMP('2013-01-09 16:43:31','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2013-01-09 16:43:31','YYYY-MM-DD HH24:MI:SS'),0,'Y',0)
+;
+
+-- Jan 9, 2013 4:43:43 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET AD_Val_Rule_ID=200020,Updated=TO_TIMESTAMP('2013-01-09 16:43:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202142
+;
+
+-- Jan 9, 2013 4:46:38 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Val_Rule SET Code='X_ShipperLabels.X_ShipperLabels_ID IN (SELECT X_ShipperLabels_ID FROM X_ShipperLabels WHERE X_Shipper_ID IN (SELECT X_Shipper_ID FROM M_Shipper WHERE M_Shipper_ID=@M_Shipper_ID@))',Updated=TO_TIMESTAMP('2013-01-09 16:46:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=200020
+;
+
+-- Jan 9, 2013 4:47:52 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Val_Rule (Code,AD_Val_Rule_ID,EntityType,Name,Type,AD_Val_Rule_UU,CreatedBy,UpdatedBy,Updated,Created,AD_Client_ID,IsActive,AD_Org_ID) VALUES ('X_ShipperPackaging.X_ShipperPackaging_ID IN (SELECT X_ShipperPackaging_ID FROM X_ShipperPackaging WHERE X_Shipper_ID IN (SELECT X_Shipper_ID FROM M_Shipper WHERE M_Shipper_ID=@M_Shipper_ID@))',200021,'D','M_ShipperPackaging X_ShipperPackaging_ID','S','0eda1648-695c-40e0-b421-d2fb0077c672',100,100,TO_TIMESTAMP('2013-01-09 16:47:51','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2013-01-09 16:47:51','YYYY-MM-DD HH24:MI:SS'),0,'Y',0)
+;
+
+-- Jan 9, 2013 4:47:59 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET AD_Val_Rule_ID=200021,Updated=TO_TIMESTAMP('2013-01-09 16:47:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202141
+;
+
+-- Jan 9, 2013 4:48:39 PM SGT
+-- Ticket 1001758: FedEx & UPS
+INSERT INTO AD_Val_Rule (Code,AD_Val_Rule_ID,EntityType,Name,Type,AD_Val_Rule_UU,CreatedBy,UpdatedBy,Updated,Created,AD_Client_ID,IsActive,AD_Org_ID) VALUES ('X_ShipperPickupTypes.X_ShipperPickupTypes_ID IN (SELECT X_ShipperPickupTypes_ID FROM X_ShipperPickupTypes WHERE X_Shipper_ID IN (SELECT X_Shipper_ID FROM M_Shipper WHERE M_Shipper_ID=@M_Shipper_ID@))',200022,'D','M_ShipperPickupTypes X_ShipperPickupTypes_ID','S','7eb82600-c4ef-41c2-9205-4015b9b15e9c',100,100,TO_TIMESTAMP('2013-01-09 16:48:38','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2013-01-09 16:48:38','YYYY-MM-DD HH24:MI:SS'),0,'Y',0)
+;
+
+-- Jan 9, 2013 4:48:45 PM SGT
+-- Ticket 1001758: FedEx & UPS
+UPDATE AD_Column SET AD_Val_Rule_ID=200022,Updated=TO_TIMESTAMP('2013-01-09 16:48:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202143
+;
+
+SELECT register_migration_script('201301091712_TICKET-1001758.sql') FROM dual
+;
\ No newline at end of file
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutShipper.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutShipper.java
index c3a3071967..ea88f07229 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutShipper.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutShipper.java
@@ -31,6 +31,9 @@ public class CalloutShipper extends CalloutEngine
 		if (X_Shipper_ID == null || X_Shipper_ID.intValue() == 0)
 			return "";
 		
+		X_X_Shipper s = new X_X_Shipper(ctx, X_Shipper_ID, null);
+		mTab.setValue(MShipper.COLUMNNAME_Name, s.getName());
+		
 		StringBuilder sb = new StringBuilder();
 		sb.append("SELECT sp.M_ShippingProcessor_ID ");
 		sb.append("FROM M_ShippingProcessor sp, X_ShippingProcessor xsp, X_Shipper xs ");
@@ -56,6 +59,7 @@ public class CalloutShipper extends CalloutEngine
 			return "";
 		
 		X_X_ShipperLabels sl = new X_X_ShipperLabels(ctx, X_ShipperLabels_ID, null);
+		mTab.setValue(MShipperLabels.COLUMNNAME_Name, sl.getName());
 		mTab.setValue(MShipperLabels.COLUMNNAME_LabelPrintMethod, sl.getLabelPrintMethod());
 		mTab.setValue(MShipperLabels.COLUMNNAME_IsDefault, sl.isDefault());
 		
@@ -69,6 +73,7 @@ public class CalloutShipper extends CalloutEngine
 			return "";
 		
 		X_X_ShipperPackaging sp = new X_X_ShipperPackaging(ctx, X_ShipperPackaging_ID, null);
+		mTab.setValue(MShipperPackaging.COLUMNNAME_Name, sp.getName());
 		mTab.setValue(MShipperPackaging.COLUMNNAME_IsDefault, sp.isDefault());
 		mTab.setValue(MShipperPackaging.COLUMNNAME_Weight, sp.getWeight());
 		
@@ -82,6 +87,7 @@ public class CalloutShipper extends CalloutEngine
 			return "";
 		
 		X_X_ShipperPickupTypes spt = new X_X_ShipperPickupTypes(ctx, X_ShipperPickupTypes_ID, null);
+		mTab.setValue(MShipperLabels.COLUMNNAME_Name, spt.getName());
 		mTab.setValue(MShipperLabels.COLUMNNAME_IsDefault, spt.isDefault());
 		
 		return null;
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutShippingProcessor.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutShippingProcessor.java
new file mode 100644
index 0000000000..7ce95a8ac8
--- /dev/null
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutShippingProcessor.java
@@ -0,0 +1,36 @@
+/******************************************************************************
+ * Copyright (C) 2013 Elaine Tan                                              *
+ * Copyright (C) 2013 Trek Global
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.util.Properties;
+
+/**
+ * 
+ * @author Elaine
+ *
+ */
+public class CalloutShippingProcessor extends CalloutEngine
+{
+	public String shippingProcessor(Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value)
+	{
+		Integer X_ShippingProcessor_ID = (Integer)value;
+		if (X_ShippingProcessor_ID == null || X_ShippingProcessor_ID.intValue() == 0)
+			return "";
+		
+		X_X_ShippingProcessor sp = new X_X_ShippingProcessor(ctx, X_ShippingProcessor_ID, null);
+		mTab.setValue(MShippingProcessor.COLUMNNAME_Name, sp.getName());
+		
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/org.adempiere.base/src/org/adempiere/process/ShipperCreateFrom.java b/org.adempiere.base/src/org/adempiere/process/ShipperCreateFrom.java
index 5ff28de1ff..5eb3db4f38 100644
--- a/org.adempiere.base/src/org/adempiere/process/ShipperCreateFrom.java
+++ b/org.adempiere.base/src/org/adempiere/process/ShipperCreateFrom.java
@@ -46,6 +46,7 @@ public class ShipperCreateFrom extends SvrProcess
 			MShipperPackaging sp = new MShipperPackaging(getCtx(), 0, null);
 			sp.setM_Shipper_ID(m_shipper.getM_Shipper_ID());
 			sp.setX_ShipperPackaging_ID(xsp.getX_ShipperPackaging_ID());
+			sp.setName(xsp.getName());
 			sp.setIsDefault(xsp.isDefault());
 			sp.setWeight(xsp.getWeight());
 			sp.saveEx();				
@@ -69,6 +70,7 @@ public class ShipperCreateFrom extends SvrProcess
 			MShipperLabels sl = new MShipperLabels(getCtx(), 0, null);
 			sl.setM_Shipper_ID(m_shipper.getM_Shipper_ID());
 			sl.setX_ShipperLabels_ID(xsl.getX_ShipperLabels_ID());
+			sl.setName(xsl.getName());
 			sl.setIsDefault(xsl.isDefault());
 			sl.setLabelPrintMethod(xsl.getLabelPrintMethod());
 			sl.saveEx();				
@@ -92,9 +94,9 @@ public class ShipperCreateFrom extends SvrProcess
 			MShipperPickupTypes spt = new MShipperPickupTypes(getCtx(), 0, null);
 			spt.setM_Shipper_ID(m_shipper.getM_Shipper_ID());
 			spt.setX_ShipperPickupTypes_ID(xspt.getX_ShipperPickupTypes_ID());
+			spt.setName(xspt.getName());
 			spt.setIsDefault(xspt.isDefault());
 			spt.saveEx();				
 		}
 	}
-
-}
+}
\ No newline at end of file
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Shipper.java b/org.adempiere.base/src/org/compiere/model/I_M_Shipper.java
index 3893c59add..848b83698b 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_Shipper.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_Shipper.java
@@ -93,6 +93,19 @@ public interface I_M_Shipper
 	  */
 	public int getCreatedBy();
 
+    /** Column name CreateFrom */
+    public static final String COLUMNNAME_CreateFrom = "CreateFrom";
+
+	/** Set Create lines from.
+	  * Process which will generate a new document lines based on an existing document
+	  */
+	public void setCreateFrom (String CreateFrom);
+
+	/** Get Create lines from.
+	  * Process which will generate a new document lines based on an existing document
+	  */
+	public String getCreateFrom();
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
@@ -139,6 +152,19 @@ public interface I_M_Shipper
 
 	public org.compiere.model.I_M_ShippingProcessor getM_ShippingProcessor() throws RuntimeException;
 
+    /** Column name Name */
+    public static final String COLUMNNAME_Name = "Name";
+
+	/** Set Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name);
+
+	/** Get Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public String getName();
+
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabels.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabels.java
index 968997b580..b1b98bd670 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabels.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabels.java
@@ -146,6 +146,19 @@ public interface I_M_ShipperLabels
 	/** Get M_ShipperLabels_UU	  */
 	public String getM_ShipperLabels_UU();
 
+    /** Column name Name */
+    public static final String COLUMNNAME_Name = "Name";
+
+	/** Set Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name);
+
+	/** Get Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public String getName();
+
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackaging.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackaging.java
index d38de0d260..8c67982342 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackaging.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackaging.java
@@ -137,6 +137,19 @@ public interface I_M_ShipperPackaging
 	/** Get M_ShipperPackaging_UU	  */
 	public String getM_ShipperPackaging_UU();
 
+    /** Column name Name */
+    public static final String COLUMNNAME_Name = "Name";
+
+	/** Set Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name);
+
+	/** Get Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public String getName();
+
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypes.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypes.java
index bb0276ae70..d785764e1d 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypes.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypes.java
@@ -137,6 +137,19 @@ public interface I_M_ShipperPickupTypes
 	/** Get M_ShipperPickupTypes_UU	  */
 	public String getM_ShipperPickupTypes_UU();
 
+    /** Column name Name */
+    public static final String COLUMNNAME_Name = "Name";
+
+	/** Set Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name);
+
+	/** Get Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public String getName();
+
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessor.java b/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessor.java
index 97395a561c..6aa5020d28 100644
--- a/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessor.java
@@ -127,6 +127,19 @@ public interface I_M_ShippingProcessor
 	/** Get M_ShippingProcessor_UU	  */
 	public String getM_ShippingProcessor_UU();
 
+    /** Column name Name */
+    public static final String COLUMNNAME_Name = "Name";
+
+	/** Set Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name);
+
+	/** Get Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public String getName();
+
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/org.adempiere.base/src/org/compiere/model/MShipper.java b/org.adempiere.base/src/org/compiere/model/MShipper.java
index 5ca781d97c..e3d34bf4c6 100644
--- a/org.adempiere.base/src/org/compiere/model/MShipper.java
+++ b/org.adempiere.base/src/org/compiere/model/MShipper.java
@@ -75,11 +75,6 @@ public class MShipper extends X_M_Shipper
 		return(result);
 	}
 	
-	public String getName()
-	{
-		return getX_Shipper().getName();
-	}
-	
 	public String getShippingServiceCode()
 	{
 		return getX_Shipper().getShippingServiceCode();
diff --git a/org.adempiere.base/src/org/compiere/model/MShipperLabels.java b/org.adempiere.base/src/org/compiere/model/MShipperLabels.java
index c08649d571..68ea0ed32d 100644
--- a/org.adempiere.base/src/org/compiere/model/MShipperLabels.java
+++ b/org.adempiere.base/src/org/compiere/model/MShipperLabels.java
@@ -27,11 +27,6 @@ public class MShipperLabels extends X_M_ShipperLabels
 		return getX_ShipperLabels().getValue();
 	}
 	
-	public String getName()
-	{
-		return getX_ShipperLabels().getName();
-	}
-	
 	public BigDecimal getHeight()
 	{
 		return getX_ShipperLabels().getHeight();
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java b/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java
index bbb374010c..8a900130e4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java
@@ -29,7 +29,7 @@ public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121213L;
+	private static final long serialVersionUID = 20130109L;
 
     /** Standard Constructor */
     public X_M_Shipper (Properties ctx, int M_Shipper_ID, String trxName)
@@ -38,6 +38,7 @@ public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent
       /** if (M_Shipper_ID == 0)
         {
 			setM_Shipper_ID (0);
+			setName (null);
         } */
     }
 
@@ -97,6 +98,23 @@ public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Create lines from.
+		@param CreateFrom 
+		Process which will generate a new document lines based on an existing document
+	  */
+	public void setCreateFrom (String CreateFrom)
+	{
+		set_Value (COLUMNNAME_CreateFrom, CreateFrom);
+	}
+
+	/** Get Create lines from.
+		@return Process which will generate a new document lines based on an existing document
+	  */
+	public String getCreateFrom () 
+	{
+		return (String)get_Value(COLUMNNAME_CreateFrom);
+	}
+
 	/** Set Shipper.
 		@param M_Shipper_ID 
 		Method or manner of product delivery
@@ -159,6 +177,23 @@ public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Name.
+		@param Name 
+		Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name)
+	{
+		set_Value (COLUMNNAME_Name, Name);
+	}
+
+	/** Get Name.
+		@return Alphanumeric identifier of the entity
+	  */
+	public String getName () 
+	{
+		return (String)get_Value(COLUMNNAME_Name);
+	}
+
 	public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException
     {
 		return (org.compiere.model.I_X_Shipper)MTable.get(getCtx(), org.compiere.model.I_X_Shipper.Table_Name)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java
index e6b9a421f5..65298d7359 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java
@@ -29,7 +29,7 @@ public class X_M_ShipperLabels extends PO implements I_M_ShipperLabels, I_Persis
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121213L;
+	private static final long serialVersionUID = 20130109L;
 
     /** Standard Constructor */
     public X_M_ShipperLabels (Properties ctx, int M_ShipperLabels_ID, String trxName)
@@ -41,6 +41,7 @@ public class X_M_ShipperLabels extends PO implements I_M_ShipperLabels, I_Persis
 // N
 			setM_Shipper_ID (0);
 			setM_ShipperLabels_ID (0);
+			setName (null);
 			setX_ShipperLabels_ID (0);
         } */
     }
@@ -182,6 +183,23 @@ public class X_M_ShipperLabels extends PO implements I_M_ShipperLabels, I_Persis
 		return (String)get_Value(COLUMNNAME_M_ShipperLabels_UU);
 	}
 
+	/** Set Name.
+		@param Name 
+		Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name)
+	{
+		set_Value (COLUMNNAME_Name, Name);
+	}
+
+	/** Get Name.
+		@return Alphanumeric identifier of the entity
+	  */
+	public String getName () 
+	{
+		return (String)get_Value(COLUMNNAME_Name);
+	}
+
 	public org.compiere.model.I_X_ShipperLabels getX_ShipperLabels() throws RuntimeException
     {
 		return (org.compiere.model.I_X_ShipperLabels)MTable.get(getCtx(), org.compiere.model.I_X_ShipperLabels.Table_Name)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java
index 261673efd5..6346406d86 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java
@@ -31,7 +31,7 @@ public class X_M_ShipperPackaging extends PO implements I_M_ShipperPackaging, I_
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121213L;
+	private static final long serialVersionUID = 20130109L;
 
     /** Standard Constructor */
     public X_M_ShipperPackaging (Properties ctx, int M_ShipperPackaging_ID, String trxName)
@@ -43,6 +43,7 @@ public class X_M_ShipperPackaging extends PO implements I_M_ShipperPackaging, I_
 // N
 			setM_Shipper_ID (0);
 			setM_ShipperPackaging_ID (0);
+			setName (null);
 			setX_ShipperPackaging_ID (0);
         } */
     }
@@ -161,6 +162,23 @@ public class X_M_ShipperPackaging extends PO implements I_M_ShipperPackaging, I_
 		return (String)get_Value(COLUMNNAME_M_ShipperPackaging_UU);
 	}
 
+	/** Set Name.
+		@param Name 
+		Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name)
+	{
+		set_Value (COLUMNNAME_Name, Name);
+	}
+
+	/** Get Name.
+		@return Alphanumeric identifier of the entity
+	  */
+	public String getName () 
+	{
+		return (String)get_Value(COLUMNNAME_Name);
+	}
+
 	/** Set Weight.
 		@param Weight 
 		Weight of a product
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java
index b8bb1b8b6a..43e637bda1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java
@@ -29,7 +29,7 @@ public class X_M_ShipperPickupTypes extends PO implements I_M_ShipperPickupTypes
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121213L;
+	private static final long serialVersionUID = 20130109L;
 
     /** Standard Constructor */
     public X_M_ShipperPickupTypes (Properties ctx, int M_ShipperPickupTypes_ID, String trxName)
@@ -41,6 +41,7 @@ public class X_M_ShipperPickupTypes extends PO implements I_M_ShipperPickupTypes
 // N
 			setM_Shipper_ID (0);
 			setM_ShipperPickupTypes_ID (0);
+			setName (null);
 			setX_ShipperPickupTypes_ID (0);
         } */
     }
@@ -159,6 +160,23 @@ public class X_M_ShipperPickupTypes extends PO implements I_M_ShipperPickupTypes
 		return (String)get_Value(COLUMNNAME_M_ShipperPickupTypes_UU);
 	}
 
+	/** Set Name.
+		@param Name 
+		Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name)
+	{
+		set_Value (COLUMNNAME_Name, Name);
+	}
+
+	/** Get Name.
+		@return Alphanumeric identifier of the entity
+	  */
+	public String getName () 
+	{
+		return (String)get_Value(COLUMNNAME_Name);
+	}
+
 	public org.compiere.model.I_X_ShipperPickupTypes getX_ShipperPickupTypes() throws RuntimeException
     {
 		return (org.compiere.model.I_X_ShipperPickupTypes)MTable.get(getCtx(), org.compiere.model.I_X_ShipperPickupTypes.Table_Name)
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java b/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java
index 25e09a6aeb..2d8e76cff6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java
@@ -29,7 +29,7 @@ public class X_M_ShippingProcessor extends PO implements I_M_ShippingProcessor,
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121213L;
+	private static final long serialVersionUID = 20130109L;
 
     /** Standard Constructor */
     public X_M_ShippingProcessor (Properties ctx, int M_ShippingProcessor_ID, String trxName)
@@ -39,6 +39,7 @@ public class X_M_ShippingProcessor extends PO implements I_M_ShippingProcessor,
         {
 			setConnectionPassword (null);
 			setM_ShippingProcessor_ID (0);
+			setName (null);
 			setUserID (null);
 			setX_ShippingProcessor_ID (0);
         } */
@@ -134,6 +135,23 @@ public class X_M_ShippingProcessor extends PO implements I_M_ShippingProcessor,
 		return (String)get_Value(COLUMNNAME_M_ShippingProcessor_UU);
 	}
 
+	/** Set Name.
+		@param Name 
+		Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name)
+	{
+		set_Value (COLUMNNAME_Name, Name);
+	}
+
+	/** Get Name.
+		@return Alphanumeric identifier of the entity
+	  */
+	public String getName () 
+	{
+		return (String)get_Value(COLUMNNAME_Name);
+	}
+
 	/** Set User ID.
 		@param UserID 
 		User ID or account number