details: /erp/devel/pi-engdev/rev/cdfd97ab9a81
changeset: 6930:cdfd97ab9a81
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Apr 06 09:17:40 2010 +0200
summary: fixed bug 12819: The variable length of the variable v_ClassName
incorrect
details: /erp/devel/pi-engdev/rev/fb97b5f3e905
changeset: 6931:fb97b5f3e905
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Apr 06 09:45:31 2010 +0200
summary: Fixes issue 12632: DomainType should be extended with hibernatetype
and xml conversion
details: /erp/devel/pi-engdev/rev/0a2aa53b170f
changeset: 6932:0a2aa53b170f
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Apr 06 09:52:40 2010 +0200
summary: Fixes issue 12633: XML Conversion from integer numbers should be
more robust
details: /erp/devel/pi-engdev/rev/907297079fbe
changeset: 6933:907297079fbe
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Tue Apr 06 13:26:11 2010 +0200
summary: Fixes issue 12881: Added deep linking support for manual windows
details: /erp/devel/pi-engdev/rev/e39ee10c09c0
changeset: 6934:e39ee10c09c0
user: Priya Muthukumar <priya.muthukumar <at> openbravo.com>
date: Tue Apr 06 14:01:49 2010 +0200
summary: Fixed issue 12880 Create a ant task to call the webservices test
details: /erp/devel/pi-engdev/rev/ba70331d074a
changeset: 6935:ba70331d074a
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Tue Apr 06 17:52:36 2010 +0530
summary: Fixes issue 12318: A sales order with negative amount, does not
appear in \"Create invoices from orders\".
details: /erp/devel/pi-engdev/rev/34b8ebfe4d69
changeset: 6936:34b8ebfe4d69
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Apr 06 15:26:33 2010 +0200
summary: fixed bug 12778: Wrong record identifier on new records
Default values for new records are calculated now using the standard column
identifier
details: /erp/devel/pi-engdev/rev/bd47ae1e2e06
changeset: 6937:bd47ae1e2e06
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Apr 06 15:22:46 2010 +0200
summary: [validation] Improved some variable names in build.xml files
details: /erp/devel/pi-engdev/rev/fe57e4f2aa44
changeset: 6938:fe57e4f2aa44
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Apr 06 15:32:31 2010 +0200
summary: [validation] Swapped the generic message and the specific error
messages of the validations
details: /erp/devel/pi-engdev/rev/b12253476074
changeset: 6939:b12253476074
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Tue Apr 06 17:02:24 2010 +0200
summary: Fixes issue 12834: Callout for amount calculation
does not work if we change the organization
details: /erp/devel/pi-engdev/rev/a31f8e677521
changeset: 6940:a31f8e677521
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Apr 06 17:35:29 2010 +0200
summary: fixed bug 12832: Precision error
Format is now taken into accout for hidden fields
details: /erp/devel/pi-engdev/rev/ff4d43f119c3
changeset: 6941:ff4d43f119c3
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Apr 06 19:01:43 2010 +0200
summary: [validation] Added utility method handleError().
details: /erp/devel/pi-engdev/rev/b7e4da5128fe
changeset: 6942:b7e4da5128fe
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Apr 06 19:21:10 2010 +0200
summary: [validation] Add missing license to newly added files.
details: /erp/devel/pi-engdev/rev/8af91206af1a
changeset: 6943:8af91206af1a
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Tue Apr 06 19:30:53 2010 +0200
summary: Fixes issue 12886: Prevents NPE on invalid tabId
details: /erp/devel/pi-engdev/rev/3e7d26d481a3
changeset: 6944:3e7d26d481a3
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Apr 07 01:33:48 2010 +0200
summary: Fixes bug 0012858: Unable to complete purchase/sales order and
purcahse/sales invoice
details: /erp/devel/pi-engdev/rev/3775b672b34e
changeset: 6945:3775b672b34e
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Apr 07 01:50:36 2010 +0200
summary: Fixes bug 0009396: Additional Incorrect licenses
details: /erp/devel/pi-engdev/rev/2a0f92919112
changeset: 6946:2a0f92919112
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Wed Apr 07 08:36:12 2010 +0530
summary: Fixes Issue 12267: \"Line\" number shown makes no sense in Asset
amortization tab.
details: /erp/devel/pi-engdev/rev/ceb1a1dc2bc4
changeset: 6947:ceb1a1dc2bc4
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Wed Apr 07 10:23:42 2010 +0530
summary: Fixes Issue 12459: Depreciated plan is set 0 when Monthly asset
schedule
details: /erp/devel/pi-engdev/rev/775f64262c01
changeset: 6948:775f64262c01
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Apr 07 08:45:20 2010 +0200
summary: Added update check on user context cache
details: /erp/devel/pi-engdev/rev/3cc3917c2808
changeset: 6949:3cc3917c2808
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Apr 07 08:47:08 2010 +0200
summary: fixes issue 12883: Rest Webservice testcases fail because test data
is not what is expected
details: /erp/devel/pi-engdev/rev/3b09034cc725
changeset: 6950:3b09034cc725
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Apr 07 10:05:35 2010 +0200
summary: fixed bug 12470: The application dictionary allows to check two
columns as "iskey"
The fix includes:
-Callout to prevent multiple key columns: a message is shown and the second
key is unchecked
-WADValidation to validate there are no tables with mulitple key columns
details: /erp/devel/pi-engdev/rev/96f0b262e18f
changeset: 6951:96f0b262e18f
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Wed Apr 07 13:48:12 2010 +0530
summary: Fixes Issue 12424: Link to Sales Order does not work in Pending Good
Receipts.
details: /erp/devel/pi-engdev/rev/6cc47c61b609
changeset: 6952:6cc47c61b609
user: Priya Muthukumar <priya.muthukumar <at> openbravo.com>
date: Wed Apr 07 11:15:56 2010 +0200
summary: Made webservices test to halt on failure
details: /erp/devel/pi-engdev/rev/509a246e7bd4
changeset: 6953:509a246e7bd4
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Apr 07 11:59:21 2010 +0200
summary: Fixes Hudson consistency-test #411
details: /erp/devel/pi-engdev/rev/5405425e49d3
changeset: 6954:5405425e49d3
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Apr 07 13:07:18 2010 +0200
summary: fixed issue 12892: Show if a module is commercial or not in the
search results pane (MMC)
details: /erp/devel/pi-engdev/rev/6ba00074e974
changeset: 6955: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/pi-engdev/rev/6100969e4b39
changeset: 6956: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/pi-engdev/rev/74935d22e705
changeset: 6957: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/pi-engdev/rev/c9b94427d692
changeset: 6958:c9b94427d692
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Apr 07 17:32:16 2010 +0200
summary: Fixed some typos
details: /erp/devel/pi-engdev/rev/e871ecee3de7
changeset: 6959:e871ecee3de7
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Apr 08 10:08:35 2010 +0530
summary: Fixes Issue 12899: Amortization lines are not displayed in sequence
of year
details: /erp/devel/pi-engdev/rev/9b652ee60f8d
changeset: 6960:9b652ee60f8d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 08 09:44:50 2010 +0200
summary: Improved logging of received content in case of exception
details: /erp/devel/pi-engdev/rev/13d2fc73db5d
changeset: 6961:13d2fc73db5d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 08 09:45:22 2010 +0200
summary: fixes issue 12883: Rest Webservice testcases fail because test data
is not what is expected
details: /erp/devel/pi-engdev/rev/8e0cb4346d50
changeset: 6962:8e0cb4346d50
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 08 09:47:11 2010 +0200
summary: fixes issue 12901: OBDal.getInstance().getConnection() does not
setup dateFormat correctly
details: /erp/devel/pi-engdev/rev/c56bf3953565
changeset: 6963:c56bf3953565
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 08 09:47:48 2010 +0200
summary: fixes issue 12903: Error in OBQuery when using with hql clause
having order by but not where part
details: /erp/devel/pi-engdev/rev/8abd2ad43256
changeset: 6964:8abd2ad43256
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 08 14:10:42 2010 +0200
summary: Buy out option for OBPS instances
details: /erp/devel/pi-engdev/rev/6c6935b5ba06
changeset: 6965:6c6935b5ba06
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 08 15:41:50 2010 +0200
summary: fixed issue 10068: URL links doesn't work if they contain protocol
details: /erp/devel/pi-engdev/rev/f806ff1950f4
changeset: 6966:f806ff1950f4
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Apr 08 19:54:51 2010 +0530
summary: Fixes Issue 12899: Amortization lines are not displayed in sequence
of year
details: /erp/devel/pi-engdev/rev/695c4b4aee08
changeset: 6967:695c4b4aee08
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 08 18:08:45 2010 +0200
summary: fixed bug 12364: JS messages not working together with modules
details: /erp/devel/pi-engdev/rev/f22a255278e5
changeset: 6968:f22a255278e5
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Apr 09 10:34:36 2010 +0530
summary: Fixes issue 12454: Errors in Daily Work Requirements Report
details: /erp/devel/pi-engdev/rev/511757e230d2
changeset: 6969:511757e230d2
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 09 08:18:55 2010 +0200
summary: buy-out: show different text when installing commercial modules on
convervted instances
details: /erp/devel/pi-engdev/rev/18eeea087f73
changeset: 6970:18eeea087f73
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Fri Apr 09 09:49:20 2010 +0200
summary: Merge with pi 6962:511757e230d2 (09/04/10)
diffstat:
build.xml |
4 +
src-core/src/org/openbravo/buildvalidation/BuildValidation.java |
20 +
src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java |
25 +-
src-core/src/org/openbravo/modulescript/ModuleScript.java |
20 +
src-core/src/org/openbravo/modulescript/ModuleScriptHandler.java |
11 +
src-db/database/model/functions/A_ASSET_POST.xml |
18 +-
src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml |
10 +-
src-db/database/model/tables/A_AMORTIZATIONLINE.xml |
4 +
src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml |
2 +-
src-db/database/model/triggers/AD_REFERENCE_MOD_TRG.xml |
10 +-
src-db/database/model/triggers/AD_TAB_TRG2.xml |
2 +-
src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml |
2 +-
src-db/database/sourcedata/AD_CALLOUT.xml |
9 +
src-db/database/sourcedata/AD_COLUMN.xml |
42 +-
src-db/database/sourcedata/AD_ELEMENT.xml |
22 -
src-db/database/sourcedata/AD_EP_PROCEDURES.xml |
4 +-
src-db/database/sourcedata/AD_FIELD.xml |
576 +++-
src-db/database/sourcedata/AD_FORM.xml |
12 +
src-db/database/sourcedata/AD_MESSAGE.xml |
12 +
src-db/database/sourcedata/AD_MODEL_OBJECT.xml |
48 +
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml |
60 +
src-db/database/sourcedata/AD_TAB.xml |
27 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml |
286 +
src-db/database/sourcedata/AD_WINDOW.xml |
4 +-
src-test/org/openbravo/test/AllWebserviceTests.java |
49 +
src-test/org/openbravo/test/dal/IssuesTest.java |
50 +-
src-test/org/openbravo/test/model/RuntimeModelTest.java |
22 +
src-test/org/openbravo/test/model/UtilsTest.java |
6 +-
src-test/org/openbravo/test/webservice/BaseWSTest.java |
35 +-
src-test/org/openbravo/test/webservice/WSReadTest.java |
43 +-
src-test/org/openbravo/test/webservice/WSUpdateTest.java |
7 +-
src-test/org/openbravo/test/xml/EntityXMLIssues.java |
29 +
src-util/buildvalidation/build.xml |
40 +-
src-util/modulescript/build.xml |
38 +-
src-wad/src/org/openbravo/wad/Fields_data.xsql |
6 +-
src-wad/src/org/openbravo/wad/Wad.java |
44 +-
src-wad/src/org/openbravo/wad/WadUtility.java |
2 +-
src-wad/src/org/openbravo/wad/controls/WADButton.java |
10 +-
src-wad/src/org/openbravo/wad/controls/WADControl.java |
46 +-
src-wad/src/org/openbravo/wad/controls/WADHidden.java |
75 -
src-wad/src/org/openbravo/wad/controls/WADHiddenNumber.html |
23 +
src-wad/src/org/openbravo/wad/controls/WADHiddenNumber.xml |
27 +
src-wad/src/org/openbravo/wad/controls/WADHiddenXML.html |
5 +-
src-wad/src/org/openbravo/wad/controls/WADImage.java |
6 +-
src-wad/src/org/openbravo/wad/controls/WADInteger.java |
11 +
src-wad/src/org/openbravo/wad/controls/WADNumber.java |
38 +-
src-wad/src/org/openbravo/wad/controls/WADSearch.java |
201 +-
src-wad/src/org/openbravo/wad/datasource.xml |
2 +-
src-wad/src/org/openbravo/wad/datasource.xsqlxml |
2 +-
src-wad/src/org/openbravo/wad/validation/WADValidationResult.java |
5 +-
src-wad/src/org/openbravo/wad/validation/WADValidator.java |
36 +-
src-wad/src/org/openbravo/wad/validation/WADValidator_data.xsql |
39 +-
src/build.xml |
8 +
src/org/openbravo/base/model/domaintype/BasePrimitiveDomainType.java |
49 +-
src/org/openbravo/base/model/domaintype/BigDecimalDomainType.java |
24 +
src/org/openbravo/base/model/domaintype/BinaryDomainType.java |
49 +
src/org/openbravo/base/model/domaintype/BooleanDomainType.java |
25 +-
src/org/openbravo/base/model/domaintype/ButtonDomainType.java |
24 +
src/org/openbravo/base/model/domaintype/DateDomainType.java |
45 +
src/org/openbravo/base/model/domaintype/DatetimeDomainType.java |
44 +
src/org/openbravo/base/model/domaintype/LongDomainType.java |
26 +
src/org/openbravo/base/model/domaintype/ObjectDomainType.java |
20 +
src/org/openbravo/base/model/domaintype/PrimitiveDomainType.java |
42 +
src/org/openbravo/base/model/domaintype/StringDomainType.java |
23 +
src/org/openbravo/base/model/domaintype/StringEnumerateDomainType.java |
23 +
src/org/openbravo/base/model/domaintype/TimestampDomainType.java |
44 +
src/org/openbravo/dal/service/OBDal.java |
17 +-
src/org/openbravo/dal/service/OBQuery.java |
121 +-
src/org/openbravo/dal/xml/EntityXMLConverter.java |
3 +-
src/org/openbravo/dal/xml/EntityXMLException.java |
1 -
src/org/openbravo/dal/xml/ModelXMLConverter.java |
4 +-
src/org/openbravo/dal/xml/StaxXMLEntityConverter.java |
4 +-
src/org/openbravo/dal/xml/XMLEntityConverter.java |
6 +-
src/org/openbravo/dal/xml/XMLTypeConverter.java |
6 +
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql |
2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Column.java |
94 +
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt.java |
10 +-
src/org/openbravo/erpCommon/ad_forms/DocAmortizationTemplate.java |
32 +-
src/org/openbravo/erpCommon/ad_forms/DocBankTemplate.java |
32 +-
src/org/openbravo/erpCommon/ad_forms/DocCashTemplate.java |
32 +-
src/org/openbravo/erpCommon/ad_forms/DocDPManagementTemplate.java |
32 +-
src/org/openbravo/erpCommon/ad_forms/DocGLJournalTemplate.java |
32 +-
src/org/openbravo/erpCommon/ad_forms/DocInOutTemplate.java |
32 +-
src/org/openbravo/erpCommon/ad_forms/DocInventoryTemplate.java |
32 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoiceTemplate.java |
32 +-
src/org/openbravo/erpCommon/ad_forms/DocMovementTemplate.java |
32 +-
src/org/openbravo/erpCommon/ad_forms/DocOrderTemplate.java |
32 +-
src/org/openbravo/erpCommon/ad_forms/DocPaymentTemplate.java |
32 +-
src/org/openbravo/erpCommon/ad_forms/DocProductionTemplate.java |
32 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html |
7 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java |
30 +-
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.html |
2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java |
69 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html |
7 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.xml |
3 +-
src/org/openbravo/erpCommon/ad_forms/Transactions.html |
485 +++
src/org/openbravo/erpCommon/ad_forms/Transactions.java |
142 +
src/org/openbravo/erpCommon/ad_forms/Transactions.xml |
29 +
src/org/openbravo/erpCommon/ad_forms/Transactions_data.xsql |
50 +
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.jrxml |
16 +-
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java |
25 +-
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml |
1501 ++++-----
src/org/openbravo/erpCommon/ad_reports/SubreportWorkRequirementDaily.jrxml |
125 +
src/org/openbravo/erpCommon/modules/ModuleBox.srpt |
11 +-
src/org/openbravo/erpCommon/modules/ModuleBox.xml |
3 +-
src/org/openbravo/erpCommon/modules/ModuleTree.java |
35 +-
src/org/openbravo/erpCommon/modules/ModuleTreeDescription.srpt |
4 +-
src/org/openbravo/erpCommon/modules/ModuleTree_data.xsql |
4 +-
src/org/openbravo/erpCommon/obps/ActivationKey.java |
39 +-
src/org/openbravo/erpCommon/security/Menu.java |
27 +-
src/org/openbravo/service/db/DalConnectionProvider.java |
13 +-
src/org/openbravo/service/web/UserContextCache.java |
13 +
web/js/messages.js |
11 +-
web/skins/Default/Main/_ParticularItems/AddModule/iconCommercial.gif |
0
web/skins/Default/Openbravo_ERP_250.css |
17 +-
115 files changed, 4362 insertions(+), 1531 deletions(-)
diffs (truncated from 8542 to 300 lines):
diff -r e9504e6a07ae -r 18eeea087f73 build.xml
--- a/build.xml Sun Apr 04 18:25:35 2010 +0200
+++ b/build.xml Fri Apr 09 09:49:20 2010 +0200
@@ -438,6 +438,10 @@
<ant dir="${base.src}" target="run.all.tests" inheritAll="true"
inheritRefs="true" />
</target>
+ <target name="run.webservice.tests" depends="init">
+ <ant dir="${base.src}" target="run.webservice.tests" inheritAll="true"
inheritRefs="true" />
+ </target>
+
<target name="run.quick.tests" depends="init">
<ant dir="${base.src}" target="run.quick.tests" inheritAll="true"
inheritRefs="true" />
</target>
diff -r e9504e6a07ae -r 18eeea087f73
src-core/src/org/openbravo/buildvalidation/BuildValidation.java
--- a/src-core/src/org/openbravo/buildvalidation/BuildValidation.java Sun Apr
04 18:25:35 2010 +0200
+++ b/src-core/src/org/openbravo/buildvalidation/BuildValidation.java Fri Apr
09 09:49:20 2010 +0200
@@ -1,6 +1,18 @@
+/*
+
************************************************************************************
+ * Copyright (C) 2010 Openbravo S.L.U.
+ * Licensed under the Apache Software License version 2.0
+ * You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License
for the
+ * specific language governing permissions and limitations under the License.
+
************************************************************************************
+ */
package org.openbravo.buildvalidation;
import java.io.File;
+import java.util.ArrayList;
import java.util.List;
import org.openbravo.database.CPStandAlone;
@@ -52,4 +64,12 @@
cp = new CPStandAlone(fProp.getAbsolutePath());
return cp;
}
+
+ protected List<String> handleError(Throwable t) {
+ ArrayList<String> errors = new ArrayList<String>();
+ errors.add("Error executing build-validation " + this.getClass().getName()
+ ": "
+ + t.getMessage());
+ errors.add("The build validation couldn't be properly executed");
+ return errors;
+ }
}
\ No newline at end of file
diff -r e9504e6a07ae -r 18eeea087f73
src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
--- a/src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
Sun Apr 04 18:25:35 2010 +0200
+++ b/src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
Fri Apr 09 09:49:20 2010 +0200
@@ -1,3 +1,14 @@
+/*
+
************************************************************************************
+ * Copyright (C) 2010 Openbravo S.L.U.
+ * Licensed under the Apache Software License version 2.0
+ * You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License
for the
+ * specific language governing permissions and limitations under the License.
+
************************************************************************************
+ */
package org.openbravo.buildvalidation;
import java.io.File;
@@ -19,7 +30,6 @@
basedir = new File(args[0]);
module = args[1];
PropertyConfigurator.configure("log4j.lcf");
- String errorMessage = "";
List<String> classes = new ArrayList<String>();
ArrayList<File> modFolders = new ArrayList<File>();
if (module != null && !module.equals("%")) {
@@ -55,9 +65,6 @@
Object instance = myClass.newInstance();
log4j.info("Executing build validation: " + s);
errors = callExecute(myClass, instance);
- for (String error : errors) {
- errorMessage += error + "\n";
- }
}
} catch (Exception e) {
log4j.info("Error executing build-validation: " + s, e);
@@ -65,14 +72,22 @@
System.exit(1);
}
if (errors.size() > 0) {
- log4j.error(errorMessage);
log4j
.error("The build validation failed. The system hasn't been
modified. Fix the problems described in the validation messages (either by
uninstalling the affected modules, or by fixing the problems the validation
found), and then start the build again.");
+ printMessage(errors);
System.exit(1);
}
}
}
+ private static void printMessage(List<String> errors) {
+ String errorMessage = "";
+ for (String error : errors) {
+ errorMessage += error + "\n";
+ }
+ log4j.error(errorMessage);
+ }
+
@SuppressWarnings("unchecked")
private static ArrayList<String> callExecute(Class<?> myClass, Object
instance)
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
diff -r e9504e6a07ae -r 18eeea087f73
src-core/src/org/openbravo/modulescript/ModuleScript.java
--- a/src-core/src/org/openbravo/modulescript/ModuleScript.java Sun Apr 04
18:25:35 2010 +0200
+++ b/src-core/src/org/openbravo/modulescript/ModuleScript.java Fri Apr 09
09:49:20 2010 +0200
@@ -1,5 +1,18 @@
+/*
+
************************************************************************************
+ * Copyright (C) 2010 Openbravo S.L.U.
+ * Licensed under the Apache Software License version 2.0
+ * You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License
for the
+ * specific language governing permissions and limitations under the License.
+
************************************************************************************
+ */
package org.openbravo.modulescript;
+import org.apache.log4j.Logger;
+import org.apache.tools.ant.BuildException;
import org.openbravo.database.CPStandAlone;
import org.openbravo.database.ConnectionProvider;
@@ -11,6 +24,7 @@
*/
public abstract class ModuleScript {
+ private static final Logger log4j = Logger.getLogger(ModuleScript.class);
private ConnectionProvider cp = null;
/**
@@ -33,4 +47,10 @@
}
return cp;
}
+
+ protected void handleError(Throwable t) {
+ log4j
+ .error("Error executing moduleScript " + this.getClass().getName() +
": " + t.getMessage());
+ throw new BuildException("Execution of moduleScript " +
this.getClass().getName() + "failed.");
+ }
}
\ No newline at end of file
diff -r e9504e6a07ae -r 18eeea087f73
src-core/src/org/openbravo/modulescript/ModuleScriptHandler.java
--- a/src-core/src/org/openbravo/modulescript/ModuleScriptHandler.java Sun Apr
04 18:25:35 2010 +0200
+++ b/src-core/src/org/openbravo/modulescript/ModuleScriptHandler.java Fri Apr
09 09:49:20 2010 +0200
@@ -1,3 +1,14 @@
+/*
+
************************************************************************************
+ * Copyright (C) 2010 Openbravo S.L.U.
+ * Licensed under the Apache Software License version 2.0
+ * You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License
for the
+ * specific language governing permissions and limitations under the License.
+
************************************************************************************
+ */
package org.openbravo.modulescript;
import java.io.File;
diff -r e9504e6a07ae -r 18eeea087f73
src-db/database/model/functions/A_ASSET_POST.xml
--- a/src-db/database/model/functions/A_ASSET_POST.xml Sun Apr 04 18:25:35
2010 +0200
+++ b/src-db/database/model/functions/A_ASSET_POST.xml Fri Apr 09 09:49:20
2010 +0200
@@ -67,6 +67,7 @@
v_AMORTIZATIONAMT NUMBER;
v_NEW_AMORTIZATION VARCHAR2(32);
v_LINE NUMBER;
+ v_SEQ_ASSET NUMBER;
v_AMORTIZATIONLINE varchar2(32);
v_FIRST_DAY_DATE DATE;
v_LAST_DAY_DATE DATE;
@@ -204,6 +205,10 @@
finish:=false;
WHILE not finish
LOOP
+ SELECT COALESCE(MAX(SEQ_NO_ASSET), 0) +10
+ INTO v_SEQ_ASSET
+ FROM A_AMORTIZATIONLINE
+ WHERE A_AMORTIZATIONLINE.A_ASSET_ID = v_Record_ID;
IF(v_COUNT=1 AND to_number(v_BEGINING_DATE-v_FIRST_DAY_DATE)<>0)
THEN
v_Percentage:=to_number(to_number(TO_DATE('31-12-'||to_char(v_AMORTIZATIONSTARTDATE,
'YYYY'), 'DD-MM-YYYY') -v_AMORTIZATIONSTARTDATE)
/(TO_DATE('31-12-'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY')
-TO_DATE('01-01-'||to_char(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY'))) *
v_PercentageGeneral;
v_USELIFEYEARS:=v_USELIFEYEARS+1;
@@ -258,10 +263,10 @@
A_AMORTIZATION_ID, A_AMORTIZATIONLINE_ID, A_ASSET_ID,
AD_CLIENT_ID,
AD_ORG_ID, CREATED, CREATEDBY, UPDATED,
UPDATEDBY, AMORTIZATION_PERCENTAGE, AMORTIZATIONAMT,
C_CURRENCY_ID,
- ISACTIVE, LINE
+ ISACTIVE, LINE, SEQ_NO_ASSET
)
VALUES
- (v_NEW_AMORTIZATION, v_AMORTIZATIONLINE, v_Record_ID,
v_AD_CLIENT_ID, v_AD_ORG_ID, now(), v_CREATEDBY, now(), v_CREATEDBY,
ROUND(v_PERCENTAGE,v_Currency_Pre), ROUND(v_AMOUNT,v_Currency_Pre),
v_C_CURRENCY_ID, 'Y', v_LINE) ;
+ (v_NEW_AMORTIZATION, v_AMORTIZATIONLINE, v_Record_ID,
v_AD_CLIENT_ID, v_AD_ORG_ID, now(), v_CREATEDBY, now(), v_CREATEDBY,
ROUND(v_PERCENTAGE,v_Currency_Pre), ROUND(v_AMOUNT,v_Currency_Pre),
v_C_CURRENCY_ID, 'Y', v_LINE, v_SEQ_ASSET) ;
v_Inserted := v_Inserted +1;
end if;
v_BEGINING_DATE:=TO_DATE('31-12-' || TO_CHAR(v_BEGINING_DATE,
'yyyy'), 'DD-MM-YYYY') + 1;
@@ -347,8 +352,8 @@
INTO v_LINE
FROM A_AMORTIZATIONLINE
WHERE A_AMORTIZATION_ID=v_NEW_AMORTIZATION;
- SELECT COALESCE(COUNT(A_AMORTIZATIONLINE_ID),0),
COALESCE(MAX(A_ASSET.USELIFEMONTHS),1)
- INTO v_Inserted, V_MONTHS
+ SELECT COALESCE(COUNT(A_AMORTIZATIONLINE_ID),0),
COALESCE(MAX(A_ASSET.USELIFEMONTHS),1), COALESCE(MAX(SEQ_NO_ASSET), 0) +10
+ INTO v_Inserted, V_MONTHS, v_SEQ_ASSET
FROM A_AMORTIZATIONLINE, A_ASSET
WHERE A_AMORTIZATIONLINE.A_ASSET_ID = A_ASSET.A_ASSET_ID
AND A_ASSET.A_ASSET_ID=v_Record_ID;
@@ -360,6 +365,7 @@
v_AMOUNT := v_AMORTIZATIONVALUEAMT - v_AMOUNT;
v_PERCENTAGE:=100 - v_PERCENTAGE;
finish:=true;
+ FINISH_PROCESS:=true;
ELSE v_AMOUNT:=v_AMORTIZATIONVALUEAMT*v_PERCENTAGE/100;
end if;
IF(v_AMOUNT>0) THEN
@@ -369,12 +375,12 @@
(
A_AMORTIZATION_ID, A_AMORTIZATIONLINE_ID, A_ASSET_ID,
AD_CLIENT_ID,
AD_ORG_ID, CREATED, CREATEDBY, UPDATED, UPDATEDBY,
- AMORTIZATION_PERCENTAGE, AMORTIZATIONAMT, C_CURRENCY_ID,
ISACTIVE, LINE
+ AMORTIZATION_PERCENTAGE, AMORTIZATIONAMT, C_CURRENCY_ID,
ISACTIVE, LINE, SEQ_NO_ASSET
)
VALUES
(v_NEW_AMORTIZATION, v_AMORTIZATIONLINE, v_Record_ID,
v_AD_CLIENT_ID,
v_AD_ORG_ID, now(), v_CREATEDBY, now(), v_CREATEDBY,
- ROUND(v_PERCENTAGE,v_Currency_Pre),
ROUND(v_AMOUNT,v_Currency_Pre), v_C_CURRENCY_ID, 'Y', v_LINE) ;
+ ROUND(v_PERCENTAGE,v_Currency_Pre),
ROUND(v_AMOUNT,v_Currency_Pre), v_C_CURRENCY_ID, 'Y', v_LINE, v_SEQ_ASSET) ;
v_Inserted := v_Inserted +1;
v_BEGINING_DATE:=TO_DATE(ADD_MONTHS(LAST_DAY(TO_DATE('01-' ||
TO_CHAR(v_BEGINING_DATE, 'MM') || '-' || TO_CHAR(v_BEGINING_DATE, 'yyyy'),
'DD-MM-YYYY')), 1) );
v_TotalAmt:=v_TotalAmt + v_Amount;
diff -r e9504e6a07ae -r 18eeea087f73
src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml
--- a/src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml Sun Apr
04 18:25:35 2010 +0200
+++ b/src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml Fri Apr
09 09:49:20 2010 +0200
@@ -44,6 +44,7 @@
v_BPartner_ID VARCHAR2(32);
v_DateInvoiced DATE;
v_TotalLines NUMBER;
+v_PaymentMethod C_INVOICE.FIN_PAYMENTMETHOD_ID%TYPE;
TYPE RECORD IS REF CURSOR;
Cur_Params RECORD;
@@ -72,10 +73,10 @@
v_ResultStr:='ReadingInvoice';
SELECT ad_client_id, ad_org_id, c_doctypetarget_id, IsSOTrx,
grandtotal, C_PaymentTerm_ID, PaymentRule, C_Currency_ID,
- C_BPartner_ID, DateInvoiced, totallines
+ C_BPartner_ID, DateInvoiced, totallines, fin_paymentmethod_id
INTO v_Client_ID, v_Org_ID, v_DocTypeTarget_ID, v_IsSOTrx,
v_GrandTotal, v_PaymentTerm, v_PaymentRule, v_Currency_ID,
- v_BPartner_ID, v_DateInvoiced, v_totallines
+ v_BPartner_ID, v_DateInvoiced, v_totallines, v_PaymentMethod
FROM c_invoice
WHERE c_invoice_id=p_record_id;
@@ -178,7 +179,7 @@
v_payment_schedule_invoice, v_client_id, v_org_id, 'Y',
now(), p_user, now(), p_user,
p_record_id, v_currency_id, null,
- 'to-do',
+ v_PaymentMethod,
v_scheduledamount, v_planneddate,
v_scheduledamount
);
@@ -346,7 +347,8 @@
SET TOTALPAID = v_PaidAmount,
OUTSTANDINGAMT = v_OutstandingAmount,
DUEAMT = V_DueAmount,
- DAYSTILLDUE = V_DayStillDue
+ DAYSTILLDUE = V_DayStillDue,
+ LASTCALCULATEDONDATE = NOW()
WHERE C_INVOICE_ID = P_RECORD_ID;
END;
diff -r e9504e6a07ae -r 18eeea087f73
src-db/database/model/tables/A_AMORTIZATIONLINE.xml
--- a/src-db/database/model/tables/A_AMORTIZATIONLINE.xml Sun Apr 04
18:25:35 2010 +0200
+++ b/src-db/database/model/tables/A_AMORTIZATIONLINE.xml Fri Apr 09
09:49:20 2010 +0200
@@ -41,6 +41,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="SEQ_NO_ASSET" primaryKey="false" required="false"
type="DECIMAL" size="10,0" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<column name="A_ASSET_ID" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
diff -r e9504e6a07ae -r 18eeea087f73
src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml
--- a/src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml Sun Apr
04 18:25:35 2010 +0200
+++ b/src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml Fri Apr
09 09:49:20 2010 +0200
@@ -65,7 +65,7 @@
------------------------------------------------------------------------------
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
