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

[ 2353794 ] Financial Report: Add Natural Balance amount type

This commit is contained in:
Heng Sin Low 2008-11-28 09:34:43 +00:00
parent a52de40a8c
commit cef9d7659a
8 changed files with 222 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
base/src/org/compiere/model/I_PA_ReportColumn.java
View File

@ -78,16 +78,7 @@ public interface I_PA_ReportColumn
*/ */
public int getC_Activity_ID(); public int getC_Activity_ID();
public I_C_Activity getC_Activity() throws Exception; public I_C_Activity getC_Activity() throws RuntimeException;
/** Column name CalculationType */
public static final String COLUMNNAME_CalculationType = "CalculationType";
/** Set Calculation */
public void setCalculationType (String CalculationType);
/** Get Calculation */
public String getCalculationType();
/** Column name C_BPartner_ID */ /** Column name C_BPartner_ID */
public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID"; public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
@ -102,7 +93,7 @@ public interface I_PA_ReportColumn
*/ */
public int getC_BPartner_ID(); public int getC_BPartner_ID();
public I_C_BPartner getC_BPartner() throws Exception; public I_C_BPartner getC_BPartner() throws RuntimeException;
/** Column name C_Campaign_ID */ /** Column name C_Campaign_ID */
public static final String COLUMNNAME_C_Campaign_ID = "C_Campaign_ID"; public static final String COLUMNNAME_C_Campaign_ID = "C_Campaign_ID";
@ -117,7 +108,7 @@ public interface I_PA_ReportColumn
*/ */
public int getC_Campaign_ID(); public int getC_Campaign_ID();
public I_C_Campaign getC_Campaign() throws Exception; public I_C_Campaign getC_Campaign() throws RuntimeException;
/** Column name C_Currency_ID */ /** Column name C_Currency_ID */
public static final String COLUMNNAME_C_Currency_ID = "C_Currency_ID"; public static final String COLUMNNAME_C_Currency_ID = "C_Currency_ID";
@ -132,7 +123,7 @@ public interface I_PA_ReportColumn
*/ */
public int getC_Currency_ID(); public int getC_Currency_ID();
public I_C_Currency getC_Currency() throws Exception; public I_C_Currency getC_Currency() throws RuntimeException;
/** Column name C_ElementValue_ID */ /** Column name C_ElementValue_ID */
public static final String COLUMNNAME_C_ElementValue_ID = "C_ElementValue_ID"; public static final String COLUMNNAME_C_ElementValue_ID = "C_ElementValue_ID";
@ -147,7 +138,7 @@ public interface I_PA_ReportColumn
*/ */
public int getC_ElementValue_ID(); public int getC_ElementValue_ID();
public I_C_ElementValue getC_ElementValue() throws Exception; public I_C_ElementValue getC_ElementValue() throws RuntimeException;
/** Column name C_Location_ID */ /** Column name C_Location_ID */
public static final String COLUMNNAME_C_Location_ID = "C_Location_ID"; public static final String COLUMNNAME_C_Location_ID = "C_Location_ID";
@ -162,15 +153,6 @@ public interface I_PA_ReportColumn
*/ */
public int getC_Location_ID(); public int getC_Location_ID();
/** Column name ColumnType */
public static final String COLUMNNAME_ColumnType = "ColumnType";
/** Set Column Type */
public void setColumnType (String ColumnType);
/** Get Column Type */
public String getColumnType();
/** Column name C_Project_ID */ /** Column name C_Project_ID */
public static final String COLUMNNAME_C_Project_ID = "C_Project_ID"; public static final String COLUMNNAME_C_Project_ID = "C_Project_ID";
@ -184,7 +166,7 @@ public interface I_PA_ReportColumn
*/ */
public int getC_Project_ID(); public int getC_Project_ID();
public I_C_Project getC_Project() throws Exception; public I_C_Project getC_Project() throws RuntimeException;
/** Column name C_SalesRegion_ID */ /** Column name C_SalesRegion_ID */
public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID"; public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
@ -199,7 +181,25 @@ public interface I_PA_ReportColumn
*/ */
public int getC_SalesRegion_ID(); public int getC_SalesRegion_ID();
public I_C_SalesRegion getC_SalesRegion() throws Exception; public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
/** Column name CalculationType */
public static final String COLUMNNAME_CalculationType = "CalculationType";
/** Set Calculation */
public void setCalculationType (String CalculationType);
/** Get Calculation */
public String getCalculationType();
/** Column name ColumnType */
public static final String COLUMNNAME_ColumnType = "ColumnType";
/** Set Column Type */
public void setColumnType (String ColumnType);
/** Get Column Type */
public String getColumnType();
/** Column name CurrencyType */ /** Column name CurrencyType */
public static final String COLUMNNAME_CurrencyType = "CurrencyType"; public static final String COLUMNNAME_CurrencyType = "CurrencyType";
@ -275,7 +275,7 @@ public interface I_PA_ReportColumn
*/ */
public int getGL_Budget_ID(); public int getGL_Budget_ID();
public I_GL_Budget getGL_Budget() throws Exception; public I_GL_Budget getGL_Budget() throws RuntimeException;
/** Column name IsAdhocConversion */ /** Column name IsAdhocConversion */
public static final String COLUMNNAME_IsAdhocConversion = "IsAdhocConversion"; public static final String COLUMNNAME_IsAdhocConversion = "IsAdhocConversion";
@ -459,7 +459,7 @@ public interface I_PA_ReportColumn
*/ */
public int getM_Product_ID(); public int getM_Product_ID();
public I_M_Product getM_Product() throws Exception; public I_M_Product getM_Product() throws RuntimeException;
/** Column name Name */ /** Column name Name */
public static final String COLUMNNAME_Name = "Name"; public static final String COLUMNNAME_Name = "Name";
@ -513,19 +513,6 @@ public interface I_PA_ReportColumn
*/ */
public int getOrg_ID(); public int getOrg_ID();
/** Column name PA_ReportColumn_ID */
public static final String COLUMNNAME_PA_ReportColumn_ID = "PA_ReportColumn_ID";
/** Set Report Column.
* Column in Report
*/
public void setPA_ReportColumn_ID (int PA_ReportColumn_ID);
/** Get Report Column.
* Column in Report
*/
public int getPA_ReportColumn_ID();
/** Column name PA_ReportColumnSet_ID */ /** Column name PA_ReportColumnSet_ID */
public static final String COLUMNNAME_PA_ReportColumnSet_ID = "PA_ReportColumnSet_ID"; public static final String COLUMNNAME_PA_ReportColumnSet_ID = "PA_ReportColumnSet_ID";
@ -539,7 +526,20 @@ public interface I_PA_ReportColumn
*/ */
public int getPA_ReportColumnSet_ID(); public int getPA_ReportColumnSet_ID();
public I_PA_ReportColumnSet getPA_ReportColumnSet() throws Exception; public I_PA_ReportColumnSet getPA_ReportColumnSet() throws RuntimeException;
/** Column name PA_ReportColumn_ID */
public static final String COLUMNNAME_PA_ReportColumn_ID = "PA_ReportColumn_ID";
/** Set Report Column.
* Column in Report
*/
public void setPA_ReportColumn_ID (int PA_ReportColumn_ID);
/** Get Report Column.
* Column in Report
*/
public int getPA_ReportColumn_ID();
/** Column name PostingType */ /** Column name PostingType */
public static final String COLUMNNAME_PostingType = "PostingType"; public static final String COLUMNNAME_PostingType = "PostingType";

