details: /erp/stable/2.50/rev/6994a95adc51
changeset: 9447:6994a95adc51
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Tue May 24 18:32:18 2011 +0200
summary: Fixes issue 17342: You cannot install current APRM version on top of
MP30. Build validation is not working
diffstat:
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckAPRMVersionDependency.class
| 0
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckAPRMVersionDependencyData.class
| 0
src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckAPRMVersionDependency.java
| 3 +-
src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckAPRMVersionDependency_data.xsql
| 16 ++++++++-
4 files changed, 15 insertions(+), 4 deletions(-)
diffs (58 lines):
diff -r ed0418b01ffc -r 6994a95adc51
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckAPRMVersionDependency.class
Binary file
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckAPRMVersionDependency.class
has changed
diff -r ed0418b01ffc -r 6994a95adc51
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckAPRMVersionDependencyData.class
Binary file
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckAPRMVersionDependencyData.class
has changed
diff -r ed0418b01ffc -r 6994a95adc51
src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckAPRMVersionDependency.java
---
a/src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckAPRMVersionDependency.java
Fri May 20 08:58:37 2011 +0200
+++
b/src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckAPRMVersionDependency.java
Tue May 24 18:32:18 2011 +0200
@@ -40,14 +40,13 @@
boolean isValid = true;
try {
- if (CheckAPRMVersionDependencyData.isAPRMinstalled(cp)) {
+ if (CheckAPRMVersionDependencyData.isAPRMinstalled(cp) ||
CheckAPRMVersionDependencyData.isInstallingAPRM(cp)) {
CheckAPRMVersionDependencyData[] data =
CheckAPRMVersionDependencyData.getAPRMversion(cp);
String[] versionParts = data[0].version.split("\\.");
if (versionParts.length == 3) {
BigDecimal part1 = new BigDecimal(versionParts[0]);
BigDecimal part2 = new BigDecimal(versionParts[1]);
BigDecimal part3 = new BigDecimal(versionParts[2]);
-
if (part1.compareTo(minPart1) < 0) {
isValid = false;
} else if (part1.compareTo(minPart1) == 0) {
diff -r ed0418b01ffc -r 6994a95adc51
src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckAPRMVersionDependency_data.xsql
---
a/src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckAPRMVersionDependency_data.xsql
Fri May 20 08:58:37 2011 +0200
+++
b/src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckAPRMVersionDependency_data.xsql
Tue May 24 18:32:18 2011 +0200
@@ -22,9 +22,14 @@
<SqlMethod name="getAPRMversion" type="preparedStatement" return="multiple">
<SqlMethodComment>Return the version of installed APRM
module</SqlMethodComment>
<Sql><![CDATA[
- SELECT version, '' as isinstalled
+ SELECT version, '' as isinstalled, '' as isupdating, '2' as ordering
FROM ad_module
WHERE ad_module_id = 'A918E3331C404B889D69AA9BFAFB23AC'
+ UNION ALL
+ SELECT version, '' as isinstalled, '' as isupdating, '1' as ordering
+ FROM ad_module_install
+ WHERE ad_module_id = 'A918E3331C404B889D69AA9BFAFB23AC'
+ ORDER BY ordering
]]></Sql>
</SqlMethod>
<SqlMethod name="isAPRMinstalled" type="preparedStatement" return="boolean">
@@ -33,7 +38,14 @@
SELECT count(*) as isinstalled
FROM ad_module
WHERE ad_module_id = 'A918E3331C404B889D69AA9BFAFB23AC'
- AND enabled = 'Y'
+ ]]></Sql>
+ </SqlMethod>
+ <SqlMethod name="isInstallingAPRM" type="preparedStatement"
return="boolean">
+ <SqlMethodComment>Checks if the Advanced Payables and Receivables module
is going to be installed.</SqlMethodComment>
+ <Sql><![CDATA[
+ SELECT count(*) as isupdating
+ FROM ad_module_install
+ WHERE ad_module_id = 'A918E3331C404B889D69AA9BFAFB23AC'
]]></Sql>
</SqlMethod>
</SqlClass>
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
