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

Merge 23e19de212b1

This commit is contained in:
Heng Sin Low 2013-02-22 14:48:46 +08:00
parent 9e10389533 ecbe68a1c7
commit abf201f9b6
13 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
migration/i1.0a-release/oracle/201302191851_TICKET-1002211.sql
View File

@ -1,3 +1,6 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Feb 19, 2013 3:37:23 PM SGT
-- Ticket #1002211: Create Help pane for Bizidium
INSERT INTO AD_Column (Version,IsSyncDatabase,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection,IsToolbarButton,IsAlwaysUpdateable,IsEncrypted) VALUES (0,'N',106,208589,'D','N','N','N',0,'N',10,'N',19,'N',202212,'N','Y','2866e75e-6021-4e27-9f48-bc3ab9d219a3','Y','AD_CtxHelp_ID','Context Help','Y',100,TO_DATE('2013-02-19 15:37:21','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2013-02-19 15:37:21','YYYY-MM-DD HH24:MI:SS'),100,0,0,'N','N','N')
@ -1565,4 +1568,4 @@ UPDATE AD_Field SET IsReadOnly='N',Updated=TO_DATE('2013-02-19 18:39:05','YYYY-M
;
SELECT register_migration_script('201302191851_TICKET-1002211.sql') FROM dual
;
;

4
org.adempiere.base.process/src/org/compiere/process/DocumentTypeVerify.java
View File

@ -88,7 +88,7 @@ public class DocumentTypeVerify extends SvrProcess
{
String name = rs.getString(2);
String value = rs.getString(1);
s_log.config(name + "=" + value);
if (s_log.isLoggable(Level.CONFIG)) s_log.config(name + "=" + value);
MDocType dt = new MDocType (ctx, value, name, trxName);
if (dt.save())
{
@ -166,7 +166,7 @@ public class DocumentTypeVerify extends SvrProcess
int Client_ID = rs.getInt(1);
int C_Period_ID = rs.getInt(2);
String DocBaseType = rs.getString(3);
s_log.config("AD_Client_ID=" + Client_ID
if (s_log.isLoggable(Level.CONFIG)) s_log.config("AD_Client_ID=" + Client_ID
+ ", C_Period_ID=" + C_Period_ID + ", DocBaseType=" + DocBaseType);
//
MPeriodControl pc = new MPeriodControl (ctx, Client_ID,

4
org.adempiere.base/src/org/adempiere/base/DefaultModelFactory.java
View File

@ -222,7 +222,7 @@ public class DefaultModelFactory implements IModelFactory {
String classTableName = clazz.getField("Table_Name").get(null).toString();
if (!tableName.equals(classTableName))
{
s_log.finest("Invalid class for table: " + className+" (tableName="+tableName+", classTableName="+classTableName+")");
if (s_log.isLoggable(Level.FINEST)) s_log.finest("Invalid class for table: " + className+" (tableName="+tableName+", classTableName="+classTableName+")");
return null;
}
}
@ -241,7 +241,7 @@ public class DefaultModelFactory implements IModelFactory {
catch (Exception e)
{
}
s_log.finest("Not found: " + className);
if (s_log.isLoggable(Level.FINEST)) s_log.finest("Not found: " + className);
return null;
} // getPOclass

8
org.adempiere.base/src/org/compiere/model/MCost.java
View File

@ -172,7 +172,7 @@ public class MCost extends X_M_Cost
String cm = rs.getString(3);
percent = rs.getBigDecimal(4);
//M_CostElement_ID = rs.getInt(5);
s_log.finest("CurrentCostPrice=" + currentCostPrice
if (s_log.isLoggable(Level.FINEST)) s_log.finest("CurrentCostPrice=" + currentCostPrice
+ ", CurrentCostPriceLL=" + currentCostPriceLL
+ ", CostElementType=" + costElementType
+ ", CostingMethod=" + cm
@ -205,7 +205,7 @@ public class MCost extends X_M_Cost
}
if (count > 1) // Print summary
s_log.finest("MaterialCost=" + materialCostEach
if (s_log.isLoggable(Level.FINEST)) s_log.finest("MaterialCost=" + materialCostEach
+ ", OtherCosts=" + otherCostEach
+ ", Percentage=" + percentage);
@ -725,7 +725,7 @@ public class MCost extends X_M_Cost
if (cost.is_new())
{
if (cost.save())
s_log.config("Std.Cost for " + product.getName()
if (s_log.isLoggable(Level.CONFIG)) s_log.config("Std.Cost for " + product.getName()
+ " - " + as.getName());
else
s_log.warning("Not created: Std.Cost for " + product.getName()
@ -743,7 +743,7 @@ public class MCost extends X_M_Cost
if (cost.is_new())
{
if (cost.save())
s_log.config("Std.Cost for " + product.getName()
if (s_log.isLoggable(Level.CONFIG)) s_log.config("Std.Cost for " + product.getName()
+ " - " + o.getName()
+ " - " + as.getName());
else

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

@ -80,7 +80,7 @@ public class MCostDetail extends X_M_CostDetail
.append(" AND M_AttributeSetInstance_ID=").append(M_AttributeSetInstance_ID);
int no = DB.executeUpdate(sql.toString(), trxName);
if (no != 0)
s_log.config("Deleted #" + no);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("Deleted #" + no);
MCostDetail cd = get (as.getCtx(), "C_OrderLine_ID=?",
C_OrderLine_ID, M_AttributeSetInstance_ID, as.getC_AcctSchema_ID(), trxName);
//
@ -113,7 +113,7 @@ public class MCostDetail extends X_M_CostDetail
{
ok = cd.process();
}
s_log.config("(" + ok + ") " + cd);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("(" + ok + ") " + cd);
return ok;
} // createOrder
@ -147,7 +147,7 @@ public class MCostDetail extends X_M_CostDetail
.append(" AND M_AttributeSetInstance_ID=").append(M_AttributeSetInstance_ID);
int no = DB.executeUpdate(sql.toString(), trxName);
if (no != 0)
s_log.config("Deleted #" + no);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("Deleted #" + no);
MCostDetail cd = get (as.getCtx(), "C_InvoiceLine_ID=?",
C_InvoiceLine_ID, M_AttributeSetInstance_ID, as.getC_AcctSchema_ID(), trxName);
//
@ -180,7 +180,7 @@ public class MCostDetail extends X_M_CostDetail
{
ok = cd.process();
}
s_log.config("(" + ok + ") " + cd);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("(" + ok + ") " + cd);
return ok;
} // createInvoice
@ -214,7 +214,7 @@ public class MCostDetail extends X_M_CostDetail
.append(" AND M_AttributeSetInstance_ID=").append(M_AttributeSetInstance_ID);
int no = DB.executeUpdate(sql.toString(), trxName);
if (no != 0)
s_log.config("Deleted #" + no);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("Deleted #" + no);
MCostDetail cd = get (as.getCtx(), "M_InOutLine_ID=?",
M_InOutLine_ID, M_AttributeSetInstance_ID, as.getC_AcctSchema_ID(), trxName);
//
@ -248,7 +248,7 @@ public class MCostDetail extends X_M_CostDetail
{
ok = cd.process();
}
s_log.config("(" + ok + ") " + cd);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("(" + ok + ") " + cd);
return ok;
} // createShipment
@ -281,7 +281,7 @@ public class MCostDetail extends X_M_CostDetail
.append(" AND M_AttributeSetInstance_ID=").append(M_AttributeSetInstance_ID);
int no = DB.executeUpdate(sql.toString(), trxName);
if (no != 0)
s_log.config("Deleted #" + no);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("Deleted #" + no);
MCostDetail cd = get (as.getCtx(), "M_InventoryLine_ID=?",
M_InventoryLine_ID, M_AttributeSetInstance_ID, as.getC_AcctSchema_ID(), trxName);
//
@ -314,7 +314,7 @@ public class MCostDetail extends X_M_CostDetail
{
ok = cd.process();
}
s_log.config("(" + ok + ") " + cd);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("(" + ok + ") " + cd);
return ok;
} // createInventory
@ -349,7 +349,7 @@ public class MCostDetail extends X_M_CostDetail
.append(" AND M_AttributeSetInstance_ID=").append(M_AttributeSetInstance_ID);
int no = DB.executeUpdate(sql.toString(), trxName);
if (no != 0)
s_log.config("Deleted #" + no);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("Deleted #" + no);
StringBuilder msget = new StringBuilder( "M_MovementLine_ID=? AND IsSOTrx=")
.append((from ? "'Y'" : "'N'"));
MCostDetail cd = get (as.getCtx(),msget.toString(),
@ -385,7 +385,7 @@ public class MCostDetail extends X_M_CostDetail
{
ok = cd.process();
}
s_log.config("(" + ok + ") " + cd);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("(" + ok + ") " + cd);
return ok;
} // createMovement
@ -418,7 +418,7 @@ public class MCostDetail extends X_M_CostDetail
.append(" AND M_AttributeSetInstance_ID=").append(M_AttributeSetInstance_ID);
int no = DB.executeUpdate(sql.toString(), trxName);
if (no != 0)
s_log.config("Deleted #" + no);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("Deleted #" + no);
MCostDetail cd = get (as.getCtx(), "M_ProductionLine_ID=?",
M_ProductionLine_ID, M_AttributeSetInstance_ID, as.getC_AcctSchema_ID(), trxName);
//
@ -451,7 +451,7 @@ public class MCostDetail extends X_M_CostDetail
{
ok = cd.process();
}
s_log.config("(" + ok + ") " + cd);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("(" + ok + ") " + cd);
return ok;
} // createProduction
@ -547,7 +547,7 @@ public class MCostDetail extends X_M_CostDetail
else
counterError++;
}
s_log.config("OK=" + counterOK + ", Errors=" + counterError);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("OK=" + counterOK + ", Errors=" + counterError);
return counterError == 0;
} // processProduct

6
org.adempiere.base/src/org/compiere/model/MCostQueue.java
View File

@ -259,7 +259,7 @@ public class MCostQueue extends X_M_CostQueue
lastPrice = queue.getCurrentCostPrice();
BigDecimal costBatch = lastPrice.multiply(remainingQty);
cost = cost.add(costBatch);
s_log.config("ASI=" + queue.getM_AttributeSetInstance_ID()
if (s_log.isLoggable(Level.CONFIG)) s_log.config("ASI=" + queue.getM_AttributeSetInstance_ID()
+ " - Cost=" + lastPrice + " * Qty=" + remainingQty + "(!) = " + costBatch);
return cost;
}
@ -281,7 +281,7 @@ public class MCostQueue extends X_M_CostQueue
// Done
if (remainingQty.signum() == 0)
{
s_log.config("Cost=" + cost);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("Cost=" + cost);
return cost;
}
if (firstPrice == null)
@ -303,7 +303,7 @@ public class MCostQueue extends X_M_CostQueue
BigDecimal costBatch = lastPrice.multiply(remainingQty);
s_log.fine("RemainingQty=" + remainingQty + " * LastPrice=" + lastPrice + " = " + costBatch);
cost = cost.add(costBatch);
s_log.config("Cost=" + cost);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("Cost=" + cost);
return cost;
} // getCosts

2
org.adempiere.base/src/org/compiere/model/MInvoice.java
View File

@ -1191,7 +1191,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
finally {
DB.close(rs);
}
s_log.config("#" + counter);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("#" + counter);
/**/
} // setIsPaid

2
org.adempiere.base/src/org/compiere/model/MPayment.java
View File

@ -872,7 +872,7 @@ public final class MPayment extends X_C_Payment
rs = null;
pstmt = null;
}
s_log.config("#" + counter);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("#" + counter);
} // setIsAllocated
/**************************************************************************

13
org.adempiere.base/src/org/compiere/model/MSequence.java
View File

@ -154,12 +154,11 @@ public class MSequence extends X_AD_Sequence
pstmt.setQueryTimeout(QUERY_TIME_OUT);
}
rs = pstmt.executeQuery();
if (CLogMgt.isLevelFinest())
s_log.finest("AC=" + conn.getAutoCommit() + ", RO=" + conn.isReadOnly()
+ " - Isolation=" + conn.getTransactionIsolation() + "(" + Connection.TRANSACTION_READ_COMMITTED
+ ") - RSType=" + pstmt.getResultSetType() + "(" + ResultSet.TYPE_SCROLL_SENSITIVE
+ "), RSConcur=" + pstmt.getResultSetConcurrency() + "(" + ResultSet.CONCUR_UPDATABLE
+ ")");
if (s_log.isLoggable(Level.FINEST)) s_log.finest("AC=" + conn.getAutoCommit() + ", RO=" + conn.isReadOnly()
+ " - Isolation=" + conn.getTransactionIsolation() + "(" + Connection.TRANSACTION_READ_COMMITTED
+ ") - RSType=" + pstmt.getResultSetType() + "(" + ResultSet.TYPE_SCROLL_SENSITIVE
+ "), RSConcur=" + pstmt.getResultSetConcurrency() + "(" + ResultSet.CONCUR_UPDATABLE
+ ")");
if (rs.next())
{
@ -283,7 +282,7 @@ public class MSequence extends X_AD_Sequence
}
//s_log.finest (retValue + " - Table=" + TableName + " [" + trx + "]");
//if (s_log.isLoggable(Level.FINEST)) s_log.finest (retValue + " - Table=" + TableName + " [" + trx + "]");
return retValue;
} // getNextID

8
org.adempiere.base/src/org/compiere/print/MPrintFormat.java
View File

@ -623,7 +623,7 @@ public class MPrintFormat extends X_AD_PrintFormat
if (pfi != null)
{
printFormatItemList.add (pfi);
s_log.finest("Tab: " + pfi);
if (s_log.isLoggable(Level.FINEST)) s_log.finest("Tab: " + pfi);
}
}
@ -844,7 +844,7 @@ public class MPrintFormat extends X_AD_PrintFormat
if (pfi != null)
{
list.add (pfi);
s_log.finest("Tab: " + pfi);
if (s_log.isLoggable(Level.FINEST)) s_log.finest("Tab: " + pfi);
}
}
}
@ -878,7 +878,7 @@ public class MPrintFormat extends X_AD_PrintFormat
if (pfi != null)
{
list.add (pfi);
s_log.finest("Table: " + pfi);
if (s_log.isLoggable(Level.FINEST)) s_log.finest("Table: " + pfi);
}
}
}
@ -962,7 +962,7 @@ public class MPrintFormat extends X_AD_PrintFormat
break;
counter += no;
} // for
s_log.finest("#" + counter);
if (s_log.isLoggable(Level.FINEST)) s_log.finest("#" + counter);
} // copyTranslationItems

6
org.adempiere.base/src/org/compiere/print/MPrintPaper.java
View File

@ -18,6 +18,7 @@ package org.compiere.print;
import java.sql.ResultSet;
import java.util.Properties;
import java.util.logging.Level;
import javax.print.attribute.EnumSyntax;
import javax.print.attribute.Size2DSyntax;
@ -52,8 +53,7 @@ public class MPrintPaper extends X_AD_PrintPaper
/**
*
*/
private static final long serialVersionUID = 8284757169766494111L;
private static final long serialVersionUID = -3609557177958141344L;
/**
* Get Paper
@ -70,7 +70,7 @@ public class MPrintPaper extends X_AD_PrintPaper
s_papers.put(key, pp);
}
else
s_log.config("AD_PrintPaper_ID=" + AD_PrintPaper_ID);
if (s_log.isLoggable(Level.CONFIG)) s_log.config("AD_PrintPaper_ID=" + AD_PrintPaper_ID);
return pp;
} // get

7
org.adempiere.base/src/org/compiere/util/Evaluator.java
View File

@ -58,7 +58,7 @@ public class Evaluator
}
String variable = logic.substring(first+1, second-1);
String eval = source.get_ValueAsString (variable);
s_log.finest(variable + "=" + eval);
if (s_log.isLoggable(Level.FINEST)) s_log.finest(variable + "=" + eval);
if (eval == null || eval.length() == 0)
return false;
//
@ -195,9 +195,8 @@ public class Evaluator
// Logical Comparison
boolean result = evaluateLogicTuple (firstEval, operand, secondEval);
//
if (CLogMgt.isLevelFinest())
s_log.finest(logic
+ " => \"" + firstEval + "\" " + operand + " \"" + secondEval + "\" => " + result);
if (s_log.isLoggable(Level.FINEST)) s_log.finest(logic
+ " => \"" + firstEval + "\" " + operand + " \"" + secondEval + "\" => " + result);
//
return result;
} // evaluateLogicTuple

2
org.adempiere.base/src/org/compiere/wf/MWorkflow.java
View File

@ -121,7 +121,7 @@ public class MWorkflow extends X_AD_Workflow
list.toArray(wfs);
s_cacheDocValue.put (oldKey, wfs);
}
s_log.config("#" + s_cacheDocValue.size());
if (s_log.isLoggable(Level.CONFIG)) s_log.config("#" + s_cacheDocValue.size());
}
// Look for Entry
MWorkflow[] retValue = (MWorkflow[])s_cacheDocValue.get(key);