22
base/src/org/compiere/model/I_PA_ReportLine.java
View File

@ -100,7 +100,7 @@ public interface I_PA_ReportLine
*/ */
public int getGL_Budget_ID(); public int getGL_Budget_ID();
public I_GL_Budget getGL_Budget() throws Exception; public I_GL_Budget getGL_Budget() throws RuntimeException;
/** Column name IsPrinted */ /** Column name IsPrinted */
public static final String COLUMNNAME_IsPrinted = "IsPrinted"; public static final String COLUMNNAME_IsPrinted = "IsPrinted";
@ -163,15 +163,6 @@ public interface I_PA_ReportLine
*/ */
public int getOper_2_ID(); public int getOper_2_ID();
/** Column name PA_ReportLine_ID */
public static final String COLUMNNAME_PA_ReportLine_ID = "PA_ReportLine_ID";
/** Set Report Line */
public void setPA_ReportLine_ID (int PA_ReportLine_ID);
/** Get Report Line */
public int getPA_ReportLine_ID();
/** Column name PA_ReportLineSet_ID */ /** Column name PA_ReportLineSet_ID */
public static final String COLUMNNAME_PA_ReportLineSet_ID = "PA_ReportLineSet_ID"; public static final String COLUMNNAME_PA_ReportLineSet_ID = "PA_ReportLineSet_ID";
@ -181,7 +172,16 @@ public interface I_PA_ReportLine
/** Get Report Line Set */ /** Get Report Line Set */
public int getPA_ReportLineSet_ID(); public int getPA_ReportLineSet_ID();
public I_PA_ReportLineSet getPA_ReportLineSet() throws Exception; public I_PA_ReportLineSet getPA_ReportLineSet() throws RuntimeException;
/** Column name PA_ReportLine_ID */
public static final String COLUMNNAME_PA_ReportLine_ID = "PA_ReportLine_ID";
/** Set Report Line */
public void setPA_ReportLine_ID (int PA_ReportLine_ID);
/** Get Report Line */
public int getPA_ReportLine_ID();
/** Column name PostingType */ /** Column name PostingType */
public static final String COLUMNNAME_PostingType = "PostingType"; public static final String COLUMNNAME_PostingType = "PostingType";

