details: /erp/stable/2.50/rev/df21127e8c41
changeset: 9458:df21127e8c41
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue May 24 09:36:21 2011 +0200
summary: fixes accounting for transactions when payment accounting is
deactivated and payment contains GL Item
details: /erp/stable/2.50/rev/06080dc158dc
changeset: 9459:06080dc158dc
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri May 27 10:40:05 2011 +0200
summary: Fixes on delete cascade rules for FIN_RECLINE_TEMP table
details: /erp/stable/2.50/rev/2c2cf6635ebf
changeset: 9460:2c2cf6635ebf
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri May 27 10:40:59 2011 +0200
summary: merge
diffstat:
.hgsigs
| 1 +
.hgtags
| 1 +
src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
| 2 +-
src-core/utils/rmi/src/rmi/RenderFo.java
| 206 ++--
src-core/utils/rmi/src/rmi/RenderFoI.java
| 42 +-
src-db/database/model/functions/C_TAXPAYMENT_POST.xml
| 2 +-
src-db/database/model/tables/FIN_RECLINE_TEMP.xml
| 10 +-
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
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 +-
src/org/openbravo/base/exception/OBException.java
| 126 +-
src/org/openbravo/base/exception/OBSecurityException.java
| 94 +-
src/org/openbravo/base/provider/OBNotSingleton.java
| 58 +-
src/org/openbravo/base/provider/OBProvidable.java
| 56 +-
src/org/openbravo/base/provider/OBProviderConfigReader.java
| 210 +++---
src/org/openbravo/base/provider/OBProviderException.java
| 96 +-
src/org/openbravo/base/provider/OBSingleton.java
| 58 +-
src/org/openbravo/base/util/ArgumentException.java
| 98 +-
src/org/openbravo/base/util/Check.java
| 350 +++++-----
src/org/openbravo/base/util/CheckException.java
| 98 +-
src/org/openbravo/base/validation/ValidationException.java
| 136 +-
src/org/openbravo/dal/xml/EntityNotFoundException.java
| 96 +-
src/org/openbravo/dal/xml/EntityXMLException.java
| 100 +-
src/org/openbravo/erpCommon/ad_actionButton/InsertAcces.java
| 7 +
src/org/openbravo/erpCommon/ad_actionButton/InsertAcces_data.xsql
| 4 +-
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
| 19 +-
src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java
| 4 +-
src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql
| 8 +-
src/org/openbravo/erpCommon/utility/ReferencedLink_data.xsql
| 1 +
src/org/openbravo/service/OBServiceException.java
| 96 +-
src/org/openbravo/service/web/InvalidContentException.java
| 96 +-
src/org/openbravo/service/web/InvalidRequestException.java
| 96 +-
src/org/openbravo/service/web/ResourceNotFoundException.java
| 96 +-
35 files changed, 1162 insertions(+), 1128 deletions(-)
diffs (truncated from 2552 to 300 lines):
diff -r ed0418b01ffc -r 2c2cf6635ebf .hgsigs
--- a/.hgsigs Fri May 20 08:58:37 2011 +0200
+++ b/.hgsigs Fri May 27 10:40:59 2011 +0200
@@ -34,3 +34,4 @@
5c14d4389c170fc46a411805d5ce7dff249bc6ca 0
iEYEABECAAYFAk2Qo/AACgkQCX/oGf+2qkORVQCgrXrM9FcsCuAOlmjkJi2S6kAsKfwAn1kT2TTDeSCNfjITL1gmVXJrfbsx
e6f5f1263cc3010c106d98d52567c9cf122c6b19 0
iEYEABECAAYFAk22pxAACgkQCX/oGf+2qkNWWACglj41gaAYb95rgGFdHP6rK/23xIkAnRLZeA6Bfv+fwxwyphpew1CrBTYp
8c925d63b87469a41eed771bafb1cea6c5e58e0e 0
iEYEABECAAYFAk2+4GQACgkQCX/oGf+2qkN+HQCg+yISqbY8wQ+XniKkfARy3Hbarw0AoNcwR9ivJWABVUC7i4r9trOBA9sU
+2cfa03023503ef72a8c4838cdb763e2cbd707893 0
iEYEABECAAYFAk3c2n4ACgkQCX/oGf+2qkO6GACg7qrg2WS8mGIH5hebESW1aoOmHMcAoP7wTmjIzUxn7w3ZRihDuh5xQLzK
diff -r ed0418b01ffc -r 2c2cf6635ebf .hgtags
--- a/.hgtags Fri May 20 08:58:37 2011 +0200
+++ b/.hgtags Fri May 27 10:40:59 2011 +0200
@@ -45,3 +45,4 @@
e624b60bac66c174c9cf71de8a03ba45791173a2 2.50MP28
2cd4bac992f78c0e44909842c5b1c1e189ce77df 2.50MP28EU1
75cd97dc706ca9edb3452e19c5708c8a16bfeb18 2.50MP29
+d467781fb9a6174eece3684b52c186bbf0c2651e 2.50MP30
diff -r ed0418b01ffc -r 2c2cf6635ebf
src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
--- a/src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
Fri May 20 08:58:37 2011 +0200
+++ b/src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
Fri May 27 10:40:59 2011 +0200
@@ -28,7 +28,7 @@
public static void main(String[] args) {
basedir = new File(args[0]);
- module = args[1];
+ module = null; // The module is not set so that all BuildValidations are
always executed.
PropertyConfigurator.configure("log4j.lcf");
List<String> classes = new ArrayList<String>();
ArrayList<File> modFolders = new ArrayList<File>();
diff -r ed0418b01ffc -r 2c2cf6635ebf src-core/utils/rmi/src/rmi/RenderFo.java
--- a/src-core/utils/rmi/src/rmi/RenderFo.java Fri May 20 08:58:37 2011 +0200
+++ b/src-core/utils/rmi/src/rmi/RenderFo.java Fri May 27 10:40:59 2011 +0200
@@ -1,103 +1,103 @@
-/*
-
************************************************************************************
- * Copyright (C) 2001-2006 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 rmi;
-
-import java.rmi.server.*;
-import java.rmi.registry.*;
-
-import java.io.*;
-import java.lang.*;
-import org.apache.fop.apps.Driver;
-import org.apache.fop.apps.Version;
-import java.net.*;
-import java.rmi.*;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import rmi.*;
-import org.xml.sax.*;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.SimpleLayout;
-import org.apache.log4j.FileAppender;
-
-public class RenderFo extends UnicastRemoteObject implements RenderFoI{
-
- private String strFo;
- static Logger logger = Logger.getLogger(RenderFo.class);
-
- public RenderFo() throws RemoteException {
- }
-
- public RenderFo(String strFo) throws RemoteException{
- this.strFo = strFo;
- }
-
- public Object execute() throws RemoteException {
- return computeRenderFo(strFo);
- }
-
-
- public byte[] computeRenderFo(String strFo) throws RemoteException{
- byte[] content = null;
- try {
- StringReader sr = new StringReader(strFo);
- InputSource inputFo = new InputSource(sr);
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- Driver driver = new Driver(inputFo, out);
- driver.run();
- content = out.toByteArray();
- out.close();
- } catch (Exception e) {
- Throwable t = (Throwable) e;
- logger.error("computeRenderFo exception: " + e.getMessage());
- e.printStackTrace();
- }
- return content;
- }
-
- // Registration for RMI serving:
- public static void main(String[] args) {
- SimpleLayout layout = new SimpleLayout();
-
- FileAppender appender = null;
-
-
- Date today = new Date();
-
- // format the date in the form "Wed 27 Aug, 2003"
- SimpleDateFormat formatter = new SimpleDateFormat( "ddMMyyyy" );
- String strToday = formatter.format( today );
-
- String strFileName = "renderFo"+strToday+".log";
-
- try {
- appender = new
FileAppender(layout,"@basepath@\\logs\\"+strFileName,false); // eg. @basepath@
= c:\\rmi
- } catch(Exception e) {}
-
- logger.addAppender(appender);
- logger.setLevel((Level) Level.WARN);
-
- System.setSecurityManager(
- new RMISecurityManager());
-
- try {
- RenderFo render = new RenderFo();
- Naming.bind("//@RenderFoAddress@/RenderFo", render);
- logger.warn("RenderFo ready");
- } catch(Exception e) {
- logger.error("Error binding:"+e.getMessage());
- e.printStackTrace();
- }
- }
-}
-
+/*
+
************************************************************************************
+ * Copyright (C) 2001-2006 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 rmi;
+
+import java.rmi.server.*;
+import java.rmi.registry.*;
+
+import java.io.*;
+import java.lang.*;
+import org.apache.fop.apps.Driver;
+import org.apache.fop.apps.Version;
+import java.net.*;
+import java.rmi.*;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import rmi.*;
+import org.xml.sax.*;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.SimpleLayout;
+import org.apache.log4j.FileAppender;
+
+public class RenderFo extends UnicastRemoteObject implements RenderFoI{
+
+ private String strFo;
+ static Logger logger = Logger.getLogger(RenderFo.class);
+
+ public RenderFo() throws RemoteException {
+ }
+
+ public RenderFo(String strFo) throws RemoteException{
+ this.strFo = strFo;
+ }
+
+ public Object execute() throws RemoteException {
+ return computeRenderFo(strFo);
+ }
+
+
+ public byte[] computeRenderFo(String strFo) throws RemoteException{
+ byte[] content = null;
+ try {
+ StringReader sr = new StringReader(strFo);
+ InputSource inputFo = new InputSource(sr);
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ Driver driver = new Driver(inputFo, out);
+ driver.run();
+ content = out.toByteArray();
+ out.close();
+ } catch (Exception e) {
+ Throwable t = (Throwable) e;
+ logger.error("computeRenderFo exception: " + e.getMessage());
+ e.printStackTrace();
+ }
+ return content;
+ }
+
+ // Registration for RMI serving:
+ public static void main(String[] args) {
+ SimpleLayout layout = new SimpleLayout();
+
+ FileAppender appender = null;
+
+
+ Date today = new Date();
+
+ // format the date in the form "Wed 27 Aug, 2003"
+ SimpleDateFormat formatter = new SimpleDateFormat( "ddMMyyyy" );
+ String strToday = formatter.format( today );
+
+ String strFileName = "renderFo"+strToday+".log";
+
+ try {
+ appender = new
FileAppender(layout,"@basepath@\\logs\\"+strFileName,false); // eg. @basepath@
= c:\\rmi
+ } catch(Exception e) {}
+
+ logger.addAppender(appender);
+ logger.setLevel((Level) Level.WARN);
+
+ System.setSecurityManager(
+ new RMISecurityManager());
+
+ try {
+ RenderFo render = new RenderFo();
+ Naming.bind("//@RenderFoAddress@/RenderFo", render);
+ logger.warn("RenderFo ready");
+ } catch(Exception e) {
+ logger.error("Error binding:"+e.getMessage());
+ e.printStackTrace();
+ }
+ }
+}
+
diff -r ed0418b01ffc -r 2c2cf6635ebf src-core/utils/rmi/src/rmi/RenderFoI.java
--- a/src-core/utils/rmi/src/rmi/RenderFoI.java Fri May 20 08:58:37 2011 +0200
+++ b/src-core/utils/rmi/src/rmi/RenderFoI.java Fri May 27 10:40:59 2011 +0200
@@ -1,22 +1,22 @@
-/*
-
************************************************************************************
- * Copyright (C) 2001-2006 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.
-
************************************************************************************
- */
-
-//: c15:rmi:PerfectTimeI.java
-// The PerfectTime remote interface.
-package rmi;
-import java.rmi.*;
-import java.io.*;
-import org.xml.sax.*;
-
-public interface RenderFoI extends Remote {
- byte[] computeRenderFo(String strFo) throws RemoteException;
+/*
+
************************************************************************************
+ * Copyright (C) 2001-2006 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.
+
************************************************************************************
+ */
+
+//: c15:rmi:PerfectTimeI.java
+// The PerfectTime remote interface.
+package rmi;
+import java.rmi.*;
+import java.io.*;
+import org.xml.sax.*;
+
+public interface RenderFoI extends Remote {
+ byte[] computeRenderFo(String strFo) throws RemoteException;
} ///:~
\ No newline at end of file
diff -r ed0418b01ffc -r 2c2cf6635ebf
src-db/database/model/functions/C_TAXPAYMENT_POST.xml
--- a/src-db/database/model/functions/C_TAXPAYMENT_POST.xml Fri May 20
08:58:37 2011 +0200
+++ b/src-db/database/model/functions/C_TAXPAYMENT_POST.xml Fri May 27
10:40:59 2011 +0200
@@ -287,7 +287,7 @@
RAISE_APPLICATION_ERROR(-20100, '@TwoRegisterTypesNeeded@');
end if;
- select case when tt.issotrx='Y' then max(glitem_debit_acct) else
max(glitem_credit_acct) end, max(tt.c_glitem_id)
+ select case when tt.issotrx='Y' then max(glitem_credit_acct) else
max(glitem_debit_acct) end, max(tt.c_glitem_id)
into v_glitem_acct, v_glitem_id
from c_taxregister_type tt
inner join c_glitem_acct gia on gia.c_glitem_id=tt.c_glitem_id
diff -r ed0418b01ffc -r 2c2cf6635ebf
src-db/database/model/tables/FIN_RECLINE_TEMP.xml
--- a/src-db/database/model/tables/FIN_RECLINE_TEMP.xml Fri May 20 08:58:37
2011 +0200
------------------------------------------------------------------------------
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
