details: /erp/devel/pi/rev/27da3568c48f
changeset: 7917:27da3568c48f
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Mon Jul 12 22:58:55 2010 +0200
summary: Fixes issue 0009740: Module version number validator (DB trigger)
changed to allow integers only.
details: /erp/devel/pi/rev/24bb544a4424
changeset: 7918:24bb544a4424
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Mon Jul 26 14:43:05 2010 +0200
summary: Fixes issue 9740: Module version number validator (DB trigger)
changed to allow integers only.
details: /erp/devel/pi/rev/7aabb80b744d
changeset: 7919:7aabb80b744d
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Mon Jul 26 15:01:24 2010 +0200
summary: Merge branches
diffstat:
CONTRIBUTORS |
1 +
build.xml |
28 +-
referencedata/sampledata/QA_Testing.xml |
265965 +++++----
src-db/database/build.xml |
8 +-
src-db/database/lib/dbsourcemanager.jar |
0
src-db/database/model/functions/AD_MODULE_CHECKED.xml |
42 +
src-db/database/model/functions/AD_MODULE_IDENTIFIER.xml |
48 +
src-db/database/model/functions/C_ORDER_POST1.xml |
8 +-
src-db/database/model/functions/C_REMITTANCE_POST.xml |
2 +-
src-db/database/model/functions/FACT_ACCT_RESET.xml |
4 +-
src-db/database/model/functions/MRP_PURCHASEPLAN.xml |
12 +-
src-db/database/model/functions/MRP_RUN_INITIALIZE.xml |
2 +
src-db/database/model/functions/M_INOUT_POST.xml |
41 +
src-db/database/model/tables/AD_TREENODEBP.xml |
4 +
src-db/database/model/tables/AD_TREENODEPR.xml |
4 +
src-db/database/model/tables/C_PERIODCONTROL.xml |
3 +
src-db/database/model/triggers/AD_DATASET_COLUMN_MOD_TRG.xml |
17 +-
src-db/database/model/triggers/AD_DATASET_TABLE_MOD_TRG.xml |
15 +-
src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml |
42 +-
src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml |
10 +-
src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml |
2 +-
src-db/database/sourcedata/AD_ELEMENT.xml |
11 +-
src-db/database/sourcedata/AD_FIELD.xml |
16 +-
src-db/database/sourcedata/AD_MESSAGE.xml |
22 +
src-db/database/sourcedata/AD_MODULE.xml |
1 +
src-db/database/sourcedata/AD_REF_LIST.xml |
23 +
src-db/database/sourcedata/AD_REF_TABLE.xml |
2 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml |
88 +-
src-test/org/openbravo/test/dal/IssuesTest.java |
23 +
src/org/openbravo/erpCommon/ad_forms/About.html |
2 +-
src/org/openbravo/erpCommon/ad_forms/AcctServer.java |
4 +-
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql |
1 +
src/org/openbravo/erpCommon/ad_forms/AlertManagement_data.xsql |
98 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java |
5 +
src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql |
2 +-
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html |
76 +-
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java |
30 +-
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java |
17 +-
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup_data.xsql |
2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java |
18 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementSettings.html |
6 +-
src/org/openbravo/erpCommon/ad_reports/ReportBudgetExportExcel.java |
3 +-
src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.html |
1 -
src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.xml |
1 -
src/org/openbravo/erpCommon/ad_reports/ReportDebtPaymentTrack.java |
111 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPaymentTrack_data.xsql |
282 +-
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java |
13 +-
src/org/openbravo/erpCommon/info/Locator_data.xsql |
4 +-
src/org/openbravo/erpCommon/modules/ImportModule.java |
43 +-
src/org/openbravo/erpCommon/modules/ModuleReferenceDataClientTree_data.xsql |
5 +-
src/org/openbravo/erpCommon/security/Login_F1.html |
25 +-
src/org/openbravo/erpCommon/security/SessionLogin.java |
2 +-
src/org/openbravo/erpCommon/utility/GenericTree.srpt |
2 +-
src/org/openbravo/erpCommon/utility/GenericTree.xml |
1 +
src/org/openbravo/reference/ui/UIReferenceUtility.java |
7 +-
src/org/openbravo/service/db/CallProcess.java |
1 +
web/js/appStatus.js |
15 +-
web/js/utils.js |
71 +-
58 files changed, 134052 insertions(+), 133240 deletions(-)
diffs (truncated from 268332 to 300 lines):
diff -r 7fb79db72f66 -r 7aabb80b744d CONTRIBUTORS
--- a/CONTRIBUTORS Mon Jul 12 22:54:26 2010 +0200
+++ b/CONTRIBUTORS Mon Jul 26 15:01:24 2010 +0200
@@ -7,3 +7,4 @@
Ben Sommerville <[email protected]> - Bug fixing
Ville Lindfors <[email protected]> - Code clean up
Miroslav Lazarevic <[email protected]> - Fixes to the build system
+Valery Lezhebokov <[email protected]> - Bug fixing
diff -r 7fb79db72f66 -r 7aabb80b744d build.xml
--- a/build.xml Mon Jul 12 22:54:26 2010 +0200
+++ b/build.xml Mon Jul 26 15:01:24 2010 +0200
@@ -190,6 +190,10 @@
</condition>
<path id="project.class.path">
+ <dirset dir="${base.modules}">
+ <include name="*/build/classes/" />
+ </dirset>
+ <pathelement path="${basedir}/../../src-util/modulescript/build/classes/"
/>
<pathelement path="${build}" />
<pathelement path="${base.src}" />
<fileset dir="${base.lib}">
@@ -213,14 +217,14 @@
<fileset dir="${base.modules}">
<include name="*/lib/**" />
</fileset>
+ </path>
+
+ <!-- This classpath is needed only for the compile.apply.module task-->
+ <path id="apply.module.compile.classpath">
<dirset dir="${base.modules}">
<include name="*/build/classes/" />
</dirset>
<pathelement path="${basedir}/../../src-util/modulescript/build/classes/"
/>
- </path>
-
- <!-- This classpath is needed only for the compile.apply.module task-->
- <path id="apply.module.compile.classpath">
<pathelement path="${build.apply.module}" />
<pathelement path="${base.src}" />
<fileset dir="${base.lib}">
@@ -244,14 +248,14 @@
<fileset dir="${base.modules}">
<include name="*/lib/**" />
</fileset>
+ </path>
+
+ <!-- This classpath is needed only for the apply.module task-->
+ <path id="apply.module.runtime.classpath">
<dirset dir="${base.modules}">
<include name="*/build/classes/" />
</dirset>
<pathelement path="${basedir}/../../src-util/modulescript/build/classes/"
/>
- </path>
-
- <!-- This classpath is needed only for the apply.module task-->
- <path id="apply.module.runtime.classpath">
<pathelement path="${build.apply.module}" />
<pathelement path="${build}" />
<pathelement path="${base.src}" />
@@ -276,10 +280,6 @@
<fileset dir="${base.modules}">
<include name="*/lib/**" />
</fileset>
- <dirset dir="${base.modules}">
- <include name="*/build/classes/" />
- </dirset>
- <pathelement path="${basedir}/../../src-util/modulescript/build/classes/"
/>
</path>
<macrodef name="updatesystemstatus">
@@ -926,12 +926,16 @@
<or>
<equals arg1="${os.arch}" arg2="x86" />
<equals arg1="${os.arch}" arg2="i386" />
+ <contains string="${os.name}" substring="Windows" />
</or>
</condition>
<condition property="osarch" value="-x64">
<or>
<equals arg1="${os.arch}" arg2="amd64" />
<equals arg1="${os.arch}" arg2="x86_64" />
+ <not>
+ <contains string="${os.name}" substring="Windows" />
+ </not>
</or>
</condition>
<condition property="osarch" value="-ia64">
diff -r 7fb79db72f66 -r 7aabb80b744d referencedata/sampledata/QA_Testing.xml
--- a/referencedata/sampledata/QA_Testing.xml Mon Jul 12 22:54:26 2010 +0200
+++ b/referencedata/sampledata/QA_Testing.xml Mon Jul 26 15:01:24 2010 +0200
@@ -1,132976 +1,132989 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ob:Openbravo xmlns:ob="http://www.openbravo.com";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <ADClient id="4028E6C72959682B01295A070852010D">
- <id>4028E6C72959682B01295A070852010D</id>
- <organization id="0"/>
- <active>true</active>
- <searchKey>QA Testing</searchKey>
- <name>QA Testing</name>
- <description>QA Testing</description>
- <mailHost xsi:nil="true"/>
- <requestEmail xsi:nil="true"/>
- <requestUser xsi:nil="true"/>
- <requestUserPassword xsi:nil="true"/>
- <requestFolder xsi:nil="true"/>
- <language xsi:nil="true"/>
- <multilingualDocuments>false</multilingualDocuments>
- <sMTPAuthentification>false</sMTPAuthentification>
- <currency id="102"/>
- </ADClient>
- <FinancialMgmtPaymentTerm id="7B308C5CB9674BB3A56E63D85887058A">
- <id>7B308C5CB9674BB3A56E63D85887058A</id>
- <client id="4028E6C72959682B01295A070852010D"/>
- <organization id="0"/>
- <active>true</active>
- <name>30 days, 5</name>
- <description xsi:nil="true"/>
- <comments xsi:nil="true"/>
- <fixedDueDate>true</fixedDueDate>
- <overduePaymentDaysRule>0</overduePaymentDaysRule>
- <maturityDate1>5</maturityDate1>
- <offsetMonthDue>1</offsetMonthDue>
- <nextBusinessDay>false</nextBusinessDay>
- <default>false</default>
- <searchKey>30d/5</searchKey>
- <overduePaymentDayRule xsi:nil="true"/>
- <valid>false</valid>
- <maturityDate2 xsi:nil="true"/>
- <maturityDate3 xsi:nil="true"/>
- </FinancialMgmtPaymentTerm>
- <FinancialMgmtPaymentTerm id="CA9D9E3E296C48E8B3F8796445F0C17D">
- <id>CA9D9E3E296C48E8B3F8796445F0C17D</id>
- <client id="4028E6C72959682B01295A070852010D"/>
- <organization id="0"/>
- <active>true</active>
- <name>90 days</name>
- <description xsi:nil="true"/>
- <comments xsi:nil="true"/>
- <fixedDueDate>false</fixedDueDate>
- <overduePaymentDaysRule>0</overduePaymentDaysRule>
- <maturityDate1 xsi:nil="true"/>
- <offsetMonthDue>3</offsetMonthDue>
- <nextBusinessDay>false</nextBusinessDay>
- <default>false</default>
- <searchKey>90d</searchKey>
- <overduePaymentDayRule xsi:nil="true"/>
- <valid>false</valid>
- <maturityDate2 xsi:nil="true"/>
- <maturityDate3 xsi:nil="true"/>
- </FinancialMgmtPaymentTerm>
- <ADUser id="0AB400823F04412EBBE5996F14B662C5">
- <id>0AB400823F04412EBBE5996F14B662C5</id>
- <client id="4028E6C72959682B01295A070852010D"/>
- <organization id="0"/>
- <active>true</active>
- <name>USAUser</name>
- <description>USAUser</description>
- <password>vGlGqXZ4nqhiXDpuUBc6OxagWVY=</password>
- <email xsi:nil="true"/>
- <supervisor xsi:nil="true"/>
- <businessPartner xsi:nil="true"/>
- <processNow xsi:nil="true"/>
- <emailServerUsername xsi:nil="true"/>
- <emailServerPassword xsi:nil="true"/>
- <partnerAddress xsi:nil="true"/>
- <greeting xsi:nil="true"/>
- <position xsi:nil="true"/>
- <comments xsi:nil="true"/>
- <phone xsi:nil="true"/>
- <alternativePhone xsi:nil="true"/>
- <fax xsi:nil="true"/>
- <lastContactDate xsi:nil="true"/>
- <lastContactResult xsi:nil="true"/>
- <birthday xsi:nil="true"/>
- <trxOrganization xsi:nil="true"/>
- <firstName xsi:nil="true"/>
- <lastName xsi:nil="true"/>
- <username>USAUser</username>
- <defaultClient xsi:nil="true"/>
- <defaultLanguage id="192"/>
- <defaultOrganization xsi:nil="true"/>
- <defaultRole xsi:nil="true"/>
- <defaultWarehouse xsi:nil="true"/>
- <locked>false</locked>
- </ADUser>
- <ADUser id="4028E6C72959682B01295A0735CB0120">
- <id>4028E6C72959682B01295A0735CB0120</id>
- <client id="4028E6C72959682B01295A070852010D"/>
- <organization id="0"/>
- <active>true</active>
- <name>QAAdmin</name>
- <description>QAAdmin</description>
- <password>ysB5jZDw0d9am0sB8WCWAPHwGhc=</password>
- <email xsi:nil="true"/>
- <supervisor xsi:nil="true"/>
- <businessPartner xsi:nil="true"/>
- <processNow>false</processNow>
- <emailServerUsername xsi:nil="true"/>
- <emailServerPassword xsi:nil="true"/>
- <partnerAddress xsi:nil="true"/>
- <greeting xsi:nil="true"/>
- <position xsi:nil="true"/>
- <comments xsi:nil="true"/>
- <phone xsi:nil="true"/>
- <alternativePhone xsi:nil="true"/>
- <fax xsi:nil="true"/>
- <lastContactDate xsi:nil="true"/>
- <lastContactResult xsi:nil="true"/>
- <birthday xsi:nil="true"/>
- <trxOrganization xsi:nil="true"/>
- <firstName xsi:nil="true"/>
- <lastName xsi:nil="true"/>
- <username>QAAdmin</username>
- <defaultClient xsi:nil="true"/>
- <defaultLanguage id="192"/>
- <defaultOrganization xsi:nil="true"/>
- <defaultRole id="4028E6C72959682B01295A071429011E"/>
- <defaultWarehouse xsi:nil="true"/>
- <locked>false</locked>
- </ADUser>
- <ADUser id="4028E6C72959682B01295F40C1D702E6">
- <id>4028E6C72959682B01295F40C1D702E6</id>
- <client id="4028E6C72959682B01295A070852010D"/>
- <organization id="0"/>
- <active>true</active>
- <name>John</name>
- <description xsi:nil="true"/>
- <password xsi:nil="true"/>
- <email xsi:nil="true"/>
- <supervisor xsi:nil="true"/>
- <businessPartner id="4028E6C72959682B01295F40BDDF02E3"/>
- <processNow>false</processNow>
- <emailServerUsername xsi:nil="true"/>
- <emailServerPassword xsi:nil="true"/>
- <partnerAddress xsi:nil="true"/>
- <greeting xsi:nil="true"/>
- <position xsi:nil="true"/>
- <comments xsi:nil="true"/>
- <phone xsi:nil="true"/>
- <alternativePhone xsi:nil="true"/>
- <fax xsi:nil="true"/>
- <lastContactDate xsi:nil="true"/>
- <lastContactResult xsi:nil="true"/>
- <birthday xsi:nil="true"/>
- <trxOrganization xsi:nil="true"/>
- <firstName xsi:nil="true"/>
- <lastName xsi:nil="true"/>
- <username xsi:nil="true"/>
- <defaultClient xsi:nil="true"/>
- <defaultLanguage xsi:nil="true"/>
- <defaultOrganization xsi:nil="true"/>
- <defaultRole xsi:nil="true"/>
- <defaultWarehouse xsi:nil="true"/>
- <locked>false</locked>
- </ADUser>
- <ADUser id="4028E6C72959682B01295F40C30F02EA">
- <id>4028E6C72959682B01295F40C30F02EA</id>
- <client id="4028E6C72959682B01295A070852010D"/>
- <organization id="0"/>
- <active>true</active>
- <name>Albert</name>
- <description xsi:nil="true"/>
- <password xsi:nil="true"/>
- <email xsi:nil="true"/>
- <supervisor xsi:nil="true"/>
- <businessPartner id="4028E6C72959682B01295F40C2A202E7"/>
- <processNow>false</processNow>
- <emailServerUsername xsi:nil="true"/>
- <emailServerPassword xsi:nil="true"/>
- <partnerAddress xsi:nil="true"/>
- <greeting xsi:nil="true"/>
- <position xsi:nil="true"/>
- <comments xsi:nil="true"/>
- <phone xsi:nil="true"/>
- <alternativePhone xsi:nil="true"/>
- <fax xsi:nil="true"/>
- <lastContactDate xsi:nil="true"/>
- <lastContactResult xsi:nil="true"/>
- <birthday xsi:nil="true"/>
- <trxOrganization xsi:nil="true"/>
- <firstName xsi:nil="true"/>
- <lastName xsi:nil="true"/>
- <username xsi:nil="true"/>
- <defaultClient xsi:nil="true"/>
- <defaultLanguage xsi:nil="true"/>
- <defaultOrganization xsi:nil="true"/>
- <defaultRole xsi:nil="true"/>
- <defaultWarehouse xsi:nil="true"/>
- <locked>false</locked>
- </ADUser>
- <ADUser id="4028E6C72959682B01295F40C43802EF">
- <id>4028E6C72959682B01295F40C43802EF</id>
- <client id="4028E6C72959682B01295A070852010D"/>
- <organization id="0"/>
- <active>true</active>
- <name>Alfred</name>
- <description xsi:nil="true"/>
- <password xsi:nil="true"/>
- <email xsi:nil="true"/>
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://ad.doubleclick.net/clk;226879339;13503038;l?
http://clk.atdmt.com/CRS/go/247765532/direct/01/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