192
base/src/org/compiere/model/X_PA_ReportColumn.java
View File

@ -69,8 +69,8 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
setIsPrinted (true); setIsPrinted (true);
// Y // Y
setName (null); setName (null);
setPA_ReportColumn_ID (0);
setPA_ReportColumnSet_ID (0); setPA_ReportColumnSet_ID (0);
setPA_ReportColumn_ID (0);
setPostingType (null); setPostingType (null);
// A // A
setSeqNo (0); setSeqNo (0);
@ -132,6 +132,8 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
public static final String AMOUNTTYPE_YearDebitOnly = "DY"; public static final String AMOUNTTYPE_YearDebitOnly = "DY";
/** Year Quantity = QY */ /** Year Quantity = QY */
public static final String AMOUNTTYPE_YearQuantity = "QY"; public static final String AMOUNTTYPE_YearQuantity = "QY";
/** Natural Balance = BN */
public static final String AMOUNTTYPE_NaturalBalance = "BN";
/** Set Amount Type. /** Set Amount Type.
@param AmountType @param AmountType
Type of amount to report Type of amount to report
@ -139,7 +141,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
public void setAmountType (String AmountType) public void setAmountType (String AmountType)
{ {
if (AmountType == null || AmountType.equals("DT") || AmountType.equals("CT") || AmountType.equals("BT") || AmountType.equals("BP") || AmountType.equals("CP") || AmountType.equals("DP") || AmountType.equals("QP") || AmountType.equals("QT") || AmountType.equals("BY") || AmountType.equals("CY") || AmountType.equals("DY") || AmountType.equals("QY")); else throw new IllegalArgumentException ("AmountType Invalid value - " + AmountType + " - Reference_ID=235 - DT - CT - BT - BP - CP - DP - QP - QT - BY - CY - DY - QY"); set_Value (COLUMNNAME_AmountType, AmountType); if (AmountType == null || AmountType.equals("DT") || AmountType.equals("CT") || AmountType.equals("BT") || AmountType.equals("BP") || AmountType.equals("CP") || AmountType.equals("DP") || AmountType.equals("QP") || AmountType.equals("QT") || AmountType.equals("BY") || AmountType.equals("CY") || AmountType.equals("DY") || AmountType.equals("QY") || AmountType.equals("BN")); else throw new IllegalArgumentException ("AmountType Invalid value - " + AmountType + " - Reference_ID=235 - DT - CT - BT - BP - CP - DP - QP - QT - BY - CY - DY - QY - BN"); set_Value (COLUMNNAME_AmountType, AmountType);
} }
/** Get Amount Type. /** Get Amount Type.
@ -150,7 +152,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
return (String)get_Value(COLUMNNAME_AmountType); return (String)get_Value(COLUMNNAME_AmountType);
} }
public I_C_Activity getC_Activity() throws Exception public I_C_Activity getC_Activity() throws RuntimeException
{ {
Class<?> clazz = MTable.getClass(I_C_Activity.Table_Name); Class<?> clazz = MTable.getClass(I_C_Activity.Table_Name);
I_C_Activity result = null; I_C_Activity result = null;
@ -161,7 +163,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
throw e; throw new RuntimeException( e );
} }
return result; return result;
} }
@ -189,32 +191,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
return ii.intValue(); return ii.intValue();
} }
/** CalculationType AD_Reference_ID=236 */ public I_C_BPartner getC_BPartner() throws RuntimeException
public static final int CALCULATIONTYPE_AD_Reference_ID=236;
/** Add (Op1+Op2) = A */
public static final String CALCULATIONTYPE_AddOp1PlusOp2 = "A";
/** Subtract (Op1-Op2) = S */
public static final String CALCULATIONTYPE_SubtractOp1_Op2 = "S";
/** Percentage (Op1 of Op2) = P */
public static final String CALCULATIONTYPE_PercentageOp1OfOp2 = "P";
/** Add Range (Op1 to Op2) = R */
public static final String CALCULATIONTYPE_AddRangeOp1ToOp2 = "R";
/** Set Calculation.
@param CalculationType Calculation */
public void setCalculationType (String CalculationType)
{
if (CalculationType == null || CalculationType.equals("A") || CalculationType.equals("S") || CalculationType.equals("P") || CalculationType.equals("R")); else throw new IllegalArgumentException ("CalculationType Invalid value - " + CalculationType + " - Reference_ID=236 - A - S - P - R"); set_Value (COLUMNNAME_CalculationType, CalculationType);
}
/** Get Calculation.
@return Calculation */
public String getCalculationType ()
{
return (String)get_Value(COLUMNNAME_CalculationType);
}
public I_C_BPartner getC_BPartner() throws Exception
{ {
Class<?> clazz = MTable.getClass(I_C_BPartner.Table_Name); Class<?> clazz = MTable.getClass(I_C_BPartner.Table_Name);
I_C_BPartner result = null; I_C_BPartner result = null;
@ -225,7 +202,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
throw e; throw new RuntimeException( e );
} }
return result; return result;
} }
@ -253,7 +230,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
return ii.intValue(); return ii.intValue();
} }
public I_C_Campaign getC_Campaign() throws Exception public I_C_Campaign getC_Campaign() throws RuntimeException
{ {
Class<?> clazz = MTable.getClass(I_C_Campaign.Table_Name); Class<?> clazz = MTable.getClass(I_C_Campaign.Table_Name);
I_C_Campaign result = null; I_C_Campaign result = null;
@ -264,7 +241,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
throw e; throw new RuntimeException( e );
} }
return result; return result;
} }
@ -292,7 +269,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
return ii.intValue(); return ii.intValue();
} }
public I_C_Currency getC_Currency() throws Exception public I_C_Currency getC_Currency() throws RuntimeException
{ {
Class<?> clazz = MTable.getClass(I_C_Currency.Table_Name); Class<?> clazz = MTable.getClass(I_C_Currency.Table_Name);
I_C_Currency result = null; I_C_Currency result = null;
@ -303,7 +280,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
throw e; throw new RuntimeException( e );
} }
return result; return result;
} }
@ -331,7 +308,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
return ii.intValue(); return ii.intValue();
} }
public I_C_ElementValue getC_ElementValue() throws Exception public I_C_ElementValue getC_ElementValue() throws RuntimeException
{ {
Class<?> clazz = MTable.getClass(I_C_ElementValue.Table_Name); Class<?> clazz = MTable.getClass(I_C_ElementValue.Table_Name);
I_C_ElementValue result = null; I_C_ElementValue result = null;
@ -342,7 +319,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
throw e; throw new RuntimeException( e );
} }
return result; return result;
} }
@ -393,30 +370,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
return ii.intValue(); return ii.intValue();
} }
/** ColumnType AD_Reference_ID=237 */ public I_C_Project getC_Project() throws RuntimeException
public static final int COLUMNTYPE_AD_Reference_ID=237;
/** Relative Period = R */
public static final String COLUMNTYPE_RelativePeriod = "R";
/** Calculation = C */
public static final String COLUMNTYPE_Calculation = "C";
/** Segment Value = S */
public static final String COLUMNTYPE_SegmentValue = "S";
/** Set Column Type.
@param ColumnType Column Type */
public void setColumnType (String ColumnType)
{
if (ColumnType == null) throw new IllegalArgumentException ("ColumnType is mandatory");
if (ColumnType.equals("R") || ColumnType.equals("C") || ColumnType.equals("S")); else throw new IllegalArgumentException ("ColumnType Invalid value - " + ColumnType + " - Reference_ID=237 - R - C - S"); set_Value (COLUMNNAME_ColumnType, ColumnType);
}
/** Get Column Type.
@return Column Type */
public String getColumnType ()
{
return (String)get_Value(COLUMNNAME_ColumnType);
}
public I_C_Project getC_Project() throws Exception
{ {
Class<?> clazz = MTable.getClass(I_C_Project.Table_Name); Class<?> clazz = MTable.getClass(I_C_Project.Table_Name);
I_C_Project result = null; I_C_Project result = null;
@ -427,7 +381,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
throw e; throw new RuntimeException( e );
} }
return result; return result;
} }
@ -455,7 +409,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
return ii.intValue(); return ii.intValue();
} }
public I_C_SalesRegion getC_SalesRegion() throws Exception public I_C_SalesRegion getC_SalesRegion() throws RuntimeException
{ {
Class<?> clazz = MTable.getClass(I_C_SalesRegion.Table_Name); Class<?> clazz = MTable.getClass(I_C_SalesRegion.Table_Name);
I_C_SalesRegion result = null; I_C_SalesRegion result = null;
@ -466,7 +420,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
throw e; throw new RuntimeException( e );
} }
return result; return result;
} }
@ -494,6 +448,54 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
return ii.intValue(); return ii.intValue();
} }
/** CalculationType AD_Reference_ID=236 */
public static final int CALCULATIONTYPE_AD_Reference_ID=236;
/** Add (Op1+Op2) = A */
public static final String CALCULATIONTYPE_AddOp1PlusOp2 = "A";
/** Subtract (Op1-Op2) = S */
public static final String CALCULATIONTYPE_SubtractOp1_Op2 = "S";
/** Percentage (Op1 of Op2) = P */
public static final String CALCULATIONTYPE_PercentageOp1OfOp2 = "P";
/** Add Range (Op1 to Op2) = R */
public static final String CALCULATIONTYPE_AddRangeOp1ToOp2 = "R";
/** Set Calculation.
@param CalculationType Calculation */
public void setCalculationType (String CalculationType)
{
if (CalculationType == null || CalculationType.equals("A") || CalculationType.equals("S") || CalculationType.equals("P") || CalculationType.equals("R")); else throw new IllegalArgumentException ("CalculationType Invalid value - " + CalculationType + " - Reference_ID=236 - A - S - P - R"); set_Value (COLUMNNAME_CalculationType, CalculationType);
}
/** Get Calculation.
@return Calculation */
public String getCalculationType ()
{
return (String)get_Value(COLUMNNAME_CalculationType);
}
/** ColumnType AD_Reference_ID=237 */
public static final int COLUMNTYPE_AD_Reference_ID=237;
/** Relative Period = R */
public static final String COLUMNTYPE_RelativePeriod = "R";
/** Calculation = C */
public static final String COLUMNTYPE_Calculation = "C";
/** Segment Value = S */
public static final String COLUMNTYPE_SegmentValue = "S";
/** Set Column Type.
@param ColumnType Column Type */
public void setColumnType (String ColumnType)
{
if (ColumnType == null) throw new IllegalArgumentException ("ColumnType is mandatory");
if (ColumnType.equals("R") || ColumnType.equals("C") || ColumnType.equals("S")); else throw new IllegalArgumentException ("ColumnType Invalid value - " + ColumnType + " - Reference_ID=237 - R - C - S"); set_Value (COLUMNNAME_ColumnType, ColumnType);
}
/** Get Column Type.
@return Column Type */
public String getColumnType ()
{
return (String)get_Value(COLUMNNAME_ColumnType);
}
/** CurrencyType AD_Reference_ID=238 */ /** CurrencyType AD_Reference_ID=238 */
public static final int CURRENCYTYPE_AD_Reference_ID=238; public static final int CURRENCYTYPE_AD_Reference_ID=238;
/** Source Currency = S */ /** Source Currency = S */
@ -590,8 +592,8 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
public static final int FACTOR_AD_Reference_ID=53285; public static final int FACTOR_AD_Reference_ID=53285;
/** Thousand = k */ /** Thousand = k */
public static final String FACTOR_Thousand = "k"; public static final String FACTOR_Thousand = "k";
/** Million = m */ /** Million = M */
public static final String FACTOR_Million = "m"; public static final String FACTOR_Million = "M";
/** Set Factor. /** Set Factor.
@param Factor @param Factor
Scaling factor. Scaling factor.
@ -599,7 +601,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
public void setFactor (String Factor) public void setFactor (String Factor)
{ {
if (Factor == null || Factor.equals("k") || Factor.equals("m")); else throw new IllegalArgumentException ("Factor Invalid value - " + Factor + " - Reference_ID=53285 - k - m"); set_Value (COLUMNNAME_Factor, Factor); if (Factor == null || Factor.equals("k") || Factor.equals("M")); else throw new IllegalArgumentException ("Factor Invalid value - " + Factor + " - Reference_ID=53285 - k - M"); set_Value (COLUMNNAME_Factor, Factor);
} }
/** Get Factor. /** Get Factor.
@ -627,7 +629,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
return (String)get_Value(COLUMNNAME_FormatPattern); return (String)get_Value(COLUMNNAME_FormatPattern);
} }
public I_GL_Budget getGL_Budget() throws Exception public I_GL_Budget getGL_Budget() throws RuntimeException
{ {
Class<?> clazz = MTable.getClass(I_GL_Budget.Table_Name); Class<?> clazz = MTable.getClass(I_GL_Budget.Table_Name);
I_GL_Budget result = null; I_GL_Budget result = null;
@ -638,7 +640,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
throw e; throw new RuntimeException( e );
} }
return result; return result;
} }
@ -978,7 +980,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
return false; return false;
} }
public I_M_Product getM_Product() throws Exception public I_M_Product getM_Product() throws RuntimeException
{ {
Class<?> clazz = MTable.getClass(I_M_Product.Table_Name); Class<?> clazz = MTable.getClass(I_M_Product.Table_Name);
I_M_Product result = null; I_M_Product result = null;
@ -989,7 +991,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
throw e; throw new RuntimeException( e );
} }
return result; return result;
} }
@ -1119,29 +1121,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
return ii.intValue(); return ii.intValue();
} }
/** Set Report Column. public I_PA_ReportColumnSet getPA_ReportColumnSet() throws RuntimeException
@param PA_ReportColumn_ID
Column in Report
*/
public void setPA_ReportColumn_ID (int PA_ReportColumn_ID)
{
if (PA_ReportColumn_ID < 1)
throw new IllegalArgumentException ("PA_ReportColumn_ID is mandatory.");
set_ValueNoCheck (COLUMNNAME_PA_ReportColumn_ID, Integer.valueOf(PA_ReportColumn_ID));
}
/** Get Report Column.
@return Column in Report
*/
public int getPA_ReportColumn_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_PA_ReportColumn_ID);
if (ii == null)
return 0;
return ii.intValue();
}
public I_PA_ReportColumnSet getPA_ReportColumnSet() throws Exception
{ {
Class<?> clazz = MTable.getClass(I_PA_ReportColumnSet.Table_Name); Class<?> clazz = MTable.getClass(I_PA_ReportColumnSet.Table_Name);
I_PA_ReportColumnSet result = null; I_PA_ReportColumnSet result = null;
@ -1152,7 +1132,7 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
throw e; throw new RuntimeException( e );
} }
return result; return result;
} }
@ -1179,6 +1159,28 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
return ii.intValue(); return ii.intValue();
} }
/** Set Report Column.
@param PA_ReportColumn_ID
Column in Report
*/
public void setPA_ReportColumn_ID (int PA_ReportColumn_ID)
{
if (PA_ReportColumn_ID < 1)
throw new IllegalArgumentException ("PA_ReportColumn_ID is mandatory.");
set_ValueNoCheck (COLUMNNAME_PA_ReportColumn_ID, Integer.valueOf(PA_ReportColumn_ID));
}
/** Get Report Column.
@return Column in Report
*/
public int getPA_ReportColumn_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_PA_ReportColumn_ID);
if (ii == null)
return 0;
return ii.intValue();
}
/** PostingType AD_Reference_ID=125 */ /** PostingType AD_Reference_ID=125 */
public static final int POSTINGTYPE_AD_Reference_ID=125; public static final int POSTINGTYPE_AD_Reference_ID=125;
/** Actual = A */ /** Actual = A */

