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

IDEMPIERE-1216 Add missing translation tables / fix oracle migration script / peer review java patch from Nicolas Micoud (nmicoud)

This commit is contained in:
Carlos Ruiz 2014-04-02 15:56:21 -05:00
parent eef6dccc23
commit c3effef177
6 changed files with 85 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
migration/i2.0z/oracle/201403212121_IDEMPIERE-1216.sql
View File

@ -94,7 +94,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_GLCategoryTrl', FKConstraintTyp
;
-- Mar 21, 2014 8:24:10 PM CET
CREATE TABLE GL_Category_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, GL_Category_ID NUMBER(10) NOT NULL, GL_Category_Trl_UU VARCHAR2(36) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name VARCHAR2(60) DEFAULT NULL , Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT GL_Category_Trl_Key PRIMARY KEY (AD_Language, GL_Category_ID), CONSTRAINT GL_Category_Trl_UU_idx UNIQUE (GL_Category_Trl_UU))
CREATE TABLE GL_Category_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, GL_Category_ID NUMBER(10) NOT NULL, GL_Category_Trl_UU VARCHAR2(36) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name NVARCHAR2(60) DEFAULT NULL , Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT GL_Category_Trl_Key PRIMARY KEY (AD_Language, GL_Category_ID), CONSTRAINT GL_Category_Trl_UU_idx UNIQUE (GL_Category_Trl_UU))
;
-- Mar 21, 2014 8:24:10 PM CET
@ -1997,7 +1997,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_AAssetGroupTrl', FKConstraintTy
;
-- Mar 21, 2014 9:10:12 PM CET
CREATE TABLE A_Asset_Group_Trl (A_Asset_Group_ID NUMBER(10) NOT NULL, A_Asset_Group_Trl_UU VARCHAR2(36) DEFAULT NULL , AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description VARCHAR2(255) DEFAULT NULL , Help VARCHAR2(2000) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name VARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT A_Asset_Group_Trl_Key PRIMARY KEY (A_Asset_Group_ID, AD_Language), CONSTRAINT A_Asset_Group_Trl_UU_idx UNIQUE (A_Asset_Group_Trl_UU))
CREATE TABLE A_Asset_Group_Trl (A_Asset_Group_ID NUMBER(10) NOT NULL, A_Asset_Group_Trl_UU VARCHAR2(36) DEFAULT NULL , AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description NVARCHAR2(255) DEFAULT NULL , Help NVARCHAR2(2000) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name NVARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT A_Asset_Group_Trl_Key PRIMARY KEY (A_Asset_Group_ID, AD_Language), CONSTRAINT A_Asset_Group_Trl_UU_idx UNIQUE (A_Asset_Group_Trl_UU))
;
-- Mar 21, 2014 9:10:13 PM CET
@ -2049,7 +2049,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_ADBroadcastMessageTr', FKConstr
;
-- Mar 21, 2014 9:10:40 PM CET
CREATE TABLE AD_BroadcastMessage_Trl (AD_BroadcastMessage_ID NUMBER(10) NOT NULL, AD_BroadcastMessage_Trl_UU VARCHAR2(36) DEFAULT NULL , AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, BroadcastMessage VARCHAR2(2000) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT AD_BroadcastMessage_Trl_Key PRIMARY KEY (AD_BroadcastMessage_ID, AD_Language), CONSTRAINT AD_BroadcastMessage_Trl_UU_idx UNIQUE (AD_BroadcastMessage_Trl_UU))
CREATE TABLE AD_BroadcastMessage_Trl (AD_BroadcastMessage_ID NUMBER(10) NOT NULL, AD_BroadcastMessage_Trl_UU VARCHAR2(36) DEFAULT NULL , AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, BroadcastMessage NVARCHAR2(2000) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT AD_BroadcastMessage_Trl_Key PRIMARY KEY (AD_BroadcastMessage_ID, AD_Language), CONSTRAINT AD_BroadcastMessage_Trl_UU_idx UNIQUE (AD_BroadcastMessage_Trl_UU))
;
-- Mar 21, 2014 9:10:40 PM CET
@ -2101,7 +2101,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_ADChartTrl', FKConstraintType='
;
-- Mar 21, 2014 9:10:54 PM CET
CREATE TABLE AD_Chart_Trl (AD_Chart_ID NUMBER(10) NOT NULL, AD_Chart_Trl_UU VARCHAR2(36) DEFAULT NULL , AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description VARCHAR2(255) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name VARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT AD_Chart_Trl_Key PRIMARY KEY (AD_Chart_ID, AD_Language), CONSTRAINT AD_Chart_Trl_UU_idx UNIQUE (AD_Chart_Trl_UU))
CREATE TABLE AD_Chart_Trl (AD_Chart_ID NUMBER(10) NOT NULL, AD_Chart_Trl_UU VARCHAR2(36) DEFAULT NULL , AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description NVARCHAR2(255) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name NVARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT AD_Chart_Trl_Key PRIMARY KEY (AD_Chart_ID, AD_Language), CONSTRAINT AD_Chart_Trl_UU_idx UNIQUE (AD_Chart_Trl_UU))
;
-- Mar 21, 2014 9:10:55 PM CET
@ -2153,7 +2153,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_ADColorTrl', FKConstraintType='
;
-- Mar 21, 2014 9:11:15 PM CET
CREATE TABLE AD_Color_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Color_ID NUMBER(10) NOT NULL, AD_Color_Trl_UU VARCHAR2(36) DEFAULT NULL , AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name VARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT AD_Color_Trl_Key PRIMARY KEY (AD_Color_ID, AD_Language), CONSTRAINT AD_Color_Trl_UU_idx UNIQUE (AD_Color_Trl_UU))
CREATE TABLE AD_Color_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Color_ID NUMBER(10) NOT NULL, AD_Color_Trl_UU VARCHAR2(36) DEFAULT NULL , AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name NVARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT AD_Color_Trl_Key PRIMARY KEY (AD_Color_ID, AD_Language), CONSTRAINT AD_Color_Trl_UU_idx UNIQUE (AD_Color_Trl_UU))
;
-- Mar 21, 2014 9:11:15 PM CET
@ -2205,7 +2205,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_ADPrintColorTrl', FKConstraintT
;
-- Mar 21, 2014 9:11:30 PM CET
CREATE TABLE AD_PrintColor_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, AD_PrintColor_ID NUMBER(10) NOT NULL, AD_PrintColor_Trl_UU VARCHAR2(36) DEFAULT NULL , Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name VARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT AD_PrintColor_Trl_Key PRIMARY KEY (AD_Language, AD_PrintColor_ID), CONSTRAINT AD_PrintColor_Trl_UU_idx UNIQUE (AD_PrintColor_Trl_UU))
CREATE TABLE AD_PrintColor_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, AD_PrintColor_ID NUMBER(10) NOT NULL, AD_PrintColor_Trl_UU VARCHAR2(36) DEFAULT NULL , Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name NVARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT AD_PrintColor_Trl_Key PRIMARY KEY (AD_Language, AD_PrintColor_ID), CONSTRAINT AD_PrintColor_Trl_UU_idx UNIQUE (AD_PrintColor_Trl_UU))
;
-- Mar 21, 2014 9:11:30 PM CET
@ -2257,7 +2257,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_CActivityTrl', FKConstraintType
;
-- Mar 21, 2014 9:11:44 PM CET
CREATE TABLE C_Activity_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, C_Activity_ID NUMBER(10) NOT NULL, C_Activity_Trl_UU VARCHAR2(36) DEFAULT NULL , Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description VARCHAR2(255) DEFAULT NULL , Help VARCHAR2(2000) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name VARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT C_Activity_Trl_Key PRIMARY KEY (AD_Language, C_Activity_ID), CONSTRAINT C_Activity_Trl_UU_idx UNIQUE (C_Activity_Trl_UU))
CREATE TABLE C_Activity_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, C_Activity_ID NUMBER(10) NOT NULL, C_Activity_Trl_UU VARCHAR2(36) DEFAULT NULL , Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description NVARCHAR2(255) DEFAULT NULL , Help NVARCHAR2(2000) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name NVARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT C_Activity_Trl_Key PRIMARY KEY (AD_Language, C_Activity_ID), CONSTRAINT C_Activity_Trl_UU_idx UNIQUE (C_Activity_Trl_UU))
;
-- Mar 21, 2014 9:11:44 PM CET
@ -2309,7 +2309,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_CCampaignTrl', FKConstraintType
;
-- Mar 21, 2014 9:11:57 PM CET
CREATE TABLE C_Campaign_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, C_Campaign_ID NUMBER(10) NOT NULL, C_Campaign_Trl_UU VARCHAR2(36) DEFAULT NULL , Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description VARCHAR2(255) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name VARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT C_Campaign_Trl_Key PRIMARY KEY (AD_Language, C_Campaign_ID), CONSTRAINT C_Campaign_Trl_UU_idx UNIQUE (C_Campaign_Trl_UU))
CREATE TABLE C_Campaign_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, C_Campaign_ID NUMBER(10) NOT NULL, C_Campaign_Trl_UU VARCHAR2(36) DEFAULT NULL , Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description NVARCHAR2(255) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name NVARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT C_Campaign_Trl_Key PRIMARY KEY (AD_Language, C_Campaign_ID), CONSTRAINT C_Campaign_Trl_UU_idx UNIQUE (C_Campaign_Trl_UU))
;
-- Mar 21, 2014 9:11:57 PM CET
@ -2361,7 +2361,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_CRegionTrl', FKConstraintType='
;
-- Mar 21, 2014 9:12:08 PM CET
CREATE TABLE C_Region_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, C_Region_ID NUMBER(10) NOT NULL, C_Region_Trl_UU VARCHAR2(36) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name VARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT C_Region_Trl_Key PRIMARY KEY (AD_Language, C_Region_ID), CONSTRAINT C_Region_Trl_UU_idx UNIQUE (C_Region_Trl_UU))
CREATE TABLE C_Region_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, C_Region_ID NUMBER(10) NOT NULL, C_Region_Trl_UU VARCHAR2(36) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name NVARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT C_Region_Trl_Key PRIMARY KEY (AD_Language, C_Region_ID), CONSTRAINT C_Region_Trl_UU_idx UNIQUE (C_Region_Trl_UU))
;
-- Mar 21, 2014 9:12:08 PM CET
@ -2413,7 +2413,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_CSalesRegionTrl', FKConstraintT
;
-- Mar 21, 2014 9:12:18 PM CET
CREATE TABLE C_SalesRegion_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, C_SalesRegion_ID NUMBER(10) NOT NULL, C_SalesRegion_Trl_UU VARCHAR2(36) DEFAULT NULL , Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description VARCHAR2(255) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name VARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT C_SalesRegion_Trl_Key PRIMARY KEY (AD_Language, C_SalesRegion_ID), CONSTRAINT C_SalesRegion_Trl_UU_idx UNIQUE (C_SalesRegion_Trl_UU))
CREATE TABLE C_SalesRegion_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, C_SalesRegion_ID NUMBER(10) NOT NULL, C_SalesRegion_Trl_UU VARCHAR2(36) DEFAULT NULL , Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description NVARCHAR2(255) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name NVARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT C_SalesRegion_Trl_Key PRIMARY KEY (AD_Language, C_SalesRegion_ID), CONSTRAINT C_SalesRegion_Trl_UU_idx UNIQUE (C_SalesRegion_Trl_UU))
;
-- Mar 21, 2014 9:12:18 PM CET
@ -2465,7 +2465,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_MPriceListTrl', FKConstraintTyp
;
-- Mar 21, 2014 9:12:35 PM CET
CREATE TABLE M_PriceList_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description VARCHAR2(255) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, M_PriceList_ID NUMBER(10) NOT NULL, M_PriceList_Trl_UU VARCHAR2(36) DEFAULT NULL , Name VARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT M_PriceList_Trl_Key PRIMARY KEY (AD_Language, M_PriceList_ID), CONSTRAINT M_PriceList_Trl_UU_idx UNIQUE (M_PriceList_Trl_UU))
CREATE TABLE M_PriceList_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description NVARCHAR2(255) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, M_PriceList_ID NUMBER(10) NOT NULL, M_PriceList_Trl_UU VARCHAR2(36) DEFAULT NULL , Name NVARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT M_PriceList_Trl_Key PRIMARY KEY (AD_Language, M_PriceList_ID), CONSTRAINT M_PriceList_Trl_UU_idx UNIQUE (M_PriceList_Trl_UU))
;
-- Mar 21, 2014 9:12:35 PM CET
@ -2517,7 +2517,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_MProductCategoryTrl', FKConstra
;
-- Mar 21, 2014 9:12:48 PM CET
CREATE TABLE M_Product_Category_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description VARCHAR2(255) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, M_Product_Category_ID NUMBER(10) NOT NULL, M_Product_Category_Trl_UU VARCHAR2(36) DEFAULT NULL , Name VARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT M_Product_Category_Trl_Key PRIMARY KEY (AD_Language, M_Product_Category_ID), CONSTRAINT M_Product_Category_Trl_UU_idx UNIQUE (M_Product_Category_Trl_UU))
CREATE TABLE M_Product_Category_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, Description NVARCHAR2(255) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, M_Product_Category_ID NUMBER(10) NOT NULL, M_Product_Category_Trl_UU VARCHAR2(36) DEFAULT NULL , Name NVARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT M_Product_Category_Trl_Key PRIMARY KEY (AD_Language, M_Product_Category_ID), CONSTRAINT M_Product_Category_Trl_UU_idx UNIQUE (M_Product_Category_Trl_UU))
;
-- Mar 21, 2014 9:12:48 PM CET
@ -2569,7 +2569,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_MPriceListVersionTrl', FKConstr
;
-- Mar 21, 2014 9:12:58 PM CET
CREATE TABLE M_PriceList_Version_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, M_PriceList_Version_ID NUMBER(10) NOT NULL, M_PriceList_Version_Trl_UU VARCHAR2(36) DEFAULT NULL , Name VARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT M_PriceList_Version_Trl_Key PRIMARY KEY (AD_Language, M_PriceList_Version_ID), CONSTRAINT M_PriceList_Version_Trl_UU_idx UNIQUE (M_PriceList_Version_Trl_UU))
CREATE TABLE M_PriceList_Version_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, M_PriceList_Version_ID NUMBER(10) NOT NULL, M_PriceList_Version_Trl_UU VARCHAR2(36) DEFAULT NULL , Name NVARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT M_PriceList_Version_Trl_Key PRIMARY KEY (AD_Language, M_PriceList_Version_ID), CONSTRAINT M_PriceList_Version_Trl_UU_idx UNIQUE (M_PriceList_Version_Trl_UU))
;
-- Mar 21, 2014 9:12:58 PM CET
@ -2610,7 +2610,7 @@ INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_O
;
-- Mar 22, 2014 1:29:23 PM CET
ALTER TABLE AD_Chart_Trl ADD DomainLabel VARCHAR2(60) DEFAULT NULL
ALTER TABLE AD_Chart_Trl ADD DomainLabel NVARCHAR2(60) DEFAULT NULL
;
-- Mar 22, 2014 1:29:37 PM CET
@ -2618,7 +2618,7 @@ INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Column_UU,AD_Element_ID,AD_O
;
-- Mar 22, 2014 1:29:39 PM CET
ALTER TABLE AD_Chart_Trl ADD RangeLabel VARCHAR2(60) DEFAULT NULL
ALTER TABLE AD_Chart_Trl ADD RangeLabel NVARCHAR2(60) DEFAULT NULL
;
-- Mar 22, 2014 1:30:05 PM CET
@ -2773,7 +2773,7 @@ UPDATE AD_Column SET FKConstraintName='UpdatedBy_CSalesStageTrl', FKConstraintTy
;
-- Mar 24, 2014 9:03:40 AM CET
CREATE TABLE C_SalesStage_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, C_SalesStage_ID NUMBER(10) NOT NULL, C_SalesStage_Trl_UU VARCHAR2(36) DEFAULT NULL , Description VARCHAR2(255) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name VARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT C_SalesStage_Trl_Key PRIMARY KEY (AD_Language, C_SalesStage_ID), CONSTRAINT C_SalesStage_Trl_UU_idx UNIQUE (C_SalesStage_Trl_UU))
CREATE TABLE C_SalesStage_Trl (AD_Client_ID NUMBER(10) NOT NULL, AD_Language VARCHAR2(6) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, C_SalesStage_ID NUMBER(10) NOT NULL, C_SalesStage_Trl_UU VARCHAR2(36) DEFAULT NULL , Description NVARCHAR2(255) DEFAULT NULL , IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL, IsTranslated CHAR(1) DEFAULT 'N' CHECK (IsTranslated IN ('Y','N')) NOT NULL, Name NVARCHAR2(60) NOT NULL, Updated DATE NOT NULL, UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT C_SalesStage_Trl_Key PRIMARY KEY (AD_Language, C_SalesStage_ID), CONSTRAINT C_SalesStage_Trl_UU_idx UNIQUE (C_SalesStage_Trl_UU))
;
-- Mar 24, 2014 9:03:41 AM CET

