details: /erp/devel/int/rev/6ba00074e974
changeset: 6948:6ba00074e974
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Wed Apr 07 18:06:23 2010 +0530
summary: Fixes Issue 12406:Errors in Payment Aging Balance
details: /erp/devel/int/rev/6100969e4b39
changeset: 6949:6100969e4b39
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Apr 07 15:52:14 2010 +0200
summary: fixed bug 12357: Incorrect message setting dependency for a module
not in development
details: /erp/devel/int/rev/74935d22e705
changeset: 6950:74935d22e705
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Apr 07 16:32:31 2010 +0200
summary: fixed issue 12703: Possible to have base reference == Y with parent
The fix includes:
-Trigger to force parent to null for base references
-WADValidation to ensure no base references with parent
details: /erp/devel/int/rev/c9b94427d692
changeset: 6951:c9b94427d692
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Apr 07 17:32:16 2010 +0200
summary: Fixed some typos
diffstat:
src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml | 2 +-
src-db/database/model/triggers/AD_REFERENCE_MOD_TRG.xml | 10 +++-
src-wad/src/org/openbravo/wad/validation/WADValidationResult.java | 3 +-
src-wad/src/org/openbravo/wad/validation/WADValidator.java | 23
+++++++++-
src-wad/src/org/openbravo/wad/validation/WADValidator_data.xsql | 16 ++++++
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.jrxml | 16 +++---
6 files changed, 58 insertions(+), 12 deletions(-)
diffs (192 lines):
diff -r 5405425e49d3 -r c9b94427d692
src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml
--- a/src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml Wed Apr
07 13:07:18 2010 +0200
+++ b/src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml Wed Apr
07 17:32:16 2010 +0200
@@ -65,7 +65,7 @@
END IF;
IF (INSERTING AND devModule='N') THEN
- RAISE_APPLICATION_ERROR(-20000, '@20533');
+ RAISE_APPLICATION_ERROR(-20000, '@20533@');
END IF;
END AD_MODULE_DEPENDENCY_MOD_TRG
]]></body>
diff -r 5405425e49d3 -r c9b94427d692
src-db/database/model/triggers/AD_REFERENCE_MOD_TRG.xml
--- a/src-db/database/model/triggers/AD_REFERENCE_MOD_TRG.xml Wed Apr 07
13:07:18 2010 +0200
+++ b/src-db/database/model/triggers/AD_REFERENCE_MOD_TRG.xml Wed Apr 07
17:32:16 2010 +0200
@@ -15,7 +15,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008-2009 Openbravo SLU
+* All portions are Copyright (C) 2008-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************/
@@ -93,6 +93,14 @@
RAISE_APPLICATION_ERROR(-20000, '@IF_NOT_BASE_THEN_PARENT_MANDATORY@');
END IF;
END IF;
+
+
+ --Force base reference not to have parent
+ IF UPDATING THEN
+ IF (:new.IsBaseReference='Y') THEN
+ :new.parentReference_ID := null;
+ END IF;
+ END IF;
END AD_REFERENCE_MOD_TRG
]]></body>
diff -r 5405425e49d3 -r c9b94427d692
src-wad/src/org/openbravo/wad/validation/WADValidationResult.java
--- a/src-wad/src/org/openbravo/wad/validation/WADValidationResult.java Wed Apr
07 13:07:18 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/validation/WADValidationResult.java Wed Apr
07 17:32:16 2010 +0200
@@ -40,7 +40,8 @@
public enum WADValidationType {
SQL("SQL"), MISSING_IDENTIFIER("Missing Identifier"), MISSING_KEY("Missing
Key Column"), MODEL_OBJECT(
"Model Object"), MODEL_OBJECT_MAPPING("HTML Mapping"),
COLUMN_NAME("Column Naming"), AUXILIARINPUT(
- "Auxiliary Input Name"), MULTIPLE_KEYS("Multiple Key Columns in
Table");
+ "Auxiliary Input Name"), MULTIPLE_KEYS("Multiple Key Columns in
Table"), BASEREFERENCE_WITH_PARENT(
+ "Base Reference with Parent Reference");
private String description;
diff -r 5405425e49d3 -r c9b94427d692
src-wad/src/org/openbravo/wad/validation/WADValidator.java
--- a/src-wad/src/org/openbravo/wad/validation/WADValidator.java Wed Apr
07 13:07:18 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/validation/WADValidator.java Wed Apr
07 17:32:16 2010 +0200
@@ -62,6 +62,7 @@
validateModelObjectMapping(result);
validateColumnNaming(result);
validateAuxiliarInput(result);
+ validateReferences(result);
return result;
}
@@ -173,8 +174,28 @@
}
} catch (Exception e) {
result.addWarning(WADValidationType.SQL,
- "Error when executing query for validating moel object: " +
e.getMessage());
+ "Error when executing query for validating model object: " +
e.getMessage());
}
}
+ /**
+ * Validates base references don't have parent reference
+ */
+ private void validateReferences(WADValidationResult result) {
+ try {
+ WADValidatorData data[] =
WADValidatorData.checkBaseReferenceWithParent(conn, modules,
+ checkAll);
+ for (WADValidatorData issue : data) {
+ result.addError(WADValidationType.BASEREFERENCE_WITH_PARENT,
issue.objectname
+ + " base reference has parent reference " + issue.currentvalue
+ + ". Base references should not have parent reference.");
+ result.addModule(issue.modulename);
+ }
+ } catch (Exception e) {
+ result.addWarning(WADValidationType.SQL,
+ "Error when executing query for validating references: " +
e.getMessage());
+ }
+
+ }
+
}
diff -r 5405425e49d3 -r c9b94427d692
src-wad/src/org/openbravo/wad/validation/WADValidator_data.xsql
--- a/src-wad/src/org/openbravo/wad/validation/WADValidator_data.xsql Wed Apr
07 13:07:18 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/validation/WADValidator_data.xsql Wed Apr
07 17:32:16 2010 +0200
@@ -269,4 +269,20 @@
<Parameter name="checkAll"/>
</SqlMethod>
+ <SqlMethod name="checkBaseReferenceWithParent" type="preparedStatement"
return="multiple">
+ <Sql>
+ <![CDATA[
+ select r.name as objectName, m.name as moduleName, r2.name as
currentvalue
+ from ad_reference r, ad_module m, ad_reference r2
+ where r.isBaseReference = 'Y'
+ and r.parentReference_ID is not null
+ and r2.ad_reference_id = r.parentReference_ID
+ and m.ad_module_id = r.ad_module_id
+ and (m.javapackage in ('1') or to_char('Y')=to_char(?))
+ ]]>
+ </Sql>
+ <Parameter name="module" optional="true" type="replace"
after="m.javapackage in (" text="'1'"/>
+ <Parameter name="checkAll"/>
+ </SqlMethod>
+
</SqlClass>
diff -r 5405425e49d3 -r c9b94427d692
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.jrxml Wed Apr
07 13:07:18 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.jrxml Wed Apr
07 17:32:16 2010 +0200
@@ -202,7 +202,7 @@
<field name="FIVE" class="java.math.BigDecimal"/>
<field name="TOTAL" class="java.math.BigDecimal"/>
- <variable name="SUM_ZERO_1" class="java.math.BigDecimal"
resetType="Column" calculation="Sum">
+ <variable name="SUM_ZERO_1" class="java.math.BigDecimal"
resetType="Report" calculation="Sum">
<variableExpression><![CDATA[$F{ZERO}]]></variableExpression>
</variable>
<variable name="SUM_ONE_1" class="java.math.BigDecimal"
resetType="Report" calculation="Sum">
@@ -570,7 +570,7 @@
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
- <textFieldExpression
class="java.math.BigDecimal"><![CDATA[$V{SUM_ZERO_1}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[($V{SUM_ZERO_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_ZERO_1}):new
String(" ")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
pattern="##0.00" isBlankWhenNull="false" evaluationTime="Now"
hyperlinkType="None" hyperlinkTarget="Self" >
<reportElement
@@ -586,7 +586,7 @@
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
- <textFieldExpression
class="java.math.BigDecimal"><![CDATA[$V{SUM_ONE_1}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[($V{SUM_ONE_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_ONE_1}):new
String(" ")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
pattern="##0.00" isBlankWhenNull="false" evaluationTime="Now"
hyperlinkType="None" hyperlinkTarget="Self" >
<reportElement
@@ -602,7 +602,7 @@
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
- <textFieldExpression
class="java.math.BigDecimal"><![CDATA[$V{SUM_TWO_1}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[($V{SUM_TWO_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_TWO_1}):new
String(" ")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
pattern="##0.00" isBlankWhenNull="false" evaluationTime="Now"
hyperlinkType="None" hyperlinkTarget="Self" >
<reportElement
@@ -618,7 +618,7 @@
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
- <textFieldExpression
class="java.math.BigDecimal"><![CDATA[$V{SUM_THREE_1}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[($V{SUM_THREE_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_THREE_1}):new
String(" ")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
pattern="##0.00" isBlankWhenNull="false" evaluationTime="Now"
hyperlinkType="None" hyperlinkTarget="Self" >
<reportElement
@@ -634,7 +634,7 @@
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
- <textFieldExpression
class="java.math.BigDecimal"><![CDATA[$V{SUM_FOUR_1}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[($V{SUM_FOUR_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_FOUR_1}):new
String(" ")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
pattern="##0.00" isBlankWhenNull="false" evaluationTime="Now"
hyperlinkType="None" hyperlinkTarget="Self" >
<reportElement
@@ -650,7 +650,7 @@
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
- <textFieldExpression
class="java.math.BigDecimal"><![CDATA[$V{SUM_FIVE_1}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[($V{SUM_FIVE_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_FIVE_1}):new
String(" ")]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="false"
pattern="##0.00" isBlankWhenNull="false" evaluationTime="Now"
hyperlinkType="None" hyperlinkTarget="Self" >
<reportElement
@@ -666,7 +666,7 @@
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
- <textFieldExpression
class="java.math.BigDecimal"><![CDATA[$V{SUM_TOTAL_1}]]></textFieldExpression>
+ <textFieldExpression
class="java.lang.String"><![CDATA[($V{SUM_TOTAL_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_TOTAL_1}):new
String(" ")]]></textFieldExpression>
</textField>
</band>
</summary>
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