52
base/src/org/compiere/model/X_PA_ReportLine.java
View File

@ -44,8 +44,8 @@ public class X_PA_ReportLine extends PO implements I_PA_ReportLine, I_Persistent
// Y // Y
setLineType (null); setLineType (null);
setName (null); setName (null);
setPA_ReportLine_ID (0);
setPA_ReportLineSet_ID (0); setPA_ReportLineSet_ID (0);
setPA_ReportLine_ID (0);
setSeqNo (0); setSeqNo (0);
// @SQL=SELECT NVL(MAX(SeqNo),0)+10 AS DefaultValue FROM PA_ReportLine WHERE PA_ReportLineSet_ID=@PA_ReportLineSet_ID@ // @SQL=SELECT NVL(MAX(SeqNo),0)+10 AS DefaultValue FROM PA_ReportLine WHERE PA_ReportLineSet_ID=@PA_ReportLineSet_ID@
} */ } */
@ -105,6 +105,8 @@ public class X_PA_ReportLine extends PO implements I_PA_ReportLine, I_Persistent
public static final String AMOUNTTYPE_YearDebitOnly = "DY"; public static final String AMOUNTTYPE_YearDebitOnly = "DY";
/** Year Quantity = QY */ /** Year Quantity = QY */
public static final String AMOUNTTYPE_YearQuantity = "QY"; public static final String AMOUNTTYPE_YearQuantity = "QY";
/** Natural Balance = BN */
public static final String AMOUNTTYPE_NaturalBalance = "BN";
/** Set Amount Type. /** Set Amount Type.
@param AmountType @param AmountType
Type of amount to report Type of amount to report
@ -112,7 +114,7 @@ public class X_PA_ReportLine extends PO implements I_PA_ReportLine, I_Persistent
public void setAmountType (String AmountType) public void setAmountType (String AmountType)
{ {
if (AmountType == null || AmountType.equals("DT") || AmountType.equals("CT") || AmountType.equals("BT") || AmountType.equals("BP") || AmountType.equals("CP") || AmountType.equals("DP") || AmountType.equals("QP") || AmountType.equals("QT") || AmountType.equals("BY") || AmountType.equals("CY") || AmountType.equals("DY") || AmountType.equals("QY")); else throw new IllegalArgumentException ("AmountType Invalid value - " + AmountType + " - Reference_ID=235 - DT - CT - BT - BP - CP - DP - QP - QT - BY - CY - DY - QY"); set_Value (COLUMNNAME_AmountType, AmountType); if (AmountType == null || AmountType.equals("DT") || AmountType.equals("CT") || AmountType.equals("BT") || AmountType.equals("BP") || AmountType.equals("CP") || AmountType.equals("DP") || AmountType.equals("QP") || AmountType.equals("QT") || AmountType.equals("BY") || AmountType.equals("CY") || AmountType.equals("DY") || AmountType.equals("QY") || AmountType.equals("BN")); else throw new IllegalArgumentException ("AmountType Invalid value - " + AmountType + " - Reference_ID=235 - DT - CT - BT - BP - CP - DP - QP - QT - BY - CY - DY - QY - BN"); set_Value (COLUMNNAME_AmountType, AmountType);
} }
/** Get Amount Type. /** Get Amount Type.
@ -165,7 +167,7 @@ public class X_PA_ReportLine extends PO implements I_PA_ReportLine, I_Persistent
return (String)get_Value(COLUMNNAME_Description); return (String)get_Value(COLUMNNAME_Description);
} }
public I_GL_Budget getGL_Budget() throws Exception public I_GL_Budget getGL_Budget() throws RuntimeException
{ {
Class<?> clazz = MTable.getClass(I_GL_Budget.Table_Name); Class<?> clazz = MTable.getClass(I_GL_Budget.Table_Name);
I_GL_Budget result = null; I_GL_Budget result = null;
@ -176,7 +178,7 @@ public class X_PA_ReportLine extends PO implements I_PA_ReportLine, I_Persistent
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
throw e; throw new RuntimeException( e );
} }
return result; return result;
} }
@ -326,26 +328,7 @@ public class X_PA_ReportLine extends PO implements I_PA_ReportLine, I_Persistent
return ii.intValue(); return ii.intValue();
} }
/** Set Report Line. public I_PA_ReportLineSet getPA_ReportLineSet() throws RuntimeException
@param PA_ReportLine_ID Report Line */
public void setPA_ReportLine_ID (int PA_ReportLine_ID)
{
if (PA_ReportLine_ID < 1)
throw new IllegalArgumentException ("PA_ReportLine_ID is mandatory.");
set_ValueNoCheck (COLUMNNAME_PA_ReportLine_ID, Integer.valueOf(PA_ReportLine_ID));
}
/** Get Report Line.
@return Report Line */
public int getPA_ReportLine_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_PA_ReportLine_ID);
if (ii == null)
return 0;
return ii.intValue();
}
public I_PA_ReportLineSet getPA_ReportLineSet() throws Exception
{ {
Class<?> clazz = MTable.getClass(I_PA_ReportLineSet.Table_Name); Class<?> clazz = MTable.getClass(I_PA_ReportLineSet.Table_Name);
I_PA_ReportLineSet result = null; I_PA_ReportLineSet result = null;
@ -356,7 +339,7 @@ public class X_PA_ReportLine extends PO implements I_PA_ReportLine, I_Persistent
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e); log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz); log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
throw e; throw new RuntimeException( e );
} }
return result; return result;
} }
@ -380,6 +363,25 @@ public class X_PA_ReportLine extends PO implements I_PA_ReportLine, I_Persistent
return ii.intValue(); return ii.intValue();
} }
/** Set Report Line.
@param PA_ReportLine_ID Report Line */
public void setPA_ReportLine_ID (int PA_ReportLine_ID)
{
if (PA_ReportLine_ID < 1)
throw new IllegalArgumentException ("PA_ReportLine_ID is mandatory.");
set_ValueNoCheck (COLUMNNAME_PA_ReportLine_ID, Integer.valueOf(PA_ReportLine_ID));
}
/** Get Report Line.
@return Report Line */
public int getPA_ReportLine_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_PA_ReportLine_ID);
if (ii == null)
return 0;
return ii.intValue();
}
/** PostingType AD_Reference_ID=125 */ /** PostingType AD_Reference_ID=125 */
public static final int POSTINGTYPE_AD_Reference_ID=125; public static final int POSTINGTYPE_AD_Reference_ID=125;
/** Actual = A */ /** Actual = A */