72
org.adempiere.base/src/org/adempiere/apps/graph/ChartBuilder.java
View File

@ -397,10 +397,10 @@ public class ChartBuilder {
private JFreeChart createXYBarChart() {
JFreeChart chart = ChartFactory.createXYBarChart(
chartModel.getName(), // chart title
chartModel.getDomainLabel(), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
true,
chartModel.getRangeLabel(), // range axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
getXYDataset(), // data
X_AD_Chart.CHARTORIENTATION_Horizontal.equals(chartModel.getChartOrientation())
? PlotOrientation.HORIZONTAL : PlotOrientation.VERTICAL, // orientation
@ -415,9 +415,9 @@ public class ChartBuilder {
private JFreeChart createTimeSeriesChart() {
JFreeChart chart = ChartFactory.createTimeSeriesChart(
chartModel.getName(), // chart title
chartModel.getDomainLabel(), // domain axis label
chartModel.getRangeLabel(), // range axis label
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
getXYDataset(), // data
chartModel.isDisplayLegend(), // include legend
true, // tooltips?
@ -430,9 +430,9 @@ public class ChartBuilder {
private JFreeChart createWaterfallChart() {
JFreeChart chart = ChartFactory.createWaterfallChart(
chartModel.getName(), // chart title
chartModel.getDomainLabel(), // domain axis label
chartModel.getRangeLabel(), // range axis label
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
getCategoryDataset(), // data
X_AD_Chart.CHARTORIENTATION_Horizontal.equals(chartModel.getChartOrientation())
? PlotOrientation.HORIZONTAL : PlotOrientation.VERTICAL, // orientation
@ -446,21 +446,21 @@ public class ChartBuilder {
}
private JFreeChart createRingChart() {
final JFreeChart chart = ChartFactory.createRingChart(chartModel.getName(),
final JFreeChart chart = ChartFactory.createRingChart(chartModel.get_Translation(MChart.COLUMNNAME_Name),
getPieDataset(), chartModel.isDisplayLegend(), true, true);
return chart;
}
private JFreeChart createPieChart() {
final JFreeChart chart = ChartFactory.createPieChart(chartModel.getName(),
final JFreeChart chart = ChartFactory.createPieChart(chartModel.get_Translation(MChart.COLUMNNAME_Name),
getPieDataset(), false, true, true);
return chart;
}
private JFreeChart create3DPieChart() {
final JFreeChart chart = ChartFactory.createPieChart3D(chartModel.getName(),
final JFreeChart chart = ChartFactory.createPieChart3D(chartModel.get_Translation(MChart.COLUMNNAME_Name),
getPieDataset(), false, true, true);
return chart;
@ -468,9 +468,9 @@ public class ChartBuilder {
private JFreeChart createBarChart() {
JFreeChart chart = ChartFactory.createBarChart(
chartModel.getName(), // chart title
chartModel.getDomainLabel(), // domain axis label
chartModel.getRangeLabel(), // range axis label
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
getCategoryDataset(), // data
X_AD_Chart.CHARTORIENTATION_Horizontal.equals(chartModel.getChartOrientation())
? PlotOrientation.HORIZONTAL : PlotOrientation.VERTICAL, // orientation
@ -491,9 +491,9 @@ public class ChartBuilder {
private JFreeChart create3DBarChart() {
JFreeChart chart = ChartFactory.createBarChart3D(
chartModel.getName(), // chart title
chartModel.getDomainLabel(), // domain axis label
chartModel.getRangeLabel(), // range axis label
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
getCategoryDataset(), // data
X_AD_Chart.CHARTORIENTATION_Horizontal.equals(chartModel.getChartOrientation())
? PlotOrientation.HORIZONTAL : PlotOrientation.VERTICAL, // orientation
@ -508,9 +508,9 @@ public class ChartBuilder {
private JFreeChart createStackedBarChart() {
JFreeChart chart = ChartFactory.createStackedBarChart(
chartModel.getName(), // chart title
chartModel.getDomainLabel(), // domain axis label
chartModel.getRangeLabel(), // range axis label
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
getCategoryDataset(), // data
X_AD_Chart.CHARTORIENTATION_Horizontal.equals(chartModel.getChartOrientation())
? PlotOrientation.HORIZONTAL : PlotOrientation.VERTICAL, // orientation
@ -532,9 +532,9 @@ public class ChartBuilder {
private JFreeChart create3DStackedBarChart() {
JFreeChart chart = ChartFactory.createStackedBarChart3D(
chartModel.getName(), // chart title
chartModel.getDomainLabel(), // domain axis label
chartModel.getRangeLabel(), // range axis label
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
getCategoryDataset(), // data
X_AD_Chart.CHARTORIENTATION_Horizontal.equals(chartModel.getChartOrientation())
? PlotOrientation.HORIZONTAL : PlotOrientation.VERTICAL, // orientation
@ -550,9 +550,9 @@ public class ChartBuilder {
private JFreeChart createAreaChart() {
// create the chart...
JFreeChart chart = ChartFactory.createAreaChart(
chartModel.getName(), // chart title
chartModel.getDomainLabel(), // domain axis label
chartModel.getRangeLabel(), // range axis label
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
getCategoryDataset(), // data
X_AD_Chart.CHARTORIENTATION_Horizontal.equals(chartModel.getChartOrientation())
? PlotOrientation.HORIZONTAL : PlotOrientation.VERTICAL, // orientation
@ -568,9 +568,9 @@ public class ChartBuilder {
private JFreeChart createStackedAreaChart() {
// create the chart...
JFreeChart chart = ChartFactory.createStackedAreaChart(
chartModel.getName(), // chart title
chartModel.getDomainLabel(), // domain axis label
chartModel.getRangeLabel(), // range axis label
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
getCategoryDataset(), // data
X_AD_Chart.CHARTORIENTATION_Horizontal.equals(chartModel.getChartOrientation())
? PlotOrientation.HORIZONTAL : PlotOrientation.VERTICAL, // orientation
@ -586,9 +586,9 @@ public class ChartBuilder {
private JFreeChart createLineChart() {
// create the chart...
JFreeChart chart = ChartFactory.createLineChart(
chartModel.getName(), // chart title
chartModel.getDomainLabel(), // domain axis label
chartModel.getRangeLabel(), // range axis label
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
getCategoryDataset(), // data
X_AD_Chart.CHARTORIENTATION_Horizontal.equals(chartModel.getChartOrientation())
? PlotOrientation.HORIZONTAL : PlotOrientation.VERTICAL, // orientation
@ -605,9 +605,9 @@ public class ChartBuilder {
private JFreeChart create3DLineChart() {
// create the chart...
JFreeChart chart = ChartFactory.createLineChart3D(
chartModel.getName(), // chart title
chartModel.getDomainLabel(), // domain axis label
chartModel.getRangeLabel(), // range axis label
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
getCategoryDataset(), // data
X_AD_Chart.CHARTORIENTATION_Horizontal.equals(chartModel.getChartOrientation())
? PlotOrientation.HORIZONTAL : PlotOrientation.VERTICAL, // orientation

38
org.adempiere.base/src/org/compiere/model/PO.java
View File

@ -51,6 +51,7 @@ import org.adempiere.exceptions.DBException;
import org.adempiere.process.UUIDGenerator;
import org.compiere.Adempiere;
import org.compiere.acct.Doc;
import org.compiere.util.CCache;
import org.compiere.util.CLogMgt;
import org.compiere.util.CLogger;
import org.compiere.util.CacheMgt;
@ -1876,6 +1877,9 @@ public abstract class PO
set_ValueNoCheck ("UpdatedBy", new Integer(AD_User_ID));
} // setAD_User_ID
/** Cache */
private static CCache<String,String> trl_cache = new CCache<String,String>("po_trl", 5);
/**
* Get Translation of column (if needed).
* It checks if the base language is used or the column is not translated.
@ -1899,20 +1903,27 @@ public abstract class PO
+ ", ID=" + m_IDs[0]);
}
String key = get_TableName() + "." + columnName + "|" + get_ID() + "|" + AD_Language;
String retValue = null;
//
// Check if NOT base language and column is translated => load trl from db
if (!Env.isBaseLanguage(AD_Language, get_TableName())
&& p_info.isColumnTranslated(p_info.getColumnIndex(columnName))
)
{
// Load translation from database
int ID = ((Integer)m_IDs[0]).intValue();
StringBuilder sql = new StringBuilder("SELECT ").append(columnName)
.append(" FROM ").append(p_info.getTableName()).append("_Trl WHERE ")
.append(m_KeyColumns[0]).append("=?")
.append(" AND AD_Language=?");
retValue = DB.getSQLValueString(get_TrxName(), sql.toString(), ID, AD_Language);
if (trl_cache.containsKey(key)) {
retValue = trl_cache.get(key);
return retValue;
} else {
//
// Check if NOT base language and column is translated => load trl from db
if (!Env.isBaseLanguage(AD_Language, get_TableName())
&& p_info.isColumnTranslated(p_info.getColumnIndex(columnName))
)
{
// Load translation from database
int ID = ((Integer)m_IDs[0]).intValue();
StringBuilder sql = new StringBuilder("SELECT ").append(columnName)
.append(" FROM ").append(p_info.getTableName()).append("_Trl WHERE ")
.append(m_KeyColumns[0]).append("=?")
.append(" AND AD_Language=?");
retValue = DB.getSQLValueString(get_TrxName(), sql.toString(), ID, AD_Language);
}
}
//
// If no translation found or not translated, fallback to original:
@ -1920,6 +1931,7 @@ public abstract class PO
Object val = get_Value(columnName);
retValue = (val != null ? val.toString() : null);
}
trl_cache.put(key, retValue);
//
return retValue;
} // get_Translation

6
org.adempiere.ui.swing/src/org/compiere/grid/ed/VChart.java
View File

@ -28,11 +28,11 @@ import org.jfree.data.time.TimeSeriesCollection;
import org.jfree.data.time.TimeSeriesDataItem;
public class VChart extends CPanel implements ChartMouseListener, VEditor {
/**
*
*/
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 4089566607789995074L;
ChartPanel chartPanel;
MChart chartModel;
private ChartBuilder chartBuilder;
@ -80,7 +80,7 @@ public class VChart extends CPanel implements ChartMouseListener, VEditor {
public void dispose() {}
@Override
public String getName() {return chartModel.getName();}
public String getName() {return chartModel.get_Translation(MChart.COLUMNNAME_Name);}
@Override
public void removeVetoableChangeListener(VetoableChangeListener listener) {}

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChartEditor.java
View File

@ -83,7 +83,7 @@ public class WChartEditor extends WEditor
@Override
public String getDisplay()
{
return chartModel.getName();
return chartModel.get_Translation(MChart.COLUMNNAME_Name);
}
@Override

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java
View File

@ -52,11 +52,11 @@ import org.zkoss.zul.South;
*
*/
public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup,EventListener<Event>{
/**
*
*/
private static final long serialVersionUID = 5990080817061314383L;
private static final long serialVersionUID = 1849434312706721390L;
private static CLogger log = CLogger.getCLogger(BroadcastMessageWindow.class);
public static final int PRESSED_PREV = 1;
public static final int PRESSED_NEXT = 2;
@ -112,7 +112,7 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
Div htmlDiv = new Div();
//textMsgContent = new Label();
htmlDiv.appendChild(textMsgContent);
textMsgContent.setContent(mbMessages.get(0).getBroadcastMessage());
textMsgContent.setContent(mbMessages.get(0).get_Translation(MBroadcastMessage.COLUMNNAME_BroadcastMessage));
htmlDiv.setFocus(true);
htmlDiv.setStyle("display: table-cell; vertical-align: middle; text-align: center;");
Div divAlign = new Div();
@ -292,7 +292,7 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
}
textMsgNo.setValue((currMsg+1)+"/"+noOfMsgs);
textMsgContent.setContent(mbMessage.getBroadcastMessage());
textMsgContent.setContent(mbMessage.get_Translation(MBroadcastMessage.COLUMNNAME_BroadcastMessage));
if (!isTest && mbMessage.isLogAcknowledge()) {
boolean ack = hashMessages.get(mbMessage.get_ID());