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
This commit is contained in:
tspc 2010-05-02 01:42:38 +00:00
parent e0f77a0731
commit f204c5662f
1 changed files with 6 additions and 0 deletions

View File

@ -1053,6 +1053,12 @@ public abstract class Doc
log.fine("(none) - " + toString()); log.fine("(none) - " + toString());
return true; 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 // Get All Currencies
HashSet<Integer> set = new HashSet<Integer>(); HashSet<Integer> set = new HashSet<Integer>();
set.add(new Integer(getC_Currency_ID())); set.add(new Integer(getC_Currency_ID()));