16
base/src/org/compiere/report/FinReport.java
View File

@ -343,6 +343,12 @@ public class FinReport extends SvrProcess
info.append("Total"); info.append("Total");
select.append(sql); select.append(sql);
} }
else if (m_lines[line].isNatural())
{
String sql = frp.getNaturalWhere("Fact_Acct");
info.append("Natural");
select.append(sql);
}
else else
{ {
log.log(Level.SEVERE, "No valid Line AmountType"); log.log(Level.SEVERE, "No valid Line AmountType");
@ -370,6 +376,12 @@ public class FinReport extends SvrProcess
info.append("Total"); info.append("Total");
select.append(sql); select.append(sql);
} }
else if (m_columns[col].isNatural())
{
String sql = frp.getNaturalWhere("Fact_Acct");
info.append("Natural");
select.append(sql);
}
else else
{ {
log.log(Level.SEVERE, "No valid Column AmountType"); log.log(Level.SEVERE, "No valid Column AmountType");
@ -883,6 +895,8 @@ public class FinReport extends SvrProcess
select.append(frp.getPeriodWhere()); select.append(frp.getPeriodWhere());
else if (m_lines[line].isYear()) else if (m_lines[line].isYear())
select.append(frp.getYearWhere()); select.append(frp.getYearWhere());
else if (m_lines[line].isNatural())
select.append(frp.getNaturalWhere("fb"));
else else
select.append(frp.getTotalWhere()); select.append(frp.getTotalWhere());
} }
@ -892,6 +906,8 @@ public class FinReport extends SvrProcess
select.append(frp.getPeriodWhere()); select.append(frp.getPeriodWhere());
else if (m_columns[col].isYear()) else if (m_columns[col].isYear())
select.append(frp.getYearWhere()); select.append(frp.getYearWhere());
else if (m_columns[col].isNatural())
select.append(frp.getNaturalWhere("fb"));
else else
select.append(frp.getTotalWhere()); select.append(frp.getTotalWhere());
} }

