Merged release-1.0c into development
This commit is contained in:
Heng Sin Low
commit
9c228f13c4
|
|
@ -0,0 +1,46 @@
|
|||
SET SQLBLANKLINES ON
|
||||
SET DEFINE OFF
|
||||
|
||||
-- Sep 11, 2013 9:47:04 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Table_ID,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,AD_Element_ID,IsSecure) VALUES (0,'N',0,53295,210868,'N','N','N',0,'N',0,'N',36,'N','N','Y','6ec9f091-1c67-4b1e-8117-10f120939584','Y','HTML','HTML','Y',TO_DATE('2013-09-11 09:46:55','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2013-09-11 09:46:55','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N',51005,'N')
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:47:07 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
ALTER TABLE PA_DashboardContent_Trl ADD HTML CLOB DEFAULT NULL
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:47:22 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
UPDATE AD_Column SET IsTranslated='Y',Updated=TO_DATE('2013-09-11 09:47:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=51012
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:48:56 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,AD_Client_ID,ColumnSpan) VALUES ('N',53372,36,'N','N',60965,90,'Y',202494,'N','D','PA_DashboardContent_Trl_UU','361b6894-aa95-424e-a371-e6123f14e502','N','N',100,0,TO_DATE('2013-09-11 09:48:48','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-09-11 09:48:48','YYYY-MM-DD HH24:MI:SS'),'Y','N',0,2)
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:48:57 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,AD_Client_ID,ColumnSpan,NumLines) VALUES ('N',53372,0,'N','N',210868,100,'Y',202495,'N','D','HTML','ac01ef3e-7eed-49e5-84eb-5b7bdb3d4218','Y','N',100,0,TO_DATE('2013-09-11 09:48:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-09-11 09:48:56','YYYY-MM-DD HH24:MI:SS'),'Y',0,2,5)
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:49:20 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
UPDATE AD_Field SET SeqNo=90, ColumnSpan=5,Updated=TO_DATE('2013-09-11 09:49:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202495
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:49:20 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
UPDATE AD_Field SET SeqNo=0,Updated=TO_DATE('2013-09-11 09:49:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202494
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:49:36 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
UPDATE AD_Field SET SeqNo=20, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-09-11 09:49:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=60879
|
||||
;
|
||||
|
||||
SELECT register_migration_script('201309110955_IDEMPIERE-1348.sql') FROM dual
|
||||
;
|
||||
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
-- Sep 11, 2013 11:30:06 AM COT
|
||||
-- IDEMPIERE-1357 Tree panel not is updated with result of "Find" window
|
||||
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Record is not in current search',200231,'D','6380f694-62e5-4368-96a2-418b006e240a','RecordIsNotInCurrentSearch','Y',TO_DATE('2013-09-11 11:30:05','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-09-11 11:30:05','YYYY-MM-DD HH24:MI:SS'),0)
|
||||
;
|
||||
|
||||
SELECT register_migration_script('201309111130_IDEMPIERE-1357.sql') FROM dual
|
||||
;
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
-- Sep 11, 2013 3:25:16 PM COT
|
||||
-- IDEMPIERE-1273 Invoice Payment Schedule" window isn't suitable
|
||||
UPDATE AD_Tab SET IsInsertRecord='N',Updated=TO_DATE('2013-09-11 15:25:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=501
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 3:25:23 PM COT
|
||||
-- IDEMPIERE-1273 Invoice Payment Schedule" window isn't suitable
|
||||
UPDATE AD_Tab SET IsInsertRecord='N',Updated=TO_DATE('2013-09-11 15:25:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=666
|
||||
;
|
||||
|
||||
SELECT register_migration_script('201309111525_IDEMPIERE-1273.sql') FROM dual
|
||||
;
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
SET SQLBLANKLINES ON
|
||||
SET DEFINE OFF
|
||||
|
||||
-- Sep 11, 2013 6:56:20 PM COT
|
||||
-- IDEMPIERE-1253 Password is not hidden in the window Storage Provider
|
||||
UPDATE AD_Field SET IsEncrypted='Y',Updated=TO_DATE('2013-09-11 18:56:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200867
|
||||
;
|
||||
|
||||
SELECT register_migration_script('201309111856_IDEMPIERE-1253.sql') FROM dual
|
||||
;
|
||||
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
-- Sep 11, 2013 9:47:04 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Table_ID,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,AD_Element_ID,IsSecure) VALUES (0,'N',0,53295,210868,'N','N','N',0,'N',0,'N',36,'N','N','Y','6ec9f091-1c67-4b1e-8117-10f120939584','Y','HTML','HTML','Y',TO_TIMESTAMP('2013-09-11 09:46:55','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2013-09-11 09:46:55','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N',51005,'N')
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:47:07 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
ALTER TABLE PA_DashboardContent_Trl ADD COLUMN HTML TEXT DEFAULT NULL
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:47:22 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
UPDATE AD_Column SET IsTranslated='Y',Updated=TO_TIMESTAMP('2013-09-11 09:47:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=51012
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:48:56 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,AD_Client_ID,ColumnSpan) VALUES ('N',53372,36,'N','N',60965,90,'Y',202494,'N','D','PA_DashboardContent_Trl_UU','361b6894-aa95-424e-a371-e6123f14e502','N','N',100,0,TO_TIMESTAMP('2013-09-11 09:48:48','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-09-11 09:48:48','YYYY-MM-DD HH24:MI:SS'),'Y','N',0,2)
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:48:57 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,AD_Client_ID,ColumnSpan,NumLines) VALUES ('N',53372,0,'N','N',210868,100,'Y',202495,'N','D','HTML','ac01ef3e-7eed-49e5-84eb-5b7bdb3d4218','Y','N',100,0,TO_TIMESTAMP('2013-09-11 09:48:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-09-11 09:48:56','YYYY-MM-DD HH24:MI:SS'),'Y',0,2,5)
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:49:20 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
UPDATE AD_Field SET SeqNo=90, ColumnSpan=5,Updated=TO_TIMESTAMP('2013-09-11 09:49:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202495
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:49:20 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
UPDATE AD_Field SET SeqNo=0,Updated=TO_TIMESTAMP('2013-09-11 09:49:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202494
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 9:49:36 AM COT
|
||||
-- IDEMPIERE-1348 Cannot translate HTML content on dashboard
|
||||
UPDATE AD_Field SET SeqNo=20, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-09-11 09:49:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=60879
|
||||
;
|
||||
|
||||
SELECT register_migration_script('201309110955_IDEMPIERE-1348.sql') FROM dual
|
||||
;
|
||||
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
-- Sep 11, 2013 11:30:06 AM COT
|
||||
-- IDEMPIERE-1357 Tree panel not is updated with result of "Find" window
|
||||
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Record is not in current search',200231,'D','6380f694-62e5-4368-96a2-418b006e240a','RecordIsNotInCurrentSearch','Y',TO_TIMESTAMP('2013-09-11 11:30:05','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-09-11 11:30:05','YYYY-MM-DD HH24:MI:SS'),0)
|
||||
;
|
||||
|
||||
SELECT register_migration_script('201309111130_IDEMPIERE-1357.sql') FROM dual
|
||||
;
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
-- Sep 11, 2013 3:25:16 PM COT
|
||||
-- IDEMPIERE-1273 Invoice Payment Schedule" window isn't suitable
|
||||
UPDATE AD_Tab SET IsInsertRecord='N',Updated=TO_TIMESTAMP('2013-09-11 15:25:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=501
|
||||
;
|
||||
|
||||
-- Sep 11, 2013 3:25:23 PM COT
|
||||
-- IDEMPIERE-1273 Invoice Payment Schedule" window isn't suitable
|
||||
UPDATE AD_Tab SET IsInsertRecord='N',Updated=TO_TIMESTAMP('2013-09-11 15:25:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=666
|
||||
;
|
||||
|
||||
SELECT register_migration_script('201309111525_IDEMPIERE-1273.sql') FROM dual
|
||||
;
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
-- Sep 11, 2013 6:56:20 PM COT
|
||||
-- IDEMPIERE-1253 Password is not hidden in the window Storage Provider
|
||||
UPDATE AD_Field SET IsEncrypted='Y',Updated=TO_TIMESTAMP('2013-09-11 18:56:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200867
|
||||
;
|
||||
|
||||
SELECT register_migration_script('201309111856_IDEMPIERE-1253.sql') FROM dual
|
||||
;
|
||||
|
||||
|
|
@ -364,6 +364,7 @@ public class MDocType extends X_C_DocType
|
|||
*/
|
||||
public String getNameTrl()
|
||||
{
|
||||
// warning: to cache this translation you need to change the cache to include language (see i.e. MWFNode)
|
||||
return get_Translation (COLUMNNAME_Name, Env.getAD_Language(getCtx()));
|
||||
} // getNameTrl
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public class MWFNode extends X_AD_WF_Node
|
|||
*/
|
||||
public static MWFNode get (Properties ctx, int AD_WF_Node_ID)
|
||||
{
|
||||
Integer key = new Integer (AD_WF_Node_ID);
|
||||
String key = Env.getAD_Language(ctx) + "_" + AD_WF_Node_ID;
|
||||
MWFNode retValue = (MWFNode) s_cache.get (key);
|
||||
if (retValue != null)
|
||||
return retValue;
|
||||
|
|
@ -75,7 +75,7 @@ public class MWFNode extends X_AD_WF_Node
|
|||
} // get
|
||||
|
||||
/** Cache */
|
||||
private static CCache<Integer,MWFNode> s_cache = new CCache<Integer,MWFNode> (Table_Name, 50);
|
||||
private static CCache<String,MWFNode> s_cache = new CCache<String,MWFNode> (Table_Name, 50);
|
||||
|
||||
|
||||
/**************************************************************************
|
||||
|
|
@ -139,9 +139,11 @@ public class MWFNode extends X_AD_WF_Node
|
|||
loadNext();
|
||||
loadTrl();
|
||||
// Save to Cache
|
||||
Integer key = null;
|
||||
String key = null;
|
||||
try {
|
||||
key = new Integer (rs.getInt("AD_WF_Node_ID"));
|
||||
Integer wfnodeid = new Integer (rs.getInt("AD_WF_Node_ID"));
|
||||
if (wfnodeid != null && wfnodeid.intValue() > 0)
|
||||
key = Env.getAD_Language(ctx) + "_" + wfnodeid;
|
||||
} catch (SQLException e) {
|
||||
throw new AdempiereException(e);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,12 +70,13 @@ public class MWorkflow extends X_AD_Workflow
|
|||
*/
|
||||
public static MWorkflow get (Properties ctx, int AD_Workflow_ID)
|
||||
{
|
||||
MWorkflow retValue = (MWorkflow)s_cache.get(AD_Workflow_ID);
|
||||
String key = Env.getAD_Language(ctx) + "_" + AD_Workflow_ID;
|
||||
MWorkflow retValue = (MWorkflow)s_cache.get(key);
|
||||
if (retValue != null)
|
||||
return retValue;
|
||||
retValue = new MWorkflow (ctx, AD_Workflow_ID, null);
|
||||
if (retValue.get_ID() != 0)
|
||||
s_cache.put(AD_Workflow_ID, retValue);
|
||||
s_cache.put(key, retValue);
|
||||
return retValue;
|
||||
} // get
|
||||
|
||||
|
|
@ -144,7 +145,7 @@ public class MWorkflow extends X_AD_Workflow
|
|||
|
||||
|
||||
/** Single Cache */
|
||||
private static CCache<Integer,MWorkflow> s_cache = new CCache<Integer,MWorkflow>(Table_Name, 20);
|
||||
private static CCache<String,MWorkflow> s_cache = new CCache<String,MWorkflow>(Table_Name, 20);
|
||||
/** Document Value Cache */
|
||||
private static CCache<String,MWorkflow[]> s_cacheDocValue = new CCache<String,MWorkflow[]> (Table_Name, Table_Name+"_Document_Value", 5);
|
||||
/** Static Logger */
|
||||
|
|
|
|||
|
|
@ -174,14 +174,16 @@ public class ColumnElementHandler extends AbstractElementHandler {
|
|||
if (!table.isView() && !mColumn.isVirtualColumn()) {
|
||||
success = createColumn(ctx, table, mColumn, recreateColumn);
|
||||
|
||||
X_AD_Package_Imp_Detail dbDetail = createImportDetail(ctx, "dbColumn", X_AD_Column.Table_Name, X_AD_Column.Table_ID);
|
||||
if (success == 1) {
|
||||
logImportDetail(ctx, dbDetail, 1, mColumn.getColumnName(),
|
||||
mColumn.get_ID(), action);
|
||||
} else {
|
||||
logImportDetail(ctx, dbDetail, 0, mColumn.getColumnName(),
|
||||
mColumn.get_ID(), action);
|
||||
throw new DatabaseAccessException("Failed to create column or related constraint for " + mColumn.getColumnName());
|
||||
if (success != 0) {
|
||||
X_AD_Package_Imp_Detail dbDetail = createImportDetail(ctx, "dbColumn", X_AD_Column.Table_Name, X_AD_Column.Table_ID);
|
||||
if (success == 1) {
|
||||
logImportDetail(ctx, dbDetail, 1, mColumn.getColumnName(),
|
||||
mColumn.get_ID(), action);
|
||||
} else {
|
||||
logImportDetail(ctx, dbDetail, 0, mColumn.getColumnName(),
|
||||
mColumn.get_ID(), action);
|
||||
throw new DatabaseAccessException("Failed to create column or related constraint for " + mColumn.getColumnName());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -199,15 +201,11 @@ public class ColumnElementHandler extends AbstractElementHandler {
|
|||
*/
|
||||
private int createColumn(PIPOContext ctx, MTable table, MColumn column, boolean doAlter) {
|
||||
|
||||
int no = 0;
|
||||
|
||||
String sql = null;
|
||||
ResultSet rst = null;
|
||||
ResultSet rsc = null;
|
||||
Connection conn = null;
|
||||
Trx trx = Trx.get(getTrxName(ctx), true);
|
||||
if (!trx.commit())
|
||||
return 0;
|
||||
|
||||
try {
|
||||
// Find Column in Database
|
||||
|
|
@ -251,27 +249,32 @@ public class ColumnElementHandler extends AbstractElementHandler {
|
|||
if (sql != null && sql.trim().length() > 0) {
|
||||
log.info(sql);
|
||||
|
||||
//make it consistent for oracle and postgresql
|
||||
if (!trx.commit())
|
||||
return -1;
|
||||
|
||||
if (sql.indexOf(DB.SQLSTATEMENT_SEPARATOR) == -1) {
|
||||
no = DB.executeUpdate(sql, false, trx.getTrxName());
|
||||
if (no == -1)
|
||||
return 0;
|
||||
int ret = DB.executeUpdate(sql, false, trx.getTrxName());
|
||||
if (ret == -1)
|
||||
return -1;
|
||||
} else {
|
||||
String statements[] = sql.split(DB.SQLSTATEMENT_SEPARATOR);
|
||||
for (int i = 0; i < statements.length; i++) {
|
||||
int count = DB.executeUpdate(statements[i], false,
|
||||
int ret = DB.executeUpdate(statements[i], false,
|
||||
trx.getTrxName());
|
||||
if (count == -1) {
|
||||
return 0;
|
||||
if (ret == -1) {
|
||||
return -1;
|
||||
}
|
||||
no += count;
|
||||
}
|
||||
}
|
||||
trx.commit(true);
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
trx.commit(true);
|
||||
} catch (SQLException e) {
|
||||
log.log(Level.SEVERE, e.getLocalizedMessage(), e);
|
||||
trx.rollback();
|
||||
return 0;
|
||||
return -1;
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ public class HtmlDashboard extends JPanel implements MouseListener,
|
|||
if (!Util.isEmpty(dc.getZulFilePath(), true))
|
||||
continue;
|
||||
//
|
||||
appendToHome = dc.getHTML();
|
||||
appendToHome = dc.get_Translation(MDashboardContent.COLUMNNAME_HTML);
|
||||
String descriptionTrl = dp.get_Translation(MDashboardContent.COLUMNNAME_Description);
|
||||
if (appendToHome != null) {
|
||||
if (descriptionTrl != null)
|
||||
|
|
|
|||
|
|
@ -49,7 +49,8 @@ public final class VTable extends CTable
|
|||
/**
|
||||
*
|
||||
*/
|
||||
private static final long serialVersionUID = -2655102084935019329L;
|
||||
private static final long serialVersionUID = -3878986086328742243L;
|
||||
|
||||
private final static String PACK_ALL_COMMAND = CColumnControlButton.COLUMN_CONTROL_MARKER + "packAll";
|
||||
|
||||
/**
|
||||
|
|
@ -197,4 +198,13 @@ public final class VTable extends CTable
|
|||
.append(getModel()).append("]").toString();
|
||||
} // toString
|
||||
|
||||
/**
|
||||
* Sets the row selection interval. If the index is out of bounds we decrement it before setting the JTables row selection interval
|
||||
*/
|
||||
@Override
|
||||
public void setRowSelectionInterval(int index0, int index1) {
|
||||
super.setRowSelectionInterval( index0 == getRowCount() && index0 > 0 ? --index0 : index0,
|
||||
index1 == getRowCount() && index1 > 0 ? --index1 : index1);
|
||||
}
|
||||
|
||||
} // VTable
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ import java.util.Map.Entry;
|
|||
import java.util.logging.Level;
|
||||
|
||||
import org.adempiere.base.Core;
|
||||
import org.adempiere.exceptions.AdempiereException;
|
||||
import org.adempiere.webui.AdempiereIdGenerator;
|
||||
import org.adempiere.webui.AdempiereWebUI;
|
||||
import org.adempiere.webui.LayoutUtils;
|
||||
|
|
@ -1143,7 +1144,11 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
|
|||
{
|
||||
if (nodeID > 0 && logger.isLoggable(Level.WARNING))
|
||||
logger.log(Level.WARNING, "Tab does not have ID with Node_ID=" + nodeID);
|
||||
return;
|
||||
if (gridTab.getCurrentRow() >= 0)
|
||||
{
|
||||
gridTab.setCurrentRow(gridTab.getCurrentRow(), true);
|
||||
}
|
||||
throw new AdempiereException(Msg.getMsg(Env.getCtx(),"RecordIsNotInCurrentSearch"));
|
||||
}
|
||||
|
||||
// Navigate to node row
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ public class DashboardController implements EventListener<Event> {
|
|||
boolean panelEmpty = true;
|
||||
|
||||
// HTML content
|
||||
String htmlContent = dc.getHTML();
|
||||
String htmlContent = dc.get_Translation(MDashboardContent.COLUMNNAME_HTML);
|
||||
if(htmlContent != null)
|
||||
{
|
||||
StringBuilder result = new StringBuilder("<html><head>");
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ import org.compiere.util.Env;
|
|||
* @author hengsin
|
||||
*
|
||||
*/
|
||||
@SuppressWarnings("deprecation")
|
||||
public class DefaultInfoFactory implements IInfoFactory {
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ import org.zkoss.zul.Vbox;
|
|||
* @version InfoAsset.java Adempiere Swing UI 3.4.1
|
||||
*/
|
||||
|
||||
@Deprecated // replaced with InfoAssetWindow IDEMPIERE-325
|
||||
public class InfoAssetPanel extends InfoPanel implements ValueChangeListener, EventListener<Event>
|
||||
{
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ import org.zkoss.zul.Vbox;
|
|||
* @version InfoAssignment.java Adempiere Swing UI 3.4.1
|
||||
*/
|
||||
|
||||
@Deprecated // replaced with InfoAssignmentWindow IDEMPIERE-325
|
||||
public class InfoAssignmentPanel extends InfoPanel implements EventListener<Event>, ValueChangeListener
|
||||
{
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ import org.zkoss.zul.Vbox;
|
|||
* @version InfoBPartner.java Adempiere Swing UI 3.4.1
|
||||
*/
|
||||
|
||||
|
||||
@Deprecated // replaced with InfoBPartnerWindow IDEMPIERE-325
|
||||
public class InfoBPartnerPanel extends InfoPanel implements EventListener<Event>, WTableModelListener
|
||||
{
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ import org.zkoss.zul.Vbox;
|
|||
* @version InfoCashLine.java Adempiere Swing UI 3.4.1
|
||||
*/
|
||||
|
||||
@Deprecated // IDEMPIERE-170 IDEMPIERE-325
|
||||
public class InfoCashLinePanel extends InfoPanel implements ValueChangeListener, EventListener<Event>
|
||||
{
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ import org.zkoss.zul.Vbox;
|
|||
* @version InfoInOut.java Adempiere Swing UI 3.4.1
|
||||
*/
|
||||
|
||||
@Deprecated // replaced with InfoInOutWindow IDEMPIERE-325
|
||||
public class InfoInOutPanel extends InfoPanel implements ValueChangeListener, EventListener<Event>
|
||||
{
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -69,6 +69,8 @@ import org.zkoss.zul.Vbox;
|
|||
* @author Elaine
|
||||
* @version InfoInvoice.java Adempiere Swing UI 3.4.1
|
||||
**/
|
||||
|
||||
@Deprecated // replaced with InfoInvoiceWindow IDEMPIERE-325
|
||||
public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener
|
||||
{
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -69,6 +69,8 @@ import org.zkoss.zul.Vbox;
|
|||
* @author Elaine
|
||||
* @version InfoOrder.java Adempiere Swing UI 3.4.1
|
||||
**/
|
||||
|
||||
@Deprecated // replaced with InfoOrderWindow IDEMPIERE-325
|
||||
public class InfoOrderPanel extends InfoPanel implements ValueChangeListener
|
||||
{
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
|
|||
* Called from InfoProduct,cmd_InfoPAttribute
|
||||
* @param parent
|
||||
*/
|
||||
@SuppressWarnings("deprecation")
|
||||
public InfoPAttributePanel(Object input)
|
||||
{
|
||||
super();
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ import org.zkoss.zul.Vbox;
|
|||
* @version InfoPayment.java Adempiere Swing UI 3.4.1
|
||||
*/
|
||||
|
||||
@Deprecated // replaced with InfoPaymentWindow IDEMPIERE-325
|
||||
public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener, EventListener<Event>
|
||||
{
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -94,6 +94,8 @@ import org.zkoss.zul.South;
|
|||
* @author Elaine
|
||||
* @version InfoPayment.java Adempiere Swing UI 3.4.1
|
||||
*/
|
||||
|
||||
@Deprecated // replaced with InfoProductWindow IDEMPIERE-325
|
||||
public class InfoProductPanel extends InfoPanel implements EventListener<Event>
|
||||
{
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue