details: /erp/devel/int/rev/0edb9a09c255
changeset: 6722:0edb9a09c255
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Mar 16 07:13:11 2010 +0100
summary: fixes issue 12660: OBContext enableAsAdminContext -
resetAsAdminContext should use an stack
details: /erp/devel/int/rev/dc6bca4b59c4
changeset: 6723:dc6bca4b59c4
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Mar 16 07:14:21 2010 +0100
summary: fixes issue 12575: It is neccessary to create a testcase for
Transient Condition
details: /erp/devel/int/rev/d0560422ea80
changeset: 6724:d0560422ea80
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Mar 16 07:15:09 2010 +0100
summary: fixes issue 12106: record identifier returned from dal uses ' ' as
separator of columns, but normal pl-version uses ' - '
details: /erp/devel/int/rev/949999a53c52
changeset: 6725:949999a53c52
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Mar 16 07:20:20 2010 +0100
summary: Small change to let testcase not fail in case a module does not have
a db prefix
details: /erp/devel/int/rev/aca9a38e5db5
changeset: 6726:aca9a38e5db5
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Mar 16 08:57:28 2010 +0100
summary: Handle null value in dateformatting
details: /erp/devel/int/rev/eba1e8f414f8
changeset: 6727:eba1e8f414f8
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Mar 16 11:01:49 2010 +0100
summary: Backing out from changesets 6722 - 6726
details: /erp/devel/int/rev/26e1f6aab1c0
changeset: 6728:26e1f6aab1c0
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Mar 16 11:36:28 2010 +0100
summary: Fixes bug 0012539: DocPayment.java has no references to currency
convert
diffstat:
src/org/openbravo/erpCommon/ad_forms/DocPayment.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diffs (35 lines):
diff -r 1232be2520b1 -r 26e1f6aab1c0
src/org/openbravo/erpCommon/ad_forms/DocPayment.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocPayment.java Mon Mar 15
20:36:52 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocPayment.java Tue Mar 16
11:36:28 2010 +0100
@@ -289,8 +289,16 @@
DocPaymentData[] data = DocPaymentData.selectManual(conn,
as.m_C_AcctSchema_ID,
line.Line_ID);
for (int j = 0; data != null && j < data.length; j++) {
- String amountdebit = data[j].amountdebit;
- String amountcredit = data[j].amountcredit;
+ String amountdebit = convertAmount(data[j].amountdebit,
line.isReceipt.equals("Y"),
+ DateAcct, line.conversionDate, line.C_Currency_ID_From,
as.m_C_Currency_ID, line,
+ as, fact, Fact_Acct_Group_ID, conn);
+ String amountcredit = convertAmount(data[j].amountcredit,
line.isReceipt.equals("Y"),
+ DateAcct, line.conversionDate, line.C_Currency_ID_From,
as.m_C_Currency_ID, line,
+ as, fact, Fact_Acct_Group_ID, conn);
+ amountdebit = getConvertedAmt(amountdebit, as.m_C_Currency_ID,
C_Currency_ID, DateAcct,
+ "", AD_Client_ID, AD_Org_ID, conn);
+ amountcredit = getConvertedAmt(amountcredit, as.m_C_Currency_ID,
C_Currency_ID,
+ DateAcct, "", AD_Client_ID, AD_Org_ID, conn);
if (log4j.isDebugEnabled())
log4j.debug("DocPayment - createFact - Conceptos - AmountDebit:
" + amountdebit
+ " - AmountCredit: " + amountcredit);
@@ -300,9 +308,9 @@
lineAux.setM_C_Tax_ID(data[j].cTaxId);
fact.createLine(lineAux, new Account(conn,
(lineAux.isReceipt.equals("Y") ? data[j].creditAcct :
data[j].debitAcct)),
- line.C_Currency_ID_From, (amountdebit.equals("0") ? "" :
amountdebit),
- (amountcredit.equals("0") ? "" : amountcredit),
Fact_Acct_Group_ID,
- nextSeqNo(SeqNo), DocumentType, conn);
+ C_Currency_ID, (amountdebit.equals("0") ? "" : amountdebit),
(amountcredit
+ .equals("0") ? "" : amountcredit), Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
+ DocumentType, conn);
}
}
} // END debt-payment conditions
------------------------------------------------------------------------------
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
