midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ticket #1001758: FedEx & UPS - Support 'Calculated', 'Fix price' and 'Freight included' freight cost rule

This commit is contained in:
Elaine Tan 2013-02-22 17:29:17 +08:00
parent 6f59d2772e
commit f13a9484c9
7 changed files with 1618 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

645
migration/i1.0a-release/oracle/201302221708_TICKET-1001758.sql Normal file
View File

@ -0,0 +1,645 @@
-- Feb 22, 2013 3:02:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element SET Name='Shipper Configuration', PrintName='Shipper Configuration',Updated=TO_DATE('2013-02-22 15:02:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200601
;
-- Feb 22, 2013 3:02:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200601
;
-- Feb 22, 2013 3:02:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Column SET ColumnName='X_Shipper_ID', Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200601
;
-- Feb 22, 2013 3:02:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_Shipper_ID', Name='Shipper Configuration', Description=NULL, Help=NULL, AD_Element_ID=200601 WHERE UPPER(ColumnName)='X_SHIPPER_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- Feb 22, 2013 3:02:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_Shipper_ID', Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200601 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:02:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_InfoColumn SET ColumnName='X_Shipper_ID', Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200601 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:02:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200601) AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:02:17 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_PrintFormatItem pi SET PrintName='Shipper Configuration', Name='Shipper Configuration' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=pi.AD_Column_ID AND c.AD_Element_ID=200601)
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element SET Name='Shipper Labels Configuration', PrintName='Shipper Labels Configuration',Updated=TO_DATE('2013-02-22 15:03:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200603
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200603
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Column SET ColumnName='X_ShipperLabels_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200603
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShipperLabels_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL, AD_Element_ID=200603 WHERE UPPER(ColumnName)='X_SHIPPERLABELS_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShipperLabels_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200603 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_InfoColumn SET ColumnName='X_ShipperLabels_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200603 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200603) AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_PrintFormatItem pi SET PrintName='Shipper Labels Configuration', Name='Shipper Labels Configuration' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=pi.AD_Column_ID AND c.AD_Element_ID=200603)
;
-- Feb 22, 2013 3:03:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element SET Name='Shipper Packaging Configuration', PrintName='Shipper Packaging Configuration',Updated=TO_DATE('2013-02-22 15:03:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200605
;
-- Feb 22, 2013 3:03:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200605
;
-- Feb 22, 2013 3:03:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Column SET ColumnName='X_ShipperPackaging_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200605
;
-- Feb 22, 2013 3:03:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShipperPackaging_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL, AD_Element_ID=200605 WHERE UPPER(ColumnName)='X_SHIPPERPACKAGING_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- Feb 22, 2013 3:03:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShipperPackaging_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200605 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_InfoColumn SET ColumnName='X_ShipperPackaging_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200605 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200605) AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_PrintFormatItem pi SET PrintName='Shipper Packaging Configuration', Name='Shipper Packaging Configuration' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=pi.AD_Column_ID AND c.AD_Element_ID=200605)
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element SET Name='Shipper Pickup Types Configuration', PrintName='Shipper Pickup Types Configuration',Updated=TO_DATE('2013-02-22 15:03:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200607
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200607
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Column SET ColumnName='X_ShipperPickupTypes_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200607
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShipperPickupTypes_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL, AD_Element_ID=200607 WHERE UPPER(ColumnName)='X_SHIPPERPICKUPTYPES_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShipperPickupTypes_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200607 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_InfoColumn SET ColumnName='X_ShipperPickupTypes_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200607 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200607) AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_PrintFormatItem pi SET PrintName='Shipper Pickup Types Configuration', Name='Shipper Pickup Types Configuration' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=pi.AD_Column_ID AND c.AD_Element_ID=200607)
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element SET Name='Shipping Processor Configuration', PrintName='Shipping Processor Configuration',Updated=TO_DATE('2013-02-22 15:04:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200599
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200599
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Column SET ColumnName='X_ShippingProcessor_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200599
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShippingProcessor_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL, AD_Element_ID=200599 WHERE UPPER(ColumnName)='X_SHIPPINGPROCESSOR_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShippingProcessor_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200599 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_InfoColumn SET ColumnName='X_ShippingProcessor_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200599 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200599) AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_PrintFormatItem pi SET PrintName='Shipping Processor Configuration', Name='Shipping Processor Configuration' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=pi.AD_Column_ID AND c.AD_Element_ID=200599)
;
-- Feb 22, 2013 3:05:11 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=201503
;
-- Feb 22, 2013 3:05:11 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=1074
;
-- Feb 22, 2013 3:05:11 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=2588
;
-- Feb 22, 2013 3:05:11 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=201435
;
-- Feb 22, 2013 3:05:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=201503
;
-- Feb 22, 2013 3:05:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=1074
;
-- Feb 22, 2013 3:05:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=2588
;
-- Feb 22, 2013 3:05:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=201435
;
-- Feb 22, 2013 3:07:37 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET XPosition=2,Updated=TO_DATE('2013-02-22 15:07:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201279
;
-- Feb 22, 2013 3:07:41 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET XPosition=2,Updated=TO_DATE('2013-02-22 15:07:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201281
;
-- Feb 22, 2013 3:10:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET XPosition=2,Updated=TO_DATE('2013-02-22 15:10:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201179
;
-- Feb 22, 2013 3:10:55 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET XPosition=2,Updated=TO_DATE('2013-02-22 15:10:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201181
;
-- Feb 22, 2013 3:14:24 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET IsActive='N',Updated=TO_DATE('2013-02-22 15:14:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200048
;
-- Feb 22, 2013 3:15:38 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Ref_List SET IsActive='Y',Updated=TO_DATE('2013-02-22 15:15:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=227
;
-- Feb 22, 2013 3:15:43 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Ref_List SET IsActive='Y',Updated=TO_DATE('2013-02-22 15:15:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=226
;
-- Feb 22, 2013 3:31:20 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET IsSameLine='N', XPosition=1,Updated=TO_DATE('2013-02-22 15:31:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1107
;
-- Feb 22, 2013 4:01:44 PM SGT
-- Ticket 1001758: FedEx & UPS
INSERT INTO AD_Column (Version,IsSyncDatabase,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,DefaultValue,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection,IsToolbarButton,IsAlwaysUpdateable,IsEncrypted) VALUES (0,'N',259,208596,'D','Y','N','N',0,'N',1,'N',20,'N',201981,'N','Y','32ed29cc-e0a4-4148-b53b-a05dfe53e537','Y','IsPriviledgedRate','N','Priviledged Rate','Y',100,TO_DATE('2013-02-22 16:01:42','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2013-02-22 16:01:42','YYYY-MM-DD HH24:MI:SS'),100,0,0,'N','N','N')
;
-- Feb 22, 2013 4:01:45 PM SGT
-- Ticket 1001758: FedEx & UPS
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) SELECT l.AD_Language,t.AD_Column_ID, 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_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=208596 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
;
-- Feb 22, 2013 4:01:48 PM SGT
-- Ticket 1001758: FedEx & UPS
ALTER TABLE C_Order ADD IsPriviledgedRate CHAR(1) DEFAULT 'N' CHECK (IsPriviledgedRate IN ('Y','N')) NOT NULL
;
-- Feb 22, 2013 4:02:21 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,EntityType,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',186,1,'N','N',208596,'Y',201827,'N','D','Priviledged Rate','N','Y','0334ed28-48ce-4bad-b226-66f159c41298',100,0,TO_DATE('2013-02-22 16:02:20','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2013-02-22 16:02:20','YYYY-MM-DD HH24:MI:SS'),'Y')
;
-- Feb 22, 2013 4:02:21 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=201827 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)
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=280,IsDisplayed='Y' WHERE AD_Field_ID=201827
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=290,IsDisplayed='Y' WHERE AD_Field_ID=201613
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=300,IsDisplayed='Y' WHERE AD_Field_ID=1104
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=310,IsDisplayed='Y' WHERE AD_Field_ID=1077
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=1103
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=330,IsDisplayed='Y' WHERE AD_Field_ID=8653
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=340,IsDisplayed='Y' WHERE AD_Field_ID=1098
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=350,IsDisplayed='Y' WHERE AD_Field_ID=3272
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=360,IsDisplayed='Y' WHERE AD_Field_ID=2112
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=370,IsDisplayed='Y' WHERE AD_Field_ID=2109
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=380,IsDisplayed='Y' WHERE AD_Field_ID=3113
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=390,IsDisplayed='Y' WHERE AD_Field_ID=1099
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=400,IsDisplayed='Y' WHERE AD_Field_ID=56906
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=410,IsDisplayed='Y' WHERE AD_Field_ID=2593
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=420,IsDisplayed='Y' WHERE AD_Field_ID=2589
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=430,IsDisplayed='Y' WHERE AD_Field_ID=1324
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=440,IsDisplayed='Y' WHERE AD_Field_ID=7038
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=450,IsDisplayed='Y' WHERE AD_Field_ID=7826
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=460,IsDisplayed='Y' WHERE AD_Field_ID=7825
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=470,IsDisplayed='Y' WHERE AD_Field_ID=1112
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=480,IsDisplayed='Y' WHERE AD_Field_ID=1113
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=490,IsDisplayed='Y' WHERE AD_Field_ID=1082
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=500,IsDisplayed='Y' WHERE AD_Field_ID=1084
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=510,IsDisplayed='Y' WHERE AD_Field_ID=60922
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=520,IsDisplayed='Y' WHERE AD_Field_ID=6560
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=530,IsDisplayed='Y' WHERE AD_Field_ID=1083
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=540,IsDisplayed='Y' WHERE AD_Field_ID=3660
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=550,IsDisplayed='Y' WHERE AD_Field_ID=52014
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=560,IsDisplayed='Y' WHERE AD_Field_ID=58037
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=570,IsDisplayed='Y' WHERE AD_Field_ID=60972
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=270,IsDisplayedGrid='Y' WHERE AD_Field_ID=201827
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=280,IsDisplayedGrid='Y' WHERE AD_Field_ID=201613
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=290,IsDisplayedGrid='Y' WHERE AD_Field_ID=1104
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=300,IsDisplayedGrid='Y' WHERE AD_Field_ID=1077
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=310,IsDisplayedGrid='Y' WHERE AD_Field_ID=1103
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=320,IsDisplayedGrid='Y' WHERE AD_Field_ID=8653
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=330,IsDisplayedGrid='Y' WHERE AD_Field_ID=1098
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=340,IsDisplayedGrid='Y' WHERE AD_Field_ID=3272
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=350,IsDisplayedGrid='Y' WHERE AD_Field_ID=2112
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=360,IsDisplayedGrid='Y' WHERE AD_Field_ID=2109
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=370,IsDisplayedGrid='Y' WHERE AD_Field_ID=3113
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=380,IsDisplayedGrid='Y' WHERE AD_Field_ID=1099
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=390,IsDisplayedGrid='Y' WHERE AD_Field_ID=56906
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=400,IsDisplayedGrid='Y' WHERE AD_Field_ID=2593
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=410,IsDisplayedGrid='Y' WHERE AD_Field_ID=2589
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=420,IsDisplayedGrid='Y' WHERE AD_Field_ID=1324
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=430,IsDisplayedGrid='Y' WHERE AD_Field_ID=7038
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=440,IsDisplayedGrid='Y' WHERE AD_Field_ID=7826
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=450,IsDisplayedGrid='Y' WHERE AD_Field_ID=7825
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=460,IsDisplayedGrid='Y' WHERE AD_Field_ID=1112
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=470,IsDisplayedGrid='Y' WHERE AD_Field_ID=1113
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=480,IsDisplayedGrid='Y' WHERE AD_Field_ID=1082
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=490,IsDisplayedGrid='Y' WHERE AD_Field_ID=1084
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=500,IsDisplayedGrid='Y' WHERE AD_Field_ID=60922
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=510,IsDisplayedGrid='Y' WHERE AD_Field_ID=6560
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=520,IsDisplayedGrid='Y' WHERE AD_Field_ID=1083
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=530,IsDisplayedGrid='Y' WHERE AD_Field_ID=3660
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=540,IsDisplayedGrid='Y' WHERE AD_Field_ID=52014
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=550,IsDisplayedGrid='Y' WHERE AD_Field_ID=58037
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=560,IsDisplayedGrid='Y' WHERE AD_Field_ID=60972
;
-- Feb 22, 2013 4:04:01 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET DisplayLogic='@OrderType@=''SO'' & @FreightCostRule@=''C''', XPosition=2, ColumnSpan=2,Updated=TO_DATE('2013-02-22 16:04:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201827
;
-- Feb 22, 2013 4:04:28 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET AD_FieldGroup_ID=130,Updated=TO_DATE('2013-02-22 16:04:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201827
;
-- Feb 22, 2013 4:04:30 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET AD_FieldGroup_ID=130,Updated=TO_DATE('2013-02-22 16:04:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201613
;
-- Feb 22, 2013 4:05:34 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET DefaultValue='@IsPriviledgedRate@',Updated=TO_DATE('2013-02-22 16:05:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200049
;
-- Feb 22, 2013 4:08:29 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET DefaultValue='@IsPriviledgedRate@=''Y''',Updated=TO_DATE('2013-02-22 16:08:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200049
;
-- Feb 22, 2013 4:09:38 PM SGT
-- Ticket 1001758: FedEx & UPS
ALTER TABLE C_Order MODIFY IsPriviledgedRate CHAR(1) DEFAULT 'N'
;
-- Feb 22, 2013 4:09:43 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE C_Order SET IsPriviledgedRate='N' WHERE IsPriviledgedRate IS NULL
;
-- Feb 22, 2013 4:10:58 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET DefaultValue='@IsPriviledgedRate@',Updated=TO_DATE('2013-02-22 16:10:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200049
;

645
migration/i1.0a-release/postgresql/201302221708_TICKET-1001758.sql Normal file
View File

@ -0,0 +1,645 @@
-- Feb 22, 2013 3:02:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element SET Name='Shipper Configuration', PrintName='Shipper Configuration',Updated=TO_TIMESTAMP('2013-02-22 15:02:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200601
;
-- Feb 22, 2013 3:02:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200601
;
-- Feb 22, 2013 3:02:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Column SET ColumnName='X_Shipper_ID', Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200601
;
-- Feb 22, 2013 3:02:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_Shipper_ID', Name='Shipper Configuration', Description=NULL, Help=NULL, AD_Element_ID=200601 WHERE UPPER(ColumnName)='X_SHIPPER_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- Feb 22, 2013 3:02:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_Shipper_ID', Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200601 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:02:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_InfoColumn SET ColumnName='X_Shipper_ID', Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200601 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:02:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200601) AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:02:17 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_PrintFormatItem SET PrintName='Shipper Configuration', Name='Shipper Configuration' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=200601)
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element SET Name='Shipper Labels Configuration', PrintName='Shipper Labels Configuration',Updated=TO_TIMESTAMP('2013-02-22 15:03:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200603
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200603
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Column SET ColumnName='X_ShipperLabels_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200603
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShipperLabels_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL, AD_Element_ID=200603 WHERE UPPER(ColumnName)='X_SHIPPERLABELS_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShipperLabels_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200603 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_InfoColumn SET ColumnName='X_ShipperLabels_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200603 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200603) AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:47 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_PrintFormatItem SET PrintName='Shipper Labels Configuration', Name='Shipper Labels Configuration' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=200603)
;
-- Feb 22, 2013 3:03:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element SET Name='Shipper Packaging Configuration', PrintName='Shipper Packaging Configuration',Updated=TO_TIMESTAMP('2013-02-22 15:03:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200605
;
-- Feb 22, 2013 3:03:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200605
;
-- Feb 22, 2013 3:03:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Column SET ColumnName='X_ShipperPackaging_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200605
;
-- Feb 22, 2013 3:03:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShipperPackaging_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL, AD_Element_ID=200605 WHERE UPPER(ColumnName)='X_SHIPPERPACKAGING_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- Feb 22, 2013 3:03:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShipperPackaging_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200605 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_InfoColumn SET ColumnName='X_ShipperPackaging_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200605 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200605) AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_PrintFormatItem SET PrintName='Shipper Packaging Configuration', Name='Shipper Packaging Configuration' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=200605)
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element SET Name='Shipper Pickup Types Configuration', PrintName='Shipper Pickup Types Configuration',Updated=TO_TIMESTAMP('2013-02-22 15:03:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200607
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200607
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Column SET ColumnName='X_ShipperPickupTypes_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200607
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShipperPickupTypes_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL, AD_Element_ID=200607 WHERE UPPER(ColumnName)='X_SHIPPERPICKUPTYPES_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShipperPickupTypes_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200607 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_InfoColumn SET ColumnName='X_ShipperPickupTypes_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200607 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200607) AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:03:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_PrintFormatItem SET PrintName='Shipper Pickup Types Configuration', Name='Shipper Pickup Types Configuration' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=200607)
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element SET Name='Shipping Processor Configuration', PrintName='Shipping Processor Configuration',Updated=TO_TIMESTAMP('2013-02-22 15:04:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200599
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200599
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Column SET ColumnName='X_ShippingProcessor_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200599
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShippingProcessor_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL, AD_Element_ID=200599 WHERE UPPER(ColumnName)='X_SHIPPINGPROCESSOR_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET ColumnName='X_ShippingProcessor_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200599 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_InfoColumn SET ColumnName='X_ShippingProcessor_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200599 AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:04:12 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200599) AND IsCentrallyMaintained='Y'
;
-- Feb 22, 2013 3:04:13 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_PrintFormatItem SET PrintName='Shipping Processor Configuration', Name='Shipping Processor Configuration' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=200599)
;
-- Feb 22, 2013 3:05:11 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=201503
;
-- Feb 22, 2013 3:05:11 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=1074
;
-- Feb 22, 2013 3:05:11 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=2588
;
-- Feb 22, 2013 3:05:11 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=201435
;
-- Feb 22, 2013 3:05:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=201503
;
-- Feb 22, 2013 3:05:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=1074
;
-- Feb 22, 2013 3:05:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=2588
;
-- Feb 22, 2013 3:05:15 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=201435
;
-- Feb 22, 2013 3:07:37 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET XPosition=2,Updated=TO_TIMESTAMP('2013-02-22 15:07:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201279
;
-- Feb 22, 2013 3:07:41 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET XPosition=2,Updated=TO_TIMESTAMP('2013-02-22 15:07:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201281
;
-- Feb 22, 2013 3:10:54 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET XPosition=2,Updated=TO_TIMESTAMP('2013-02-22 15:10:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201179
;
-- Feb 22, 2013 3:10:55 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET XPosition=2,Updated=TO_TIMESTAMP('2013-02-22 15:10:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201181
;
-- Feb 22, 2013 3:14:24 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET IsActive='N',Updated=TO_TIMESTAMP('2013-02-22 15:14:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200048
;
-- Feb 22, 2013 3:15:38 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Ref_List SET IsActive='Y',Updated=TO_TIMESTAMP('2013-02-22 15:15:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=227
;
-- Feb 22, 2013 3:15:43 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Ref_List SET IsActive='Y',Updated=TO_TIMESTAMP('2013-02-22 15:15:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=226
;
-- Feb 22, 2013 3:31:20 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET IsSameLine='N', XPosition=1,Updated=TO_TIMESTAMP('2013-02-22 15:31:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1107
;
-- Feb 22, 2013 4:01:44 PM SGT
-- Ticket 1001758: FedEx & UPS
INSERT INTO AD_Column (Version,IsSyncDatabase,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,DefaultValue,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection,IsToolbarButton,IsAlwaysUpdateable,IsEncrypted) VALUES (0,'N',259,208596,'D','Y','N','N',0,'N',1,'N',20,'N',201981,'N','Y','32ed29cc-e0a4-4148-b53b-a05dfe53e537','Y','IsPriviledgedRate','N','Priviledged Rate','Y',100,TO_TIMESTAMP('2013-02-22 16:01:42','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2013-02-22 16:01:42','YYYY-MM-DD HH24:MI:SS'),100,0,0,'N','N','N')
;
-- Feb 22, 2013 4:01:45 PM SGT
-- Ticket 1001758: FedEx & UPS
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) SELECT l.AD_Language,t.AD_Column_ID, 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_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=208596 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
;
-- Feb 22, 2013 4:01:48 PM SGT
-- Ticket 1001758: FedEx & UPS
ALTER TABLE C_Order ADD COLUMN IsPriviledgedRate CHAR(1) DEFAULT 'N' CHECK (IsPriviledgedRate IN ('Y','N')) NOT NULL
;
-- Feb 22, 2013 4:02:21 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,EntityType,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',186,1,'N','N',208596,'Y',201827,'N','D','Priviledged Rate','N','Y','0334ed28-48ce-4bad-b226-66f159c41298',100,0,TO_TIMESTAMP('2013-02-22 16:02:20','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2013-02-22 16:02:20','YYYY-MM-DD HH24:MI:SS'),'Y')
;
-- Feb 22, 2013 4:02:21 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=201827 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)
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=280,IsDisplayed='Y' WHERE AD_Field_ID=201827
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=290,IsDisplayed='Y' WHERE AD_Field_ID=201613
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=300,IsDisplayed='Y' WHERE AD_Field_ID=1104
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=310,IsDisplayed='Y' WHERE AD_Field_ID=1077
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=1103
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=330,IsDisplayed='Y' WHERE AD_Field_ID=8653
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=340,IsDisplayed='Y' WHERE AD_Field_ID=1098
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=350,IsDisplayed='Y' WHERE AD_Field_ID=3272
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=360,IsDisplayed='Y' WHERE AD_Field_ID=2112
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=370,IsDisplayed='Y' WHERE AD_Field_ID=2109
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=380,IsDisplayed='Y' WHERE AD_Field_ID=3113
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=390,IsDisplayed='Y' WHERE AD_Field_ID=1099
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=400,IsDisplayed='Y' WHERE AD_Field_ID=56906
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=410,IsDisplayed='Y' WHERE AD_Field_ID=2593
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=420,IsDisplayed='Y' WHERE AD_Field_ID=2589
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=430,IsDisplayed='Y' WHERE AD_Field_ID=1324
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=440,IsDisplayed='Y' WHERE AD_Field_ID=7038
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=450,IsDisplayed='Y' WHERE AD_Field_ID=7826
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=460,IsDisplayed='Y' WHERE AD_Field_ID=7825
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=470,IsDisplayed='Y' WHERE AD_Field_ID=1112
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=480,IsDisplayed='Y' WHERE AD_Field_ID=1113
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=490,IsDisplayed='Y' WHERE AD_Field_ID=1082
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=500,IsDisplayed='Y' WHERE AD_Field_ID=1084
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=510,IsDisplayed='Y' WHERE AD_Field_ID=60922
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=520,IsDisplayed='Y' WHERE AD_Field_ID=6560
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=530,IsDisplayed='Y' WHERE AD_Field_ID=1083
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=540,IsDisplayed='Y' WHERE AD_Field_ID=3660
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=550,IsDisplayed='Y' WHERE AD_Field_ID=52014
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=560,IsDisplayed='Y' WHERE AD_Field_ID=58037
;
-- Feb 22, 2013 4:02:39 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNo=570,IsDisplayed='Y' WHERE AD_Field_ID=60972
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=270,IsDisplayedGrid='Y' WHERE AD_Field_ID=201827
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=280,IsDisplayedGrid='Y' WHERE AD_Field_ID=201613
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=290,IsDisplayedGrid='Y' WHERE AD_Field_ID=1104
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=300,IsDisplayedGrid='Y' WHERE AD_Field_ID=1077
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=310,IsDisplayedGrid='Y' WHERE AD_Field_ID=1103
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=320,IsDisplayedGrid='Y' WHERE AD_Field_ID=8653
;
-- Feb 22, 2013 4:02:50 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=330,IsDisplayedGrid='Y' WHERE AD_Field_ID=1098
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=340,IsDisplayedGrid='Y' WHERE AD_Field_ID=3272
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=350,IsDisplayedGrid='Y' WHERE AD_Field_ID=2112
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=360,IsDisplayedGrid='Y' WHERE AD_Field_ID=2109
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=370,IsDisplayedGrid='Y' WHERE AD_Field_ID=3113
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=380,IsDisplayedGrid='Y' WHERE AD_Field_ID=1099
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=390,IsDisplayedGrid='Y' WHERE AD_Field_ID=56906
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=400,IsDisplayedGrid='Y' WHERE AD_Field_ID=2593
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=410,IsDisplayedGrid='Y' WHERE AD_Field_ID=2589
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=420,IsDisplayedGrid='Y' WHERE AD_Field_ID=1324
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=430,IsDisplayedGrid='Y' WHERE AD_Field_ID=7038
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=440,IsDisplayedGrid='Y' WHERE AD_Field_ID=7826
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=450,IsDisplayedGrid='Y' WHERE AD_Field_ID=7825
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=460,IsDisplayedGrid='Y' WHERE AD_Field_ID=1112
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=470,IsDisplayedGrid='Y' WHERE AD_Field_ID=1113
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=480,IsDisplayedGrid='Y' WHERE AD_Field_ID=1082
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=490,IsDisplayedGrid='Y' WHERE AD_Field_ID=1084
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=500,IsDisplayedGrid='Y' WHERE AD_Field_ID=60922
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=510,IsDisplayedGrid='Y' WHERE AD_Field_ID=6560
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=520,IsDisplayedGrid='Y' WHERE AD_Field_ID=1083
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=530,IsDisplayedGrid='Y' WHERE AD_Field_ID=3660
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=540,IsDisplayedGrid='Y' WHERE AD_Field_ID=52014
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=550,IsDisplayedGrid='Y' WHERE AD_Field_ID=58037
;
-- Feb 22, 2013 4:02:51 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET SeqNoGrid=560,IsDisplayedGrid='Y' WHERE AD_Field_ID=60972
;
-- Feb 22, 2013 4:04:01 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET DisplayLogic='@OrderType@=''SO'' & @FreightCostRule@=''C''', XPosition=2, ColumnSpan=2,Updated=TO_TIMESTAMP('2013-02-22 16:04:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201827
;
-- Feb 22, 2013 4:04:28 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET AD_FieldGroup_ID=130,Updated=TO_TIMESTAMP('2013-02-22 16:04:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201827
;
-- Feb 22, 2013 4:04:30 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Field SET AD_FieldGroup_ID=130,Updated=TO_TIMESTAMP('2013-02-22 16:04:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201613
;
-- Feb 22, 2013 4:05:34 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET DefaultValue='@IsPriviledgedRate@',Updated=TO_TIMESTAMP('2013-02-22 16:05:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200049
;
-- Feb 22, 2013 4:08:29 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET DefaultValue='@IsPriviledgedRate@=''Y''',Updated=TO_TIMESTAMP('2013-02-22 16:08:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200049
;
-- Feb 22, 2013 4:09:38 PM SGT
-- Ticket 1001758: FedEx & UPS
INSERT INTO t_alter_column values('c_order','IsPriviledgedRate','CHAR(1)',null,'N')
;
-- Feb 22, 2013 4:09:43 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE C_Order SET IsPriviledgedRate='N' WHERE IsPriviledgedRate IS NULL
;
-- Feb 22, 2013 4:10:58 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Para SET DefaultValue='@IsPriviledgedRate@',Updated=TO_TIMESTAMP('2013-02-22 16:10:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200049
;

73
org.adempiere.base/src/org/adempiere/model/ShippingPackage.java Normal file
View File

@ -0,0 +1,73 @@
/******************************************************************************
* 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.adempiere.model;
import java.math.BigDecimal;
import java.util.ArrayList;
import org.compiere.model.MProduct;
/**
*
* @author Elaine
*
*/
public class ShippingPackage
{
private BigDecimal weight;
private BigDecimal height;
private BigDecimal length;
private BigDecimal width;
private ArrayList<MProduct> products;
public BigDecimal getWeight() {
return weight;
}
public void setWeight(BigDecimal weight) {
this.weight = weight;
}
public BigDecimal getHeight() {
return height;
}
public void setHeight(BigDecimal height) {
this.height = height;
}
public BigDecimal getLength() {
return length;
}
public void setLength(BigDecimal length) {
this.length = length;
}
public BigDecimal getWidth() {
return width;
}
public void setWidth(BigDecimal width) {
this.width = width;
}
public ArrayList<MProduct> getProducts() {
return products;
}
public void setProducts(ArrayList<MProduct> products) {
this.products = products;
}
}

141
org.adempiere.base/src/org/adempiere/process/SalesOrderRateInquiryProcess.java
View File

@ -1,12 +1,27 @@
/******************************************************************************
* 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.adempiere.process; package org.adempiere.process;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Properties;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.exceptions.AdempiereException; import org.adempiere.exceptions.AdempiereException;
import org.adempiere.exceptions.FillMandatoryException; import org.adempiere.exceptions.FillMandatoryException;
import org.adempiere.model.ShippingPackage;
import org.adempiere.util.ShippingUtil; import org.adempiere.util.ShippingUtil;
import org.compiere.model.MClientInfo; import org.compiere.model.MClientInfo;
import org.compiere.model.MOrder; import org.compiere.model.MOrder;
@ -25,6 +40,11 @@ import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess; import org.compiere.process.SvrProcess;
import org.compiere.util.Trx; import org.compiere.util.Trx;
/**
*
* @author Elaine
*
*/
public class SalesOrderRateInquiryProcess extends SvrProcess public class SalesOrderRateInquiryProcess extends SvrProcess
{ {
private boolean p_IsPriviledgedRate = false; private boolean p_IsPriviledgedRate = false;
@ -85,7 +105,7 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
MShippingTransaction st = null; MShippingTransaction st = null;
try try
{ {
st = createShippingTransaction(m_order, MShippingTransaction.ACTION_RateInquiry, get_TrxName()); st = createShippingTransaction(getCtx(), m_order, MShippingTransaction.ACTION_RateInquiry, p_IsPriviledgedRate, get_TrxName());
ok = st.processOnline(); ok = st.processOnline();
} }
catch (Exception e) catch (Exception e)
@ -112,23 +132,41 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
} }
} }
if (freightLine == null) if (m_order.getFreightCostRule().equals(MOrder.FREIGHTCOSTRULE_FreightIncluded))
{ {
freightLine = new MOrderLine(m_order); if (freightLine != null)
{
if (ci.getC_ChargeFreight_ID() > 0) boolean deleted = freightLine.delete(false);
freightLine.setC_Charge_ID(ci.getC_ChargeFreight_ID()); if (!deleted)
else if (ci.getM_ProductFreight_ID() > 0) {
freightLine.setM_Product_ID(ci.getM_ProductFreight_ID()); freightLine.setC_BPartner_Location_ID(m_order.getC_BPartner_Location_ID());
else freightLine.setM_Shipper_ID(m_order.getM_Shipper_ID());
throw new AdempiereException("Product or Charge for Freight is not defined at Client window > Client Info tab"); freightLine.setQty(BigDecimal.ONE);
freightLine.setPrice(BigDecimal.ZERO);
freightLine.saveEx();
}
}
}
else if (m_order.getFreightCostRule().equals(MOrder.FREIGHTCOSTRULE_Calculated))
{
if (freightLine == null)
{
freightLine = new MOrderLine(m_order);
if (ci.getC_ChargeFreight_ID() > 0)
freightLine.setC_Charge_ID(ci.getC_ChargeFreight_ID());
else if (ci.getM_ProductFreight_ID() > 0)
freightLine.setM_Product_ID(ci.getM_ProductFreight_ID());
else
throw new AdempiereException("Product or Charge for Freight is not defined at Client window > Client Info tab");
}
freightLine.setC_BPartner_Location_ID(m_order.getC_BPartner_Location_ID());
freightLine.setM_Shipper_ID(m_order.getM_Shipper_ID());
freightLine.setQty(BigDecimal.ONE);
freightLine.setPrice(st.getPrice());
freightLine.saveEx();
} }
freightLine.setC_BPartner_Location_ID(m_order.getC_BPartner_Location_ID());
freightLine.setM_Shipper_ID(m_order.getM_Shipper_ID());
freightLine.setQty(BigDecimal.ONE);
freightLine.setPrice(st.getPrice());
freightLine.saveEx();
} }
else else
{ {
@ -143,22 +181,22 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
return st.getShippingRespMessage(); return st.getShippingRespMessage();
} }
private MShippingTransaction createShippingTransaction(MOrder m_order, String action, String trxName) public static MShippingTransaction createShippingTransaction(Properties ctx, MOrder m_order, String action, boolean isPriviledgedRate, String trxName)
{ {
MShipper shipper = new MShipper(getCtx(), m_order.getM_Shipper_ID(), get_TrxName()); MShipper shipper = new MShipper(ctx, m_order.getM_Shipper_ID(), trxName);
String whereClause = "M_Shipper_ID = " + shipper.getM_Shipper_ID() + " AND IsDefault='Y' AND IsActive='Y'"; String whereClause = "M_Shipper_ID = " + shipper.getM_Shipper_ID() + " AND IsDefault='Y' AND IsActive='Y'";
int M_ShipperLabels_ID = 0; int M_ShipperLabels_ID = 0;
int[] ids = MShipperLabels.getAllIDs(MShipperLabels.Table_Name, whereClause, get_TrxName()); int[] ids = MShipperLabels.getAllIDs(MShipperLabels.Table_Name, whereClause, trxName);
if (ids.length > 0) if (ids.length > 0)
M_ShipperLabels_ID = ids[0]; M_ShipperLabels_ID = ids[0];
int M_ShipperPackaging_ID = 0; int M_ShipperPackaging_ID = 0;
ids = MShipperPackaging.getAllIDs(MShipperPackaging.Table_Name, whereClause, get_TrxName()); ids = MShipperPackaging.getAllIDs(MShipperPackaging.Table_Name, whereClause, trxName);
if (ids.length > 0) if (ids.length > 0)
M_ShipperPackaging_ID = ids[0]; M_ShipperPackaging_ID = ids[0];
int M_ShipperPickupTypes_ID = 0; int M_ShipperPickupTypes_ID = 0;
ids = MShipperPickupTypes.getAllIDs(MShipperPickupTypes.Table_Name, whereClause, get_TrxName()); ids = MShipperPickupTypes.getAllIDs(MShipperPickupTypes.Table_Name, whereClause, trxName);
if (ids.length > 0) if (ids.length > 0)
M_ShipperPickupTypes_ID = ids[0]; M_ShipperPickupTypes_ID = ids[0];
@ -166,8 +204,8 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
String DutiesShipperAccount = ShippingUtil.getSenderDutiesShipperAccount(shipper.getM_Shipper_ID(), shipper.getAD_Org_ID()); String DutiesShipperAccount = ShippingUtil.getSenderDutiesShipperAccount(shipper.getM_Shipper_ID(), shipper.getAD_Org_ID());
// 1 kg = 2.20462 lb // 1 kg = 2.20462 lb
MClientInfo ci = MClientInfo.get(getCtx(), getAD_Client_ID(), get_TrxName()); MClientInfo ci = MClientInfo.get(ctx, m_order.getAD_Client_ID(), trxName);
MUOM uom = new MUOM(getCtx(), ci.getC_UOM_Weight_ID(), null); MUOM uom = new MUOM(ctx, ci.getC_UOM_Weight_ID(), null);
String unit = uom.getX12DE355(); String unit = uom.getX12DE355();
boolean isPound = false; boolean isPound = false;
if (unit != null) if (unit != null)
@ -177,7 +215,7 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
isPound = true; isPound = true;
} }
MShipperPackaging sp = new MShipperPackaging(getCtx(), M_ShipperPackaging_ID, get_TrxName()); MShipperPackaging sp = new MShipperPackaging(ctx, M_ShipperPackaging_ID, trxName);
BigDecimal WeightPerPackage = sp.getWeight().multiply(isPound ? new BigDecimal(2.20462) : BigDecimal.ONE); BigDecimal WeightPerPackage = sp.getWeight().multiply(isPound ? new BigDecimal(2.20462) : BigDecimal.ONE);
if (WeightPerPackage == null || WeightPerPackage.compareTo(BigDecimal.ZERO) == 0) if (WeightPerPackage == null || WeightPerPackage.compareTo(BigDecimal.ZERO) == 0)
@ -205,7 +243,7 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
} }
else if (ol.getM_Product_ID() > 0) else if (ol.getM_Product_ID() > 0)
{ {
MProduct product = new MProduct(getCtx(), ol.getM_Product_ID(), get_TrxName()); MProduct product = new MProduct(ctx, ol.getM_Product_ID(), trxName);
BigDecimal weight = product.getWeight(); BigDecimal weight = product.getWeight();
if (weight == null || weight.compareTo(BigDecimal.ZERO) == 0) if (weight == null || weight.compareTo(BigDecimal.ZERO) == 0)
@ -267,7 +305,7 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
int BoxCount = packages.size(); int BoxCount = packages.size();
MShippingTransaction st = new MShippingTransaction(getCtx(), 0, trxName); MShippingTransaction st = new MShippingTransaction(ctx, 0, trxName);
st.setAction(action); st.setAction(action);
// st.setAD_Client_ID(m_order.getAD_Client_ID()); // st.setAD_Client_ID(m_order.getAD_Client_ID());
st.setAD_Org_ID(m_order.getAD_Org_ID()); st.setAD_Org_ID(m_order.getAD_Org_ID());
@ -315,7 +353,7 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
// st.setIsHoldAtLocation(isHoldAtLocation()); // st.setIsHoldAtLocation(isHoldAtLocation());
// st.setIsIgnoreZipNotFound(isIgnoreZipNotFound()); // st.setIsIgnoreZipNotFound(isIgnoreZipNotFound());
// st.setIsIgnoreZipStateNotMatch(isIgnoreZipStateNotMatch()); // st.setIsIgnoreZipStateNotMatch(isIgnoreZipStateNotMatch());
st.setIsPriviledgedRate(p_IsPriviledgedRate); st.setIsPriviledgedRate(isPriviledgedRate);
st.setIsResidential(shipper.isResidential()); st.setIsResidential(shipper.isResidential());
st.setIsSaturdayDelivery(shipper.isSaturdayDelivery()); st.setIsSaturdayDelivery(shipper.isSaturdayDelivery());
// st.setIsSaturdayPickup(isSaturdayPickup()); // st.setIsSaturdayPickup(isSaturdayPickup());
@ -379,53 +417,4 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
return st; return st;
} }
class ShippingPackage
{
private BigDecimal weight;
private BigDecimal height;
private BigDecimal length;
private BigDecimal width;
private ArrayList<MProduct> products;
public BigDecimal getWeight() {
return weight;
}
public void setWeight(BigDecimal weight) {
this.weight = weight;
}
public BigDecimal getHeight() {
return height;
}
public void setHeight(BigDecimal height) {
this.height = height;
}
public BigDecimal getLength() {
return length;
}
public void setLength(BigDecimal length) {
this.length = length;
}
public BigDecimal getWidth() {
return width;
}
public void setWidth(BigDecimal width) {
this.width = width;
}
public ArrayList<MProduct> getProducts() {
return products;
}
public void setProducts(ArrayList<MProduct> products) {
this.products = products;
}
}
} }

9
org.adempiere.base/src/org/compiere/model/I_C_Order.java
View File

@ -789,6 +789,15 @@ public interface I_C_Order
*/ */
public boolean isPrinted(); public boolean isPrinted();
/** Column name IsPriviledgedRate */
public static final String COLUMNNAME_IsPriviledgedRate = "IsPriviledgedRate";
/** Set Priviledged Rate */
public void setIsPriviledgedRate (boolean IsPriviledgedRate);
/** Get Priviledged Rate */
public boolean isPriviledgedRate();
/** Column name IsSelected */ /** Column name IsSelected */
public static final String COLUMNNAME_IsSelected = "IsSelected"; public static final String COLUMNNAME_IsSelected = "IsSelected";

158
org.adempiere.base/src/org/compiere/model/MOrder.java
View File

@ -34,6 +34,7 @@ import org.adempiere.exceptions.AdempiereException;
import org.adempiere.exceptions.BPartnerNoBillToAddressException; import org.adempiere.exceptions.BPartnerNoBillToAddressException;
import org.adempiere.exceptions.BPartnerNoShipToAddressException; import org.adempiere.exceptions.BPartnerNoShipToAddressException;
import org.adempiere.exceptions.FillMandatoryException; import org.adempiere.exceptions.FillMandatoryException;
import org.adempiere.process.SalesOrderRateInquiryProcess;
import org.compiere.print.MPrintFormat; import org.compiere.print.MPrintFormat;
import org.compiere.print.ReportEngine; import org.compiere.print.ReportEngine;
import org.compiere.process.DocAction; import org.compiere.process.DocAction;
@ -43,6 +44,7 @@ import org.compiere.process.ServerProcessCtl;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.compiere.util.Trx;
import org.compiere.util.Util; import org.compiere.util.Util;
import org.eevolution.model.MPPProductBOM; import org.eevolution.model.MPPProductBOM;
import org.eevolution.model.MPPProductBOMLine; import org.eevolution.model.MPPProductBOMLine;
@ -1231,6 +1233,18 @@ public class MOrder extends X_C_Order implements DocAction
return DocAction.STATUS_Invalid; return DocAction.STATUS_Invalid;
} }
if (isSOTrx() && getDeliveryViaRule().equals(DELIVERYVIARULE_Shipper))
{
if (getM_Shipper_ID() == 0)
{
m_processMsg = "@FillMandatory@" + Msg.getElement(getCtx(), COLUMNNAME_M_Shipper_ID);
return DocAction.STATUS_Invalid;
}
if (!calculateFreightCharge())
return DocAction.STATUS_Invalid;
}
// Lines // Lines
MOrderLine[] lines = getLines(true, MOrderLine.COLUMNNAME_M_Product_ID); MOrderLine[] lines = getLines(true, MOrderLine.COLUMNNAME_M_Product_ID);
if (lines.length == 0) if (lines.length == 0)
@ -1238,7 +1252,7 @@ public class MOrder extends X_C_Order implements DocAction
m_processMsg = "@NoLines@"; m_processMsg = "@NoLines@";
return DocAction.STATUS_Invalid; return DocAction.STATUS_Invalid;
} }
// Bug 1564431 // Bug 1564431
if (getDeliveryRule() != null && getDeliveryRule().equals(MOrder.DELIVERYRULE_CompleteOrder)) if (getDeliveryRule() != null && getDeliveryRule().equals(MOrder.DELIVERYRULE_CompleteOrder))
{ {
@ -1396,6 +1410,148 @@ public class MOrder extends X_C_Order implements DocAction
return DocAction.STATUS_InProgress; return DocAction.STATUS_InProgress;
} // prepareIt } // prepareIt
private boolean calculateFreightCharge()
{
MClientInfo ci = MClientInfo.get(getCtx(), getAD_Client_ID(), get_TrxName());
if (ci.getC_ChargeFreight_ID() == 0 && ci.getM_ProductFreight_ID() == 0)
{
m_processMsg = "Product or Charge for Freight is not defined at Client window > Client Info tab";
return false;
}
MOrderLine[] ols = getLines(false, MOrderLine.COLUMNNAME_Line);
if (ols.length == 0)
{
m_processMsg = "@NoLines@";
return false;
}
MOrderLine freightLine = null;
for (MOrderLine ol : ols)
{
if ((ol.getM_Product_ID() > 0 && ol.getM_Product_ID() == ci.getM_ProductFreight_ID()) ||
(ol.getC_Charge_ID() > 0 && ol.getC_Charge_ID() == ci.getC_ChargeFreight_ID()))
{
freightLine = ol;
break;
}
}
if (getFreightCostRule().equals(FREIGHTCOSTRULE_FreightIncluded))
{
if (freightLine != null)
{
boolean deleted = freightLine.delete(false);
if (!deleted)
{
freightLine.setC_BPartner_Location_ID(getC_BPartner_Location_ID());
freightLine.setM_Shipper_ID(getM_Shipper_ID());
freightLine.setQty(BigDecimal.ONE);
freightLine.setPrice(BigDecimal.ZERO);
freightLine.saveEx();
}
}
}
else if (getFreightCostRule().equals(FREIGHTCOSTRULE_FixPrice))
{
if (freightLine == null)
{
freightLine = new MOrderLine(this);
if (ci.getC_ChargeFreight_ID() > 0)
freightLine.setC_Charge_ID(ci.getC_ChargeFreight_ID());
else if (ci.getM_ProductFreight_ID() > 0)
freightLine.setM_Product_ID(ci.getM_ProductFreight_ID());
else
throw new AdempiereException("Product or Charge for Freight is not defined at Client window > Client Info tab");
}
freightLine.setC_BPartner_Location_ID(getC_BPartner_Location_ID());
freightLine.setM_Shipper_ID(getM_Shipper_ID());
freightLine.setQty(BigDecimal.ONE);
freightLine.setPrice(getFreightAmt());
freightLine.saveEx();
}
else if (getFreightCostRule().equals(FREIGHTCOSTRULE_Calculated))
{
if (ci.getC_UOM_Weight_ID() == 0)
{
m_processMsg = "UOM for Weight is not defined at Client window > Client Info tab";
return false;
}
if (ci.getC_UOM_Length_ID() == 0)
{
m_processMsg = "UOM for Length is not defined at Client window > Client Info ta";
return false;
}
for (MOrderLine ol : ols)
{
if ((ol.getM_Product_ID() > 0 && ol.getM_Product_ID() == ci.getM_ProductFreight_ID()) ||
(ol.getC_Charge_ID() > 0 && ol.getC_Charge_ID() == ci.getC_ChargeFreight_ID()))
continue;
else if (ol.getM_Product_ID() > 0)
{
MProduct product = new MProduct(getCtx(), ol.getM_Product_ID(), get_TrxName());
BigDecimal weight = product.getWeight();
if (weight == null || weight.compareTo(BigDecimal.ZERO) == 0)
{
m_processMsg = "No weight defined for product " + product.toString();
return false;
}
}
}
Trx trx = Trx.get(Trx.createTrxName("spt-"), true);
boolean ok = false;
MShippingTransaction st = null;
try
{
st = SalesOrderRateInquiryProcess.createShippingTransaction(getCtx(), this, MShippingTransaction.ACTION_RateInquiry, isPriviledgedRate(), get_TrxName());
ok = st.processOnline();
}
catch (Exception e)
{
log.log(Level.SEVERE, "processOnline", e);
}
if (trx != null)
{
trx.commit();
trx.close();
}
if (ok)
{
if (freightLine == null)
{
freightLine = new MOrderLine(this);
if (ci.getC_ChargeFreight_ID() > 0)
freightLine.setC_Charge_ID(ci.getC_ChargeFreight_ID());
else if (ci.getM_ProductFreight_ID() > 0)
freightLine.setM_Product_ID(ci.getM_ProductFreight_ID());
else
throw new AdempiereException("Product or Charge for Freight is not defined at Client window > Client Info tab");
}
freightLine.setC_BPartner_Location_ID(getC_BPartner_Location_ID());
freightLine.setM_Shipper_ID(getM_Shipper_ID());
freightLine.setQty(BigDecimal.ONE);
freightLine.setPrice(st.getPrice());
freightLine.saveEx();
}
else
{
m_processMsg = st.getErrorMessage();
return false;
}
}
return true;
}
/** /**
* Explode non stocked BOM. * Explode non stocked BOM.
* @return true if bom exploded * @return true if bom exploded

25
org.adempiere.base/src/org/compiere/model/X_C_Order.java
View File

@ -33,7 +33,7 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
/** /**
* *
*/ */
private static final long serialVersionUID = 20121221L; private static final long serialVersionUID = 20130222L;
/** Standard Constructor */ /** Standard Constructor */
public X_C_Order (Properties ctx, int C_Order_ID, String trxName) public X_C_Order (Properties ctx, int C_Order_ID, String trxName)
@ -82,6 +82,8 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
setIsPayScheduleValid (false); setIsPayScheduleValid (false);
// N // N
setIsPrinted (false); setIsPrinted (false);
setIsPriviledgedRate (false);
// N
setIsSelected (false); setIsSelected (false);
setIsSelfService (false); setIsSelfService (false);
setIsSOTrx (false); setIsSOTrx (false);
@ -1445,6 +1447,27 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
return false; return false;
} }
/** Set Priviledged Rate.
@param IsPriviledgedRate Priviledged Rate */
public void setIsPriviledgedRate (boolean IsPriviledgedRate)
{
set_Value (COLUMNNAME_IsPriviledgedRate, Boolean.valueOf(IsPriviledgedRate));
}
/** Get Priviledged Rate.
@return Priviledged Rate */
public boolean isPriviledgedRate ()
{
Object oo = get_Value(COLUMNNAME_IsPriviledgedRate);
if (oo != null)
{
if (oo instanceof Boolean)
return ((Boolean)oo).booleanValue();
return "Y".equals(oo);
}
return false;
}
/** Set Selected. /** Set Selected.
@param IsSelected Selected */ @param IsSelected Selected */
public void setIsSelected (boolean IsSelected) public void setIsSelected (boolean IsSelected)