details: /erp/devel/int/rev/56038a11b9db
changeset: 6965:56038a11b9db
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Apr 09 11:58:37 2010 +0200
summary: Fixed issue 12833. Now compile warnings will not appear in the
rebuild window, as they are not relevant for common users.
details: /erp/devel/int/rev/7e9e2ac8a348
changeset: 6966:7e9e2ac8a348
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Apr 09 16:05:56 2010 +0530
summary: Fixes issue 12387: It is possible to add some records when a Work
effort is processed
details: /erp/devel/int/rev/aadbbebc99d1
changeset: 6967:aadbbebc99d1
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Fri Apr 09 16:21:01 2010 +0530
summary: Fixes issue for invalid function error
details: /erp/devel/int/rev/a3bbaccec99f
changeset: 6968:a3bbaccec99f
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 09 15:34:38 2010 +0200
summary: fixed bug 12921: User info pop-up window: Default organization is
not working
details: /erp/devel/int/rev/e809fe06034d
changeset: 6969:e809fe06034d
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Fri Apr 09 16:05:37 2010 +0200
summary: Fixed 12502: Make decimalformat used by renderJR fully configurable
via Format.xml format name euroInform
details: /erp/devel/int/rev/5c592e20669a
changeset: 6970:5c592e20669a
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Fri Apr 09 18:50:30 2010 +0200
summary: Fixes issue 12824: api check build 327
details: /erp/devel/int/rev/6c78ad9d5176
changeset: 6971:6c78ad9d5176
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Fri Apr 09 19:17:41 2010 +0200
summary: Fixes issue 12824: api check build 327
details: /erp/devel/int/rev/b535611b2394
changeset: 6972:b535611b2394
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Apr 09 21:11:28 2010 +0200
summary: fixes issue 12918: DAL: Exception in commitTransaction leaves
Postgres connection in illegal state
details: /erp/devel/int/rev/253f727de17e
changeset: 6973:253f727de17e
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Apr 09 21:12:35 2010 +0200
summary: fixes issue 12901: OBDal.getInstance().getConnection() does not
setup dateFormat correctly
diffstat:
src-core/src/org/openbravo/utils/OBRebuildAppender.java
| 11 +-
src-db/database/model/functions/MRP_WORKREQUIREMENT.xml
| 4 +-
src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml
| 36 +++----
src-db/database/model/triggers/MA_PL_IC_TRG.xml
| 36 +++----
src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml
| 36 +++----
src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml
| 36 +++----
src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml
| 36 +++----
src-db/database/sourcedata/AD_MESSAGE.xml
| 2 +-
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/Cbpvendoracct.class
| 0
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CbpvendoracctData.class
| 0
src-util/buildvalidation/src/org/openbravo/buildvalidation/Cbpvendoracct.java
| 50 ++++++++++
src-util/buildvalidation/src/org/openbravo/buildvalidation/Cbpvendoracct_data.xsql
| 37 +++++++
src/build.xml
| 6 +-
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
| 11 +-
src/org/openbravo/base/secureApp/LoginUtils.java
| 2 +
src/org/openbravo/dal/core/DalSessionFactory.java
| 13 ++-
src/org/openbravo/dal/core/SessionHandler.java
| 10 ++
src/org/openbravo/dal/service/OBDal.java
| 21 +---
18 files changed, 216 insertions(+), 131 deletions(-)
diffs (truncated from 572 to 300 lines):
diff -r 3df698af8ada -r 253f727de17e
src-core/src/org/openbravo/utils/OBRebuildAppender.java
--- a/src-core/src/org/openbravo/utils/OBRebuildAppender.java Fri Apr 09
14:39:57 2010 +0530
+++ b/src-core/src/org/openbravo/utils/OBRebuildAppender.java Fri Apr 09
21:12:35 2010 +0200
@@ -78,8 +78,15 @@
message = message.substring(0, 2997) + "...";
PreparedStatement ps = connection
.prepareStatement("INSERT INTO ad_error_log (ad_error_log_id,
ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby,
system_status, error_level, message, line_number) SELECT get_uuid(), '0', '0',
'Y', now(), '0', now(), '0', system_status, ?,?, to_number(?) FROM
ad_system_info");
- ps.setString(1, arg0.getLevel().toString());
- ps.setString(2, arg0.getMessage().toString());
+ String level = arg0.getLevel().toString();
+
+ // Warnings show when compiling are changed to level Info, so that
they don't appear in the
+ // rebuild window, because they are not relevant for common users
+ if (message.startsWith("Note: ")) {
+ level = Level.INFO.toString();
+ }
+ ps.setString(1, level);
+ ps.setString(2, message);
ps.setString(3, line_number);
ps.executeUpdate();
} catch (Exception e) {
diff -r 3df698af8ada -r 253f727de17e
src-db/database/model/functions/MRP_WORKREQUIREMENT.xml
--- a/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml Fri Apr 09
14:39:57 2010 +0530
+++ b/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml Fri Apr 09
21:12:35 2010 +0200
@@ -67,7 +67,7 @@
FOR Cur_workproposal IN (
SELECT MRP_RUN_PRODUCTIONLINE.* , MA_PROCESSPLAN.EXPLODEPHASES,
MA_PROCESSPLAN.CONVERSIONRATE, MA_PROCESSPLAN.SECONDARYUNIT,
- ROUND((MRP_RUN_PRODUCTIONLINE.qty/A.PROQTY)+0.0005,3) AS PROCESSPLANQTY,
MRP_RUN_PRODUCTIONLINE.AD_ORG_ID
+ ROUND((MRP_RUN_PRODUCTIONLINE.qty/A.PROQTY)+0.0005,3) AS PROCESSPLANQTY,
MRP_RUN_PRODUCTIONLINE.AD_ORG_ID AS ADORG_ID
FROM MRP_RUN_PRODUCTIONLINE, MA_PROCESSPLAN,
(SELECT DISTINCT produced, proqty, ma_processplan_id
FROM MA_PROCESSPLAN_TOTALIZED) A
@@ -80,7 +80,7 @@
ORDER BY PLANNEDDATE
) LOOP
v_ResultStr:='Create Work Requirement';
-V_ORG_ID :=Cur_workproposal.AD_ORG_ID;
+V_ORG_ID :=Cur_workproposal.ADORG_ID;
Ad_Sequence_Next('MA_WorkRequirement', v_Client_ID, v_WR_ID);
Ad_Sequence_Doc('DocumentNo_MA_WorkRequirement', v_Client_ID, 'Y',
v_DocumentNo) ;
INSERT INTO MA_WORKREQUIREMENT (
diff -r 3df698af8ada -r 253f727de17e
src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml
--- a/src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml Fri Apr 09
14:39:57 2010 +0530
+++ b/src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml Fri Apr 09
21:12:35 2010 +0200
@@ -2,26 +2,22 @@
<database name="TRIGGER MA_PL_EMPLOYEE_TRG">
<trigger name="MA_PL_EMPLOYEE_TRG" table="MA_PL_EMPLOYEE" fires="after"
insert="true" update="true" delete="true" foreach="row">
<body><![CDATA[
- /*************************************************************************
- * The contents of this file are subject to the Compiere Public
- * License 1.1 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License in
- * the legal folder of your Openbravo installation.
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing rights
- * and limitations under the License.
- * The Original Code is Compiere ERP & Business Solution
- * The Initial Developer of the Original Code is Jorg Janke and ComPiere,
Inc.
- * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
- * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
- * All Rights Reserved.
- * Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2010 Openbravo, S.L.U.
- *
- * Specifically, this derivative work is based upon the following Compiere
- * file and version.
- *************************************************************************/
+/*************************************************************************
+* The contents of this file are subject to the Openbravo Public License
+* Version 1.0 (the "License"), being the Mozilla Public License
+* Version 1.1 with a permitted attribution clause; you may not use this
+* file except in compliance with the License. You may obtain a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License is distributed on an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific language governing rights and limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2010 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s): ______________________________________.
+************************************************************************/
v_ID VARCHAR2(32);
v_RO NUMBER;
v_New_Plan_ID VARCHAR2(32);
diff -r 3df698af8ada -r 253f727de17e
src-db/database/model/triggers/MA_PL_IC_TRG.xml
--- a/src-db/database/model/triggers/MA_PL_IC_TRG.xml Fri Apr 09 14:39:57
2010 +0530
+++ b/src-db/database/model/triggers/MA_PL_IC_TRG.xml Fri Apr 09 21:12:35
2010 +0200
@@ -2,26 +2,22 @@
<database name="TRIGGER MA_PL_IC_TRG">
<trigger name="MA_PL_IC_TRG" table="MA_PL_IC" fires="after" insert="true"
update="true" delete="true" foreach="row">
<body><![CDATA[
- /*************************************************************************
- * The contents of this file are subject to the Compiere Public
- * License 1.1 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License in
- * the legal folder of your Openbravo installation.
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing rights
- * and limitations under the License.
- * The Original Code is Compiere ERP & Business Solution
- * The Initial Developer of the Original Code is Jorg Janke and ComPiere,
Inc.
- * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
- * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
- * All Rights Reserved.
- * Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2010 Openbravo, S.L.U.
- *
- * Specifically, this derivative work is based upon the following Compiere
- * file and version.
- *************************************************************************/
+/*************************************************************************
+* The contents of this file are subject to the Openbravo Public License
+* Version 1.0 (the "License"), being the Mozilla Public License
+* Version 1.1 with a permitted attribution clause; you may not use this
+* file except in compliance with the License. You may obtain a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License is distributed on an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific language governing rights and limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2010 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s): ______________________________________.
+************************************************************************/
v_ID VARCHAR2(32);
v_RO NUMBER;
v_New_Plan_ID VARCHAR2(32);
diff -r 3df698af8ada -r 253f727de17e
src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml
--- a/src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml Fri Apr 09
14:39:57 2010 +0530
+++ b/src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml Fri Apr 09
21:12:35 2010 +0200
@@ -2,26 +2,22 @@
<database name="TRIGGER MA_PL_INVOICELINE_TRG">
<trigger name="MA_PL_INVOICELINE_TRG" table="MA_PL_INVOICELINE"
fires="after" insert="true" update="true" delete="true" foreach="row">
<body><![CDATA[
- /*************************************************************************
- * The contents of this file are subject to the Compiere Public
- * License 1.1 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License in
- * the legal folder of your Openbravo installation.
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing rights
- * and limitations under the License.
- * The Original Code is Compiere ERP & Business Solution
- * The Initial Developer of the Original Code is Jorg Janke and ComPiere,
Inc.
- * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
- * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
- * All Rights Reserved.
- * Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2008 Openbravo, S.L.U.
- *
- * Specifically, this derivative work is based upon the following Compiere
- * file and version.
- *************************************************************************/
+/*************************************************************************
+* The contents of this file are subject to the Openbravo Public License
+* Version 1.0 (the "License"), being the Mozilla Public License
+* Version 1.1 with a permitted attribution clause; you may not use this
+* file except in compliance with the License. You may obtain a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License is distributed on an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific language governing rights and limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2010 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s): ______________________________________.
+************************************************************************/
v_ID VARCHAR2(32);
v_RO NUMBER;
v_New_Plan_ID VARCHAR2(32);
diff -r 3df698af8ada -r 253f727de17e
src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml
--- a/src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml Fri Apr 09
14:39:57 2010 +0530
+++ b/src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml Fri Apr 09
21:12:35 2010 +0200
@@ -2,26 +2,22 @@
<database name="TRIGGER MA_PL_MACHINE_TRG">
<trigger name="MA_PL_MACHINE_TRG" table="MA_PL_MACHINE" fires="after"
insert="true" update="true" delete="true" foreach="row">
<body><![CDATA[
- /*************************************************************************
- * The contents of this file are subject to the Compiere Public
- * License 1.1 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License in
- * the legal folder of your Openbravo installation.
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing rights
- * and limitations under the License.
- * The Original Code is Compiere ERP & Business Solution
- * The Initial Developer of the Original Code is Jorg Janke and ComPiere,
Inc.
- * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
- * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
- * All Rights Reserved.
- * Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2010 Openbravo, S.L.U.
- *
- * Specifically, this derivative work is based upon the following Compiere
- * file and version.
- *************************************************************************/
+/*************************************************************************
+* The contents of this file are subject to the Openbravo Public License
+* Version 1.0 (the "License"), being the Mozilla Public License
+* Version 1.1 with a permitted attribution clause; you may not use this
+* file except in compliance with the License. You may obtain a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License is distributed on an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific language governing rights and limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2010 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s): ______________________________________.
+************************************************************************/
v_ID VARCHAR2(32);
v_RO NUMBER;
v_New_Plan_ID VARCHAR2(32);
diff -r 3df698af8ada -r 253f727de17e
src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml
--- a/src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml Fri Apr 09
14:39:57 2010 +0530
+++ b/src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml Fri Apr 09
21:12:35 2010 +0200
@@ -2,26 +2,22 @@
<database name="TRIGGER MA_TOOLSETUSED_TRG">
<trigger name="MA_TOOLSETUSED_TRG" table="MA_TOOLSETUSED" fires="after"
insert="true" update="true" delete="true" foreach="row">
<body><![CDATA[
- /*************************************************************************
- * The contents of this file are subject to the Compiere Public
- * License 1.1 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License in
- * the legal folder of your Openbravo installation.
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing rights
- * and limitations under the License.
- * The Original Code is Compiere ERP & Business Solution
- * The Initial Developer of the Original Code is Jorg Janke and ComPiere,
Inc.
- * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
- * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
- * All Rights Reserved.
- * Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2008 Openbravo, S.L.U.
- *
- * Specifically, this derivative work is based upon the following Compiere
- * file and version.
- *************************************************************************/
+/*************************************************************************
+* The contents of this file are subject to the Openbravo Public License
+* Version 1.0 (the "License"), being the Mozilla Public License
+* Version 1.1 with a permitted attribution clause; you may not use this
+* file except in compliance with the License. You may obtain a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License is distributed on an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific language governing rights and limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2010 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s): ______________________________________.
+************************************************************************/
v_ID VARCHAR2(32);
v_RO NUMBER;
v_New_Plan_ID VARCHAR2(32);
diff -r 3df698af8ada -r 253f727de17e src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Fri Apr 09 14:39:57 2010 +0530
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Fri Apr 09 21:12:35 2010 +0200
@@ -8731,7 +8731,7 @@
<!--800203--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--800203--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--800203--> <VALUE><![CDATA[C_BP_VENDOR_ACCT_ACCTSCHEMA_UN]]></VALUE>
-<!--800203--> <MSGTEXT><![CDATA[The vendor already has a record with the same
accounting schema, with the same organization and with the same status. At
least change one of the three]]></MSGTEXT>
+<!--800203--> <MSGTEXT><![CDATA[The vendor already has a record with the same
accounting schema and with the same status. At least change one of
them]]></MSGTEXT>
<!--800203--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
<!--800203--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--800203--></AD_MESSAGE>
diff -r 3df698af8ada -r 253f727de17e
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/Cbpvendoracct.class
Binary file
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/Cbpvendoracct.class
has changed
diff -r 3df698af8ada -r 253f727de17e
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CbpvendoracctData.class
Binary file
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CbpvendoracctData.class
has changed
diff -r 3df698af8ada -r 253f727de17e
src-util/buildvalidation/src/org/openbravo/buildvalidation/Cbpvendoracct.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/src-util/buildvalidation/src/org/openbravo/buildvalidation/Cbpvendoracct.java
Fri Apr 09 21:12:35 2010 +0200
@@ -0,0 +1,50 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.0 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
------------------------------------------------------------------------------
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