9
base/src/org/compiere/report/FinReportPeriod.java
View File

@ -147,4 +147,13 @@ public class FinReportPeriod
return m_YearStartDate; return m_YearStartDate;
} }
public String getNaturalWhere(String alias) {
String yearWhere = getYearWhere();
String totalWhere = getTotalWhere();
String bs = " EXISTS (SELECT C_ElementValue_ID FROM C_ElementValue WHERE C_ElementValue_ID = " + alias + ".Account_ID AND AccountType NOT IN ('R', 'E'))";
String full = totalWhere + " AND ( " + bs + " OR TRUNC(" + alias + ".DateAcct) " + yearWhere + " ) ";
return full;
}
} // FinReportPeriod } // FinReportPeriod

7
base/src/org/compiere/report/MReportColumn.java
View File

@ -501,4 +501,11 @@ public class MReportColumn extends X_PA_ReportColumn
return retValue; return retValue;
} // copy } // copy
public boolean isNatural() {
String at = getAmountType();
if (at == null)
return false;
return AMOUNTTYPE_NaturalBalance.equals(at);
}
} // MReportColumn } // MReportColumn

14
base/src/org/compiere/report/MReportLine.java
View File

@ -241,6 +241,20 @@ public class MReportLine extends X_PA_ReportLine
|| AMOUNTTYPE_TotalDebitOnly.equals(at) || AMOUNTTYPE_TotalDebitOnly.equals(at)
|| AMOUNTTYPE_TotalQuantity.equals(at); || AMOUNTTYPE_TotalQuantity.equals(at);
} // isTotal } // isTotal
/**
* Is it natural balance ?
* Natural balance means year balance for profit and loss a/c, total balance for balance sheet account
* @return true if Natural Balance Amount Type
*/
public boolean isNatural()
{
String at = getAmountType();
if (at == null)
return false;
return AMOUNTTYPE_NaturalBalance.equals(at);
}
/** /**
* Get SQL where clause (sources, posting type) * Get SQL where clause (sources, posting type)