details: /erp/devel/pi/rev/d32a3062697c
changeset: 7455:d32a3062697c
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Mon May 31 23:16:13 2010 +0200
summary: Fixes issue 13489: If any accounting process fails, no rollback is
done
details: /erp/devel/pi/rev/65540ab338e4
changeset: 7456:65540ab338e4
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Tue Jun 01 09:28:04 2010 +0200
summary: [InitialClientSetupRefactor] Code review feedback
details: /erp/devel/pi/rev/703e25df1630
changeset: 7457:703e25df1630
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Tue Jun 01 09:31:33 2010 +0200
summary: Merge
diffstat:
src-test/org/openbravo/test/AllAntTaskTests.java | 2 +
src-test/org/openbravo/test/AllQuickAntTaskTests.java | 2 +
src-test/org/openbravo/test/AntTaskTests.java | 2 +
src-test/org/openbravo/test/model/ClassLoaderTest.java | 2 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql | 2 +-
src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 1 +
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html | 2 +-
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java | 17 +-
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup_data.xsql | 654
----------
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java | 8 +-
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup_data.xsql | 35 +
src/org/openbravo/erpCommon/businessUtility/COAData.java | 277
+++-
src/org/openbravo/erpCommon/businessUtility/COAUtility.java | 265
++--
src/org/openbravo/erpCommon/businessUtility/InitialClientSetup.java | 238 +-
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 392
+++++-
15 files changed, 886 insertions(+), 1013 deletions(-)
diffs (truncated from 3161 to 300 lines):
diff -r b6ab6043ab92 -r 703e25df1630
src-test/org/openbravo/test/AllAntTaskTests.java
--- a/src-test/org/openbravo/test/AllAntTaskTests.java Sat May 29 09:38:32
2010 +0200
+++ b/src-test/org/openbravo/test/AllAntTaskTests.java Tue Jun 01 09:31:33
2010 +0200
@@ -40,6 +40,7 @@
import org.openbravo.test.dal.ReadByNameTest;
import org.openbravo.test.dal.ValidationTest;
import org.openbravo.test.expression.EvaluationTest;
+import org.openbravo.test.model.ClassLoaderTest;
import org.openbravo.test.model.OneToManyTest;
import org.openbravo.test.model.RuntimeModelTest;
import org.openbravo.test.model.UniqueConstraintTest;
@@ -104,6 +105,7 @@
suite.addTestSuite(RuntimeModelTest.class);
suite.addTestSuite(OneToManyTest.class);
suite.addTestSuite(UniqueConstraintTest.class);
+ suite.addTestSuite(ClassLoaderTest.class);
// modularity
suite.addTestSuite(DatasetServiceTest.class);
diff -r b6ab6043ab92 -r 703e25df1630
src-test/org/openbravo/test/AllQuickAntTaskTests.java
--- a/src-test/org/openbravo/test/AllQuickAntTaskTests.java Sat May 29
09:38:32 2010 +0200
+++ b/src-test/org/openbravo/test/AllQuickAntTaskTests.java Tue Jun 01
09:31:33 2010 +0200
@@ -29,6 +29,7 @@
import org.openbravo.test.dal.DalUtilTest;
import org.openbravo.test.dal.OBContextTest;
import org.openbravo.test.dal.ValidationTest;
+import org.openbravo.test.model.ClassLoaderTest;
import org.openbravo.test.model.UniqueConstraintTest;
import org.openbravo.test.modularity.DBPrefixTest;
import org.openbravo.test.preference.PreferenceTest;
@@ -88,6 +89,7 @@
// suite.addTestSuite(RuntimeModelTest.class);
// suite.addTestSuite(OneToManyTest.class);
suite.addTestSuite(UniqueConstraintTest.class);
+ suite.addTestSuite(ClassLoaderTest.class);
// modularity
// suite.addTestSuite(DatasetServiceTest.class);
diff -r b6ab6043ab92 -r 703e25df1630
src-test/org/openbravo/test/AntTaskTests.java
--- a/src-test/org/openbravo/test/AntTaskTests.java Sat May 29 09:38:32
2010 +0200
+++ b/src-test/org/openbravo/test/AntTaskTests.java Tue Jun 01 09:31:33
2010 +0200
@@ -40,6 +40,7 @@
import org.openbravo.test.dal.ReadByNameTest;
import org.openbravo.test.dal.ValidationTest;
import org.openbravo.test.expression.EvaluationTest;
+import org.openbravo.test.model.ClassLoaderTest;
import org.openbravo.test.model.OneToManyTest;
import org.openbravo.test.model.RuntimeModelTest;
import org.openbravo.test.model.UniqueConstraintTest;
@@ -106,6 +107,7 @@
suite.addTestSuite(RuntimeModelTest.class);
suite.addTestSuite(OneToManyTest.class);
suite.addTestSuite(UniqueConstraintTest.class);
+ suite.addTestSuite(ClassLoaderTest.class);
// modularity
suite.addTestSuite(DatasetServiceTest.class);
diff -r b6ab6043ab92 -r 703e25df1630
src-test/org/openbravo/test/model/ClassLoaderTest.java
--- a/src-test/org/openbravo/test/model/ClassLoaderTest.java Sat May 29
09:38:32 2010 +0200
+++ b/src-test/org/openbravo/test/model/ClassLoaderTest.java Tue Jun 01
09:31:33 2010 +0200
@@ -72,7 +72,7 @@
}
// Testing if the defined class can be loaded
- ClassLoader.getSystemClassLoader().loadClass(mi.getJavaClassName());
+ Class.forName(mi.getJavaClassName());
} catch (ClassNotFoundException e) {
notFoundClasses.add(mi.getId() + " : " + mi.getJavaClassName());
diff -r b6ab6043ab92 -r 703e25df1630
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql
Sat May 29 09:38:32 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql
Tue Jun 01 09:31:33 2010 +0200
@@ -55,7 +55,7 @@
PRICESTD)
SELECT ?, ?, ?, ?, 'Y', now(), ?, now(), ?,
(SELECT COALESCE(MAX(LINE),0)+10 FROM C_InvoiceLine WHERE
C_InvoiceLine_ID = ?), DESCRIPTION, M_PRODUCT_ID,
- QTYINVOICED, ?, ?, ?, ?, C_CHARGE_ID, CHARGEAMT, C_UOM_ID, ?,
+ QTYINVOICED, TO_NUMBER(?), TO_NUMBER(?), TO_NUMBER(?), TO_NUMBER(?),
C_CHARGE_ID, CHARGEAMT, C_UOM_ID, ?,
S_RESOURCEASSIGNMENT_ID, TAXAMT, M_ATTRIBUTESETINSTANCE_ID,
ISDESCRIPTION, QUANTITYORDER, M_PRODUCT_UOM_ID,
PRICESTD
FROM C_INVOICELINE
diff -r b6ab6043ab92 -r 703e25df1630
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Sat May 29
09:38:32 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Tue Jun 01
09:31:33 2010 +0200
@@ -983,6 +983,7 @@
AcctProcessTemplate newTemplate = (AcctProcessTemplate)
Class.forName(strClassname)
.newInstance();
if (!newTemplate.execute(this, as, conn, con, vars)) {
+ OBDal.getInstance().rollbackAndClose();
return getStatus();
}
} catch (Exception e) {
diff -r b6ab6043ab92 -r 703e25df1630
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html
--- a/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html Sat May
29 09:38:32 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html Tue Jun
01 09:31:33 2010 +0200
@@ -55,7 +55,7 @@
var frm = document.frmMain;
if (frm.inpClient.value==null || frm.inpClient.value=="")
{setWindowElementFocus(frm.inpClient); showJSMessage(7);
setProcessingMode('window',false); return false; }
if (frm.inpCurrency.value==null || frm.inpCurrency.value=="")
{setWindowElementFocus(frm.inpCurrency); showJSMessage(7);
setProcessingMode('window',false); return false; }
- if (frm.inpClientUser.value==null || frm.inpClientUser.value=="")
{setWindowElementFocus(frm.inpClientUser); showJSMessage(7);
rsetProcessingMode('window',false); return false; }
+ if (frm.inpClientUser.value==null || frm.inpClientUser.value=="")
{setWindowElementFocus(frm.inpClientUser); showJSMessage(7);
setProcessingMode('window',false); return false; }
if (frm.inpPassword.value==null || frm.inpPassword.value=="")
{setWindowElementFocus(frm.inpPassword); showJSMessage(7);
setProcessingMode('window',false); return false; }
return true;
}
diff -r b6ab6043ab92 -r 703e25df1630
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java
--- a/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java Sat May
29 09:38:32 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java Tue Jun
01 09:31:33 2010 +0200
@@ -38,10 +38,9 @@
public class InitialClientSetup extends HttpSecureAppServlet {
- static Logger log4j = Logger.getLogger(InitialClientSetup.class);
+ private static final Logger log4j =
Logger.getLogger(InitialClientSetup.class);
private static final long serialVersionUID = 1L;
- private static final String strMessageOk = "Success";
- private StringBuffer strLog = new StringBuffer();
+ private static final String STRMESSAGEOK = "Success";
public void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
@@ -51,10 +50,10 @@
printPage(response, vars);
} else if (vars.commandIn("OK")) {
String strModules = vars.getInStringParameter("inpNodes",
IsIDFilter.instance);
- strLog.delete(0, strLog.length());
- OBError obeResultado = process(request, response, vars, strModules);
+ StringBuffer strLog = new StringBuffer();
+ OBError obeResultado = process(request, response, vars, strModules,
strLog);
log4j.debug("InitialClientSetup - after processFile");
- printPageResult(response, vars, obeResultado);
+ printPageResult(response, vars, obeResultado, strLog);
} else
pageError(response);
}
@@ -114,7 +113,7 @@
}
private void printPageResult(HttpServletResponse response,
VariablesSecureApp vars,
- OBError obeResult) throws IOException, ServletException {
+ OBError obeResult, StringBuffer strLog) throws IOException,
ServletException {
XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
"org/openbravo/erpCommon/ad_forms/Resultado").createXmlDocument();
String strLanguage = vars.getLanguage();
@@ -156,11 +155,11 @@
}
private OBError process(HttpServletRequest request, HttpServletResponse
response,
- VariablesSecureApp vars, String strModules) throws IOException {
+ VariablesSecureApp vars, String strModules, StringBuffer strLog) throws
IOException {
log4j.debug("process() - Initial Client Setup Process Start - strModules -
" + strModules);
OBError obeResult = new OBError();
- obeResult.setType(strMessageOk);
+ obeResult.setType(STRMESSAGEOK);
String strClientName = vars.getStringParameter("inpClient");
String strClientUser = vars.getStringParameter("inpClientUser");
diff -r b6ab6043ab92 -r 703e25df1630
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup_data.xsql Sat May
29 09:38:32 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,655 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- ******************************************************************************
- * The contents of this file are subject to the Compiere License Version 1.1
- * ("License"); You may not use this file except in compliance with the License
- * You may obtain a copy of the License at http://www.compiere.org/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 Compiere ERP & CRM 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-2010 Openbravo S.L.U.
- ******************************************************************************
--->
-<SqlClass name="InitialClientSetupData"
package="org.openbravo.erpCommon.ad_forms">
- <SqlClassComment></SqlClassComment>
- <SqlMethod name="select" type="preparedStatement" return="multiple">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- <![CDATA[
- SELECT '' AS id, '' AS NAME, '' AS HASCHARTOFACCOUNTS, '' AS
ISTRANSLATIONMODULE,
- '' AS AD_MODULE_ID, '' AS PATH, '' AS JAVAPACKAGE, '' AS DATASETNAME, ''
AS VERSION, '' AS TOTAL
- FROM DUAL
- ]]>
- </Sql>
- </SqlMethod>
-
- <SqlMethod name="insertClient" type="preparedStatement" connection="true"
return="rowCount">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- <![CDATA[
- INSERT INTO
AD_Client(AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Value,Name,Description,
C_Currency_ID)
- VALUES (?,'0','Y',now(),'0',now(),'0',?, ?, ?, ?)
- ]]>
- </Sql>
- <Parameter name="claveClient"/>
- <Parameter name="client"/>
- <Parameter name="client"/>
- <Parameter name="client"/>
- <Parameter name="currency"/>
- </SqlMethod>
- <SqlMethod name="insertTree" type="preparedStatement" connection="true"
return="rowCount">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- <![CDATA[
- INSERT INTO
AD_Tree(AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Tree_ID,Name,Description,TreeType)
- VALUES (?,'0','Y',now(),'0',now(),'0',?,?,?,?)
- ]]>
- </Sql>
- <Parameter name="claveCliente"/>
- <Parameter name="AD_Tree_ID"/>
- <Parameter name="tree"/>
- <Parameter name="tree"/>
- <Parameter name="value"/>
- </SqlMethod>
- <SqlMethod name="updateUser2" type="preparedStatement" connection="true"
return="rowCount">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- <![CDATA[
- UPDATE AD_User
- SET CreatedBy = '0'
- WHERE Name = ?
- ]]>
- </Sql>
- <Parameter name="User"/>
- </SqlMethod>
-
- <SqlMethod name="updateClient2" type="preparedStatement" connection="true"
return="rowCount">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- <![CDATA[
- UPDATE AD_Client
- SET CreatedBy = '0'
- WHERE VALUE = ?
- ]]>
- </Sql>
- <Parameter name="Client"/>
- </SqlMethod>
-
- <!-- SqlMethod name="updateClientInfo" type="preparedStatement"
connection="true" return="rowCount">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- <![CDATA[
- UPDATE AD_ClientInfo SET C_AcctSchema1_ID = ?, C_Calendar_ID = ?
- WHERE AD_Client_ID = ?
- ]]>
- </Sql>
- <Parameter name="C_AcctSchema_ID"/>
- <Parameter name="C_Calendar_ID"/>
- <Parameter name="AD_Client_ID"/>
- </SqlMethod-->
- <SqlMethod name="insertClientInfo" type="preparedStatement"
connection="true" return="rowCount">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- <![CDATA[
- INSERT INTO
AD_ClientInfo(AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Acct2_Active,Acct3_Active,AD_Tree_Menu_ID,
AD_Tree_Org_ID,AD_Tree_BPartner_ID,AD_Tree_Project_ID,AD_Tree_SalesRegion_ID,AD_Tree_Product_ID)
- VALUES (?,'0','Y',now(),'0',now(),'0' ,'N','N',?,?,?,?,?,?)
- ]]>
- </Sql>
- <Parameter name="client"/>
- <Parameter name="AD_Tree_Menu_ID"/>
- <Parameter name="AD_Tree_Org_ID"/>
- <Parameter name="AD_Tree_BPartner_ID"/>
- <Parameter name="AD_Tree_Project_ID"/>
- <Parameter name="AD_Tree_SalesRegion_ID"/>
- <Parameter name="AD_Tree_Product_ID"/>
- </SqlMethod>
-
- <SqlMethod name="insertRole" type="preparedStatement" connection="true"
return="rowCount">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- <![CDATA[
- INSERT INTO AD_Role
(AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Role_ID,Name,
- Description,UserLevel,ClientList,OrgList)
- VALUES (?,'0','Y',now(),'0',now(),'0',?,?,?,' CO',?,?)
- ]]>
- </Sql>
- <Parameter name="AD_Client_ID"/>
- <Parameter name="AD_Role_ID"/>
- <Parameter name="name"/>
- <Parameter name="name"/>
- <Parameter name="AD_Client_ID"/>
- <Parameter name="AD_Org_ID"/>
- </SqlMethod>
-
- <SqlMethod name="insertRoleOrgAccess" type="preparedStatement"
connection="true" return="rowCount">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- <![CDATA[
- INSERT INTO AD_Role_OrgAccess(AD_Role_OrgAccess_ID,
AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Role_ID)
- VALUES (get_uuid(), ?,?,'Y',now(),'0',now(),'0',?)
- ]]>
- </Sql>
- <Parameter name="AD_Client_ID"/>
- <Parameter name="AD_Org_ID"/>
- <Parameter name="AD_Role_ID"/>
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
