From f204c5662ffbd8636785a23bd8dfbe33fda8ccfc Mon Sep 17 00:00:00 2001
From: tspc <devnull@localhost>
Date: Sun, 2 May 2010 01:42:38 +0000
Subject: [PATCH] Merge bug fixes from release to trunk merge 12196

Revision: 12196
http://adempiere.svn.sourceforge.net/adempiere/?rev=12196&view=rev
Fix [2994418] Posting GLJournal on different acct schema conv rate
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2994418

Regards,
Tony
---
 base/src/org/compiere/acct/Doc.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/base/src/org/compiere/acct/Doc.java b/base/src/org/compiere/acct/Doc.java
index 8e45f09bb3..80a4c58395 100644
--- a/base/src/org/compiere/acct/Doc.java
+++ b/base/src/org/compiere/acct/Doc.java
@@ -1053,6 +1053,12 @@ public abstract class Doc
 			log.fine("(none) - " + toString());
 			return true;
 		}
+		// Journal from a different acct schema
+		if (this instanceof Doc_GLJournal) {
+			int glj_as = ((Integer) p_po.get_Value("C_AcctSchema_ID")).intValue();
+			if (acctSchema.getC_AcctSchema_ID() != glj_as)
+				return true;
+		}
 		//  Get All Currencies
 		HashSet<Integer> set = new HashSet<Integer>();
 		set.add(new Integer(getC_Currency_ID()));