diff --git a/migration/i1.0a-release/oracle/201303181636_IDEMPIERE-764.sql b/migration/i1.0a-release/oracle/201303181636_IDEMPIERE-764.sql new file mode 100644 index 0000000000..6334fc66df --- /dev/null +++ b/migration/i1.0a-release/oracle/201303181636_IDEMPIERE-764.sql @@ -0,0 +1,380 @@ +-- IDEMPIERE-764 Some tablenames starts with X whereas they have centralized IDs +ALTER TABLE X_Shipper RENAME TO M_ShipperCfg +; + +ALTER TABLE X_ShipperPickupTypes RENAME TO M_ShipperPickupTypesCfg +; + +ALTER TABLE X_ShipperPackaging RENAME TO M_ShipperPackagingCfg +; + +ALTER TABLE X_ShipperLabels RENAME TO M_ShipperLabelsCfg +; + +ALTER TABLE X_ShippingProcessor RENAME TO M_ShippingProcessorCfg +; + +ALTER TABLE M_Shipper RENAME COLUMN X_Shipper_ID TO M_ShipperCfg_ID +; + +ALTER TABLE M_ShipperCfg RENAME COLUMN X_Shipper_ID TO M_ShipperCfg_ID +; + +ALTER TABLE M_ShipperCfg RENAME COLUMN X_Shipper_UU TO M_ShipperCfg_UU +; + +ALTER TABLE M_ShipperCfg RENAME COLUMN X_ShippingProcessor_ID TO M_ShippingProcessorCfg_ID +; + +ALTER TABLE M_ShipperLabels RENAME COLUMN X_ShipperLabels_ID TO M_ShipperLabelsCfg_ID +; + +ALTER TABLE M_ShipperLabelsCfg RENAME COLUMN X_Shipper_ID TO M_ShipperCfg_ID +; + +ALTER TABLE M_ShipperLabelsCfg RENAME COLUMN X_ShipperLabels_ID TO M_ShipperLabelsCfg_ID +; + +ALTER TABLE M_ShipperLabelsCfg RENAME COLUMN X_ShipperLabels_UU TO M_ShipperLabelsCfg_UU +; + +ALTER TABLE M_ShipperPackaging RENAME COLUMN X_ShipperPackaging_ID TO M_ShipperPackagingCfg_ID +; + +ALTER TABLE M_ShipperPackagingCfg RENAME COLUMN X_Shipper_ID TO M_ShipperCfg_ID +; + +ALTER TABLE M_ShipperPackagingCfg RENAME COLUMN X_ShipperPackaging_ID TO M_ShipperPackagingCfg_ID +; + +ALTER TABLE M_ShipperPackagingCfg RENAME COLUMN X_ShipperPackaging_UU TO M_ShipperPackagingCfg_UU +; + +ALTER TABLE M_ShipperPickupTypes RENAME COLUMN X_ShipperPickupTypes_ID TO M_ShipperPickupTypesCfg_ID +; + +ALTER TABLE M_ShipperPickupTypesCfg RENAME COLUMN X_Shipper_ID TO M_ShipperCfg_ID +; + +ALTER TABLE M_ShipperPickupTypesCfg RENAME COLUMN X_ShipperPickupTypes_ID TO M_ShipperPickupTypesCfg_ID +; + +ALTER TABLE M_ShipperPickupTypesCfg RENAME COLUMN X_ShipperPickupTypes_UU TO M_ShipperPickupTypesCfg_UU +; + +ALTER TABLE M_ShippingProcessor RENAME COLUMN X_ShippingProcessor_ID TO M_ShippingProcessorCfg_ID +; + +ALTER TABLE M_ShippingProcessorCfg RENAME COLUMN X_ShippingProcessor_ID TO M_ShippingProcessorCfg_ID +; + +ALTER TABLE M_ShippingProcessorCfg RENAME COLUMN X_ShippingProcessor_UU TO M_ShippingProcessorCfg_UU +; + +-- Mar 18, 2013 4:23:18 PM COT +UPDATE AD_Field SET DisplayLogic='@M_ShipperCfg_ID@>0',Updated=TO_DATE('2013-03-18 16:23:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201502 +; + +-- Mar 18, 2013 4:25:00 PM COT +UPDATE AD_Sequence SET Description='Table M_ShipperCfg', Name='M_ShipperCfg',Updated=TO_DATE('2013-03-18 16:25:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200043 +; + +-- Mar 18, 2013 4:25:10 PM COT +UPDATE AD_Sequence SET Description='Table M_ShipperLabelsCfg', Name='M_ShipperLabelsCfg',Updated=TO_DATE('2013-03-18 16:25:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200044 +; + +-- Mar 18, 2013 4:25:22 PM COT +UPDATE AD_Sequence SET Description='Table M_ShipperPackagingCfg', Name='M_ShipperPackagingCfg',Updated=TO_DATE('2013-03-18 16:25:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200045 +; + +-- Mar 18, 2013 4:25:32 PM COT +UPDATE AD_Sequence SET Description='Table M_ShipperPickupTypesCfg', Name='M_ShipperPickupTypesCfg',Updated=TO_DATE('2013-03-18 16:25:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200046 +; + +-- Mar 18, 2013 4:25:42 PM COT +UPDATE AD_Sequence SET Description='Table M_ShippingProcessorCfg', Name='M_ShippingProcessorCfg',Updated=TO_DATE('2013-03-18 16:25:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200042 +; + +-- Mar 18, 2013 4:27:57 PM COT +UPDATE AD_Table SET TableName='M_ShipperCfg',Updated=TO_DATE('2013-03-18 16:27:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200047 +; + +-- Mar 18, 2013 4:28:05 PM COT +UPDATE AD_Table SET TableName='M_ShipperLabelsCfg',Updated=TO_DATE('2013-03-18 16:28:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200048 +; + +-- Mar 18, 2013 4:28:12 PM COT +UPDATE AD_Table SET TableName='M_ShipperPackagingCfg',Updated=TO_DATE('2013-03-18 16:28:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200049 +; + +-- Mar 18, 2013 4:28:19 PM COT +UPDATE AD_Table SET TableName='M_ShipperPickupTypesCfg',Updated=TO_DATE('2013-03-18 16:28:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200050 +; + +-- Mar 18, 2013 4:28:27 PM COT +UPDATE AD_Table SET TableName='M_ShippingProcessorCfg',Updated=TO_DATE('2013-03-18 16:28:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200046 +; + +-- Mar 18, 2013 4:30:20 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperCfg_ID',Updated=TO_DATE('2013-03-18 16:30:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200601 +; + +-- Mar 18, 2013 4:30:20 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperCfg_ID', Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200601 +; + +-- Mar 18, 2013 4:30:20 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperCfg_ID', Name='Shipper Configuration', Description=NULL, Help=NULL, AD_Element_ID=200601 WHERE UPPER(ColumnName)='M_SHIPPERCFG_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:30:20 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperCfg_ID', Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200601 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:30:20 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperCfg_ID', Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200601 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:31:43 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperLabelsCfg_ID',Updated=TO_DATE('2013-03-18 16:31:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200603 +; + +-- Mar 18, 2013 4:31:43 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperLabelsCfg_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200603 +; + +-- Mar 18, 2013 4:31:43 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperLabelsCfg_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL, AD_Element_ID=200603 WHERE UPPER(ColumnName)='M_SHIPPERLABELSCFG_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:31:43 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperLabelsCfg_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200603 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:31:43 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperLabelsCfg_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200603 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperLabelsCfg_UU', Name='M_ShipperLabelsCfg_UU', PrintName='M_ShipperLabelsCfg_UU',Updated=TO_DATE('2013-03-18 16:31:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200604 +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200604 +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperLabelsCfg_UU', Name='M_ShipperLabelsCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200604 +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperLabelsCfg_UU', Name='M_ShipperLabelsCfg_UU', Description=NULL, Help=NULL, AD_Element_ID=200604 WHERE UPPER(ColumnName)='M_SHIPPERLABELSCFG_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperLabelsCfg_UU', Name='M_ShipperLabelsCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200604 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperLabelsCfg_UU', Name='M_ShipperLabelsCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200604 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_Field SET Name='M_ShipperLabelsCfg_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200604) AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_PrintFormatItem SET PrintName='M_ShipperLabelsCfg_UU', Name='M_ShipperLabelsCfg_UU' 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=200604) +; + +-- Mar 18, 2013 4:32:09 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperPackagingCfg_ID',Updated=TO_DATE('2013-03-18 16:32:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200605 +; + +-- Mar 18, 2013 4:32:09 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperPackagingCfg_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200605 +; + +-- Mar 18, 2013 4:32:09 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPackagingCfg_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL, AD_Element_ID=200605 WHERE UPPER(ColumnName)='M_SHIPPERPACKAGINGCFG_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:32:09 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPackagingCfg_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200605 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:09 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperPackagingCfg_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200605 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperPackagingCfg_UU', Name='M_ShipperPackagingCfg_UU', PrintName='M_ShipperPackagingCfg_UU',Updated=TO_DATE('2013-03-18 16:32:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200606 +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200606 +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperPackagingCfg_UU', Name='M_ShipperPackagingCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200606 +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPackagingCfg_UU', Name='M_ShipperPackagingCfg_UU', Description=NULL, Help=NULL, AD_Element_ID=200606 WHERE UPPER(ColumnName)='M_SHIPPERPACKAGINGCFG_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPackagingCfg_UU', Name='M_ShipperPackagingCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200606 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperPackagingCfg_UU', Name='M_ShipperPackagingCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200606 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_Field SET Name='M_ShipperPackagingCfg_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200606) AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_PrintFormatItem SET PrintName='M_ShipperPackagingCfg_UU', Name='M_ShipperPackagingCfg_UU' 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=200606) +; + +-- Mar 18, 2013 4:32:35 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperPickupTypesCfg_ID',Updated=TO_DATE('2013-03-18 16:32:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200607 +; + +-- Mar 18, 2013 4:32:35 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperPickupTypesCfg_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200607 +; + +-- Mar 18, 2013 4:32:35 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPickupTypesCfg_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL, AD_Element_ID=200607 WHERE UPPER(ColumnName)='M_SHIPPERPICKUPTYPESCFG_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:32:35 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPickupTypesCfg_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200607 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:35 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperPickupTypesCfg_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200607 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperPickupTypesCfg_UU', Name='M_ShipperPickupTypesCfg_UU', PrintName='M_ShipperPickupTypesCfg_UU',Updated=TO_DATE('2013-03-18 16:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200608 +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200608 +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperPickupTypesCfg_UU', Name='M_ShipperPickupTypesCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200608 +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPickupTypesCfg_UU', Name='M_ShipperPickupTypesCfg_UU', Description=NULL, Help=NULL, AD_Element_ID=200608 WHERE UPPER(ColumnName)='M_SHIPPERPICKUPTYPESCFG_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPickupTypesCfg_UU', Name='M_ShipperPickupTypesCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200608 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperPickupTypesCfg_UU', Name='M_ShipperPickupTypesCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200608 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_Field SET Name='M_ShipperPickupTypesCfg_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200608) AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_PrintFormatItem SET PrintName='M_ShipperPickupTypesCfg_UU', Name='M_ShipperPickupTypesCfg_UU' 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=200608) +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperCfg_UU', Name='M_ShipperCfg_UU', PrintName='M_ShipperCfg_UU',Updated=TO_DATE('2013-03-18 16:33:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200602 +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200602 +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperCfg_UU', Name='M_ShipperCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200602 +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperCfg_UU', Name='M_ShipperCfg_UU', Description=NULL, Help=NULL, AD_Element_ID=200602 WHERE UPPER(ColumnName)='M_SHIPPERCFG_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperCfg_UU', Name='M_ShipperCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200602 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperCfg_UU', Name='M_ShipperCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200602 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_Field SET Name='M_ShipperCfg_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200602) AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_PrintFormatItem SET PrintName='M_ShipperCfg_UU', Name='M_ShipperCfg_UU' 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=200602) +; + +-- Mar 18, 2013 4:33:14 PM COT +UPDATE AD_Element SET ColumnName='M_ShippingProcessorCfg_ID',Updated=TO_DATE('2013-03-18 16:33:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200599 +; + +-- Mar 18, 2013 4:33:14 PM COT +UPDATE AD_Column SET ColumnName='M_ShippingProcessorCfg_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200599 +; + +-- Mar 18, 2013 4:33:14 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShippingProcessorCfg_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL, AD_Element_ID=200599 WHERE UPPER(ColumnName)='M_SHIPPINGPROCESSORCFG_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:33:14 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShippingProcessorCfg_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200599 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:14 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShippingProcessorCfg_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200599 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_Element SET ColumnName='M_ShippingProcessorCfg_UU', Name='M_ShippingProcessorCfg_UU', PrintName='M_ShippingProcessorCfg_UU',Updated=TO_DATE('2013-03-18 16:33:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200600 +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200600 +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_Column SET ColumnName='M_ShippingProcessorCfg_UU', Name='M_ShippingProcessorCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200600 +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShippingProcessorCfg_UU', Name='M_ShippingProcessorCfg_UU', Description=NULL, Help=NULL, AD_Element_ID=200600 WHERE UPPER(ColumnName)='M_SHIPPINGPROCESSORCFG_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShippingProcessorCfg_UU', Name='M_ShippingProcessorCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200600 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShippingProcessorCfg_UU', Name='M_ShippingProcessorCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200600 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_Field SET Name='M_ShippingProcessorCfg_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200600) AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_PrintFormatItem SET PrintName='M_ShippingProcessorCfg_UU', Name='M_ShippingProcessorCfg_UU' 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=200600) +; + +SELECT register_migration_script('201303181636_IDEMPIERE-764.sql') FROM dual +; + diff --git a/migration/i1.0a-release/postgresql/201303181636_IDEMPIERE-764.sql b/migration/i1.0a-release/postgresql/201303181636_IDEMPIERE-764.sql new file mode 100644 index 0000000000..2da5b094ea --- /dev/null +++ b/migration/i1.0a-release/postgresql/201303181636_IDEMPIERE-764.sql @@ -0,0 +1,380 @@ +-- IDEMPIERE-764 Some tablenames starts with X whereas they have centralized IDs +ALTER TABLE X_ShippingProcessor RENAME TO M_ShippingProcessorCfg +; + +ALTER TABLE X_Shipper RENAME TO M_ShipperCfg +; + +ALTER TABLE X_ShipperPickupTypes RENAME TO M_ShipperPickupTypesCfg +; + +ALTER TABLE X_ShipperPackaging RENAME TO M_ShipperPackagingCfg +; + +ALTER TABLE X_ShipperLabels RENAME TO M_ShipperLabelsCfg +; + +ALTER TABLE M_Shipper RENAME X_Shipper_ID TO M_ShipperCfg_ID +; + +ALTER TABLE M_ShipperCfg RENAME X_Shipper_ID TO M_ShipperCfg_ID +; + +ALTER TABLE M_ShipperCfg RENAME X_Shipper_UU TO M_ShipperCfg_UU +; + +ALTER TABLE M_ShipperCfg RENAME X_ShippingProcessor_ID TO M_ShippingProcessorCfg_ID +; + +ALTER TABLE M_ShipperLabels RENAME X_ShipperLabels_ID TO M_ShipperLabelsCfg_ID +; + +ALTER TABLE M_ShipperLabelsCfg RENAME X_Shipper_ID TO M_ShipperCfg_ID +; + +ALTER TABLE M_ShipperLabelsCfg RENAME X_ShipperLabels_ID TO M_ShipperLabelsCfg_ID +; + +ALTER TABLE M_ShipperLabelsCfg RENAME X_ShipperLabels_UU TO M_ShipperLabelsCfg_UU +; + +ALTER TABLE M_ShipperPackaging RENAME X_ShipperPackaging_ID TO M_ShipperPackagingCfg_ID +; + +ALTER TABLE M_ShipperPackagingCfg RENAME X_Shipper_ID TO M_ShipperCfg_ID +; + +ALTER TABLE M_ShipperPackagingCfg RENAME X_ShipperPackaging_ID TO M_ShipperPackagingCfg_ID +; + +ALTER TABLE M_ShipperPackagingCfg RENAME X_ShipperPackaging_UU TO M_ShipperPackagingCfg_UU +; + +ALTER TABLE M_ShipperPickupTypes RENAME X_ShipperPickupTypes_ID TO M_ShipperPickupTypesCfg_ID +; + +ALTER TABLE M_ShipperPickupTypesCfg RENAME X_Shipper_ID TO M_ShipperCfg_ID +; + +ALTER TABLE M_ShipperPickupTypesCfg RENAME X_ShipperPickupTypes_ID TO M_ShipperPickupTypesCfg_ID +; + +ALTER TABLE M_ShipperPickupTypesCfg RENAME X_ShipperPickupTypes_UU TO M_ShipperPickupTypesCfg_UU +; + +ALTER TABLE M_ShippingProcessor RENAME X_ShippingProcessor_ID TO M_ShippingProcessorCfg_ID +; + +ALTER TABLE M_ShippingProcessorCfg RENAME X_ShippingProcessor_ID TO M_ShippingProcessorCfg_ID +; + +ALTER TABLE M_ShippingProcessorCfg RENAME X_ShippingProcessor_UU TO M_ShippingProcessorCfg_UU +; + +-- Mar 18, 2013 4:23:18 PM COT +UPDATE AD_Field SET DisplayLogic='@M_ShipperCfg_ID@>0',Updated=TO_TIMESTAMP('2013-03-18 16:23:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201502 +; + +-- Mar 18, 2013 4:25:00 PM COT +UPDATE AD_Sequence SET Description='Table M_ShipperCfg', Name='M_ShipperCfg',Updated=TO_TIMESTAMP('2013-03-18 16:25:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200043 +; + +-- Mar 18, 2013 4:25:10 PM COT +UPDATE AD_Sequence SET Description='Table M_ShipperLabelsCfg', Name='M_ShipperLabelsCfg',Updated=TO_TIMESTAMP('2013-03-18 16:25:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200044 +; + +-- Mar 18, 2013 4:25:22 PM COT +UPDATE AD_Sequence SET Description='Table M_ShipperPackagingCfg', Name='M_ShipperPackagingCfg',Updated=TO_TIMESTAMP('2013-03-18 16:25:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200045 +; + +-- Mar 18, 2013 4:25:32 PM COT +UPDATE AD_Sequence SET Description='Table M_ShipperPickupTypesCfg', Name='M_ShipperPickupTypesCfg',Updated=TO_TIMESTAMP('2013-03-18 16:25:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200046 +; + +-- Mar 18, 2013 4:25:42 PM COT +UPDATE AD_Sequence SET Description='Table M_ShippingProcessorCfg', Name='M_ShippingProcessorCfg',Updated=TO_TIMESTAMP('2013-03-18 16:25:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Sequence_ID=200042 +; + +-- Mar 18, 2013 4:27:57 PM COT +UPDATE AD_Table SET TableName='M_ShipperCfg',Updated=TO_TIMESTAMP('2013-03-18 16:27:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200047 +; + +-- Mar 18, 2013 4:28:05 PM COT +UPDATE AD_Table SET TableName='M_ShipperLabelsCfg',Updated=TO_TIMESTAMP('2013-03-18 16:28:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200048 +; + +-- Mar 18, 2013 4:28:12 PM COT +UPDATE AD_Table SET TableName='M_ShipperPackagingCfg',Updated=TO_TIMESTAMP('2013-03-18 16:28:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200049 +; + +-- Mar 18, 2013 4:28:19 PM COT +UPDATE AD_Table SET TableName='M_ShipperPickupTypesCfg',Updated=TO_TIMESTAMP('2013-03-18 16:28:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200050 +; + +-- Mar 18, 2013 4:28:27 PM COT +UPDATE AD_Table SET TableName='M_ShippingProcessorCfg',Updated=TO_TIMESTAMP('2013-03-18 16:28:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200046 +; + +-- Mar 18, 2013 4:30:20 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperCfg_ID',Updated=TO_TIMESTAMP('2013-03-18 16:30:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200601 +; + +-- Mar 18, 2013 4:30:20 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperCfg_ID', Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200601 +; + +-- Mar 18, 2013 4:30:20 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperCfg_ID', Name='Shipper Configuration', Description=NULL, Help=NULL, AD_Element_ID=200601 WHERE UPPER(ColumnName)='M_SHIPPERCFG_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:30:20 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperCfg_ID', Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200601 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:30:20 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperCfg_ID', Name='Shipper Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200601 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:31:43 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperLabelsCfg_ID',Updated=TO_TIMESTAMP('2013-03-18 16:31:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200603 +; + +-- Mar 18, 2013 4:31:43 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperLabelsCfg_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200603 +; + +-- Mar 18, 2013 4:31:43 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperLabelsCfg_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL, AD_Element_ID=200603 WHERE UPPER(ColumnName)='M_SHIPPERLABELSCFG_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:31:43 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperLabelsCfg_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200603 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:31:43 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperLabelsCfg_ID', Name='Shipper Labels Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200603 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperLabelsCfg_UU', Name='M_ShipperLabelsCfg_UU', PrintName='M_ShipperLabelsCfg_UU',Updated=TO_TIMESTAMP('2013-03-18 16:31:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200604 +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200604 +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperLabelsCfg_UU', Name='M_ShipperLabelsCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200604 +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperLabelsCfg_UU', Name='M_ShipperLabelsCfg_UU', Description=NULL, Help=NULL, AD_Element_ID=200604 WHERE UPPER(ColumnName)='M_SHIPPERLABELSCFG_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperLabelsCfg_UU', Name='M_ShipperLabelsCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200604 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperLabelsCfg_UU', Name='M_ShipperLabelsCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200604 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_Field SET Name='M_ShipperLabelsCfg_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200604) AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:31:57 PM COT +UPDATE AD_PrintFormatItem SET PrintName='M_ShipperLabelsCfg_UU', Name='M_ShipperLabelsCfg_UU' 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=200604) +; + +-- Mar 18, 2013 4:32:09 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperPackagingCfg_ID',Updated=TO_TIMESTAMP('2013-03-18 16:32:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200605 +; + +-- Mar 18, 2013 4:32:09 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperPackagingCfg_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200605 +; + +-- Mar 18, 2013 4:32:09 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPackagingCfg_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL, AD_Element_ID=200605 WHERE UPPER(ColumnName)='M_SHIPPERPACKAGINGCFG_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:32:09 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPackagingCfg_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200605 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:09 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperPackagingCfg_ID', Name='Shipper Packaging Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200605 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperPackagingCfg_UU', Name='M_ShipperPackagingCfg_UU', PrintName='M_ShipperPackagingCfg_UU',Updated=TO_TIMESTAMP('2013-03-18 16:32:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200606 +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200606 +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperPackagingCfg_UU', Name='M_ShipperPackagingCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200606 +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPackagingCfg_UU', Name='M_ShipperPackagingCfg_UU', Description=NULL, Help=NULL, AD_Element_ID=200606 WHERE UPPER(ColumnName)='M_SHIPPERPACKAGINGCFG_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPackagingCfg_UU', Name='M_ShipperPackagingCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200606 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperPackagingCfg_UU', Name='M_ShipperPackagingCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200606 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_Field SET Name='M_ShipperPackagingCfg_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200606) AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:22 PM COT +UPDATE AD_PrintFormatItem SET PrintName='M_ShipperPackagingCfg_UU', Name='M_ShipperPackagingCfg_UU' 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=200606) +; + +-- Mar 18, 2013 4:32:35 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperPickupTypesCfg_ID',Updated=TO_TIMESTAMP('2013-03-18 16:32:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200607 +; + +-- Mar 18, 2013 4:32:35 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperPickupTypesCfg_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200607 +; + +-- Mar 18, 2013 4:32:35 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPickupTypesCfg_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL, AD_Element_ID=200607 WHERE UPPER(ColumnName)='M_SHIPPERPICKUPTYPESCFG_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:32:35 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPickupTypesCfg_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200607 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:35 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperPickupTypesCfg_ID', Name='Shipper Pickup Types Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200607 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperPickupTypesCfg_UU', Name='M_ShipperPickupTypesCfg_UU', PrintName='M_ShipperPickupTypesCfg_UU',Updated=TO_TIMESTAMP('2013-03-18 16:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200608 +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200608 +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperPickupTypesCfg_UU', Name='M_ShipperPickupTypesCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200608 +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPickupTypesCfg_UU', Name='M_ShipperPickupTypesCfg_UU', Description=NULL, Help=NULL, AD_Element_ID=200608 WHERE UPPER(ColumnName)='M_SHIPPERPICKUPTYPESCFG_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperPickupTypesCfg_UU', Name='M_ShipperPickupTypesCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200608 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperPickupTypesCfg_UU', Name='M_ShipperPickupTypesCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200608 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_Field SET Name='M_ShipperPickupTypesCfg_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200608) AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:32:49 PM COT +UPDATE AD_PrintFormatItem SET PrintName='M_ShipperPickupTypesCfg_UU', Name='M_ShipperPickupTypesCfg_UU' 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=200608) +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_Element SET ColumnName='M_ShipperCfg_UU', Name='M_ShipperCfg_UU', PrintName='M_ShipperCfg_UU',Updated=TO_TIMESTAMP('2013-03-18 16:33:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200602 +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200602 +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_Column SET ColumnName='M_ShipperCfg_UU', Name='M_ShipperCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200602 +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperCfg_UU', Name='M_ShipperCfg_UU', Description=NULL, Help=NULL, AD_Element_ID=200602 WHERE UPPER(ColumnName)='M_SHIPPERCFG_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShipperCfg_UU', Name='M_ShipperCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200602 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShipperCfg_UU', Name='M_ShipperCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200602 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_Field SET Name='M_ShipperCfg_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200602) AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:03 PM COT +UPDATE AD_PrintFormatItem SET PrintName='M_ShipperCfg_UU', Name='M_ShipperCfg_UU' 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=200602) +; + +-- Mar 18, 2013 4:33:14 PM COT +UPDATE AD_Element SET ColumnName='M_ShippingProcessorCfg_ID',Updated=TO_TIMESTAMP('2013-03-18 16:33:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200599 +; + +-- Mar 18, 2013 4:33:14 PM COT +UPDATE AD_Column SET ColumnName='M_ShippingProcessorCfg_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200599 +; + +-- Mar 18, 2013 4:33:14 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShippingProcessorCfg_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL, AD_Element_ID=200599 WHERE UPPER(ColumnName)='M_SHIPPINGPROCESSORCFG_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:33:14 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShippingProcessorCfg_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200599 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:14 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShippingProcessorCfg_ID', Name='Shipping Processor Configuration', Description=NULL, Help=NULL WHERE AD_Element_ID=200599 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_Element SET ColumnName='M_ShippingProcessorCfg_UU', Name='M_ShippingProcessorCfg_UU', PrintName='M_ShippingProcessorCfg_UU',Updated=TO_TIMESTAMP('2013-03-18 16:33:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200600 +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200600 +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_Column SET ColumnName='M_ShippingProcessorCfg_UU', Name='M_ShippingProcessorCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200600 +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShippingProcessorCfg_UU', Name='M_ShippingProcessorCfg_UU', Description=NULL, Help=NULL, AD_Element_ID=200600 WHERE UPPER(ColumnName)='M_SHIPPINGPROCESSORCFG_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_Process_Para SET ColumnName='M_ShippingProcessorCfg_UU', Name='M_ShippingProcessorCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200600 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_InfoColumn SET ColumnName='M_ShippingProcessorCfg_UU', Name='M_ShippingProcessorCfg_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200600 AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_Field SET Name='M_ShippingProcessorCfg_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200600) AND IsCentrallyMaintained='Y' +; + +-- Mar 18, 2013 4:33:27 PM COT +UPDATE AD_PrintFormatItem SET PrintName='M_ShippingProcessorCfg_UU', Name='M_ShippingProcessorCfg_UU' 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=200600) +; + +SELECT register_migration_script('201303181636_IDEMPIERE-764.sql') FROM dual +; + 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 ea88f07229..2a9fced422 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutShipper.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutShipper.java @@ -27,25 +27,25 @@ public class CalloutShipper extends CalloutEngine { public String shipper(Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value) { - Integer X_Shipper_ID = (Integer)value; - if (X_Shipper_ID == null || X_Shipper_ID.intValue() == 0) + Integer M_ShipperCfg_ID = (Integer)value; + if (M_ShipperCfg_ID == null || M_ShipperCfg_ID.intValue() == 0) return ""; - X_X_Shipper s = new X_X_Shipper(ctx, X_Shipper_ID, null); + X_M_ShipperCfg s = new X_M_ShipperCfg(ctx, M_ShipperCfg_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 "); - sb.append("WHERE sp.X_ShippingProcessor_ID = xsp.X_ShippingProcessor_ID "); - sb.append("AND xsp.X_ShippingProcessor_ID = xs.X_ShippingProcessor_ID "); + sb.append("FROM M_ShippingProcessor sp, M_ShippingProcessorCfg xsp, M_ShipperCfg xs "); + sb.append("WHERE sp.M_ShippingProcessorCfg_ID = xsp.M_ShippingProcessorCfg_ID "); + sb.append("AND xsp.M_ShippingProcessorCfg_ID = xs.M_ShippingProcessorCfg_ID "); sb.append("AND sp.IsActive = 'Y' "); sb.append("AND sp.AD_Client_ID = ? "); sb.append("AND sp.AD_Org_ID IN (0, ?) "); - sb.append("AND xs.X_Shipper_ID = ? "); + sb.append("AND xs.M_ShipperCfg_ID = ? "); sb.append("ORDER BY sp.AD_Org_ID DESC"); - int M_ShippingProcessor_ID = DB.getSQLValue(null, sb.toString(), Env.getAD_Client_ID(ctx), Env.getAD_Org_ID(ctx), X_Shipper_ID); + int M_ShippingProcessor_ID = DB.getSQLValue(null, sb.toString(), Env.getAD_Client_ID(ctx), Env.getAD_Org_ID(ctx), M_ShipperCfg_ID); if (M_ShippingProcessor_ID > 0) mTab.setValue(MShipper.COLUMNNAME_M_ShippingProcessor_ID, M_ShippingProcessor_ID); @@ -54,11 +54,11 @@ public class CalloutShipper extends CalloutEngine public String shipperLabels(Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value) { - Integer X_ShipperLabels_ID = (Integer)value; - if (X_ShipperLabels_ID == null || X_ShipperLabels_ID.intValue() == 0) + Integer M_ShipperLabelsCfg_ID = (Integer)value; + if (M_ShipperLabelsCfg_ID == null || M_ShipperLabelsCfg_ID.intValue() == 0) return ""; - X_X_ShipperLabels sl = new X_X_ShipperLabels(ctx, X_ShipperLabels_ID, null); + X_M_ShipperLabelsCfg sl = new X_M_ShipperLabelsCfg(ctx, M_ShipperLabelsCfg_ID, null); mTab.setValue(MShipperLabels.COLUMNNAME_Name, sl.getName()); mTab.setValue(MShipperLabels.COLUMNNAME_LabelPrintMethod, sl.getLabelPrintMethod()); mTab.setValue(MShipperLabels.COLUMNNAME_IsDefault, sl.isDefault()); @@ -68,11 +68,11 @@ public class CalloutShipper extends CalloutEngine public String shipperPackaging(Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value) { - Integer X_ShipperPackaging_ID = (Integer)value; - if (X_ShipperPackaging_ID == null || X_ShipperPackaging_ID.intValue() == 0) + Integer M_ShipperPackagingCfg_ID = (Integer)value; + if (M_ShipperPackagingCfg_ID == null || M_ShipperPackagingCfg_ID.intValue() == 0) return ""; - X_X_ShipperPackaging sp = new X_X_ShipperPackaging(ctx, X_ShipperPackaging_ID, null); + X_M_ShipperPackagingCfg sp = new X_M_ShipperPackagingCfg(ctx, M_ShipperPackagingCfg_ID, null); mTab.setValue(MShipperPackaging.COLUMNNAME_Name, sp.getName()); mTab.setValue(MShipperPackaging.COLUMNNAME_IsDefault, sp.isDefault()); mTab.setValue(MShipperPackaging.COLUMNNAME_Weight, sp.getWeight()); @@ -82,11 +82,11 @@ public class CalloutShipper extends CalloutEngine public String shipperPickupTypes(Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value) { - Integer X_ShipperPickupTypes_ID = (Integer)value; - if (X_ShipperPickupTypes_ID == null || X_ShipperPickupTypes_ID.intValue() == 0) + Integer M_ShipperPickupTypesCfg_ID = (Integer)value; + if (M_ShipperPickupTypesCfg_ID == null || M_ShipperPickupTypesCfg_ID.intValue() == 0) return ""; - X_X_ShipperPickupTypes spt = new X_X_ShipperPickupTypes(ctx, X_ShipperPickupTypes_ID, null); + X_M_ShipperPickupTypesCfg spt = new X_M_ShipperPickupTypesCfg(ctx, M_ShipperPickupTypesCfg_ID, null); mTab.setValue(MShipperLabels.COLUMNNAME_Name, spt.getName()); mTab.setValue(MShipperLabels.COLUMNNAME_IsDefault, spt.isDefault()); diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutShippingProcessor.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutShippingProcessor.java index 7ce95a8ac8..1fcf8de9e3 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutShippingProcessor.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutShippingProcessor.java @@ -24,11 +24,11 @@ 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) + Integer M_ShippingProcessorCfg_ID = (Integer)value; + if (M_ShippingProcessorCfg_ID == null || M_ShippingProcessorCfg_ID.intValue() == 0) return ""; - X_X_ShippingProcessor sp = new X_X_ShippingProcessor(ctx, X_ShippingProcessor_ID, null); + X_M_ShippingProcessorCfg sp = new X_M_ShippingProcessorCfg(ctx, M_ShippingProcessorCfg_ID, null); mTab.setValue(MShippingProcessor.COLUMNNAME_Name, sp.getName()); return null; diff --git a/org.adempiere.base/src/org/adempiere/process/ShipperCopyFrom.java b/org.adempiere.base/src/org/adempiere/process/ShipperCopyFrom.java index 9c24561fa9..aa9602db94 100644 --- a/org.adempiere.base/src/org/adempiere/process/ShipperCopyFrom.java +++ b/org.adempiere.base/src/org/adempiere/process/ShipperCopyFrom.java @@ -3,16 +3,16 @@ package org.adempiere.process; import java.math.BigDecimal; import java.util.logging.Level; -import org.compiere.model.X_X_Shipper; -import org.compiere.model.X_X_ShipperLabels; -import org.compiere.model.X_X_ShipperPackaging; -import org.compiere.model.X_X_ShipperPickupTypes; +import org.compiere.model.X_M_ShipperCfg; +import org.compiere.model.X_M_ShipperLabelsCfg; +import org.compiere.model.X_M_ShipperPackagingCfg; +import org.compiere.model.X_M_ShipperPickupTypesCfg; import org.compiere.process.ProcessInfoParameter; import org.compiere.process.SvrProcess; public class ShipperCopyFrom extends SvrProcess { - private int p_X_Shipper_ID = 0; + private int p_M_ShipperCfg_ID = 0; @Override protected void prepare() @@ -23,8 +23,8 @@ public class ShipperCopyFrom extends SvrProcess String name = para[i].getParameterName(); if (para[i].getParameter() == null) ; - else if (name.equals(X_X_Shipper.COLUMNNAME_X_Shipper_ID)) - p_X_Shipper_ID = ((BigDecimal)para[i].getParameter()).intValue(); + else if (name.equals(X_M_ShipperCfg.COLUMNNAME_M_ShipperCfg_ID)) + p_M_ShipperCfg_ID = ((BigDecimal)para[i].getParameter()).intValue(); else log.log(Level.SEVERE, "Unknown Parameter: " + name); } @@ -33,61 +33,61 @@ public class ShipperCopyFrom extends SvrProcess @Override protected String doIt() throws Exception { - int To_X_Shipper_ID = getRecord_ID(); - if (log.isLoggable(Level.INFO)) log.info("From X_Shipper_ID=" + p_X_Shipper_ID + " to " + To_X_Shipper_ID); - if (To_X_Shipper_ID == 0) - throw new IllegalArgumentException("Target X_Shipper_ID == 0"); - if (p_X_Shipper_ID == 0) - throw new IllegalArgumentException("Source X_Shipper_ID == 0"); + int To_M_ShipperCfg_ID = getRecord_ID(); + if (log.isLoggable(Level.INFO)) log.info("From M_ShipperCfg_ID=" + p_M_ShipperCfg_ID + " to " + To_M_ShipperCfg_ID); + if (To_M_ShipperCfg_ID == 0) + throw new IllegalArgumentException("Target M_ShipperCfg_ID == 0"); + if (p_M_ShipperCfg_ID == 0) + throw new IllegalArgumentException("Source M_ShipperCfg_ID == 0"); - createShipperPackaging(To_X_Shipper_ID); - createShipperLabels(To_X_Shipper_ID); - createShipperPickupTypes(To_X_Shipper_ID); + createShipperPackaging(To_M_ShipperCfg_ID); + createShipperLabels(To_M_ShipperCfg_ID); + createShipperPickupTypes(To_M_ShipperCfg_ID); return "OK"; } - private void createShipperPackaging(int To_X_Shipper_ID) + private void createShipperPackaging(int To_M_ShipperCfg_ID) { StringBuilder whereClause = new StringBuilder(); - whereClause.append("X_Shipper_ID=" + p_X_Shipper_ID + " "); + whereClause.append("M_ShipperCfg_ID=" + p_M_ShipperCfg_ID + " "); whereClause.append("AND IsActive='Y' "); - whereClause.append("AND X_ShipperPackaging_ID NOT IN ( "); - whereClause.append("SELECT X_ShipperPackaging_ID "); - whereClause.append("FROM X_ShipperPackaging "); - whereClause.append("WHERE X_Shipper_ID=" + To_X_Shipper_ID + ")"); + whereClause.append("AND M_ShipperPackagingCfg_ID NOT IN ( "); + whereClause.append("SELECT M_ShipperPackagingCfg_ID "); + whereClause.append("FROM M_ShipperPackagingCfg "); + whereClause.append("WHERE M_ShipperCfg_ID=" + To_M_ShipperCfg_ID + ")"); - int[] xspIds = X_X_ShipperPackaging.getAllIDs(X_X_ShipperPackaging.Table_Name, whereClause.toString(), get_TrxName()); + int[] xspIds = X_M_ShipperPackagingCfg.getAllIDs(X_M_ShipperPackagingCfg.Table_Name, whereClause.toString(), get_TrxName()); for (int xspId : xspIds) { - X_X_ShipperPackaging xsp = new X_X_ShipperPackaging(getCtx(), xspId, get_TrxName()); - X_X_ShipperPackaging sp = new X_X_ShipperPackaging(getCtx(), 0, null); + X_M_ShipperPackagingCfg xsp = new X_M_ShipperPackagingCfg(getCtx(), xspId, get_TrxName()); + X_M_ShipperPackagingCfg sp = new X_M_ShipperPackagingCfg(getCtx(), 0, null); sp.setDescription(xsp.getDescription()); sp.setIsActive(xsp.isActive()); sp.setIsDefault(xsp.isDefault()); sp.setName(xsp.getName()); sp.setValue(xsp.getValue()); sp.setWeight(xsp.getWeight()); - sp.setX_Shipper_ID(To_X_Shipper_ID); + sp.setM_ShipperCfg_ID(To_M_ShipperCfg_ID); sp.saveEx(); } } - private void createShipperLabels(int To_X_Shipper_ID) + private void createShipperLabels(int To_M_ShipperCfg_ID) { StringBuilder whereClause = new StringBuilder(); - whereClause.append("X_Shipper_ID=" + p_X_Shipper_ID + " "); + whereClause.append("M_ShipperCfg_ID=" + p_M_ShipperCfg_ID + " "); whereClause.append("AND IsActive='Y' "); - whereClause.append("AND X_ShipperLabels_ID NOT IN ( "); - whereClause.append("SELECT X_ShipperLabels_ID "); - whereClause.append("FROM X_ShipperLabels "); - whereClause.append("WHERE X_Shipper_ID=" + To_X_Shipper_ID + ")"); + whereClause.append("AND M_ShipperLabelsCfg_ID NOT IN ( "); + whereClause.append("SELECT M_ShipperLabelsCfg_ID "); + whereClause.append("FROM M_ShipperLabelsCfg "); + whereClause.append("WHERE M_ShipperCfg_ID=" + To_M_ShipperCfg_ID + ")"); - int[] xslIds = X_X_ShipperLabels.getAllIDs(X_X_ShipperLabels.Table_Name, whereClause.toString(), get_TrxName()); + int[] xslIds = X_M_ShipperLabelsCfg.getAllIDs(X_M_ShipperLabelsCfg.Table_Name, whereClause.toString(), get_TrxName()); for (int xslId : xslIds) { - X_X_ShipperLabels xsl = new X_X_ShipperLabels(getCtx(), xslId, get_TrxName()); - X_X_ShipperLabels sl = new X_X_ShipperLabels(getCtx(), 0, null); + X_M_ShipperLabelsCfg xsl = new X_M_ShipperLabelsCfg(getCtx(), xslId, get_TrxName()); + X_M_ShipperLabelsCfg sl = new X_M_ShipperLabelsCfg(getCtx(), 0, null); sl.setDescription(xsl.getDescription()); sl.setHeight(xsl.getHeight()); sl.setIsActive(xsl.isActive()); @@ -96,32 +96,32 @@ public class ShipperCopyFrom extends SvrProcess sl.setName(xsl.getName()); sl.setValue(xsl.getValue()); sl.setWidth(xsl.getWidth()); - sl.setX_Shipper_ID(To_X_Shipper_ID); + sl.setM_ShipperCfg_ID(To_M_ShipperCfg_ID); sl.saveEx(); } } - private void createShipperPickupTypes(int To_X_Shipper_ID) + private void createShipperPickupTypes(int To_M_ShipperCfg_ID) { StringBuilder whereClause = new StringBuilder(); - whereClause.append("X_Shipper_ID=" + p_X_Shipper_ID + " "); + whereClause.append("M_ShipperCfg_ID=" + p_M_ShipperCfg_ID + " "); whereClause.append("AND IsActive='Y' "); - whereClause.append("AND X_ShipperPickupTypes_ID NOT IN ( "); - whereClause.append("SELECT X_ShipperPickupTypes_ID "); - whereClause.append("FROM X_ShipperPickupTypes "); - whereClause.append("WHERE X_Shipper_ID=" + To_X_Shipper_ID + ")"); + whereClause.append("AND M_ShipperPickupTypesCfg_ID NOT IN ( "); + whereClause.append("SELECT M_ShipperPickupTypesCfg_ID "); + whereClause.append("FROM M_ShipperPickupTypesCfg "); + whereClause.append("WHERE M_ShipperCfg_ID=" + To_M_ShipperCfg_ID + ")"); - int[] xsptIds = X_X_ShipperPickupTypes.getAllIDs(X_X_ShipperPickupTypes.Table_Name, whereClause.toString(), get_TrxName()); + int[] xsptIds = X_M_ShipperPickupTypesCfg.getAllIDs(X_M_ShipperPickupTypesCfg.Table_Name, whereClause.toString(), get_TrxName()); for (int xsptId : xsptIds) { - X_X_ShipperPickupTypes xspt = new X_X_ShipperPickupTypes(getCtx(), xsptId, get_TrxName()); - X_X_ShipperPickupTypes spt = new X_X_ShipperPickupTypes(getCtx(), 0, null); + X_M_ShipperPickupTypesCfg xspt = new X_M_ShipperPickupTypesCfg(getCtx(), xsptId, get_TrxName()); + X_M_ShipperPickupTypesCfg spt = new X_M_ShipperPickupTypesCfg(getCtx(), 0, null); spt.setDescription(xspt.getDescription()); spt.setIsActive(xspt.isActive()); spt.setIsDefault(xspt.isDefault()); spt.setName(xspt.getName()); spt.setValue(xspt.getValue()); - spt.setX_Shipper_ID(To_X_Shipper_ID); + spt.setM_ShipperCfg_ID(To_M_ShipperCfg_ID); spt.saveEx(); } } diff --git a/org.adempiere.base/src/org/adempiere/process/ShipperCreateFrom.java b/org.adempiere.base/src/org/adempiere/process/ShipperCreateFrom.java index 5eb3db4f38..93748c1c97 100644 --- a/org.adempiere.base/src/org/adempiere/process/ShipperCreateFrom.java +++ b/org.adempiere.base/src/org/adempiere/process/ShipperCreateFrom.java @@ -4,9 +4,9 @@ import org.compiere.model.MShipper; import org.compiere.model.MShipperLabels; import org.compiere.model.MShipperPackaging; import org.compiere.model.MShipperPickupTypes; -import org.compiere.model.X_X_ShipperLabels; -import org.compiere.model.X_X_ShipperPackaging; -import org.compiere.model.X_X_ShipperPickupTypes; +import org.compiere.model.X_M_ShipperLabelsCfg; +import org.compiere.model.X_M_ShipperPackagingCfg; +import org.compiere.model.X_M_ShipperPickupTypesCfg; import org.compiere.process.SvrProcess; public class ShipperCreateFrom extends SvrProcess @@ -32,20 +32,20 @@ public class ShipperCreateFrom extends SvrProcess private void createShipperPackaging() { StringBuilder whereClause = new StringBuilder(); - whereClause.append("X_Shipper_ID=" + m_shipper.getX_Shipper_ID() + " "); + whereClause.append("M_ShipperCfg_ID=" + m_shipper.getM_ShipperCfg_ID() + " "); whereClause.append("AND IsActive='Y' "); - whereClause.append("AND X_ShipperPackaging_ID NOT IN ( "); - whereClause.append("SELECT X_ShipperPackaging_ID "); + whereClause.append("AND M_ShipperPackagingCfg_ID NOT IN ( "); + whereClause.append("SELECT M_ShipperPackagingCfg_ID "); whereClause.append("FROM M_ShipperPackaging "); whereClause.append("WHERE M_Shipper_ID=" + m_shipper.getM_Shipper_ID() + ")"); - int[] xspIds = X_X_ShipperPackaging.getAllIDs(X_X_ShipperPackaging.Table_Name, whereClause.toString(), get_TrxName()); + int[] xspIds = X_M_ShipperPackagingCfg.getAllIDs(X_M_ShipperPackagingCfg.Table_Name, whereClause.toString(), get_TrxName()); for (int xspId : xspIds) { - X_X_ShipperPackaging xsp = new X_X_ShipperPackaging(getCtx(), xspId, get_TrxName()); + X_M_ShipperPackagingCfg xsp = new X_M_ShipperPackagingCfg(getCtx(), xspId, get_TrxName()); 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.setM_ShipperPackagingCfg_ID(xsp.getM_ShipperPackagingCfg_ID()); sp.setName(xsp.getName()); sp.setIsDefault(xsp.isDefault()); sp.setWeight(xsp.getWeight()); @@ -56,20 +56,20 @@ public class ShipperCreateFrom extends SvrProcess private void createShipperLabels() { StringBuilder whereClause = new StringBuilder(); - whereClause.append("X_Shipper_ID=" + m_shipper.getX_Shipper_ID() + " "); + whereClause.append("M_ShipperCfg_ID=" + m_shipper.getM_ShipperCfg_ID() + " "); whereClause.append("AND IsActive='Y' "); - whereClause.append("AND X_ShipperLabels_ID NOT IN ( "); - whereClause.append("SELECT X_ShipperLabels_ID "); + whereClause.append("AND M_ShipperLabelsCfg_ID NOT IN ( "); + whereClause.append("SELECT M_ShipperLabelsCfg_ID "); whereClause.append("FROM M_ShipperLabels "); whereClause.append("WHERE M_Shipper_ID=" + m_shipper.getM_Shipper_ID() + ")"); - int[] xslIds = X_X_ShipperLabels.getAllIDs(X_X_ShipperLabels.Table_Name, whereClause.toString(), get_TrxName()); + int[] xslIds = X_M_ShipperLabelsCfg.getAllIDs(X_M_ShipperLabelsCfg.Table_Name, whereClause.toString(), get_TrxName()); for (int xslId : xslIds) { - X_X_ShipperLabels xsl = new X_X_ShipperLabels(getCtx(), xslId, get_TrxName()); + X_M_ShipperLabelsCfg xsl = new X_M_ShipperLabelsCfg(getCtx(), xslId, get_TrxName()); 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.setM_ShipperLabelsCfg_ID(xsl.getM_ShipperLabelsCfg_ID()); sl.setName(xsl.getName()); sl.setIsDefault(xsl.isDefault()); sl.setLabelPrintMethod(xsl.getLabelPrintMethod()); @@ -80,20 +80,20 @@ public class ShipperCreateFrom extends SvrProcess private void createShipperPickupTypes() { StringBuilder whereClause = new StringBuilder(); - whereClause.append("X_Shipper_ID=" + m_shipper.getX_Shipper_ID() + " "); + whereClause.append("M_ShipperCfg_ID=" + m_shipper.getM_ShipperCfg_ID() + " "); whereClause.append("AND IsActive='Y' "); - whereClause.append("AND X_ShipperPickupTypes_ID NOT IN ( "); - whereClause.append("SELECT X_ShipperPickupTypes_ID "); + whereClause.append("AND M_ShipperPickupTypesCfg_ID NOT IN ( "); + whereClause.append("SELECT M_ShipperPickupTypesCfg_ID "); whereClause.append("FROM M_ShipperPickupTypes "); whereClause.append("WHERE M_Shipper_ID=" + m_shipper.getM_Shipper_ID() + ")"); - int[] xsptIds = X_X_ShipperPickupTypes.getAllIDs(X_X_ShipperPickupTypes.Table_Name, whereClause.toString(), get_TrxName()); + int[] xsptIds = X_M_ShipperPickupTypesCfg.getAllIDs(X_M_ShipperPickupTypesCfg.Table_Name, whereClause.toString(), get_TrxName()); for (int xsptId : xsptIds) { - X_X_ShipperPickupTypes xspt = new X_X_ShipperPickupTypes(getCtx(), xsptId, get_TrxName()); + X_M_ShipperPickupTypesCfg xspt = new X_M_ShipperPickupTypesCfg(getCtx(), xsptId, get_TrxName()); 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.setM_ShipperPickupTypesCfg_ID(xspt.getM_ShipperPickupTypesCfg_ID()); spt.setName(xspt.getName()); spt.setIsDefault(xspt.isDefault()); spt.saveEx(); 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 848b83698b..6902483619 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 @@ -119,6 +119,17 @@ public interface I_M_Shipper */ public boolean isActive(); + /** Column name M_ShipperCfg_ID */ + public static final String COLUMNNAME_M_ShipperCfg_ID = "M_ShipperCfg_ID"; + + /** Set Shipper Configuration */ + public void setM_ShipperCfg_ID (int M_ShipperCfg_ID); + + /** Get Shipper Configuration */ + public int getM_ShipperCfg_ID(); + + public org.compiere.model.I_M_ShipperCfg getM_ShipperCfg() throws RuntimeException; + /** Column name M_Shipper_ID */ public static final String COLUMNNAME_M_Shipper_ID = "M_Shipper_ID"; @@ -180,15 +191,4 @@ public interface I_M_Shipper * User who updated this records */ public int getUpdatedBy(); - - /** Column name X_Shipper_ID */ - public static final String COLUMNNAME_X_Shipper_ID = "X_Shipper_ID"; - - /** Set Shipper */ - public void setX_Shipper_ID (int X_Shipper_ID); - - /** Get Shipper */ - public int getX_Shipper_ID(); - - public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException; } diff --git a/org.adempiere.base/src/org/compiere/model/I_X_Shipper.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperCfg.java similarity index 79% rename from org.adempiere.base/src/org/compiere/model/I_X_Shipper.java rename to org.adempiere.base/src/org/compiere/model/I_M_ShipperCfg.java index 0aa453b954..4f1f12bb2a 100644 --- a/org.adempiere.base/src/org/compiere/model/I_X_Shipper.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperCfg.java @@ -20,15 +20,15 @@ import java.math.BigDecimal; import java.sql.Timestamp; import org.compiere.util.KeyNamePair; -/** Generated Interface for X_Shipper +/** Generated Interface for M_ShipperCfg * @author iDempiere (generated) * @version Release 1.0a */ -public interface I_X_Shipper +public interface I_M_ShipperCfg { - /** TableName=X_Shipper */ - public static final String Table_Name = "X_Shipper"; + /** TableName=M_ShipperCfg */ + public static final String Table_Name = "M_ShipperCfg"; /** AD_Table_ID=200047 */ public static final int Table_ID = 200047; @@ -62,6 +62,19 @@ public interface I_X_Shipper */ public int getAD_Org_ID(); + /** Column name CopyFrom */ + public static final String COLUMNNAME_CopyFrom = "CopyFrom"; + + /** Set Copy From. + * Copy From Record + */ + public void setCopyFrom (String CopyFrom); + + /** Get Copy From. + * Copy From Record + */ + public String getCopyFrom(); + /** Column name Created */ public static final String COLUMNNAME_Created = "Created"; @@ -144,6 +157,35 @@ public interface I_X_Shipper /** Get Saturday Delivery */ public boolean isSaturdayDelivery(); + /** Column name M_ShipperCfg_ID */ + public static final String COLUMNNAME_M_ShipperCfg_ID = "M_ShipperCfg_ID"; + + /** Set Shipper Configuration */ + public void setM_ShipperCfg_ID (int M_ShipperCfg_ID); + + /** Get Shipper Configuration */ + public int getM_ShipperCfg_ID(); + + /** Column name M_ShipperCfg_UU */ + public static final String COLUMNNAME_M_ShipperCfg_UU = "M_ShipperCfg_UU"; + + /** Set M_ShipperCfg_UU */ + public void setM_ShipperCfg_UU (String M_ShipperCfg_UU); + + /** Get M_ShipperCfg_UU */ + public String getM_ShipperCfg_UU(); + + /** Column name M_ShippingProcessorCfg_ID */ + public static final String COLUMNNAME_M_ShippingProcessorCfg_ID = "M_ShippingProcessorCfg_ID"; + + /** Set Shipping Processor Configuration */ + public void setM_ShippingProcessorCfg_ID (int M_ShippingProcessorCfg_ID); + + /** Get Shipping Processor Configuration */ + public int getM_ShippingProcessorCfg_ID(); + + public org.compiere.model.I_M_ShippingProcessorCfg getM_ShippingProcessorCfg() throws RuntimeException; + /** Column name Name */ public static final String COLUMNNAME_Name = "Name"; @@ -194,33 +236,4 @@ public interface I_X_Shipper * User who updated this records */ public int getUpdatedBy(); - - /** Column name X_Shipper_ID */ - public static final String COLUMNNAME_X_Shipper_ID = "X_Shipper_ID"; - - /** Set Shipper */ - public void setX_Shipper_ID (int X_Shipper_ID); - - /** Get Shipper */ - public int getX_Shipper_ID(); - - /** Column name X_Shipper_UU */ - public static final String COLUMNNAME_X_Shipper_UU = "X_Shipper_UU"; - - /** Set X_Shipper_UU */ - public void setX_Shipper_UU (String X_Shipper_UU); - - /** Get X_Shipper_UU */ - public String getX_Shipper_UU(); - - /** Column name X_ShippingProcessor_ID */ - public static final String COLUMNNAME_X_ShippingProcessor_ID = "X_ShippingProcessor_ID"; - - /** Set Shipping Processor */ - public void setX_ShippingProcessor_ID (int X_ShippingProcessor_ID); - - /** Get Shipping Processor */ - public int getX_ShippingProcessor_ID(); - - public org.compiere.model.I_X_ShippingProcessor getX_ShippingProcessor() throws RuntimeException; } 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 b1b98bd670..e521a38674 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 @@ -128,6 +128,17 @@ public interface I_M_ShipperLabels public org.compiere.model.I_M_Shipper getM_Shipper() throws RuntimeException; + /** Column name M_ShipperLabelsCfg_ID */ + public static final String COLUMNNAME_M_ShipperLabelsCfg_ID = "M_ShipperLabelsCfg_ID"; + + /** Set Shipper Labels Configuration */ + public void setM_ShipperLabelsCfg_ID (int M_ShipperLabelsCfg_ID); + + /** Get Shipper Labels Configuration */ + public int getM_ShipperLabelsCfg_ID(); + + public org.compiere.model.I_M_ShipperLabelsCfg getM_ShipperLabelsCfg() throws RuntimeException; + /** Column name M_ShipperLabels_ID */ public static final String COLUMNNAME_M_ShipperLabels_ID = "M_ShipperLabels_ID"; @@ -174,15 +185,4 @@ public interface I_M_ShipperLabels * User who updated this records */ public int getUpdatedBy(); - - /** Column name X_ShipperLabels_ID */ - public static final String COLUMNNAME_X_ShipperLabels_ID = "X_ShipperLabels_ID"; - - /** Set Shipper Labels */ - public void setX_ShipperLabels_ID (int X_ShipperLabels_ID); - - /** Get Shipper Labels */ - public int getX_ShipperLabels_ID(); - - public org.compiere.model.I_X_ShipperLabels getX_ShipperLabels() throws RuntimeException; } diff --git a/org.adempiere.base/src/org/compiere/model/I_X_ShipperLabels.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabelsCfg.java similarity index 81% rename from org.adempiere.base/src/org/compiere/model/I_X_ShipperLabels.java rename to org.adempiere.base/src/org/compiere/model/I_M_ShipperLabelsCfg.java index 8f705c1960..e9d1b4395c 100644 --- a/org.adempiere.base/src/org/compiere/model/I_X_ShipperLabels.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperLabelsCfg.java @@ -20,15 +20,15 @@ import java.math.BigDecimal; import java.sql.Timestamp; import org.compiere.util.KeyNamePair; -/** Generated Interface for X_ShipperLabels +/** Generated Interface for M_ShipperLabelsCfg * @author iDempiere (generated) * @version Release 1.0a */ -public interface I_X_ShipperLabels +public interface I_M_ShipperLabelsCfg { - /** TableName=X_ShipperLabels */ - public static final String Table_Name = "X_ShipperLabels"; + /** TableName=M_ShipperLabelsCfg */ + public static final String Table_Name = "M_ShipperLabelsCfg"; /** AD_Table_ID=200048 */ public static final int Table_ID = 200048; @@ -135,6 +135,35 @@ public interface I_X_ShipperLabels /** Get Label Print Method */ public String getLabelPrintMethod(); + /** Column name M_ShipperCfg_ID */ + public static final String COLUMNNAME_M_ShipperCfg_ID = "M_ShipperCfg_ID"; + + /** Set Shipper Configuration */ + public void setM_ShipperCfg_ID (int M_ShipperCfg_ID); + + /** Get Shipper Configuration */ + public int getM_ShipperCfg_ID(); + + public org.compiere.model.I_M_ShipperCfg getM_ShipperCfg() throws RuntimeException; + + /** Column name M_ShipperLabelsCfg_ID */ + public static final String COLUMNNAME_M_ShipperLabelsCfg_ID = "M_ShipperLabelsCfg_ID"; + + /** Set Shipper Labels Configuration */ + public void setM_ShipperLabelsCfg_ID (int M_ShipperLabelsCfg_ID); + + /** Get Shipper Labels Configuration */ + public int getM_ShipperLabelsCfg_ID(); + + /** Column name M_ShipperLabelsCfg_UU */ + public static final String COLUMNNAME_M_ShipperLabelsCfg_UU = "M_ShipperLabelsCfg_UU"; + + /** Set M_ShipperLabelsCfg_UU */ + public void setM_ShipperLabelsCfg_UU (String M_ShipperLabelsCfg_UU); + + /** Get M_ShipperLabelsCfg_UU */ + public String getM_ShipperLabelsCfg_UU(); + /** Column name Name */ public static final String COLUMNNAME_Name = "Name"; @@ -185,33 +214,4 @@ public interface I_X_ShipperLabels /** Get Width */ public BigDecimal getWidth(); - - /** Column name X_Shipper_ID */ - public static final String COLUMNNAME_X_Shipper_ID = "X_Shipper_ID"; - - /** Set Shipper */ - public void setX_Shipper_ID (int X_Shipper_ID); - - /** Get Shipper */ - public int getX_Shipper_ID(); - - public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException; - - /** Column name X_ShipperLabels_ID */ - public static final String COLUMNNAME_X_ShipperLabels_ID = "X_ShipperLabels_ID"; - - /** Set Shipper Labels */ - public void setX_ShipperLabels_ID (int X_ShipperLabels_ID); - - /** Get Shipper Labels */ - public int getX_ShipperLabels_ID(); - - /** Column name X_ShipperLabels_UU */ - public static final String COLUMNNAME_X_ShipperLabels_UU = "X_ShipperLabels_UU"; - - /** Set X_ShipperLabels_UU */ - public void setX_ShipperLabels_UU (String X_ShipperLabels_UU); - - /** Get X_ShipperLabels_UU */ - public String getX_ShipperLabels_UU(); } 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 8c67982342..14c3552d11 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 @@ -119,6 +119,17 @@ public interface I_M_ShipperPackaging public org.compiere.model.I_M_Shipper getM_Shipper() throws RuntimeException; + /** Column name M_ShipperPackagingCfg_ID */ + public static final String COLUMNNAME_M_ShipperPackagingCfg_ID = "M_ShipperPackagingCfg_ID"; + + /** Set Shipper Packaging Configuration */ + public void setM_ShipperPackagingCfg_ID (int M_ShipperPackagingCfg_ID); + + /** Get Shipper Packaging Configuration */ + public int getM_ShipperPackagingCfg_ID(); + + public org.compiere.model.I_M_ShipperPackagingCfg getM_ShipperPackagingCfg() throws RuntimeException; + /** Column name M_ShipperPackaging_ID */ public static final String COLUMNNAME_M_ShipperPackaging_ID = "M_ShipperPackaging_ID"; @@ -178,15 +189,4 @@ public interface I_M_ShipperPackaging * Weight of a product */ public BigDecimal getWeight(); - - /** Column name X_ShipperPackaging_ID */ - public static final String COLUMNNAME_X_ShipperPackaging_ID = "X_ShipperPackaging_ID"; - - /** Set Shipper Packaging */ - public void setX_ShipperPackaging_ID (int X_ShipperPackaging_ID); - - /** Get Shipper Packaging */ - public int getX_ShipperPackaging_ID(); - - public org.compiere.model.I_X_ShipperPackaging getX_ShipperPackaging() throws RuntimeException; } diff --git a/org.adempiere.base/src/org/compiere/model/I_X_ShipperPackaging.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackagingCfg.java similarity index 79% rename from org.adempiere.base/src/org/compiere/model/I_X_ShipperPackaging.java rename to org.adempiere.base/src/org/compiere/model/I_M_ShipperPackagingCfg.java index 7ca5f5a6c7..6bc4605e10 100644 --- a/org.adempiere.base/src/org/compiere/model/I_X_ShipperPackaging.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPackagingCfg.java @@ -20,15 +20,15 @@ import java.math.BigDecimal; import java.sql.Timestamp; import org.compiere.util.KeyNamePair; -/** Generated Interface for X_ShipperPackaging +/** Generated Interface for M_ShipperPackagingCfg * @author iDempiere (generated) * @version Release 1.0a */ -public interface I_X_ShipperPackaging +public interface I_M_ShipperPackagingCfg { - /** TableName=X_ShipperPackaging */ - public static final String Table_Name = "X_ShipperPackaging"; + /** TableName=M_ShipperPackagingCfg */ + public static final String Table_Name = "M_ShipperPackagingCfg"; /** AD_Table_ID=200049 */ public static final int Table_ID = 200049; @@ -117,6 +117,35 @@ public interface I_X_ShipperPackaging */ public boolean isDefault(); + /** Column name M_ShipperCfg_ID */ + public static final String COLUMNNAME_M_ShipperCfg_ID = "M_ShipperCfg_ID"; + + /** Set Shipper Configuration */ + public void setM_ShipperCfg_ID (int M_ShipperCfg_ID); + + /** Get Shipper Configuration */ + public int getM_ShipperCfg_ID(); + + public org.compiere.model.I_M_ShipperCfg getM_ShipperCfg() throws RuntimeException; + + /** Column name M_ShipperPackagingCfg_ID */ + public static final String COLUMNNAME_M_ShipperPackagingCfg_ID = "M_ShipperPackagingCfg_ID"; + + /** Set Shipper Packaging Configuration */ + public void setM_ShipperPackagingCfg_ID (int M_ShipperPackagingCfg_ID); + + /** Get Shipper Packaging Configuration */ + public int getM_ShipperPackagingCfg_ID(); + + /** Column name M_ShipperPackagingCfg_UU */ + public static final String COLUMNNAME_M_ShipperPackagingCfg_UU = "M_ShipperPackagingCfg_UU"; + + /** Set M_ShipperPackagingCfg_UU */ + public void setM_ShipperPackagingCfg_UU (String M_ShipperPackagingCfg_UU); + + /** Get M_ShipperPackagingCfg_UU */ + public String getM_ShipperPackagingCfg_UU(); + /** Column name Name */ public static final String COLUMNNAME_Name = "Name"; @@ -171,33 +200,4 @@ public interface I_X_ShipperPackaging * Weight of a product */ public BigDecimal getWeight(); - - /** Column name X_Shipper_ID */ - public static final String COLUMNNAME_X_Shipper_ID = "X_Shipper_ID"; - - /** Set Shipper */ - public void setX_Shipper_ID (int X_Shipper_ID); - - /** Get Shipper */ - public int getX_Shipper_ID(); - - public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException; - - /** Column name X_ShipperPackaging_ID */ - public static final String COLUMNNAME_X_ShipperPackaging_ID = "X_ShipperPackaging_ID"; - - /** Set Shipper Packaging */ - public void setX_ShipperPackaging_ID (int X_ShipperPackaging_ID); - - /** Get Shipper Packaging */ - public int getX_ShipperPackaging_ID(); - - /** Column name X_ShipperPackaging_UU */ - public static final String COLUMNNAME_X_ShipperPackaging_UU = "X_ShipperPackaging_UU"; - - /** Set X_ShipperPackaging_UU */ - public void setX_ShipperPackaging_UU (String X_ShipperPackaging_UU); - - /** Get X_ShipperPackaging_UU */ - public String getX_ShipperPackaging_UU(); } 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 d785764e1d..f2c6475ab7 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 @@ -119,6 +119,17 @@ public interface I_M_ShipperPickupTypes public org.compiere.model.I_M_Shipper getM_Shipper() throws RuntimeException; + /** Column name M_ShipperPickupTypesCfg_ID */ + public static final String COLUMNNAME_M_ShipperPickupTypesCfg_ID = "M_ShipperPickupTypesCfg_ID"; + + /** Set Shipper Pickup Types Configuration */ + public void setM_ShipperPickupTypesCfg_ID (int M_ShipperPickupTypesCfg_ID); + + /** Get Shipper Pickup Types Configuration */ + public int getM_ShipperPickupTypesCfg_ID(); + + public org.compiere.model.I_M_ShipperPickupTypesCfg getM_ShipperPickupTypesCfg() throws RuntimeException; + /** Column name M_ShipperPickupTypes_ID */ public static final String COLUMNNAME_M_ShipperPickupTypes_ID = "M_ShipperPickupTypes_ID"; @@ -165,15 +176,4 @@ public interface I_M_ShipperPickupTypes * User who updated this records */ public int getUpdatedBy(); - - /** Column name X_ShipperPickupTypes_ID */ - public static final String COLUMNNAME_X_ShipperPickupTypes_ID = "X_ShipperPickupTypes_ID"; - - /** Set Shipper Pickup Types */ - public void setX_ShipperPickupTypes_ID (int X_ShipperPickupTypes_ID); - - /** Get Shipper Pickup Types */ - public int getX_ShipperPickupTypes_ID(); - - public org.compiere.model.I_X_ShipperPickupTypes getX_ShipperPickupTypes() throws RuntimeException; } diff --git a/org.adempiere.base/src/org/compiere/model/I_X_ShipperPickupTypes.java b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypesCfg.java similarity index 77% rename from org.adempiere.base/src/org/compiere/model/I_X_ShipperPickupTypes.java rename to org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypesCfg.java index 7da2b0d9bf..14e575262d 100644 --- a/org.adempiere.base/src/org/compiere/model/I_X_ShipperPickupTypes.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypesCfg.java @@ -20,15 +20,15 @@ import java.math.BigDecimal; import java.sql.Timestamp; import org.compiere.util.KeyNamePair; -/** Generated Interface for X_ShipperPickupTypes +/** Generated Interface for M_ShipperPickupTypesCfg * @author iDempiere (generated) * @version Release 1.0a */ -public interface I_X_ShipperPickupTypes +public interface I_M_ShipperPickupTypesCfg { - /** TableName=X_ShipperPickupTypes */ - public static final String Table_Name = "X_ShipperPickupTypes"; + /** TableName=M_ShipperPickupTypesCfg */ + public static final String Table_Name = "M_ShipperPickupTypesCfg"; /** AD_Table_ID=200050 */ public static final int Table_ID = 200050; @@ -117,6 +117,35 @@ public interface I_X_ShipperPickupTypes */ public boolean isDefault(); + /** Column name M_ShipperCfg_ID */ + public static final String COLUMNNAME_M_ShipperCfg_ID = "M_ShipperCfg_ID"; + + /** Set Shipper Configuration */ + public void setM_ShipperCfg_ID (int M_ShipperCfg_ID); + + /** Get Shipper Configuration */ + public int getM_ShipperCfg_ID(); + + public org.compiere.model.I_M_ShipperCfg getM_ShipperCfg() throws RuntimeException; + + /** Column name M_ShipperPickupTypesCfg_ID */ + public static final String COLUMNNAME_M_ShipperPickupTypesCfg_ID = "M_ShipperPickupTypesCfg_ID"; + + /** Set Shipper Pickup Types Configuration */ + public void setM_ShipperPickupTypesCfg_ID (int M_ShipperPickupTypesCfg_ID); + + /** Get Shipper Pickup Types Configuration */ + public int getM_ShipperPickupTypesCfg_ID(); + + /** Column name M_ShipperPickupTypesCfg_UU */ + public static final String COLUMNNAME_M_ShipperPickupTypesCfg_UU = "M_ShipperPickupTypesCfg_UU"; + + /** Set M_ShipperPickupTypesCfg_UU */ + public void setM_ShipperPickupTypesCfg_UU (String M_ShipperPickupTypesCfg_UU); + + /** Get M_ShipperPickupTypesCfg_UU */ + public String getM_ShipperPickupTypesCfg_UU(); + /** Column name Name */ public static final String COLUMNNAME_Name = "Name"; @@ -158,33 +187,4 @@ public interface I_X_ShipperPickupTypes * Search key for the record in the format required - must be unique */ public String getValue(); - - /** Column name X_Shipper_ID */ - public static final String COLUMNNAME_X_Shipper_ID = "X_Shipper_ID"; - - /** Set Shipper */ - public void setX_Shipper_ID (int X_Shipper_ID); - - /** Get Shipper */ - public int getX_Shipper_ID(); - - public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException; - - /** Column name X_ShipperPickupTypes_ID */ - public static final String COLUMNNAME_X_ShipperPickupTypes_ID = "X_ShipperPickupTypes_ID"; - - /** Set Shipper Pickup Types */ - public void setX_ShipperPickupTypes_ID (int X_ShipperPickupTypes_ID); - - /** Get Shipper Pickup Types */ - public int getX_ShipperPickupTypes_ID(); - - /** Column name X_ShipperPickupTypes_UU */ - public static final String COLUMNNAME_X_ShipperPickupTypes_UU = "X_ShipperPickupTypes_UU"; - - /** Set X_ShipperPickupTypes_UU */ - public void setX_ShipperPickupTypes_UU (String X_ShipperPickupTypes_UU); - - /** Get X_ShipperPickupTypes_UU */ - public String getX_ShipperPickupTypes_UU(); } 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 6aa5020d28..0e0ce39001 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 @@ -109,6 +109,17 @@ public interface I_M_ShippingProcessor */ public boolean isActive(); + /** Column name M_ShippingProcessorCfg_ID */ + public static final String COLUMNNAME_M_ShippingProcessorCfg_ID = "M_ShippingProcessorCfg_ID"; + + /** Set Shipping Processor Configuration */ + public void setM_ShippingProcessorCfg_ID (int M_ShippingProcessorCfg_ID); + + /** Get Shipping Processor Configuration */ + public int getM_ShippingProcessorCfg_ID(); + + public org.compiere.model.I_M_ShippingProcessorCfg getM_ShippingProcessorCfg() throws RuntimeException; + /** Column name M_ShippingProcessor_ID */ public static final String COLUMNNAME_M_ShippingProcessor_ID = "M_ShippingProcessor_ID"; @@ -168,15 +179,4 @@ public interface I_M_ShippingProcessor * User ID or account number */ public String getUserID(); - - /** Column name X_ShippingProcessor_ID */ - public static final String COLUMNNAME_X_ShippingProcessor_ID = "X_ShippingProcessor_ID"; - - /** Set Shipping Processor */ - public void setX_ShippingProcessor_ID (int X_ShippingProcessor_ID); - - /** Get Shipping Processor */ - public int getX_ShippingProcessor_ID(); - - public org.compiere.model.I_X_ShippingProcessor getX_ShippingProcessor() throws RuntimeException; } diff --git a/org.adempiere.base/src/org/compiere/model/I_X_ShippingProcessor.java b/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessorCfg.java similarity index 87% rename from org.adempiere.base/src/org/compiere/model/I_X_ShippingProcessor.java rename to org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessorCfg.java index 364287b61a..48b8ae9559 100644 --- a/org.adempiere.base/src/org/compiere/model/I_X_ShippingProcessor.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessorCfg.java @@ -20,15 +20,15 @@ import java.math.BigDecimal; import java.sql.Timestamp; import org.compiere.util.KeyNamePair; -/** Generated Interface for X_ShippingProcessor +/** Generated Interface for M_ShippingProcessorCfg * @author iDempiere (generated) * @version Release 1.0a */ -public interface I_X_ShippingProcessor +public interface I_M_ShippingProcessorCfg { - /** TableName=X_ShippingProcessor */ - public static final String Table_Name = "X_ShippingProcessor"; + /** TableName=M_ShippingProcessorCfg */ + public static final String Table_Name = "M_ShippingProcessorCfg"; /** AD_Table_ID=200046 */ public static final int Table_ID = 200046; @@ -130,6 +130,24 @@ public interface I_X_ShippingProcessor */ public boolean isActive(); + /** Column name M_ShippingProcessorCfg_ID */ + public static final String COLUMNNAME_M_ShippingProcessorCfg_ID = "M_ShippingProcessorCfg_ID"; + + /** Set Shipping Processor Configuration */ + public void setM_ShippingProcessorCfg_ID (int M_ShippingProcessorCfg_ID); + + /** Get Shipping Processor Configuration */ + public int getM_ShippingProcessorCfg_ID(); + + /** Column name M_ShippingProcessorCfg_UU */ + public static final String COLUMNNAME_M_ShippingProcessorCfg_UU = "M_ShippingProcessorCfg_UU"; + + /** Set M_ShippingProcessorCfg_UU */ + public void setM_ShippingProcessorCfg_UU (String M_ShippingProcessorCfg_UU); + + /** Get M_ShippingProcessorCfg_UU */ + public String getM_ShippingProcessorCfg_UU(); + /** Column name Name */ public static final String COLUMNNAME_Name = "Name"; @@ -228,22 +246,4 @@ public interface I_X_ShippingProcessor * User who updated this records */ public int getUpdatedBy(); - - /** Column name X_ShippingProcessor_ID */ - public static final String COLUMNNAME_X_ShippingProcessor_ID = "X_ShippingProcessor_ID"; - - /** Set Shipping Processor */ - public void setX_ShippingProcessor_ID (int X_ShippingProcessor_ID); - - /** Get Shipping Processor */ - public int getX_ShippingProcessor_ID(); - - /** Column name X_ShippingProcessor_UU */ - public static final String COLUMNNAME_X_ShippingProcessor_UU = "X_ShippingProcessor_UU"; - - /** Set X_ShippingProcessor_UU */ - public void setX_ShippingProcessor_UU (String X_ShippingProcessor_UU); - - /** Get X_ShippingProcessor_UU */ - public String getX_ShippingProcessor_UU(); } diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransaction.java b/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransaction.java index 698db14f26..f397980b45 100644 --- a/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransaction.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransaction.java @@ -114,16 +114,14 @@ public interface I_M_ShippingTransaction /** Get Box Count */ public int getBoxCount(); - /** Column name C_BP_ShippingAcct_ID */ - public static final String COLUMNNAME_C_BP_ShippingAcct_ID = "C_BP_ShippingAcct_ID"; + /** Column name CashOnDelivery */ + public static final String COLUMNNAME_CashOnDelivery = "CashOnDelivery"; - /** Set Business Partner Shipping Account */ - public void setC_BP_ShippingAcct_ID (int C_BP_ShippingAcct_ID); + /** Set COD */ + public void setCashOnDelivery (boolean CashOnDelivery); - /** Get Business Partner Shipping Account */ - public int getC_BP_ShippingAcct_ID(); - - public org.compiere.model.I_C_BP_ShippingAcct getC_BP_ShippingAcct() throws RuntimeException; + /** Get COD */ + public boolean isCashOnDelivery(); /** Column name C_BPartner_ID */ public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID"; @@ -155,6 +153,17 @@ public interface I_M_ShippingTransaction public org.compiere.model.I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException; + /** Column name C_BP_ShippingAcct_ID */ + public static final String COLUMNNAME_C_BP_ShippingAcct_ID = "C_BP_ShippingAcct_ID"; + + /** Set Business Partner Shipping Account */ + public void setC_BP_ShippingAcct_ID (int C_BP_ShippingAcct_ID); + + /** Get Business Partner Shipping Account */ + public int getC_BP_ShippingAcct_ID(); + + public org.compiere.model.I_C_BP_ShippingAcct getC_BP_ShippingAcct() throws RuntimeException; + /** Column name C_Currency_ID */ public static final String COLUMNNAME_C_Currency_ID = "C_Currency_ID"; @@ -185,6 +194,15 @@ public interface I_M_ShippingTransaction public org.compiere.model.I_C_Invoice getC_Invoice() throws RuntimeException; + /** Column name CODAmount */ + public static final String COLUMNNAME_CODAmount = "CODAmount"; + + /** Set COD Amount */ + public void setCODAmount (BigDecimal CODAmount); + + /** Get COD Amount */ + public BigDecimal getCODAmount(); + /** Column name C_Order_ID */ public static final String COLUMNNAME_C_Order_ID = "C_Order_ID"; @@ -200,6 +218,22 @@ public interface I_M_ShippingTransaction public org.compiere.model.I_C_Order getC_Order() throws RuntimeException; + /** Column name Created */ + public static final String COLUMNNAME_Created = "Created"; + + /** Get Created. + * Date this record was created + */ + public Timestamp getCreated(); + + /** Column name CreatedBy */ + public static final String COLUMNNAME_CreatedBy = "CreatedBy"; + + /** Get Created By. + * User who created this records + */ + public int getCreatedBy(); + /** Column name C_UOM_Length_ID */ public static final String COLUMNNAME_C_UOM_Length_ID = "C_UOM_Length_ID"; @@ -230,40 +264,6 @@ public interface I_M_ShippingTransaction public org.compiere.model.I_C_UOM getC_UOM_Weight() throws RuntimeException; - /** Column name CashOnDelivery */ - public static final String COLUMNNAME_CashOnDelivery = "CashOnDelivery"; - - /** Set COD */ - public void setCashOnDelivery (boolean CashOnDelivery); - - /** Get COD */ - public boolean isCashOnDelivery(); - - /** Column name CODAmount */ - public static final String COLUMNNAME_CODAmount = "CODAmount"; - - /** Set COD Amount */ - public void setCODAmount (BigDecimal CODAmount); - - /** Get COD Amount */ - public BigDecimal getCODAmount(); - - /** Column name Created */ - public static final String COLUMNNAME_Created = "Created"; - - /** Get Created. - * Date this record was created - */ - public Timestamp getCreated(); - - /** Column name CreatedBy */ - public static final String COLUMNNAME_CreatedBy = "CreatedBy"; - - /** Get Created By. - * User who created this records - */ - public int getCreatedBy(); - /** Column name CustomsValue */ public static final String COLUMNNAME_CustomsValue = "CustomsValue"; diff --git a/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransactionLine.java b/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransactionLine.java index bfc73fa193..e26dc1d003 100644 --- a/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransactionLine.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_ShippingTransactionLine.java @@ -62,6 +62,22 @@ public interface I_M_ShippingTransactionLine */ public int getAD_Org_ID(); + /** Column name Created */ + public static final String COLUMNNAME_Created = "Created"; + + /** Get Created. + * Date this record was created + */ + public Timestamp getCreated(); + + /** Column name CreatedBy */ + public static final String COLUMNNAME_CreatedBy = "CreatedBy"; + + /** Get Created By. + * User who created this records + */ + public int getCreatedBy(); + /** Column name C_UOM_Length_ID */ public static final String COLUMNNAME_C_UOM_Length_ID = "C_UOM_Length_ID"; @@ -92,22 +108,6 @@ public interface I_M_ShippingTransactionLine public org.compiere.model.I_C_UOM getC_UOM_Weight() throws RuntimeException; - /** Column name Created */ - public static final String COLUMNNAME_Created = "Created"; - - /** Get Created. - * Date this record was created - */ - public Timestamp getCreated(); - - /** Column name CreatedBy */ - public static final String COLUMNNAME_CreatedBy = "CreatedBy"; - - /** Get Created By. - * User who created this records - */ - public int getCreatedBy(); - /** Column name Description */ public static final String COLUMNNAME_Description = "Description"; @@ -152,6 +152,15 @@ public interface I_M_ShippingTransactionLine /** Get Length */ public BigDecimal getLength(); + /** Column name MasterTrackingNo */ + public static final String COLUMNNAME_MasterTrackingNo = "MasterTrackingNo"; + + /** Set Master Tracking No */ + public void setMasterTrackingNo (String MasterTrackingNo); + + /** Get Master Tracking No */ + public String getMasterTrackingNo(); + /** Column name M_PackageMPS_ID */ public static final String COLUMNNAME_M_PackageMPS_ID = "M_PackageMPS_ID"; @@ -192,15 +201,6 @@ public interface I_M_ShippingTransactionLine /** Get M_ShippingTransactionLine_UU */ public String getM_ShippingTransactionLine_UU(); - /** Column name MasterTrackingNo */ - public static final String COLUMNNAME_MasterTrackingNo = "MasterTrackingNo"; - - /** Set Master Tracking No */ - public void setMasterTrackingNo (String MasterTrackingNo); - - /** Get Master Tracking No */ - public String getMasterTrackingNo(); - /** Column name Price */ public static final String COLUMNNAME_Price = "Price"; diff --git a/org.adempiere.base/src/org/compiere/model/MShipper.java b/org.adempiere.base/src/org/compiere/model/MShipper.java index e3d34bf4c6..1fa414ae7a 100644 --- a/org.adempiere.base/src/org/compiere/model/MShipper.java +++ b/org.adempiere.base/src/org/compiere/model/MShipper.java @@ -77,27 +77,27 @@ public class MShipper extends X_M_Shipper public String getShippingServiceCode() { - return getX_Shipper().getShippingServiceCode(); + return getM_ShipperCfg().getShippingServiceCode(); } public boolean isInternational() { - return getX_Shipper().isInternational(); + return getM_ShipperCfg().isInternational(); } public boolean isResidential() { - return getX_Shipper().isResidential(); + return getM_ShipperCfg().isResidential(); } public boolean isSaturdayDelivery() { - return getX_Shipper().isSaturdayDelivery(); + return getM_ShipperCfg().isSaturdayDelivery(); } public String getTrackingURL() { - return getX_Shipper().getTrackingURL(); + return getM_ShipperCfg().getTrackingURL(); } } // MShipper \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/MShipperLabels.java b/org.adempiere.base/src/org/compiere/model/MShipperLabels.java index 68ea0ed32d..1c0287fde3 100644 --- a/org.adempiere.base/src/org/compiere/model/MShipperLabels.java +++ b/org.adempiere.base/src/org/compiere/model/MShipperLabels.java @@ -24,17 +24,17 @@ public class MShipperLabels extends X_M_ShipperLabels public String getValue() { - return getX_ShipperLabels().getValue(); + return getM_ShipperLabelsCfg().getValue(); } public BigDecimal getHeight() { - return getX_ShipperLabels().getHeight(); + return getM_ShipperLabelsCfg().getHeight(); } public BigDecimal getWidth() { - return getX_ShipperLabels().getWidth(); + return getM_ShipperLabelsCfg().getWidth(); } } diff --git a/org.adempiere.base/src/org/compiere/model/MShipperPackaging.java b/org.adempiere.base/src/org/compiere/model/MShipperPackaging.java index 56a9d716b4..46bbcdc78b 100644 --- a/org.adempiere.base/src/org/compiere/model/MShipperPackaging.java +++ b/org.adempiere.base/src/org/compiere/model/MShipperPackaging.java @@ -23,6 +23,6 @@ public class MShipperPackaging extends X_M_ShipperPackaging public String getValue() { - return getX_ShipperPackaging().getValue(); + return getM_ShipperPackagingCfg().getValue(); } } diff --git a/org.adempiere.base/src/org/compiere/model/MShipperPickupTypes.java b/org.adempiere.base/src/org/compiere/model/MShipperPickupTypes.java index a38accfb7b..382db8dbc7 100644 --- a/org.adempiere.base/src/org/compiere/model/MShipperPickupTypes.java +++ b/org.adempiere.base/src/org/compiere/model/MShipperPickupTypes.java @@ -23,7 +23,7 @@ public class MShipperPickupTypes extends X_M_ShipperPickupTypes public String getValue() { - return getX_ShipperPickupTypes().getValue(); + return getM_ShipperPickupTypesCfg().getValue(); } } diff --git a/org.adempiere.base/src/org/compiere/model/MShippingProcessor.java b/org.adempiere.base/src/org/compiere/model/MShippingProcessor.java index f0d763768d..95b38a9d16 100644 --- a/org.adempiere.base/src/org/compiere/model/MShippingProcessor.java +++ b/org.adempiere.base/src/org/compiere/model/MShippingProcessor.java @@ -23,42 +23,42 @@ public class MShippingProcessor extends X_M_ShippingProcessor public String getShippingProcessorClass() { - return getX_ShippingProcessor().getShippingProcessorClass(); + return getM_ShippingProcessorCfg().getShippingProcessorClass(); } public String getHostAddress() { - return getX_ShippingProcessor().getHostAddress(); + return getM_ShippingProcessorCfg().getHostAddress(); } public int getHostPort() { - return getX_ShippingProcessor().getHostPort(); + return getM_ShippingProcessorCfg().getHostPort(); } public String getProxyAddress() { - return getX_ShippingProcessor().getProxyAddress(); + return getM_ShippingProcessorCfg().getProxyAddress(); } public int getProxyPort() { - return getX_ShippingProcessor().getProxyPort(); + return getM_ShippingProcessorCfg().getProxyPort(); } public String getProxyLogon() { - return getX_ShippingProcessor().getProxyLogon(); + return getM_ShippingProcessorCfg().getProxyLogon(); } public String getProxyPassword() { - return getX_ShippingProcessor().getProxyPassword(); + return getM_ShippingProcessorCfg().getProxyPassword(); } public String getServicePath() { - return getX_ShippingProcessor().getServicePath(); + return getM_ShippingProcessorCfg().getServicePath(); } } 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 8a900130e4..c7e1987ea5 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 = 20130109L; + private static final long serialVersionUID = 20130318L; /** Standard Constructor */ public X_M_Shipper (Properties ctx, int M_Shipper_ID, String trxName) @@ -115,6 +115,31 @@ public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent return (String)get_Value(COLUMNNAME_CreateFrom); } + public org.compiere.model.I_M_ShipperCfg getM_ShipperCfg() throws RuntimeException + { + return (org.compiere.model.I_M_ShipperCfg)MTable.get(getCtx(), org.compiere.model.I_M_ShipperCfg.Table_Name) + .getPO(getM_ShipperCfg_ID(), get_TrxName()); } + + /** Set Shipper Configuration. + @param M_ShipperCfg_ID Shipper Configuration */ + public void setM_ShipperCfg_ID (int M_ShipperCfg_ID) + { + if (M_ShipperCfg_ID < 1) + set_Value (COLUMNNAME_M_ShipperCfg_ID, null); + else + set_Value (COLUMNNAME_M_ShipperCfg_ID, Integer.valueOf(M_ShipperCfg_ID)); + } + + /** Get Shipper Configuration. + @return Shipper Configuration */ + public int getM_ShipperCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Shipper. @param M_Shipper_ID Method or manner of product delivery @@ -193,29 +218,4 @@ public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent { 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) - .getPO(getX_Shipper_ID(), get_TrxName()); } - - /** Set Shipper. - @param X_Shipper_ID Shipper */ - public void setX_Shipper_ID (int X_Shipper_ID) - { - if (X_Shipper_ID < 1) - set_Value (COLUMNNAME_X_Shipper_ID, null); - else - set_Value (COLUMNNAME_X_Shipper_ID, Integer.valueOf(X_Shipper_ID)); - } - - /** Get Shipper. - @return Shipper */ - public int getX_Shipper_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_Shipper_ID); - if (ii == null) - return 0; - return ii.intValue(); - } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_X_Shipper.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperCfg.java similarity index 70% rename from org.adempiere.base/src/org/compiere/model/X_X_Shipper.java rename to org.adempiere.base/src/org/compiere/model/X_M_ShipperCfg.java index 6e9c1186ad..cfa1f31fb3 100644 --- a/org.adempiere.base/src/org/compiere/model/X_X_Shipper.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperCfg.java @@ -21,22 +21,22 @@ import java.sql.ResultSet; import java.util.Properties; import org.compiere.util.KeyNamePair; -/** Generated Model for X_Shipper +/** Generated Model for M_ShipperCfg * @author iDempiere (generated) * @version Release 1.0a - $Id$ */ -public class X_X_Shipper extends PO implements I_X_Shipper, I_Persistent +public class X_M_ShipperCfg extends PO implements I_M_ShipperCfg, I_Persistent { /** * */ - private static final long serialVersionUID = 20121213L; + private static final long serialVersionUID = 20130318L; /** Standard Constructor */ - public X_X_Shipper (Properties ctx, int X_Shipper_ID, String trxName) + public X_M_ShipperCfg (Properties ctx, int M_ShipperCfg_ID, String trxName) { - super (ctx, X_Shipper_ID, trxName); - /** if (X_Shipper_ID == 0) + super (ctx, M_ShipperCfg_ID, trxName); + /** if (M_ShipperCfg_ID == 0) { setIsInternational (false); // N @@ -46,13 +46,13 @@ public class X_X_Shipper extends PO implements I_X_Shipper, I_Persistent // N setIsSaturdayDelivery (false); // N + setM_ShipperCfg_ID (0); setName (null); - setX_Shipper_ID (0); } */ } /** Load Constructor */ - public X_X_Shipper (Properties ctx, ResultSet rs, String trxName) + public X_M_ShipperCfg (Properties ctx, ResultSet rs, String trxName) { super (ctx, rs, trxName); } @@ -74,11 +74,28 @@ public class X_X_Shipper extends PO implements I_X_Shipper, I_Persistent public String toString() { - StringBuffer sb = new StringBuffer ("X_X_Shipper[") + StringBuffer sb = new StringBuffer ("X_M_ShipperCfg[") .append(get_ID()).append("]"); return sb.toString(); } + /** Set Copy From. + @param CopyFrom + Copy From Record + */ + public void setCopyFrom (String CopyFrom) + { + set_Value (COLUMNNAME_CopyFrom, CopyFrom); + } + + /** Get Copy From. + @return Copy From Record + */ + public String getCopyFrom () + { + return (String)get_Value(COLUMNNAME_CopyFrom); + } + /** Set Description. @param Description Optional short description of the record @@ -183,6 +200,65 @@ public class X_X_Shipper extends PO implements I_X_Shipper, I_Persistent return false; } + /** Set Shipper Configuration. + @param M_ShipperCfg_ID Shipper Configuration */ + public void setM_ShipperCfg_ID (int M_ShipperCfg_ID) + { + if (M_ShipperCfg_ID < 1) + set_ValueNoCheck (COLUMNNAME_M_ShipperCfg_ID, null); + else + set_ValueNoCheck (COLUMNNAME_M_ShipperCfg_ID, Integer.valueOf(M_ShipperCfg_ID)); + } + + /** Get Shipper Configuration. + @return Shipper Configuration */ + public int getM_ShipperCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set M_ShipperCfg_UU. + @param M_ShipperCfg_UU M_ShipperCfg_UU */ + public void setM_ShipperCfg_UU (String M_ShipperCfg_UU) + { + set_Value (COLUMNNAME_M_ShipperCfg_UU, M_ShipperCfg_UU); + } + + /** Get M_ShipperCfg_UU. + @return M_ShipperCfg_UU */ + public String getM_ShipperCfg_UU () + { + return (String)get_Value(COLUMNNAME_M_ShipperCfg_UU); + } + + public org.compiere.model.I_M_ShippingProcessorCfg getM_ShippingProcessorCfg() throws RuntimeException + { + return (org.compiere.model.I_M_ShippingProcessorCfg)MTable.get(getCtx(), org.compiere.model.I_M_ShippingProcessorCfg.Table_Name) + .getPO(getM_ShippingProcessorCfg_ID(), get_TrxName()); } + + /** Set Shipping Processor Configuration. + @param M_ShippingProcessorCfg_ID Shipping Processor Configuration */ + public void setM_ShippingProcessorCfg_ID (int M_ShippingProcessorCfg_ID) + { + if (M_ShippingProcessorCfg_ID < 1) + set_Value (COLUMNNAME_M_ShippingProcessorCfg_ID, null); + else + set_Value (COLUMNNAME_M_ShippingProcessorCfg_ID, Integer.valueOf(M_ShippingProcessorCfg_ID)); + } + + /** Get Shipping Processor Configuration. + @return Shipping Processor Configuration */ + public int getM_ShippingProcessorCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShippingProcessorCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Name. @param Name Alphanumeric identifier of the entity @@ -238,63 +314,4 @@ public class X_X_Shipper extends PO implements I_X_Shipper, I_Persistent { return (String)get_Value(COLUMNNAME_TrackingURL); } - - /** Set Shipper. - @param X_Shipper_ID Shipper */ - public void setX_Shipper_ID (int X_Shipper_ID) - { - if (X_Shipper_ID < 1) - set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, null); - else - set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, Integer.valueOf(X_Shipper_ID)); - } - - /** Get Shipper. - @return Shipper */ - public int getX_Shipper_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_Shipper_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - - /** Set X_Shipper_UU. - @param X_Shipper_UU X_Shipper_UU */ - public void setX_Shipper_UU (String X_Shipper_UU) - { - set_Value (COLUMNNAME_X_Shipper_UU, X_Shipper_UU); - } - - /** Get X_Shipper_UU. - @return X_Shipper_UU */ - public String getX_Shipper_UU () - { - return (String)get_Value(COLUMNNAME_X_Shipper_UU); - } - - public org.compiere.model.I_X_ShippingProcessor getX_ShippingProcessor() throws RuntimeException - { - return (org.compiere.model.I_X_ShippingProcessor)MTable.get(getCtx(), org.compiere.model.I_X_ShippingProcessor.Table_Name) - .getPO(getX_ShippingProcessor_ID(), get_TrxName()); } - - /** Set Shipping Processor. - @param X_ShippingProcessor_ID Shipping Processor */ - public void setX_ShippingProcessor_ID (int X_ShippingProcessor_ID) - { - if (X_ShippingProcessor_ID < 1) - set_Value (COLUMNNAME_X_ShippingProcessor_ID, null); - else - set_Value (COLUMNNAME_X_ShippingProcessor_ID, Integer.valueOf(X_ShippingProcessor_ID)); - } - - /** Get Shipping Processor. - @return Shipping Processor */ - public int getX_ShippingProcessor_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_ShippingProcessor_ID); - if (ii == null) - return 0; - return ii.intValue(); - } } \ No newline at end of file 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 65298d7359..86e5ea9d9e 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 = 20130109L; + private static final long serialVersionUID = 20130318L; /** Standard Constructor */ public X_M_ShipperLabels (Properties ctx, int M_ShipperLabels_ID, String trxName) @@ -40,9 +40,9 @@ public class X_M_ShipperLabels extends PO implements I_M_ShipperLabels, I_Persis setIsDefault (false); // N setM_Shipper_ID (0); + setM_ShipperLabelsCfg_ID (0); setM_ShipperLabels_ID (0); setName (null); - setX_ShipperLabels_ID (0); } */ } @@ -149,6 +149,31 @@ public class X_M_ShipperLabels extends PO implements I_M_ShipperLabels, I_Persis return ii.intValue(); } + public org.compiere.model.I_M_ShipperLabelsCfg getM_ShipperLabelsCfg() throws RuntimeException + { + return (org.compiere.model.I_M_ShipperLabelsCfg)MTable.get(getCtx(), org.compiere.model.I_M_ShipperLabelsCfg.Table_Name) + .getPO(getM_ShipperLabelsCfg_ID(), get_TrxName()); } + + /** Set Shipper Labels Configuration. + @param M_ShipperLabelsCfg_ID Shipper Labels Configuration */ + public void setM_ShipperLabelsCfg_ID (int M_ShipperLabelsCfg_ID) + { + if (M_ShipperLabelsCfg_ID < 1) + set_Value (COLUMNNAME_M_ShipperLabelsCfg_ID, null); + else + set_Value (COLUMNNAME_M_ShipperLabelsCfg_ID, Integer.valueOf(M_ShipperLabelsCfg_ID)); + } + + /** Get Shipper Labels Configuration. + @return Shipper Labels Configuration */ + public int getM_ShipperLabelsCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperLabelsCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Shipper Labels. @param M_ShipperLabels_ID Shipper Labels */ public void setM_ShipperLabels_ID (int M_ShipperLabels_ID) @@ -199,29 +224,4 @@ public class X_M_ShipperLabels extends PO implements I_M_ShipperLabels, I_Persis { 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) - .getPO(getX_ShipperLabels_ID(), get_TrxName()); } - - /** Set Shipper Labels. - @param X_ShipperLabels_ID Shipper Labels */ - public void setX_ShipperLabels_ID (int X_ShipperLabels_ID) - { - if (X_ShipperLabels_ID < 1) - set_Value (COLUMNNAME_X_ShipperLabels_ID, null); - else - set_Value (COLUMNNAME_X_ShipperLabels_ID, Integer.valueOf(X_ShipperLabels_ID)); - } - - /** Get Shipper Labels. - @return Shipper Labels */ - public int getX_ShipperLabels_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_ShipperLabels_ID); - if (ii == null) - return 0; - return ii.intValue(); - } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_X_ShipperLabels.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabelsCfg.java similarity index 70% rename from org.adempiere.base/src/org/compiere/model/X_X_ShipperLabels.java rename to org.adempiere.base/src/org/compiere/model/X_M_ShipperLabelsCfg.java index 875dcca8e2..3fabd7f148 100644 --- a/org.adempiere.base/src/org/compiere/model/X_X_ShipperLabels.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabelsCfg.java @@ -23,34 +23,34 @@ import java.util.Properties; import org.compiere.util.Env; import org.compiere.util.KeyNamePair; -/** Generated Model for X_ShipperLabels +/** Generated Model for M_ShipperLabelsCfg * @author iDempiere (generated) * @version Release 1.0a - $Id$ */ -public class X_X_ShipperLabels extends PO implements I_X_ShipperLabels, I_Persistent +public class X_M_ShipperLabelsCfg extends PO implements I_M_ShipperLabelsCfg, I_Persistent { /** * */ - private static final long serialVersionUID = 20121213L; + private static final long serialVersionUID = 20130318L; /** Standard Constructor */ - public X_X_ShipperLabels (Properties ctx, int X_ShipperLabels_ID, String trxName) + public X_M_ShipperLabelsCfg (Properties ctx, int M_ShipperLabelsCfg_ID, String trxName) { - super (ctx, X_ShipperLabels_ID, trxName); - /** if (X_ShipperLabels_ID == 0) + super (ctx, M_ShipperLabelsCfg_ID, trxName); + /** if (M_ShipperLabelsCfg_ID == 0) { setIsDefault (false); // N + setM_ShipperCfg_ID (0); + setM_ShipperLabelsCfg_ID (0); setName (null); setValue (null); - setX_Shipper_ID (0); - setX_ShipperLabels_ID (0); } */ } /** Load Constructor */ - public X_X_ShipperLabels (Properties ctx, ResultSet rs, String trxName) + public X_M_ShipperLabelsCfg (Properties ctx, ResultSet rs, String trxName) { super (ctx, rs, trxName); } @@ -72,7 +72,7 @@ public class X_X_ShipperLabels extends PO implements I_X_ShipperLabels, I_Persis public String toString() { - StringBuffer sb = new StringBuffer ("X_X_ShipperLabels[") + StringBuffer sb = new StringBuffer ("X_M_ShipperLabelsCfg[") .append(get_ID()).append("]"); return sb.toString(); } @@ -158,6 +158,65 @@ public class X_X_ShipperLabels extends PO implements I_X_ShipperLabels, I_Persis return (String)get_Value(COLUMNNAME_LabelPrintMethod); } + public org.compiere.model.I_M_ShipperCfg getM_ShipperCfg() throws RuntimeException + { + return (org.compiere.model.I_M_ShipperCfg)MTable.get(getCtx(), org.compiere.model.I_M_ShipperCfg.Table_Name) + .getPO(getM_ShipperCfg_ID(), get_TrxName()); } + + /** Set Shipper Configuration. + @param M_ShipperCfg_ID Shipper Configuration */ + public void setM_ShipperCfg_ID (int M_ShipperCfg_ID) + { + if (M_ShipperCfg_ID < 1) + set_ValueNoCheck (COLUMNNAME_M_ShipperCfg_ID, null); + else + set_ValueNoCheck (COLUMNNAME_M_ShipperCfg_ID, Integer.valueOf(M_ShipperCfg_ID)); + } + + /** Get Shipper Configuration. + @return Shipper Configuration */ + public int getM_ShipperCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set Shipper Labels Configuration. + @param M_ShipperLabelsCfg_ID Shipper Labels Configuration */ + public void setM_ShipperLabelsCfg_ID (int M_ShipperLabelsCfg_ID) + { + if (M_ShipperLabelsCfg_ID < 1) + set_ValueNoCheck (COLUMNNAME_M_ShipperLabelsCfg_ID, null); + else + set_ValueNoCheck (COLUMNNAME_M_ShipperLabelsCfg_ID, Integer.valueOf(M_ShipperLabelsCfg_ID)); + } + + /** Get Shipper Labels Configuration. + @return Shipper Labels Configuration */ + public int getM_ShipperLabelsCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperLabelsCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set M_ShipperLabelsCfg_UU. + @param M_ShipperLabelsCfg_UU M_ShipperLabelsCfg_UU */ + public void setM_ShipperLabelsCfg_UU (String M_ShipperLabelsCfg_UU) + { + set_Value (COLUMNNAME_M_ShipperLabelsCfg_UU, M_ShipperLabelsCfg_UU); + } + + /** Get M_ShipperLabelsCfg_UU. + @return M_ShipperLabelsCfg_UU */ + public String getM_ShipperLabelsCfg_UU () + { + return (String)get_Value(COLUMNNAME_M_ShipperLabelsCfg_UU); + } + /** Set Name. @param Name Alphanumeric identifier of the entity @@ -216,63 +275,4 @@ public class X_X_ShipperLabels extends PO implements I_X_ShipperLabels, I_Persis return Env.ZERO; return bd; } - - 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) - .getPO(getX_Shipper_ID(), get_TrxName()); } - - /** Set Shipper. - @param X_Shipper_ID Shipper */ - public void setX_Shipper_ID (int X_Shipper_ID) - { - if (X_Shipper_ID < 1) - set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, null); - else - set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, Integer.valueOf(X_Shipper_ID)); - } - - /** Get Shipper. - @return Shipper */ - public int getX_Shipper_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_Shipper_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - - /** Set Shipper Labels. - @param X_ShipperLabels_ID Shipper Labels */ - public void setX_ShipperLabels_ID (int X_ShipperLabels_ID) - { - if (X_ShipperLabels_ID < 1) - set_ValueNoCheck (COLUMNNAME_X_ShipperLabels_ID, null); - else - set_ValueNoCheck (COLUMNNAME_X_ShipperLabels_ID, Integer.valueOf(X_ShipperLabels_ID)); - } - - /** Get Shipper Labels. - @return Shipper Labels */ - public int getX_ShipperLabels_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_ShipperLabels_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - - /** Set X_ShipperLabels_UU. - @param X_ShipperLabels_UU X_ShipperLabels_UU */ - public void setX_ShipperLabels_UU (String X_ShipperLabels_UU) - { - set_Value (COLUMNNAME_X_ShipperLabels_UU, X_ShipperLabels_UU); - } - - /** Get X_ShipperLabels_UU. - @return X_ShipperLabels_UU */ - public String getX_ShipperLabels_UU () - { - return (String)get_Value(COLUMNNAME_X_ShipperLabels_UU); - } } \ No newline at end of file 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 6346406d86..39a2c48376 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 = 20130109L; + private static final long serialVersionUID = 20130318L; /** Standard Constructor */ public X_M_ShipperPackaging (Properties ctx, int M_ShipperPackaging_ID, String trxName) @@ -42,9 +42,9 @@ public class X_M_ShipperPackaging extends PO implements I_M_ShipperPackaging, I_ setIsDefault (false); // N setM_Shipper_ID (0); + setM_ShipperPackagingCfg_ID (0); setM_ShipperPackaging_ID (0); setName (null); - setX_ShipperPackaging_ID (0); } */ } @@ -128,6 +128,31 @@ public class X_M_ShipperPackaging extends PO implements I_M_ShipperPackaging, I_ return ii.intValue(); } + public org.compiere.model.I_M_ShipperPackagingCfg getM_ShipperPackagingCfg() throws RuntimeException + { + return (org.compiere.model.I_M_ShipperPackagingCfg)MTable.get(getCtx(), org.compiere.model.I_M_ShipperPackagingCfg.Table_Name) + .getPO(getM_ShipperPackagingCfg_ID(), get_TrxName()); } + + /** Set Shipper Packaging Configuration. + @param M_ShipperPackagingCfg_ID Shipper Packaging Configuration */ + public void setM_ShipperPackagingCfg_ID (int M_ShipperPackagingCfg_ID) + { + if (M_ShipperPackagingCfg_ID < 1) + set_Value (COLUMNNAME_M_ShipperPackagingCfg_ID, null); + else + set_Value (COLUMNNAME_M_ShipperPackagingCfg_ID, Integer.valueOf(M_ShipperPackagingCfg_ID)); + } + + /** Get Shipper Packaging Configuration. + @return Shipper Packaging Configuration */ + public int getM_ShipperPackagingCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperPackagingCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Shipper Packaging. @param M_ShipperPackaging_ID Shipper Packaging */ public void setM_ShipperPackaging_ID (int M_ShipperPackaging_ID) @@ -198,29 +223,4 @@ public class X_M_ShipperPackaging extends PO implements I_M_ShipperPackaging, I_ return Env.ZERO; return bd; } - - public org.compiere.model.I_X_ShipperPackaging getX_ShipperPackaging() throws RuntimeException - { - return (org.compiere.model.I_X_ShipperPackaging)MTable.get(getCtx(), org.compiere.model.I_X_ShipperPackaging.Table_Name) - .getPO(getX_ShipperPackaging_ID(), get_TrxName()); } - - /** Set Shipper Packaging. - @param X_ShipperPackaging_ID Shipper Packaging */ - public void setX_ShipperPackaging_ID (int X_ShipperPackaging_ID) - { - if (X_ShipperPackaging_ID < 1) - set_Value (COLUMNNAME_X_ShipperPackaging_ID, null); - else - set_Value (COLUMNNAME_X_ShipperPackaging_ID, Integer.valueOf(X_ShipperPackaging_ID)); - } - - /** Get Shipper Packaging. - @return Shipper Packaging */ - public int getX_ShipperPackaging_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_ShipperPackaging_ID); - if (ii == null) - return 0; - return ii.intValue(); - } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_X_ShipperPackaging.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackagingCfg.java similarity index 65% rename from org.adempiere.base/src/org/compiere/model/X_X_ShipperPackaging.java rename to org.adempiere.base/src/org/compiere/model/X_M_ShipperPackagingCfg.java index 3f433a9024..7f6980b269 100644 --- a/org.adempiere.base/src/org/compiere/model/X_X_ShipperPackaging.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackagingCfg.java @@ -23,34 +23,34 @@ import java.util.Properties; import org.compiere.util.Env; import org.compiere.util.KeyNamePair; -/** Generated Model for X_ShipperPackaging +/** Generated Model for M_ShipperPackagingCfg * @author iDempiere (generated) * @version Release 1.0a - $Id$ */ -public class X_X_ShipperPackaging extends PO implements I_X_ShipperPackaging, I_Persistent +public class X_M_ShipperPackagingCfg extends PO implements I_M_ShipperPackagingCfg, I_Persistent { /** * */ - private static final long serialVersionUID = 20121213L; + private static final long serialVersionUID = 20130318L; /** Standard Constructor */ - public X_X_ShipperPackaging (Properties ctx, int X_ShipperPackaging_ID, String trxName) + public X_M_ShipperPackagingCfg (Properties ctx, int M_ShipperPackagingCfg_ID, String trxName) { - super (ctx, X_ShipperPackaging_ID, trxName); - /** if (X_ShipperPackaging_ID == 0) + super (ctx, M_ShipperPackagingCfg_ID, trxName); + /** if (M_ShipperPackagingCfg_ID == 0) { setIsDefault (false); // N + setM_ShipperCfg_ID (0); + setM_ShipperPackagingCfg_ID (0); setName (null); setValue (null); - setX_Shipper_ID (0); - setX_ShipperPackaging_ID (0); } */ } /** Load Constructor */ - public X_X_ShipperPackaging (Properties ctx, ResultSet rs, String trxName) + public X_M_ShipperPackagingCfg (Properties ctx, ResultSet rs, String trxName) { super (ctx, rs, trxName); } @@ -72,7 +72,7 @@ public class X_X_ShipperPackaging extends PO implements I_X_ShipperPackaging, I_ public String toString() { - StringBuffer sb = new StringBuffer ("X_X_ShipperPackaging[") + StringBuffer sb = new StringBuffer ("X_M_ShipperPackagingCfg[") .append(get_ID()).append("]"); return sb.toString(); } @@ -118,6 +118,65 @@ public class X_X_ShipperPackaging extends PO implements I_X_ShipperPackaging, I_ return false; } + public org.compiere.model.I_M_ShipperCfg getM_ShipperCfg() throws RuntimeException + { + return (org.compiere.model.I_M_ShipperCfg)MTable.get(getCtx(), org.compiere.model.I_M_ShipperCfg.Table_Name) + .getPO(getM_ShipperCfg_ID(), get_TrxName()); } + + /** Set Shipper Configuration. + @param M_ShipperCfg_ID Shipper Configuration */ + public void setM_ShipperCfg_ID (int M_ShipperCfg_ID) + { + if (M_ShipperCfg_ID < 1) + set_ValueNoCheck (COLUMNNAME_M_ShipperCfg_ID, null); + else + set_ValueNoCheck (COLUMNNAME_M_ShipperCfg_ID, Integer.valueOf(M_ShipperCfg_ID)); + } + + /** Get Shipper Configuration. + @return Shipper Configuration */ + public int getM_ShipperCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set Shipper Packaging Configuration. + @param M_ShipperPackagingCfg_ID Shipper Packaging Configuration */ + public void setM_ShipperPackagingCfg_ID (int M_ShipperPackagingCfg_ID) + { + if (M_ShipperPackagingCfg_ID < 1) + set_ValueNoCheck (COLUMNNAME_M_ShipperPackagingCfg_ID, null); + else + set_ValueNoCheck (COLUMNNAME_M_ShipperPackagingCfg_ID, Integer.valueOf(M_ShipperPackagingCfg_ID)); + } + + /** Get Shipper Packaging Configuration. + @return Shipper Packaging Configuration */ + public int getM_ShipperPackagingCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperPackagingCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set M_ShipperPackagingCfg_UU. + @param M_ShipperPackagingCfg_UU M_ShipperPackagingCfg_UU */ + public void setM_ShipperPackagingCfg_UU (String M_ShipperPackagingCfg_UU) + { + set_Value (COLUMNNAME_M_ShipperPackagingCfg_UU, M_ShipperPackagingCfg_UU); + } + + /** Get M_ShipperPackagingCfg_UU. + @return M_ShipperPackagingCfg_UU */ + public String getM_ShipperPackagingCfg_UU () + { + return (String)get_Value(COLUMNNAME_M_ShipperPackagingCfg_UU); + } + /** Set Name. @param Name Alphanumeric identifier of the entity @@ -179,63 +238,4 @@ public class X_X_ShipperPackaging extends PO implements I_X_ShipperPackaging, I_ return Env.ZERO; return bd; } - - 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) - .getPO(getX_Shipper_ID(), get_TrxName()); } - - /** Set Shipper. - @param X_Shipper_ID Shipper */ - public void setX_Shipper_ID (int X_Shipper_ID) - { - if (X_Shipper_ID < 1) - set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, null); - else - set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, Integer.valueOf(X_Shipper_ID)); - } - - /** Get Shipper. - @return Shipper */ - public int getX_Shipper_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_Shipper_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - - /** Set Shipper Packaging. - @param X_ShipperPackaging_ID Shipper Packaging */ - public void setX_ShipperPackaging_ID (int X_ShipperPackaging_ID) - { - if (X_ShipperPackaging_ID < 1) - set_ValueNoCheck (COLUMNNAME_X_ShipperPackaging_ID, null); - else - set_ValueNoCheck (COLUMNNAME_X_ShipperPackaging_ID, Integer.valueOf(X_ShipperPackaging_ID)); - } - - /** Get Shipper Packaging. - @return Shipper Packaging */ - public int getX_ShipperPackaging_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_ShipperPackaging_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - - /** Set X_ShipperPackaging_UU. - @param X_ShipperPackaging_UU X_ShipperPackaging_UU */ - public void setX_ShipperPackaging_UU (String X_ShipperPackaging_UU) - { - set_Value (COLUMNNAME_X_ShipperPackaging_UU, X_ShipperPackaging_UU); - } - - /** Get X_ShipperPackaging_UU. - @return X_ShipperPackaging_UU */ - public String getX_ShipperPackaging_UU () - { - return (String)get_Value(COLUMNNAME_X_ShipperPackaging_UU); - } } \ No newline at end of file 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 43e637bda1..9be3dd98a5 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 = 20130109L; + private static final long serialVersionUID = 20130318L; /** Standard Constructor */ public X_M_ShipperPickupTypes (Properties ctx, int M_ShipperPickupTypes_ID, String trxName) @@ -40,9 +40,9 @@ public class X_M_ShipperPickupTypes extends PO implements I_M_ShipperPickupTypes setIsDefault (false); // N setM_Shipper_ID (0); + setM_ShipperPickupTypesCfg_ID (0); setM_ShipperPickupTypes_ID (0); setName (null); - setX_ShipperPickupTypes_ID (0); } */ } @@ -126,6 +126,31 @@ public class X_M_ShipperPickupTypes extends PO implements I_M_ShipperPickupTypes return ii.intValue(); } + public org.compiere.model.I_M_ShipperPickupTypesCfg getM_ShipperPickupTypesCfg() throws RuntimeException + { + return (org.compiere.model.I_M_ShipperPickupTypesCfg)MTable.get(getCtx(), org.compiere.model.I_M_ShipperPickupTypesCfg.Table_Name) + .getPO(getM_ShipperPickupTypesCfg_ID(), get_TrxName()); } + + /** Set Shipper Pickup Types Configuration. + @param M_ShipperPickupTypesCfg_ID Shipper Pickup Types Configuration */ + public void setM_ShipperPickupTypesCfg_ID (int M_ShipperPickupTypesCfg_ID) + { + if (M_ShipperPickupTypesCfg_ID < 1) + set_Value (COLUMNNAME_M_ShipperPickupTypesCfg_ID, null); + else + set_Value (COLUMNNAME_M_ShipperPickupTypesCfg_ID, Integer.valueOf(M_ShipperPickupTypesCfg_ID)); + } + + /** Get Shipper Pickup Types Configuration. + @return Shipper Pickup Types Configuration */ + public int getM_ShipperPickupTypesCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperPickupTypesCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Shipper Pickup Types. @param M_ShipperPickupTypes_ID Shipper Pickup Types */ public void setM_ShipperPickupTypes_ID (int M_ShipperPickupTypes_ID) @@ -176,29 +201,4 @@ public class X_M_ShipperPickupTypes extends PO implements I_M_ShipperPickupTypes { 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) - .getPO(getX_ShipperPickupTypes_ID(), get_TrxName()); } - - /** Set Shipper Pickup Types. - @param X_ShipperPickupTypes_ID Shipper Pickup Types */ - public void setX_ShipperPickupTypes_ID (int X_ShipperPickupTypes_ID) - { - if (X_ShipperPickupTypes_ID < 1) - set_Value (COLUMNNAME_X_ShipperPickupTypes_ID, null); - else - set_Value (COLUMNNAME_X_ShipperPickupTypes_ID, Integer.valueOf(X_ShipperPickupTypes_ID)); - } - - /** Get Shipper Pickup Types. - @return Shipper Pickup Types */ - public int getX_ShipperPickupTypes_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_ShipperPickupTypes_ID); - if (ii == null) - return 0; - return ii.intValue(); - } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_X_ShipperPickupTypes.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypesCfg.java similarity index 62% rename from org.adempiere.base/src/org/compiere/model/X_X_ShipperPickupTypes.java rename to org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypesCfg.java index 54fb13825f..6aac397dfd 100644 --- a/org.adempiere.base/src/org/compiere/model/X_X_ShipperPickupTypes.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypesCfg.java @@ -21,34 +21,34 @@ import java.sql.ResultSet; import java.util.Properties; import org.compiere.util.KeyNamePair; -/** Generated Model for X_ShipperPickupTypes +/** Generated Model for M_ShipperPickupTypesCfg * @author iDempiere (generated) * @version Release 1.0a - $Id$ */ -public class X_X_ShipperPickupTypes extends PO implements I_X_ShipperPickupTypes, I_Persistent +public class X_M_ShipperPickupTypesCfg extends PO implements I_M_ShipperPickupTypesCfg, I_Persistent { /** * */ - private static final long serialVersionUID = 20121213L; + private static final long serialVersionUID = 20130318L; /** Standard Constructor */ - public X_X_ShipperPickupTypes (Properties ctx, int X_ShipperPickupTypes_ID, String trxName) + public X_M_ShipperPickupTypesCfg (Properties ctx, int M_ShipperPickupTypesCfg_ID, String trxName) { - super (ctx, X_ShipperPickupTypes_ID, trxName); - /** if (X_ShipperPickupTypes_ID == 0) + super (ctx, M_ShipperPickupTypesCfg_ID, trxName); + /** if (M_ShipperPickupTypesCfg_ID == 0) { setIsDefault (false); // N + setM_ShipperCfg_ID (0); + setM_ShipperPickupTypesCfg_ID (0); setName (null); setValue (null); - setX_Shipper_ID (0); - setX_ShipperPickupTypes_ID (0); } */ } /** Load Constructor */ - public X_X_ShipperPickupTypes (Properties ctx, ResultSet rs, String trxName) + public X_M_ShipperPickupTypesCfg (Properties ctx, ResultSet rs, String trxName) { super (ctx, rs, trxName); } @@ -70,7 +70,7 @@ public class X_X_ShipperPickupTypes extends PO implements I_X_ShipperPickupTypes public String toString() { - StringBuffer sb = new StringBuffer ("X_X_ShipperPickupTypes[") + StringBuffer sb = new StringBuffer ("X_M_ShipperPickupTypesCfg[") .append(get_ID()).append("]"); return sb.toString(); } @@ -116,6 +116,65 @@ public class X_X_ShipperPickupTypes extends PO implements I_X_ShipperPickupTypes return false; } + public org.compiere.model.I_M_ShipperCfg getM_ShipperCfg() throws RuntimeException + { + return (org.compiere.model.I_M_ShipperCfg)MTable.get(getCtx(), org.compiere.model.I_M_ShipperCfg.Table_Name) + .getPO(getM_ShipperCfg_ID(), get_TrxName()); } + + /** Set Shipper Configuration. + @param M_ShipperCfg_ID Shipper Configuration */ + public void setM_ShipperCfg_ID (int M_ShipperCfg_ID) + { + if (M_ShipperCfg_ID < 1) + set_ValueNoCheck (COLUMNNAME_M_ShipperCfg_ID, null); + else + set_ValueNoCheck (COLUMNNAME_M_ShipperCfg_ID, Integer.valueOf(M_ShipperCfg_ID)); + } + + /** Get Shipper Configuration. + @return Shipper Configuration */ + public int getM_ShipperCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set Shipper Pickup Types Configuration. + @param M_ShipperPickupTypesCfg_ID Shipper Pickup Types Configuration */ + public void setM_ShipperPickupTypesCfg_ID (int M_ShipperPickupTypesCfg_ID) + { + if (M_ShipperPickupTypesCfg_ID < 1) + set_ValueNoCheck (COLUMNNAME_M_ShipperPickupTypesCfg_ID, null); + else + set_ValueNoCheck (COLUMNNAME_M_ShipperPickupTypesCfg_ID, Integer.valueOf(M_ShipperPickupTypesCfg_ID)); + } + + /** Get Shipper Pickup Types Configuration. + @return Shipper Pickup Types Configuration */ + public int getM_ShipperPickupTypesCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperPickupTypesCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set M_ShipperPickupTypesCfg_UU. + @param M_ShipperPickupTypesCfg_UU M_ShipperPickupTypesCfg_UU */ + public void setM_ShipperPickupTypesCfg_UU (String M_ShipperPickupTypesCfg_UU) + { + set_Value (COLUMNNAME_M_ShipperPickupTypesCfg_UU, M_ShipperPickupTypesCfg_UU); + } + + /** Get M_ShipperPickupTypesCfg_UU. + @return M_ShipperPickupTypesCfg_UU */ + public String getM_ShipperPickupTypesCfg_UU () + { + return (String)get_Value(COLUMNNAME_M_ShipperPickupTypesCfg_UU); + } + /** Set Name. @param Name Alphanumeric identifier of the entity @@ -157,63 +216,4 @@ public class X_X_ShipperPickupTypes extends PO implements I_X_ShipperPickupTypes { return (String)get_Value(COLUMNNAME_Value); } - - 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) - .getPO(getX_Shipper_ID(), get_TrxName()); } - - /** Set Shipper. - @param X_Shipper_ID Shipper */ - public void setX_Shipper_ID (int X_Shipper_ID) - { - if (X_Shipper_ID < 1) - set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, null); - else - set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, Integer.valueOf(X_Shipper_ID)); - } - - /** Get Shipper. - @return Shipper */ - public int getX_Shipper_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_Shipper_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - - /** Set Shipper Pickup Types. - @param X_ShipperPickupTypes_ID Shipper Pickup Types */ - public void setX_ShipperPickupTypes_ID (int X_ShipperPickupTypes_ID) - { - if (X_ShipperPickupTypes_ID < 1) - set_ValueNoCheck (COLUMNNAME_X_ShipperPickupTypes_ID, null); - else - set_ValueNoCheck (COLUMNNAME_X_ShipperPickupTypes_ID, Integer.valueOf(X_ShipperPickupTypes_ID)); - } - - /** Get Shipper Pickup Types. - @return Shipper Pickup Types */ - public int getX_ShipperPickupTypes_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_ShipperPickupTypes_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - - /** Set X_ShipperPickupTypes_UU. - @param X_ShipperPickupTypes_UU X_ShipperPickupTypes_UU */ - public void setX_ShipperPickupTypes_UU (String X_ShipperPickupTypes_UU) - { - set_Value (COLUMNNAME_X_ShipperPickupTypes_UU, X_ShipperPickupTypes_UU); - } - - /** Get X_ShipperPickupTypes_UU. - @return X_ShipperPickupTypes_UU */ - public String getX_ShipperPickupTypes_UU () - { - return (String)get_Value(COLUMNNAME_X_ShipperPickupTypes_UU); - } } \ No newline at end of file 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 2d8e76cff6..26f9b684c4 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 = 20130109L; + private static final long serialVersionUID = 20130318L; /** Standard Constructor */ public X_M_ShippingProcessor (Properties ctx, int M_ShippingProcessor_ID, String trxName) @@ -38,10 +38,10 @@ public class X_M_ShippingProcessor extends PO implements I_M_ShippingProcessor, /** if (M_ShippingProcessor_ID == 0) { setConnectionPassword (null); + setM_ShippingProcessorCfg_ID (0); setM_ShippingProcessor_ID (0); setName (null); setUserID (null); - setX_ShippingProcessor_ID (0); } */ } @@ -101,6 +101,31 @@ public class X_M_ShippingProcessor extends PO implements I_M_ShippingProcessor, return (String)get_Value(COLUMNNAME_ConnectionPassword); } + public org.compiere.model.I_M_ShippingProcessorCfg getM_ShippingProcessorCfg() throws RuntimeException + { + return (org.compiere.model.I_M_ShippingProcessorCfg)MTable.get(getCtx(), org.compiere.model.I_M_ShippingProcessorCfg.Table_Name) + .getPO(getM_ShippingProcessorCfg_ID(), get_TrxName()); } + + /** Set Shipping Processor Configuration. + @param M_ShippingProcessorCfg_ID Shipping Processor Configuration */ + public void setM_ShippingProcessorCfg_ID (int M_ShippingProcessorCfg_ID) + { + if (M_ShippingProcessorCfg_ID < 1) + set_Value (COLUMNNAME_M_ShippingProcessorCfg_ID, null); + else + set_Value (COLUMNNAME_M_ShippingProcessorCfg_ID, Integer.valueOf(M_ShippingProcessorCfg_ID)); + } + + /** Get Shipping Processor Configuration. + @return Shipping Processor Configuration */ + public int getM_ShippingProcessorCfg_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShippingProcessorCfg_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Shipping Processor. @param M_ShippingProcessor_ID Shipping Processor */ public void setM_ShippingProcessor_ID (int M_ShippingProcessor_ID) @@ -168,29 +193,4 @@ public class X_M_ShippingProcessor extends PO implements I_M_ShippingProcessor, { return (String)get_Value(COLUMNNAME_UserID); } - - public org.compiere.model.I_X_ShippingProcessor getX_ShippingProcessor() throws RuntimeException - { - return (org.compiere.model.I_X_ShippingProcessor)MTable.get(getCtx(), org.compiere.model.I_X_ShippingProcessor.Table_Name) - .getPO(getX_ShippingProcessor_ID(), get_TrxName()); } - - /** Set Shipping Processor. - @param X_ShippingProcessor_ID Shipping Processor */ - public void setX_ShippingProcessor_ID (int X_ShippingProcessor_ID) - { - if (X_ShippingProcessor_ID < 1) - set_Value (COLUMNNAME_X_ShippingProcessor_ID, null); - else - set_Value (COLUMNNAME_X_ShippingProcessor_ID, Integer.valueOf(X_ShippingProcessor_ID)); - } - - /** Get Shipping Processor. - @return Shipping Processor */ - public int getX_ShippingProcessor_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_X_ShippingProcessor_ID); - if (ii == null) - return 0; - return ii.intValue(); - } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_X_ShippingProcessor.java b/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessorCfg.java similarity index 81% rename from org.adempiere.base/src/org/compiere/model/X_X_ShippingProcessor.java rename to org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessorCfg.java index 1b21489baa..709385ed27 100644 --- a/org.adempiere.base/src/org/compiere/model/X_X_ShippingProcessor.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessorCfg.java @@ -21,10 +21,10 @@ import java.sql.ResultSet; import java.util.Properties; import org.compiere.util.KeyNamePair; -/** Generated Model for X_ShippingProcessor +/** Generated Model for M_ShippingProcessorCfg * @author iDempiere (generated) * @version Release 1.0a - $Id$ */ -public class X_X_ShippingProcessor extends PO implements I_X_ShippingProcessor, I_Persistent +public class X_M_ShippingProcessorCfg extends PO implements I_M_ShippingProcessorCfg, I_Persistent { /** @@ -33,20 +33,20 @@ public class X_X_ShippingProcessor extends PO implements I_X_ShippingProcessor, private static final long serialVersionUID = 20121213L; /** Standard Constructor */ - public X_X_ShippingProcessor (Properties ctx, int X_ShippingProcessor_ID, String trxName) + public X_M_ShippingProcessorCfg (Properties ctx, int M_ShippingProcessorCfg_ID, String trxName) { - super (ctx, X_ShippingProcessor_ID, trxName); - /** if (X_ShippingProcessor_ID == 0) + super (ctx, M_ShippingProcessorCfg_ID, trxName); + /** if (M_ShippingProcessorCfg_ID == 0) { setHostAddress (null); setHostPort (0); setName (null); - setX_ShippingProcessor_ID (0); + setM_ShippingProcessorCfg_ID (0); } */ } /** Load Constructor */ - public X_X_ShippingProcessor (Properties ctx, ResultSet rs, String trxName) + public X_M_ShippingProcessorCfg (Properties ctx, ResultSet rs, String trxName) { super (ctx, rs, trxName); } @@ -68,7 +68,7 @@ public class X_X_ShippingProcessor extends PO implements I_X_ShippingProcessor, public String toString() { - StringBuffer sb = new StringBuffer ("X_X_ShippingProcessor[") + StringBuffer sb = new StringBuffer ("X_M_ShippingProcessorCfg[") .append(get_ID()).append("]"); return sb.toString(); } @@ -252,36 +252,36 @@ public class X_X_ShippingProcessor extends PO implements I_X_ShippingProcessor, } /** Set Shipping Processor. - @param X_ShippingProcessor_ID Shipping Processor */ - public void setX_ShippingProcessor_ID (int X_ShippingProcessor_ID) + @param M_ShippingProcessorCfg_ID Shipping Processor */ + public void setM_ShippingProcessorCfg_ID (int M_ShippingProcessorCfg_ID) { - if (X_ShippingProcessor_ID < 1) - set_ValueNoCheck (COLUMNNAME_X_ShippingProcessor_ID, null); + if (M_ShippingProcessorCfg_ID < 1) + set_ValueNoCheck (COLUMNNAME_M_ShippingProcessorCfg_ID, null); else - set_ValueNoCheck (COLUMNNAME_X_ShippingProcessor_ID, Integer.valueOf(X_ShippingProcessor_ID)); + set_ValueNoCheck (COLUMNNAME_M_ShippingProcessorCfg_ID, Integer.valueOf(M_ShippingProcessorCfg_ID)); } /** Get Shipping Processor. @return Shipping Processor */ - public int getX_ShippingProcessor_ID () + public int getM_ShippingProcessorCfg_ID () { - Integer ii = (Integer)get_Value(COLUMNNAME_X_ShippingProcessor_ID); + Integer ii = (Integer)get_Value(COLUMNNAME_M_ShippingProcessorCfg_ID); if (ii == null) return 0; return ii.intValue(); } - /** Set X_ShippingProcessor_UU. - @param X_ShippingProcessor_UU X_ShippingProcessor_UU */ - public void setX_ShippingProcessor_UU (String X_ShippingProcessor_UU) + /** Set M_ShippingProcessorCfg_UU. + @param M_ShippingProcessorCfg_UU M_ShippingProcessorCfg_UU */ + public void setM_ShippingProcessorCfg_UU (String M_ShippingProcessorCfg_UU) { - set_Value (COLUMNNAME_X_ShippingProcessor_UU, X_ShippingProcessor_UU); + set_Value (COLUMNNAME_M_ShippingProcessorCfg_UU, M_ShippingProcessorCfg_UU); } - /** Get X_ShippingProcessor_UU. - @return X_ShippingProcessor_UU */ - public String getX_ShippingProcessor_UU () + /** Get M_ShippingProcessorCfg_UU. + @return M_ShippingProcessorCfg_UU */ + public String getM_ShippingProcessorCfg_UU () { - return (String)get_Value(COLUMNNAME_X_ShippingProcessor_UU); + return (String)get_Value(COLUMNNAME_M_ShippingProcessorCfg_UU); } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java b/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java index 76a19ca3e3..52d80fed81 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java @@ -32,7 +32,7 @@ public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransacti /** * */ - private static final long serialVersionUID = 20121221L; + private static final long serialVersionUID = 20130318L; /** Standard Constructor */ public X_M_ShippingTransaction (Properties ctx, int M_ShippingTransaction_ID, String trxName) @@ -211,29 +211,25 @@ public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransacti return ii.intValue(); } - public org.compiere.model.I_C_BP_ShippingAcct getC_BP_ShippingAcct() throws RuntimeException - { - return (org.compiere.model.I_C_BP_ShippingAcct)MTable.get(getCtx(), org.compiere.model.I_C_BP_ShippingAcct.Table_Name) - .getPO(getC_BP_ShippingAcct_ID(), get_TrxName()); } - - /** Set Business Partner Shipping Account. - @param C_BP_ShippingAcct_ID Business Partner Shipping Account */ - public void setC_BP_ShippingAcct_ID (int C_BP_ShippingAcct_ID) + /** Set COD. + @param CashOnDelivery COD */ + public void setCashOnDelivery (boolean CashOnDelivery) { - if (C_BP_ShippingAcct_ID < 1) - set_Value (COLUMNNAME_C_BP_ShippingAcct_ID, null); - else - set_Value (COLUMNNAME_C_BP_ShippingAcct_ID, Integer.valueOf(C_BP_ShippingAcct_ID)); + set_Value (COLUMNNAME_CashOnDelivery, Boolean.valueOf(CashOnDelivery)); } - /** Get Business Partner Shipping Account. - @return Business Partner Shipping Account */ - public int getC_BP_ShippingAcct_ID () + /** Get COD. + @return COD */ + public boolean isCashOnDelivery () { - Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_ShippingAcct_ID); - if (ii == null) - return 0; - return ii.intValue(); + Object oo = get_Value(COLUMNNAME_CashOnDelivery); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; } public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException @@ -292,6 +288,31 @@ public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransacti return ii.intValue(); } + public org.compiere.model.I_C_BP_ShippingAcct getC_BP_ShippingAcct() throws RuntimeException + { + return (org.compiere.model.I_C_BP_ShippingAcct)MTable.get(getCtx(), org.compiere.model.I_C_BP_ShippingAcct.Table_Name) + .getPO(getC_BP_ShippingAcct_ID(), get_TrxName()); } + + /** Set Business Partner Shipping Account. + @param C_BP_ShippingAcct_ID Business Partner Shipping Account */ + public void setC_BP_ShippingAcct_ID (int C_BP_ShippingAcct_ID) + { + if (C_BP_ShippingAcct_ID < 1) + set_Value (COLUMNNAME_C_BP_ShippingAcct_ID, null); + else + set_Value (COLUMNNAME_C_BP_ShippingAcct_ID, Integer.valueOf(C_BP_ShippingAcct_ID)); + } + + /** Get Business Partner Shipping Account. + @return Business Partner Shipping Account */ + public int getC_BP_ShippingAcct_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_ShippingAcct_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + public org.compiere.model.I_C_Currency getC_Currency() throws RuntimeException { return (org.compiere.model.I_C_Currency)MTable.get(getCtx(), org.compiere.model.I_C_Currency.Table_Name) @@ -348,6 +369,23 @@ public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransacti return ii.intValue(); } + /** Set COD Amount. + @param CODAmount COD Amount */ + public void setCODAmount (BigDecimal CODAmount) + { + set_Value (COLUMNNAME_CODAmount, CODAmount); + } + + /** Get COD Amount. + @return COD Amount */ + public BigDecimal getCODAmount () + { + BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CODAmount); + if (bd == null) + return Env.ZERO; + return bd; + } + public org.compiere.model.I_C_Order getC_Order() throws RuntimeException { return (org.compiere.model.I_C_Order)MTable.get(getCtx(), org.compiere.model.I_C_Order.Table_Name) @@ -432,44 +470,6 @@ public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransacti return ii.intValue(); } - /** Set COD. - @param CashOnDelivery COD */ - public void setCashOnDelivery (boolean CashOnDelivery) - { - set_Value (COLUMNNAME_CashOnDelivery, Boolean.valueOf(CashOnDelivery)); - } - - /** Get COD. - @return COD */ - public boolean isCashOnDelivery () - { - Object oo = get_Value(COLUMNNAME_CashOnDelivery); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; - } - - /** Set COD Amount. - @param CODAmount COD Amount */ - public void setCODAmount (BigDecimal CODAmount) - { - set_Value (COLUMNNAME_CODAmount, CODAmount); - } - - /** Get COD Amount. - @return COD Amount */ - public BigDecimal getCODAmount () - { - BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CODAmount); - if (bd == null) - return Env.ZERO; - return bd; - } - /** Set Customs Value. @param CustomsValue Customs Value */ public void setCustomsValue (BigDecimal CustomsValue) diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java index 02993270bf..499b8c87f0 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java @@ -32,7 +32,7 @@ public class X_M_ShippingTransactionLine extends PO implements I_M_ShippingTrans /** * */ - private static final long serialVersionUID = 20121219L; + private static final long serialVersionUID = 20130318L; /** Standard Constructor */ public X_M_ShippingTransactionLine (Properties ctx, int M_ShippingTransactionLine_ID, String trxName) @@ -182,6 +182,20 @@ public class X_M_ShippingTransactionLine extends PO implements I_M_ShippingTrans return bd; } + /** Set Master Tracking No. + @param MasterTrackingNo Master Tracking No */ + public void setMasterTrackingNo (String MasterTrackingNo) + { + set_Value (COLUMNNAME_MasterTrackingNo, MasterTrackingNo); + } + + /** Get Master Tracking No. + @return Master Tracking No */ + public String getMasterTrackingNo () + { + return (String)get_Value(COLUMNNAME_MasterTrackingNo); + } + public org.compiere.model.I_M_PackageMPS getM_PackageMPS() throws RuntimeException { return (org.compiere.model.I_M_PackageMPS)MTable.get(getCtx(), org.compiere.model.I_M_PackageMPS.Table_Name) @@ -274,20 +288,6 @@ public class X_M_ShippingTransactionLine extends PO implements I_M_ShippingTrans return (String)get_Value(COLUMNNAME_M_ShippingTransactionLine_UU); } - /** Set Master Tracking No. - @param MasterTrackingNo Master Tracking No */ - public void setMasterTrackingNo (String MasterTrackingNo) - { - set_Value (COLUMNNAME_MasterTrackingNo, MasterTrackingNo); - } - - /** Get Master Tracking No. - @return Master Tracking No */ - public String getMasterTrackingNo () - { - return (String)get_Value(COLUMNNAME_MasterTrackingNo); - } - /** Set Price. @param Price Price