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

IDEMPIERE-2353 Please, add to WLocationDialog & C_Location new field Address5 / thanks to Anna Smirnova from Palichmos

This commit is contained in:
Carlos Ruiz 2017-09-08 16:02:41 +02:00
parent fdc105bbd7
commit 2281f9ec81
13 changed files with 609 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
migration/i4.1z/oracle/201708020730_IDEMPIERE-2353.sql Normal file
View File

@ -0,0 +1,119 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-2353 Please, add to WLocationDialog & C_Location new field Address5
-- 23.07.2017 11:06:25 MSK
INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,Description,Help,PrintName,EntityType,AD_Element_UU) VALUES (203117,0,0,'Y',TO_DATE('2017-07-23 11:06:24','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-07-23 11:06:24','YYYY-MM-DD HH24:MI:SS'),100,'Address5','Address 5','Address Line 5 for the location','The Address 5 provides additional address information for an entity. It can be used for building location, apartment number or similar information.','Address 5','D','3b1f35e1-30e1-4bc6-b108-6a1c9da54f51')
;
-- 23.07.2017 11:06:51 MSK
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,IsToolbarButton,IsSecure) VALUES (213141,1,'Address 5','Address Line 5 for the location','The Address 5 provides additional address information for an entity. It can be used for building location, apartment number or similar information.',162,'Address5',60,'N','N','N','N','N',0,'N',10,0,0,'Y',TO_DATE('2017-07-23 11:06:50','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-07-23 11:06:50','YYYY-MM-DD HH24:MI:SS'),100,203117,'N','N','D','N','N','N','Y','680e8d95-5b70-4d81-a4bb-b9b7f54a3cce','Y','N','N')
;
-- 23.07.2017 11:08:15 MSK
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,IsToolbarButton,IsSecure) VALUES (213142,1,'Comments','Comments or additional information','The Comments field allows for free form entry of additional information.',162,'Comments',2000,'N','N','N','N','N',0,'N',14,0,0,'Y',TO_DATE('2017-07-23 11:08:15','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-07-23 11:08:15','YYYY-MM-DD HH24:MI:SS'),100,230,'Y','N','D','N','N','N','Y','79d8ffc6-6885-43a1-bc9e-9fbd73771f52','Y','N','N')
;
-- 23.07.2017 11:10:55 MSK
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan,NumLines,IsQuickEntry,IsDefaultFocus,IsAdvancedField) VALUES (205137,'Address 5','Address Line 5 for the location','The Address 5 provides additional address information for an entity. It can be used for building location, apartment number or similar information.',154,213141,'Y',60,190,'N','N','N','N',0,0,'Y',TO_DATE('2017-07-23 11:10:54','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-07-23 11:10:54','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','U','11698caa-47e0-44f2-a319-31185fc081d7','Y',70,1,5,1,'N','N','N')
;
-- 23.07.2017 11:11:02 MSK
UPDATE AD_Field SET EntityType='D', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:11:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205137
;
-- 23.07.2017 11:11:58 MSK
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan,NumLines,IsQuickEntry,IsDefaultFocus,IsAdvancedField) VALUES (205138,'Comments','Comments or additional information','The Comments field allows for free form entry of additional information.',154,213142,'Y',60,200,'N','N','N','N',0,0,'Y',TO_DATE('2017-07-23 11:11:57','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-07-23 11:11:57','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','84a69cfb-ae19-4379-8427-69e017a6d480','Y',70,1,5,1,'N','N','N')
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, ColumnSpan=2, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205137
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=110, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=545
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=550
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=547
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=140, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=6297
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=548
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202473
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202474
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=180, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202475
;
-- 23.07.2017 11:13:33 MSK
UPDATE AD_Field SET SeqNo=190, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:13:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202476
;
-- 23.07.2017 11:13:33 MSK
UPDATE AD_Field SET SeqNo=200, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, NumLines=3, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:13:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205138
;
-- 23.07.2017 11:14:17 MSK
UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=205137
;
-- 23.07.2017 11:14:17 MSK
UPDATE AD_Field SET SeqNo=90,IsDisplayed='Y' WHERE AD_Field_ID=546
;
-- 23.07.2017 11:14:17 MSK
UPDATE AD_Field SET SeqNo=100,IsDisplayed='Y' WHERE AD_Field_ID=5754
;
-- 23.07.2017 11:18:35 MSK
UPDATE C_Country SET CaptureSequence='@CO@ @R@ @A1@ @C@ @P@ @A2@ @A3@ @A4@ @A5@',Updated=TO_DATE('2017-07-23 11:18:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE C_Country_ID=286
;
-- 23.07.2017 11:20:04 MSK
ALTER TABLE C_Location ADD Address5 VARCHAR2(60) DEFAULT NULL
;
-- 23.07.2017 11:20:19 MSK
ALTER TABLE C_Location ADD Comments VARCHAR2(2000) DEFAULT NULL
;
-- 23.07.2017 11:21:03 MSK
UPDATE AD_Field SET SeqNo=80, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:21:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=546
;
-- 23.07.2017 11:21:03 MSK
UPDATE AD_Field SET SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:21:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5754
;
-- 23.07.2017 11:21:03 MSK
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-23 11:21:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205137
;
-- 23.07.2017 11:22:13 MSK
UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_DATE('2017-07-23 11:22:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=213141
;
-- 23.07.2017 11:31:57 MSK
UPDATE C_Country SET CaptureSequence='@CO@ @R@ @A1@ @C@ @P@ @A2@ @A3@ @A4@ @A5@ @Com@',Updated=TO_DATE('2017-07-23 11:31:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE C_Country_ID=286
;
SELECT register_migration_script('201708020730_IDEMPIERE-2353.sql') FROM dual
;

67
migration/i4.1z/oracle/201708020731_IDEMPIERE-2353.sql Normal file
View File

@ -0,0 +1,67 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-2353 Please, add to WLocationDialog & C_Location new field Address5
-- 24.07.2017 20:26:19 MSK
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,IsToolbarButton,IsSecure,FKConstraintType) VALUES (213143,1,'Flat/Office','Address Line 5 for the location','The Address 5 provides additional address information for an entity. It can be used for building location, apartment number or similar information.',200102,'Address5',60,'N','N','N','N','N',0,'N',10,0,0,'Y',TO_DATE('2017-07-24 20:26:19','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-07-24 20:26:19','YYYY-MM-DD HH24:MI:SS'),100,203117,'Y','N','D','N','N','N','Y','1d76a532-ff6f-4a10-a6f8-f09a4cf881e5','Y','N','N','N')
;
-- 24.07.2017 20:27:20 MSK
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure) VALUES (213144,0,'Comments','Comments or additional information','The Comments field allows for free form entry of additional information.',200102,'Comments',2000,'N','N','N','N','N',0,'N',14,0,0,'Y',TO_DATE('2017-07-24 20:27:19','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-07-24 20:27:19','YYYY-MM-DD HH24:MI:SS'),100,230,'Y','N','D','N','N','N','Y','40cdc476-a73a-4822-bc8a-c17937bc9078','Y',0,'N','N')
;
-- 24.07.2017 20:27:27 MSK
ALTER TABLE C_AddressTransaction ADD Comments VARCHAR2(2000) DEFAULT NULL
;
-- 24.07.2017 20:27:43 MSK
ALTER TABLE C_AddressTransaction ADD Address5 VARCHAR2(60) DEFAULT NULL
;
-- 24.07.2017 20:29:51 MSK
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan,NumLines,IsQuickEntry,IsDefaultFocus,IsAdvancedField) VALUES (205139,'Flat/Office','Address Line 5 for the location','The Address 5 provides additional address information for an entity. It can be used for building location, apartment number or similar information.',200111,213143,'Y',22,160,'N','N','N','N',0,0,'Y',TO_DATE('2017-07-24 20:29:51','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-07-24 20:29:51','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','274fb6ef-ff02-4d8f-aabd-06f2c0165640','Y',70,1,2,1,'N','N','N')
;
-- 24.07.2017 20:30:52 MSK
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,SortNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan,NumLines,IsQuickEntry,IsDefaultFocus,IsAdvancedField) VALUES (205140,'Comments','Comments or additional information','The Comments field allows for free form entry of additional information.',200111,213144,'Y',0,170,0,'N','N','N','N',0,0,'Y',TO_DATE('2017-07-24 20:30:51','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-07-24 20:30:51','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','9dd4eef9-4dac-4d13-9862-390ca03ea8e0','Y',160,1,1,1,'N','N','N')
;
-- 24.07.2017 20:32:17 MSK
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-24 20:32:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205139
;
-- 24.07.2017 20:32:17 MSK
UPDATE AD_Field SET SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-24 20:32:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202460
;
-- 24.07.2017 20:32:17 MSK
UPDATE AD_Field SET SeqNo=110, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-24 20:32:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202459
;
-- 24.07.2017 20:32:18 MSK
UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-24 20:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202468
;
-- 24.07.2017 20:32:18 MSK
UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-24 20:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202464
;
-- 24.07.2017 20:32:18 MSK
UPDATE AD_Field SET SeqNo=140, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-24 20:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202463
;
-- 24.07.2017 20:32:18 MSK
UPDATE AD_Field SET SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-24 20:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202465
;
-- 24.07.2017 20:32:18 MSK
UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-24 20:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202462
;
-- 24.07.2017 20:32:18 MSK
UPDATE AD_Field SET SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, ColumnSpan=5, NumLines=3, IsToolbarButton=NULL,Updated=TO_DATE('2017-07-24 20:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205140
;
SELECT register_migration_script('201708020731_IDEMPIERE-2353.sql') FROM dual
;

116
migration/i4.1z/postgresql/201708020730_IDEMPIERE-2353.sql Normal file
View File

@ -0,0 +1,116 @@
-- IDEMPIERE-2353 Please, add to WLocationDialog & C_Location new field Address5
-- 23.07.2017 11:06:25 MSK
INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,Description,Help,PrintName,EntityType,AD_Element_UU) VALUES (203117,0,0,'Y',TO_TIMESTAMP('2017-07-23 11:06:24','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-07-23 11:06:24','YYYY-MM-DD HH24:MI:SS'),100,'Address5','Address 5','Address Line 5 for the location','The Address 5 provides additional address information for an entity. It can be used for building location, apartment number or similar information.','Address 5','D','3b1f35e1-30e1-4bc6-b108-6a1c9da54f51')
;
-- 23.07.2017 11:06:51 MSK
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,IsToolbarButton,IsSecure) VALUES (213141,1,'Address 5','Address Line 5 for the location','The Address 5 provides additional address information for an entity. It can be used for building location, apartment number or similar information.',162,'Address5',60,'N','N','N','N','N',0,'N',10,0,0,'Y',TO_TIMESTAMP('2017-07-23 11:06:50','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-07-23 11:06:50','YYYY-MM-DD HH24:MI:SS'),100,203117,'N','N','D','N','N','N','Y','680e8d95-5b70-4d81-a4bb-b9b7f54a3cce','Y','N','N')
;
-- 23.07.2017 11:08:15 MSK
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,IsToolbarButton,IsSecure) VALUES (213142,1,'Comments','Comments or additional information','The Comments field allows for free form entry of additional information.',162,'Comments',2000,'N','N','N','N','N',0,'N',14,0,0,'Y',TO_TIMESTAMP('2017-07-23 11:08:15','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-07-23 11:08:15','YYYY-MM-DD HH24:MI:SS'),100,230,'Y','N','D','N','N','N','Y','79d8ffc6-6885-43a1-bc9e-9fbd73771f52','Y','N','N')
;
-- 23.07.2017 11:10:55 MSK
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan,NumLines,IsQuickEntry,IsDefaultFocus,IsAdvancedField) VALUES (205137,'Address 5','Address Line 5 for the location','The Address 5 provides additional address information for an entity. It can be used for building location, apartment number or similar information.',154,213141,'Y',60,190,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2017-07-23 11:10:54','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-07-23 11:10:54','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','U','11698caa-47e0-44f2-a319-31185fc081d7','Y',70,1,5,1,'N','N','N')
;
-- 23.07.2017 11:11:02 MSK
UPDATE AD_Field SET EntityType='D', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:11:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205137
;
-- 23.07.2017 11:11:58 MSK
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan,NumLines,IsQuickEntry,IsDefaultFocus,IsAdvancedField) VALUES (205138,'Comments','Comments or additional information','The Comments field allows for free form entry of additional information.',154,213142,'Y',60,200,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2017-07-23 11:11:57','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-07-23 11:11:57','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','84a69cfb-ae19-4379-8427-69e017a6d480','Y',70,1,5,1,'N','N','N')
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, ColumnSpan=2, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205137
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=110, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=545
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=550
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=547
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=140, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=6297
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=548
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202473
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202474
;
-- 23.07.2017 11:13:32 MSK
UPDATE AD_Field SET SeqNo=180, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:13:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202475
;
-- 23.07.2017 11:13:33 MSK
UPDATE AD_Field SET SeqNo=190, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:13:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202476
;
-- 23.07.2017 11:13:33 MSK
UPDATE AD_Field SET SeqNo=200, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, NumLines=3, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:13:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205138
;
-- 23.07.2017 11:14:17 MSK
UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=205137
;
-- 23.07.2017 11:14:17 MSK
UPDATE AD_Field SET SeqNo=90,IsDisplayed='Y' WHERE AD_Field_ID=546
;
-- 23.07.2017 11:14:17 MSK
UPDATE AD_Field SET SeqNo=100,IsDisplayed='Y' WHERE AD_Field_ID=5754
;
-- 23.07.2017 11:18:35 MSK
UPDATE C_Country SET CaptureSequence='@CO@ @R@ @A1@ @C@ @P@ @A2@ @A3@ @A4@ @A5@',Updated=TO_TIMESTAMP('2017-07-23 11:18:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE C_Country_ID=286
;
-- 23.07.2017 11:20:04 MSK
ALTER TABLE C_Location ADD COLUMN Address5 VARCHAR(60) DEFAULT NULL
;
-- 23.07.2017 11:20:19 MSK
ALTER TABLE C_Location ADD COLUMN Comments VARCHAR(2000) DEFAULT NULL
;
-- 23.07.2017 11:21:03 MSK
UPDATE AD_Field SET SeqNo=80, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:21:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=546
;
-- 23.07.2017 11:21:03 MSK
UPDATE AD_Field SET SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:21:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5754
;
-- 23.07.2017 11:21:03 MSK
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-23 11:21:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205137
;
-- 23.07.2017 11:22:13 MSK
UPDATE AD_Column SET IsUpdateable='Y',Updated=TO_TIMESTAMP('2017-07-23 11:22:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=213141
;
-- 23.07.2017 11:31:57 MSK
UPDATE C_Country SET CaptureSequence='@CO@ @R@ @A1@ @C@ @P@ @A2@ @A3@ @A4@ @A5@ @Com@',Updated=TO_TIMESTAMP('2017-07-23 11:31:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE C_Country_ID=286
;
SELECT register_migration_script('201708020730_IDEMPIERE-2353.sql') FROM dual
;

64
migration/i4.1z/postgresql/201708020731_IDEMPIERE-2353.sql Normal file
View File

@ -0,0 +1,64 @@
-- IDEMPIERE-2353 Please, add to WLocationDialog & C_Location new field Address5
-- 24.07.2017 20:26:19 MSK
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,IsToolbarButton,IsSecure,FKConstraintType) VALUES (213143,1,'Flat/Office','Address Line 5 for the location','The Address 5 provides additional address information for an entity. It can be used for building location, apartment number or similar information.',200102,'Address5',60,'N','N','N','N','N',0,'N',10,0,0,'Y',TO_TIMESTAMP('2017-07-24 20:26:19','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-07-24 20:26:19','YYYY-MM-DD HH24:MI:SS'),100,203117,'Y','N','D','N','N','N','Y','1d76a532-ff6f-4a10-a6f8-f09a4cf881e5','Y','N','N','N')
;
-- 24.07.2017 20:27:20 MSK
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure) VALUES (213144,0,'Comments','Comments or additional information','The Comments field allows for free form entry of additional information.',200102,'Comments',2000,'N','N','N','N','N',0,'N',14,0,0,'Y',TO_TIMESTAMP('2017-07-24 20:27:19','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-07-24 20:27:19','YYYY-MM-DD HH24:MI:SS'),100,230,'Y','N','D','N','N','N','Y','40cdc476-a73a-4822-bc8a-c17937bc9078','Y',0,'N','N')
;
-- 24.07.2017 20:27:27 MSK
ALTER TABLE C_AddressTransaction ADD COLUMN Comments VARCHAR(2000) DEFAULT NULL
;
-- 24.07.2017 20:27:43 MSK
ALTER TABLE C_AddressTransaction ADD COLUMN Address5 VARCHAR(60) DEFAULT NULL
;
-- 24.07.2017 20:29:51 MSK
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan,NumLines,IsQuickEntry,IsDefaultFocus,IsAdvancedField) VALUES (205139,'Flat/Office','Address Line 5 for the location','The Address 5 provides additional address information for an entity. It can be used for building location, apartment number or similar information.',200111,213143,'Y',22,160,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2017-07-24 20:29:51','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-07-24 20:29:51','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','274fb6ef-ff02-4d8f-aabd-06f2c0165640','Y',70,1,2,1,'N','N','N')
;
-- 24.07.2017 20:30:52 MSK
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,SortNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan,NumLines,IsQuickEntry,IsDefaultFocus,IsAdvancedField) VALUES (205140,'Comments','Comments or additional information','The Comments field allows for free form entry of additional information.',200111,213144,'Y',0,170,0,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2017-07-24 20:30:51','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-07-24 20:30:51','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','9dd4eef9-4dac-4d13-9862-390ca03ea8e0','Y',160,1,1,1,'N','N','N')
;
-- 24.07.2017 20:32:17 MSK
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-24 20:32:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205139
;
-- 24.07.2017 20:32:17 MSK
UPDATE AD_Field SET SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-24 20:32:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202460
;
-- 24.07.2017 20:32:17 MSK
UPDATE AD_Field SET SeqNo=110, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-24 20:32:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202459
;
-- 24.07.2017 20:32:18 MSK
UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-24 20:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202468
;
-- 24.07.2017 20:32:18 MSK
UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-24 20:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202464
;
-- 24.07.2017 20:32:18 MSK
UPDATE AD_Field SET SeqNo=140, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-24 20:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202463
;
-- 24.07.2017 20:32:18 MSK
UPDATE AD_Field SET SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-24 20:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202465
;
-- 24.07.2017 20:32:18 MSK
UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-24 20:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202462
;
-- 24.07.2017 20:32:18 MSK
UPDATE AD_Field SET SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, ColumnSpan=5, NumLines=3, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2017-07-24 20:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205140
;
SELECT register_migration_script('201708020731_IDEMPIERE-2353.sql') FROM dual
;

4
org.adempiere.base/src/com/akunagroup/uk/postcode/AddressInterface.java
View File

@ -43,6 +43,10 @@ public interface AddressInterface
public void setStreet3(String newStreet3); public void setStreet3(String newStreet3);
public String getStreet4(); public String getStreet4();
public void setStreet4(String newStreet4); public void setStreet4(String newStreet4);
public String getStreet5();
public void setStreet5(String newStreet5);
public String getComments();
public void setComments(String newComments);
public String getCity(); public String getCity();
public void setCity(String newCity); public void setCity(String newCity);
public String getRegion(); public String getRegion();

20
org.adempiere.base/src/com/akunagroup/uk/postcode/Postcode.java
View File

@ -34,6 +34,8 @@ public class Postcode implements AddressInterface
private String Street2; private String Street2;
private String Street3; private String Street3;
private String Street4; private String Street4;
private String Street5;
private String Comments;
private String City; private String City;
private String Region; private String Region;
private String Postcode; private String Postcode;
@ -97,6 +99,24 @@ public class Postcode implements AddressInterface
{ {
Street4 = newStreet4; Street4 = newStreet4;
} }
public String getStreet5()
{
return Street5;
}
public void setStreet5(String newStreet5)
{
Street4 = newStreet5;
}
public String getComments()
{
return Comments;
}
public void setComments(String newComments)
{
Street4 = newComments;
}
public String getCity() public String getCity()
{ {

26
org.adempiere.base/src/org/compiere/model/I_C_AddressTransaction.java
View File

@ -101,6 +101,19 @@ public interface I_C_AddressTransaction
*/ */
public String getAddress4(); public String getAddress4();
/** Column name Address5 */
public static final String COLUMNNAME_Address5 = "Address5";
/** Set Address 5.
* Address Line 5 for the location
*/
public void setAddress5 (String Address5);
/** Get Address 5.
* Address Line 5 for the location
*/
public String getAddress5();
/** Column name AD_Org_ID */ /** Column name AD_Org_ID */
public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID"; public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
@ -171,6 +184,19 @@ public interface I_C_AddressTransaction
public I_C_Location getC_Location() throws RuntimeException; public I_C_Location getC_Location() throws RuntimeException;
/** Column name Comments */
public static final String COLUMNNAME_Comments = "Comments";
/** Set Comments.
* Comments or additional information
*/
public void setComments (String Comments);
/** Get Comments.
* Comments or additional information
*/
public String getComments();
/** Column name Country */ /** Column name Country */
public static final String COLUMNNAME_Country = "Country"; public static final String COLUMNNAME_Country = "Country";

26
org.adempiere.base/src/org/compiere/model/I_C_Location.java
View File

@ -101,6 +101,19 @@ public interface I_C_Location
*/ */
public String getAddress4(); public String getAddress4();
/** Column name Address5 */
public static final String COLUMNNAME_Address5 = "Address5";
/** Set Address 5.
* Address Line 5 for the location
*/
public void setAddress5 (String Address5);
/** Get Address 5.
* Address Line 5 for the location
*/
public String getAddress5();
/** Column name AD_Org_ID */ /** Column name AD_Org_ID */
public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID"; public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
@ -190,6 +203,19 @@ public interface I_C_Location
/** Get C_Location_UU */ /** Get C_Location_UU */
public String getC_Location_UU(); public String getC_Location_UU();
/** Column name Comments */
public static final String COLUMNNAME_Comments = "Comments";
/** Set Comments.
* Comments or additional information
*/
public void setComments (String Comments);
/** Get Comments.
* Comments or additional information
*/
public String getComments();
/** Column name Created */ /** Column name Created */
public static final String COLUMNNAME_Created = "Created"; public static final String COLUMNNAME_Created = "Created";

11
org.adempiere.base/src/org/compiere/model/MLocation.java
View File

@ -538,6 +538,8 @@ public class MLocation extends X_C_Location implements Comparator<Object>
{ {
// City, Region, Postal // City, Region, Postal
retStr.append(", ").append(parseCRP (getCountry())); retStr.append(", ").append(parseCRP (getCountry()));
if (getAddress5() != null && getAddress5().length() > 0)
retStr.append(", ").append(getAddress5());
if (getAddress4() != null && getAddress4().length() > 0) if (getAddress4() != null && getAddress4().length() > 0)
retStr.append(", ").append(getAddress4()); retStr.append(", ").append(getAddress4());
if (getAddress3() != null && getAddress3().length() > 0) if (getAddress3() != null && getAddress3().length() > 0)
@ -557,6 +559,8 @@ public class MLocation extends X_C_Location implements Comparator<Object>
retStr.append(", ").append(getAddress3()); retStr.append(", ").append(getAddress3());
if (getAddress4() != null && getAddress4().length() > 0) if (getAddress4() != null && getAddress4().length() > 0)
retStr.append(", ").append(getAddress4()); retStr.append(", ").append(getAddress4());
if (getAddress5() != null && getAddress5().length() > 0)
retStr.append(", ").append(getAddress5());
// City, Region, Postal // City, Region, Postal
retStr.append(", ").append(parseCRP (getCountry())); retStr.append(", ").append(parseCRP (getCountry()));
// Add Country would come here // Add Country would come here
@ -575,6 +579,8 @@ public class MLocation extends X_C_Location implements Comparator<Object>
{ {
// City, Region, Postal // City, Region, Postal
retStr.append(parseCRP (getCountry())); retStr.append(parseCRP (getCountry()));
if (getAddress5() != null && getAddress5().length() > 0)
retStr.append("\n").append(getAddress5());
if (getAddress4() != null && getAddress4().length() > 0) if (getAddress4() != null && getAddress4().length() > 0)
retStr.append("\n").append(getAddress4()); retStr.append("\n").append(getAddress4());
if (getAddress3() != null && getAddress3().length() > 0) if (getAddress3() != null && getAddress3().length() > 0)
@ -594,6 +600,8 @@ public class MLocation extends X_C_Location implements Comparator<Object>
retStr.append("\n").append(getAddress3()); retStr.append("\n").append(getAddress3());
if (getAddress4() != null && getAddress4().length() > 0) if (getAddress4() != null && getAddress4().length() > 0)
retStr.append("\n").append(getAddress4()); retStr.append("\n").append(getAddress4());
if (getAddress5() != null && getAddress5().length() > 0)
retStr.append("\n").append(getAddress5());
// City, Region, Postal // City, Region, Postal
retStr.append("\n").append(parseCRP (getCountry())); retStr.append("\n").append(parseCRP (getCountry()));
// Add Country would come here // Add Country would come here
@ -731,6 +739,7 @@ public class MLocation extends X_C_Location implements Comparator<Object>
StringBuilder address = new StringBuilder(); StringBuilder address = new StringBuilder();
address.append((getAddress1() != null ? getAddress1() + ", " : "")); address.append((getAddress1() != null ? getAddress1() + ", " : ""));
address.append((getAddress2() != null ? getAddress2() + ", " : "")); address.append((getAddress2() != null ? getAddress2() + ", " : ""));
address.append((getAddress3() != null ? getAddress3() + ", " : ""));
address.append((getCity() != null ? getCity() + ", " : "")); address.append((getCity() != null ? getCity() + ", " : ""));
address.append((region.getName() != null ? region.getName() + ", " : "")); address.append((region.getName() != null ? region.getName() + ", " : ""));
address.append((getCountryName() != null ? getCountryName() : "")); address.append((getCountryName() != null ? getCountryName() : ""));
@ -826,6 +835,8 @@ public class MLocation extends X_C_Location implements Comparator<Object>
at.setAddress2(location.getAddress2()); at.setAddress2(location.getAddress2());
at.setAddress3(location.getAddress3()); at.setAddress3(location.getAddress3());
at.setAddress4(location.getAddress4()); at.setAddress4(location.getAddress4());
at.setAddress5(location.getAddress5());
at.setComments(location.getComments());
at.setC_AddressValidation_ID(C_AddressValidation_ID); at.setC_AddressValidation_ID(C_AddressValidation_ID);
at.setC_Location_ID(location.getC_Location_ID()); at.setC_Location_ID(location.getC_Location_ID());
at.setCity(location.getCity()); at.setCity(location.getCity());

36
org.adempiere.base/src/org/compiere/model/X_C_AddressTransaction.java
View File

@ -30,7 +30,7 @@ public class X_C_AddressTransaction extends PO implements I_C_AddressTransaction
/** /**
* *
*/ */
private static final long serialVersionUID = 20161030L; private static final long serialVersionUID = 20170908L;
/** Standard Constructor */ /** Standard Constructor */
public X_C_AddressTransaction (Properties ctx, int C_AddressTransaction_ID, String trxName) public X_C_AddressTransaction (Properties ctx, int C_AddressTransaction_ID, String trxName)
@ -143,6 +143,23 @@ public class X_C_AddressTransaction extends PO implements I_C_AddressTransaction
return (String)get_Value(COLUMNNAME_Address4); return (String)get_Value(COLUMNNAME_Address4);
} }
/** Set Address 5.
@param Address5
Address Line 5 for the location
*/
public void setAddress5 (String Address5)
{
set_Value (COLUMNNAME_Address5, Address5);
}
/** Get Address 5.
@return Address Line 5 for the location
*/
public String getAddress5 ()
{
return (String)get_Value(COLUMNNAME_Address5);
}
/** Set Address Transaction. /** Set Address Transaction.
@param C_AddressTransaction_ID Address Transaction */ @param C_AddressTransaction_ID Address Transaction */
public void setC_AddressTransaction_ID (int C_AddressTransaction_ID) public void setC_AddressTransaction_ID (int C_AddressTransaction_ID)
@ -255,6 +272,23 @@ public class X_C_AddressTransaction extends PO implements I_C_AddressTransaction
return ii.intValue(); return ii.intValue();
} }
/** Set Comments.
@param Comments
Comments or additional information
*/
public void setComments (String Comments)
{
set_Value (COLUMNNAME_Comments, Comments);
}
/** Get Comments.
@return Comments or additional information
*/
public String getComments ()
{
return (String)get_Value(COLUMNNAME_Comments);
}
/** Set Country. /** Set Country.
@param Country Country */ @param Country Country */
public void setCountry (String Country) public void setCountry (String Country)

36
org.adempiere.base/src/org/compiere/model/X_C_Location.java
View File

@ -30,7 +30,7 @@ public class X_C_Location extends PO implements I_C_Location, I_Persistent
/** /**
* *
*/ */
private static final long serialVersionUID = 20161030L; private static final long serialVersionUID = 20170908L;
/** Standard Constructor */ /** Standard Constructor */
public X_C_Location (Properties ctx, int C_Location_ID, String trxName) public X_C_Location (Properties ctx, int C_Location_ID, String trxName)
@ -139,6 +139,23 @@ public class X_C_Location extends PO implements I_C_Location, I_Persistent
return (String)get_Value(COLUMNNAME_Address4); return (String)get_Value(COLUMNNAME_Address4);
} }
/** Set Address 5.
@param Address5
Address Line 5 for the location
*/
public void setAddress5 (String Address5)
{
set_Value (COLUMNNAME_Address5, Address5);
}
/** Get Address 5.
@return Address Line 5 for the location
*/
public String getAddress5 ()
{
return (String)get_Value(COLUMNNAME_Address5);
}
public org.compiere.model.I_C_AddressValidation getC_AddressValidation() throws RuntimeException public org.compiere.model.I_C_AddressValidation getC_AddressValidation() throws RuntimeException
{ {
return (org.compiere.model.I_C_AddressValidation)MTable.get(getCtx(), org.compiere.model.I_C_AddressValidation.Table_Name) return (org.compiere.model.I_C_AddressValidation)MTable.get(getCtx(), org.compiere.model.I_C_AddressValidation.Table_Name)
@ -282,6 +299,23 @@ public class X_C_Location extends PO implements I_C_Location, I_Persistent
return (String)get_Value(COLUMNNAME_C_Location_UU); return (String)get_Value(COLUMNNAME_C_Location_UU);
} }
/** Set Comments.
@param Comments
Comments or additional information
*/
public void setComments (String Comments)
{
set_Value (COLUMNNAME_Comments, Comments);
}
/** Get Comments.
@return Comments or additional information
*/
public String getComments ()
{
return (String)get_Value(COLUMNNAME_Comments);
}
public org.compiere.model.I_C_Region getC_Region() throws RuntimeException public org.compiere.model.I_C_Region getC_Region() throws RuntimeException
{ {
return (org.compiere.model.I_C_Region)MTable.get(getCtx(), org.compiere.model.I_C_Region.Table_Name) return (org.compiere.model.I_C_Region)MTable.get(getCtx(), org.compiere.model.I_C_Region.Table_Name)

38
org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocationDialog.java
View File

@ -180,6 +180,8 @@ public class VLocationDialog extends CDialog
private CLabel lAddress2 = new CLabel(Msg.getElement(Env.getCtx(), "Address2")); private CLabel lAddress2 = new CLabel(Msg.getElement(Env.getCtx(), "Address2"));
private CLabel lAddress3 = new CLabel(Msg.getElement(Env.getCtx(), "Address3")); private CLabel lAddress3 = new CLabel(Msg.getElement(Env.getCtx(), "Address3"));
private CLabel lAddress4 = new CLabel(Msg.getElement(Env.getCtx(), "Address4")); private CLabel lAddress4 = new CLabel(Msg.getElement(Env.getCtx(), "Address4"));
private CLabel lAddress5 = new CLabel(Msg.getElement(Env.getCtx(), "Address5"));
private CLabel lComments = new CLabel(Msg.getElement(Env.getCtx(), "Comments"));
private CLabel lCity = new CLabel(Msg.getMsg(Env.getCtx(), "City")); private CLabel lCity = new CLabel(Msg.getMsg(Env.getCtx(), "City"));
private CLabel lCountry = new CLabel(Msg.getMsg(Env.getCtx(), "Country")); private CLabel lCountry = new CLabel(Msg.getMsg(Env.getCtx(), "Country"));
private CLabel lRegion = new CLabel(Msg.getMsg(Env.getCtx(), "Region")); private CLabel lRegion = new CLabel(Msg.getMsg(Env.getCtx(), "Region"));
@ -190,6 +192,8 @@ public class VLocationDialog extends CDialog
private CTextField fAddress2 = new CTextField(20); // length=60 private CTextField fAddress2 = new CTextField(20); // length=60
private CTextField fAddress3 = new CTextField(20); // length=60 private CTextField fAddress3 = new CTextField(20); // length=60
private CTextField fAddress4 = new CTextField(20); // length=60 private CTextField fAddress4 = new CTextField(20); // length=60
private CTextField fAddress5 = new CTextField(20); // length=60
private CTextField fComments = new CTextField(20); // length=2000
private CTextField fCity = new CTextField(20); // length=60 private CTextField fCity = new CTextField(20); // length=60
private CityAutoCompleter fCityAutoCompleter; private CityAutoCompleter fCityAutoCompleter;
private CComboBoxEditable<Object> fCountry; private CComboBoxEditable<Object> fCountry;
@ -208,6 +212,8 @@ public class VLocationDialog extends CDialog
private boolean isAddress2Mandatory = false; private boolean isAddress2Mandatory = false;
private boolean isAddress3Mandatory = false; private boolean isAddress3Mandatory = false;
private boolean isAddress4Mandatory = false; private boolean isAddress4Mandatory = false;
private boolean isAddress5Mandatory = false;
private boolean isCommentsMandatory = false;
private boolean isPostalMandatory = false; private boolean isPostalMandatory = false;
private boolean isPostalAddMandatory = false; private boolean isPostalAddMandatory = false;
@ -337,6 +343,8 @@ public class VLocationDialog extends CDialog
isAddress2Mandatory = false; isAddress2Mandatory = false;
isAddress3Mandatory = false; isAddress3Mandatory = false;
isAddress4Mandatory = false; isAddress4Mandatory = false;
isAddress5Mandatory = false;
isCommentsMandatory = false;
isPostalMandatory = false; isPostalMandatory = false;
isPostalAddMandatory = false; isPostalAddMandatory = false;
StringTokenizer st = new StringTokenizer(ds, "@", false); StringTokenizer st = new StringTokenizer(ds, "@", false);
@ -350,6 +358,9 @@ public class VLocationDialog extends CDialog
if (m_location.getCountry().isPostcodeLookup()) { if (m_location.getCountry().isPostcodeLookup()) {
addLine(line++, lOnline, fOnline); addLine(line++, lOnline, fOnline);
} }
} else if (s.startsWith("Com")) {
addLine(line++, lComments, fComments);
isCommentsMandatory = s.endsWith("!");
} else if (s.startsWith("A1")) { } else if (s.startsWith("A1")) {
addLine(line++, lAddress1, fAddress1); addLine(line++, lAddress1, fAddress1);
isAddress1Mandatory = s.endsWith("!"); isAddress1Mandatory = s.endsWith("!");
@ -362,6 +373,9 @@ public class VLocationDialog extends CDialog
} else if (s.startsWith("A4")) { } else if (s.startsWith("A4")) {
addLine(line++, lAddress4, fAddress4); addLine(line++, lAddress4, fAddress4);
isAddress4Mandatory = s.endsWith("!"); isAddress4Mandatory = s.endsWith("!");
} else if (s.startsWith("A5")) {
addLine(line++, lAddress5, fAddress5);
isAddress5Mandatory = s.endsWith("!");
} else if (s.startsWith("C")) { } else if (s.startsWith("C")) {
addLine(line++, lCity, fCity); addLine(line++, lCity, fCity);
isCityMandatory = s.endsWith("!"); isCityMandatory = s.endsWith("!");
@ -384,6 +398,8 @@ public class VLocationDialog extends CDialog
fAddress2.setText(m_location.getAddress2()); fAddress2.setText(m_location.getAddress2());
fAddress3.setText(m_location.getAddress3()); fAddress3.setText(m_location.getAddress3());
fAddress4.setText(m_location.getAddress4()); fAddress4.setText(m_location.getAddress4());
fAddress5.setText(m_location.getAddress5());
fComments.setText(m_location.getComments());
fCity.setText(m_location.getCity()); fCity.setText(m_location.getCity());
fPostal.setText(m_location.getPostal()); fPostal.setText(m_location.getPostal());
fPostalAdd.setText(m_location.getPostal_Add()); fPostalAdd.setText(m_location.getPostal_Add());
@ -643,6 +659,8 @@ public class VLocationDialog extends CDialog
m_location.setAddress2(fAddress2.getText()); m_location.setAddress2(fAddress2.getText());
m_location.setAddress3(fAddress3.getText()); m_location.setAddress3(fAddress3.getText());
m_location.setAddress4(fAddress4.getText()); m_location.setAddress4(fAddress4.getText());
m_location.setAddress5(fAddress5.getText());
m_location.setComments(fComments.getText());
m_location.setCity(fCity.getText()); m_location.setCity(fCity.getText());
m_location.setC_City_ID(fCityAutoCompleter.getC_City_ID()); m_location.setC_City_ID(fCityAutoCompleter.getC_City_ID());
m_location.setPostal(fPostal.getText()); m_location.setPostal(fPostal.getText());
@ -704,6 +722,12 @@ public class VLocationDialog extends CDialog
if (isAddress4Mandatory && fAddress4.getText().trim().length() == 0) { if (isAddress4Mandatory && fAddress4.getText().trim().length() == 0) {
fields = fields + " " + "@Address4@, "; fields = fields + " " + "@Address4@, ";
} }
if (isAddress5Mandatory && fAddress5.getText().trim().length() == 0) {
fields = fields + " " + "@Address5@, ";
}
if (isCommentsMandatory && fComments.getText().trim().length() == 0) {
fields = fields + " " + "@Comments@, ";
}
if (isCityMandatory && fCity.getText().trim().length() == 0) { if (isCityMandatory && fCity.getText().trim().length() == 0) {
fields = fields + " " + "@C_City_ID@, "; fields = fields + " " + "@C_City_ID@, ";
} }
@ -734,6 +758,8 @@ public class VLocationDialog extends CDialog
m_location.setAddress2(fAddress2.getText()); m_location.setAddress2(fAddress2.getText());
m_location.setAddress3(fAddress3.getText()); m_location.setAddress3(fAddress3.getText());
m_location.setAddress4(fAddress4.getText()); m_location.setAddress4(fAddress4.getText());
m_location.setAddress5(fAddress5.getText());
m_location.setComments(fComments.getText());
m_location.setCity(fCity.getText()); m_location.setCity(fCity.getText());
m_location.setC_City_ID(fCityAutoCompleter.getC_City_ID()); m_location.setC_City_ID(fCityAutoCompleter.getC_City_ID());
m_location.setPostal(fPostal.getText()); m_location.setPostal(fPostal.getText());
@ -863,9 +889,13 @@ public class VLocationDialog extends CDialog
private void fillLocation(HashMap<String, Object> postcodeData, MCountry country) { private void fillLocation(HashMap<String, Object> postcodeData, MCountry country) {
// If it's not empty warn the user. // If it's not empty warn the user.
if (fAddress1 != null || fAddress2 != null if (fAddress1 != null
|| fAddress2 != null
|| fAddress3 != null || fAddress3 != null
|| fAddress4 != null || fCity != null) { || fAddress4 != null
|| fAddress5 != null
|| fComments != null
|| fCity != null) {
String warningMsg = "Existing address information will be overwritten. Proceed?"; String warningMsg = "Existing address information will be overwritten. Proceed?";
String warningTitle = "Warning"; String warningTitle = "Warning";
int response = JOptionPane.showConfirmDialog(null, warningMsg, int response = JOptionPane.showConfirmDialog(null, warningMsg,
@ -902,6 +932,8 @@ public class VLocationDialog extends CDialog
fAddress2.setText(values.getStreet2()); fAddress2.setText(values.getStreet2());
fAddress3.setText(values.getStreet3()); fAddress3.setText(values.getStreet3());
fAddress4.setText(values.getStreet4()); fAddress4.setText(values.getStreet4());
fAddress5.setText(values.getStreet5());
fComments.setText(values.getComments());
fCity.setText(values.getCity()); fCity.setText(values.getCity());
fPostal.setText(values.getPostcode()); fPostal.setText(values.getPostcode());
@ -964,6 +996,8 @@ public class VLocationDialog extends CDialog
String address = ""; String address = "";
address = address + (fAddress1.getText() != null ? fAddress1.getText() + ", " : ""); address = address + (fAddress1.getText() != null ? fAddress1.getText() + ", " : "");
address = address + (fAddress2.getText() != null ? fAddress2.getText() + ", " : ""); address = address + (fAddress2.getText() != null ? fAddress2.getText() + ", " : "");
address = address + (fAddress3.getText() != null ? fAddress3.getText() + ", " : "");
address = address + (fAddress4.getText() != null ? fAddress4.getText() + ", " : "");
address = address + (fCity.getText() != null ? fCity.getText() + ", " : ""); address = address + (fCity.getText() != null ? fCity.getText() + ", " : "");
if (region != null) if (region != null)
address = address + (region.getName() != null ? region.getName() + ", " : ""); address = address + (region.getName() != null ? region.getName() + ", " : "");

52
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
View File

@ -99,6 +99,8 @@ public class WLocationDialog extends Window implements EventListener<Event>
private Label lblAddress2; private Label lblAddress2;
private Label lblAddress3; private Label lblAddress3;
private Label lblAddress4; private Label lblAddress4;
private Label lblAddress5;
private Label lblComments;
private Label lblCity; private Label lblCity;
private Label lblZip; private Label lblZip;
private Label lblRegion; private Label lblRegion;
@ -110,6 +112,8 @@ public class WLocationDialog extends Window implements EventListener<Event>
private Textbox txtAddress2; private Textbox txtAddress2;
private Textbox txtAddress3; private Textbox txtAddress3;
private Textbox txtAddress4; private Textbox txtAddress4;
private Textbox txtAddress5;
private Textbox txtComments;
private WAutoCompleterCity txtCity; private WAutoCompleterCity txtCity;
private Textbox txtPostal; private Textbox txtPostal;
private Textbox txtPostalAdd; private Textbox txtPostalAdd;
@ -132,6 +136,8 @@ public class WLocationDialog extends Window implements EventListener<Event>
private boolean isAddress2Mandatory = false; private boolean isAddress2Mandatory = false;
private boolean isAddress3Mandatory = false; private boolean isAddress3Mandatory = false;
private boolean isAddress4Mandatory = false; private boolean isAddress4Mandatory = false;
private boolean isAddress5Mandatory = false;
private boolean isCommentsMandatory = false;
private boolean isPostalMandatory = false; private boolean isPostalMandatory = false;
private boolean isPostalAddMandatory = false; private boolean isPostalAddMandatory = false;
@ -199,8 +205,8 @@ public class WLocationDialog extends Window implements EventListener<Event>
setRegion(); setRegion();
initLocation(); initLocation();
// //
ZKUpdateUtil.setWidth(this, "350px"); ZKUpdateUtil.setWidth(this, "380px");
ZKUpdateUtil.setHeight(this, "360px"); // required fixed height for ZK to auto adjust the position based on available space ZKUpdateUtil.setHeight(this, "420px"); // required fixed height for ZK to auto adjust the position based on available space
this.setSclass("popup-dialog"); this.setSclass("popup-dialog");
this.setClosable(true); this.setClosable(true);
this.setBorder("normal"); this.setBorder("normal");
@ -218,6 +224,10 @@ public class WLocationDialog extends Window implements EventListener<Event>
lblAddress3.setStyle(LABEL_STYLE); lblAddress3.setStyle(LABEL_STYLE);
lblAddress4 = new Label(Msg.getElement(Env.getCtx(), "Address4")); lblAddress4 = new Label(Msg.getElement(Env.getCtx(), "Address4"));
lblAddress4.setStyle(LABEL_STYLE); lblAddress4.setStyle(LABEL_STYLE);
lblAddress5 = new Label(Msg.getElement(Env.getCtx(), "Address5"));
lblAddress5.setStyle(LABEL_STYLE);
lblComments = new Label(Msg.getElement(Env.getCtx(), "Comments"));
lblComments.setStyle(LABEL_STYLE);
lblCity = new Label(Msg.getMsg(Env.getCtx(), "City")); lblCity = new Label(Msg.getMsg(Env.getCtx(), "City"));
lblCity.setStyle(LABEL_STYLE); lblCity.setStyle(LABEL_STYLE);
lblZip = new Label(Msg.getMsg(Env.getCtx(), "Postal")); lblZip = new Label(Msg.getMsg(Env.getCtx(), "Postal"));
@ -243,6 +253,12 @@ public class WLocationDialog extends Window implements EventListener<Event>
txtAddress4 = new Textbox(); txtAddress4 = new Textbox();
txtAddress4.setCols(20); txtAddress4.setCols(20);
txtAddress4.setMaxlength(MLocation.getFieldLength(MLocation.COLUMNNAME_Address4)); txtAddress4.setMaxlength(MLocation.getFieldLength(MLocation.COLUMNNAME_Address4));
txtAddress5 = new Textbox();
txtAddress5.setCols(20);
txtAddress5.setMaxlength(MLocation.getFieldLength(MLocation.COLUMNNAME_Address5));
txtComments = new Textbox();
txtComments.setCols(20);
txtComments.setMaxlength(MLocation.getFieldLength(MLocation.COLUMNNAME_Comments));
//autocomplete City //autocomplete City
txtCity = new WAutoCompleterCity(m_WindowNo); txtCity = new WAutoCompleterCity(m_WindowNo);
@ -335,6 +351,16 @@ public class WLocationDialog extends Window implements EventListener<Event>
pnlAddress4.appendChild(txtAddress4); pnlAddress4.appendChild(txtAddress4);
ZKUpdateUtil.setHflex(txtAddress4, "1"); ZKUpdateUtil.setHflex(txtAddress4, "1");
Row pnlAddress5 = new Row();
pnlAddress5.appendChild(lblAddress5.rightAlign());
pnlAddress5.appendChild(txtAddress5);
ZKUpdateUtil.setHflex(txtAddress5, "1");
Row pnlComments = new Row();
pnlComments.appendChild(lblComments.rightAlign());
pnlComments.appendChild(txtComments);
ZKUpdateUtil.setHflex(txtComments, "1");
Row pnlCity = new Row(); Row pnlCity = new Row();
pnlCity.appendChild(lblCity.rightAlign()); pnlCity.appendChild(lblCity.rightAlign());
pnlCity.appendChild(txtCity); pnlCity.appendChild(txtCity);
@ -540,6 +566,8 @@ public class WLocationDialog extends Window implements EventListener<Event>
isAddress2Mandatory = false; isAddress2Mandatory = false;
isAddress3Mandatory = false; isAddress3Mandatory = false;
isAddress4Mandatory = false; isAddress4Mandatory = false;
isAddress5Mandatory = false;
isCommentsMandatory = false;
isPostalMandatory = false; isPostalMandatory = false;
isPostalAddMandatory = false; isPostalAddMandatory = false;
StringTokenizer st = new StringTokenizer(ds, "@", false); StringTokenizer st = new StringTokenizer(ds, "@", false);
@ -553,6 +581,9 @@ public class WLocationDialog extends Window implements EventListener<Event>
// if (m_location.getCountry().isPostcodeLookup()) { // if (m_location.getCountry().isPostcodeLookup()) {
// addLine(line++, lOnline, fOnline); // addLine(line++, lOnline, fOnline);
// } // }
} else if (s.startsWith("Com")) {
addComponents((Row)txtComments.getParent());
isCommentsMandatory = s.endsWith("!");
} else if (s.startsWith("A1")) { } else if (s.startsWith("A1")) {
addComponents((Row)txtAddress1.getParent()); addComponents((Row)txtAddress1.getParent());
isAddress1Mandatory = s.endsWith("!"); isAddress1Mandatory = s.endsWith("!");
@ -565,6 +596,9 @@ public class WLocationDialog extends Window implements EventListener<Event>
} else if (s.startsWith("A4")) { } else if (s.startsWith("A4")) {
addComponents((Row)txtAddress4.getParent()); addComponents((Row)txtAddress4.getParent());
isAddress4Mandatory = s.endsWith("!"); isAddress4Mandatory = s.endsWith("!");
} else if (s.startsWith("A5")) {
addComponents((Row)txtAddress5.getParent());
isAddress5Mandatory = s.endsWith("!");
} else if (s.startsWith("C")) { } else if (s.startsWith("C")) {
addComponents((Row)txtCity.getParent()); addComponents((Row)txtCity.getParent());
isCityMandatory = s.endsWith("!"); isCityMandatory = s.endsWith("!");
@ -587,6 +621,8 @@ public class WLocationDialog extends Window implements EventListener<Event>
txtAddress2.setText(m_location.getAddress2()); txtAddress2.setText(m_location.getAddress2());
txtAddress3.setText(m_location.getAddress3()); txtAddress3.setText(m_location.getAddress3());
txtAddress4.setText(m_location.getAddress4()); txtAddress4.setText(m_location.getAddress4());
txtAddress5.setText(m_location.getAddress5());
txtComments.setText(m_location.getComments());
txtCity.setText(m_location.getCity()); txtCity.setText(m_location.getCity());
txtPostal.setText(m_location.getPostal()); txtPostal.setText(m_location.getPostal());
txtPostalAdd.setText(m_location.getPostal_Add()); txtPostalAdd.setText(m_location.getPostal_Add());
@ -770,6 +806,8 @@ public class WLocationDialog extends Window implements EventListener<Event>
m_location.setAddress2(txtAddress2.getValue()); m_location.setAddress2(txtAddress2.getValue());
m_location.setAddress3(txtAddress3.getValue()); m_location.setAddress3(txtAddress3.getValue());
m_location.setAddress4(txtAddress4.getValue()); m_location.setAddress4(txtAddress4.getValue());
m_location.setAddress5(txtAddress5.getValue());
m_location.setComments(txtComments.getValue());
m_location.setC_City_ID(txtCity.getC_City_ID()); m_location.setC_City_ID(txtCity.getC_City_ID());
m_location.setCity(txtCity.getValue()); m_location.setCity(txtCity.getValue());
m_location.setPostal(txtPostal.getValue()); m_location.setPostal(txtPostal.getValue());
@ -890,6 +928,12 @@ public class WLocationDialog extends Window implements EventListener<Event>
if (isAddress4Mandatory && txtAddress4.getText().trim().length() == 0) { if (isAddress4Mandatory && txtAddress4.getText().trim().length() == 0) {
fields = fields + " " + "@Address4@, "; fields = fields + " " + "@Address4@, ";
} }
if (isAddress5Mandatory && txtAddress5.getText().trim().length() == 0) {
fields = fields + " " + "@Address5@, ";
}
if (isCommentsMandatory && txtComments.getText().trim().length() == 0) {
fields = fields + " " + "@Comments@, ";
}
if (isCityMandatory && txtCity.getValue().trim().length() == 0) { if (isCityMandatory && txtCity.getValue().trim().length() == 0) {
fields = fields + " " + "@C_City_ID@, "; fields = fields + " " + "@C_City_ID@, ";
} }
@ -921,6 +965,8 @@ public class WLocationDialog extends Window implements EventListener<Event>
m_location.setAddress2(txtAddress2.getValue()); m_location.setAddress2(txtAddress2.getValue());
m_location.setAddress3(txtAddress3.getValue()); m_location.setAddress3(txtAddress3.getValue());
m_location.setAddress4(txtAddress4.getValue()); m_location.setAddress4(txtAddress4.getValue());
m_location.setAddress5(txtAddress5.getValue());
m_location.setComments(txtComments.getValue());
m_location.setC_City_ID(txtCity.getC_City_ID()); m_location.setC_City_ID(txtCity.getC_City_ID());
m_location.setCity(txtCity.getValue()); m_location.setCity(txtCity.getValue());
m_location.setPostal(txtPostal.getValue()); m_location.setPostal(txtPostal.getValue());
@ -1020,6 +1066,8 @@ public class WLocationDialog extends Window implements EventListener<Event>
String address = ""; String address = "";
address = address + (txtAddress1.getText() != null ? txtAddress1.getText() + ", " : ""); address = address + (txtAddress1.getText() != null ? txtAddress1.getText() + ", " : "");
address = address + (txtAddress2.getText() != null ? txtAddress2.getText() + ", " : ""); address = address + (txtAddress2.getText() != null ? txtAddress2.getText() + ", " : "");
address = address + (txtAddress3.getText() != null ? txtAddress3.getText() + ", " : "");
address = address + (txtAddress4.getText() != null ? txtAddress4.getText() + ", " : "");
address = address + (txtCity.getText() != null ? txtCity.getText() + ", " : ""); address = address + (txtCity.getText() != null ? txtCity.getText() + ", " : "");
if (region != null) if (region != null)
address = address + (region.getName() != null ? region.getName() + ", " : ""); address = address + (region.getName() != null ? region.getName() + ", " : "");