details: /erp/devel/int/rev/d5815fdb7084
changeset: 6796:d5815fdb7084
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Thu Mar 25 00:59:29 2010 +0100
summary: Fixes issue 12458
Improved comparison of figures, taking into account
different precisions
details: /erp/devel/int/rev/93b909990b32
changeset: 6797:93b909990b32
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Mar 25 12:18:39 2010 +0530
summary: Fixes issue 12590: error to save a new record in withholding account
tab.
details: /erp/devel/int/rev/a389b092278b
changeset: 6798:a389b092278b
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Thu Mar 25 12:33:55 2010 +0530
summary: Tax credit account has been used instead of Tax liability account.
details: /erp/devel/int/rev/4532bed7aa87
changeset: 6799:4532bed7aa87
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Mar 25 13:35:48 2010 +0530
summary: Fixes Issue 12134: Expiration Date Report does not filter data
properly.
details: /erp/devel/int/rev/91ef4d9b3994
changeset: 6800:91ef4d9b3994
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Thu Mar 25 10:05:44 2010 +0100
summary: Fixes issue 0012788: Precision error in simple sales order & sales
invoice
details: /erp/devel/int/rev/2c75d71c8c16
changeset: 6801:2c75d71c8c16
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Thu Mar 25 15:55:43 2010 +0530
summary: Fixes Issue 12139: Wrong label in Warehouse Control Report.
diffstat:
src-db/database/sourcedata/AD_COLUMN.xml | 2 +-
src-db/database/sourcedata/AD_FIELD.xml | 14 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 +
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 16 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java | 16 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 87
+--------
src/org/openbravo/erpCommon/ad_forms/DocPayment.java | 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportGuaranteeDate_data.xsql | 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl.html | 2 +-
9 files changed, 50 insertions(+), 102 deletions(-)
diffs (truncated from 343 to 300 lines):
diff -r 916c4057ecd7 -r 2c75d71c8c16 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Mar 24 23:55:49 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Mar 25 15:55:43 2010 +0530
@@ -79443,7 +79443,7 @@
<!--5090--> <ISKEY><![CDATA[N]]></ISKEY>
<!--5090--> <ISPARENT><![CDATA[Y]]></ISPARENT>
<!--5090--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--5090--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--5090--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--5090--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
<!--5090--> <SEQNO><![CDATA[2]]></SEQNO>
<!--5090--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
diff -r 916c4057ecd7 -r 2c75d71c8c16 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Wed Mar 24 23:55:49 2010 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Thu Mar 25 15:55:43 2010 +0530
@@ -174778,12 +174778,13 @@
<!--1002100118--> <AD_COLUMN_ID><![CDATA[5089]]></AD_COLUMN_ID>
<!--1002100118--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--1002100118--> <DISPLAYLENGTH><![CDATA[22]]></DISPLAYLENGTH>
-<!--1002100118--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1002100118--> <SEQNO><![CDATA[40]]></SEQNO>
+<!--1002100118--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--1002100118--> <SEQNO><![CDATA[30]]></SEQNO>
<!--1002100118--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--1002100118--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--1002100118--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--1002100118--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100118--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
<!--1002100118--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--1002100118--></AD_FIELD>
@@ -174801,7 +174802,7 @@
<!--1002100119--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--1002100119--> <DISPLAYLENGTH><![CDATA[22]]></DISPLAYLENGTH>
<!--1002100119--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1002100119--> <SEQNO><![CDATA[50]]></SEQNO>
+<!--1002100119--> <SEQNO><![CDATA[40]]></SEQNO>
<!--1002100119--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--1002100119--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--1002100119--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -174864,10 +174865,9 @@
<!--1002100122--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--1002100122--> <AD_TAB_ID><![CDATA[1002100005]]></AD_TAB_ID>
<!--1002100122--> <AD_COLUMN_ID><![CDATA[5094]]></AD_COLUMN_ID>
-<!--1002100122--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1002100122--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--1002100122--> <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
<!--1002100122--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1002100122--> <SEQNO><![CDATA[60]]></SEQNO>
<!--1002100122--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--1002100122--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--1002100122--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -174889,6 +174889,7 @@
<!--1002100123--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--1002100123--> <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
<!--1002100123--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--1002100123--> <SEQNO><![CDATA[50]]></SEQNO>
<!--1002100123--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--1002100123--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--1002100123--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -174912,7 +174913,7 @@
<!--1002100124--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--1002100124--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--1002100124--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1002100124--> <SEQNO><![CDATA[30]]></SEQNO>
+<!--1002100124--> <SEQNO><![CDATA[60]]></SEQNO>
<!--1002100124--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--1002100124--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--1002100124--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -184259,7 +184260,6 @@
<!--521F8231195B6C29E040007F01001B31-->
<ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
<!--521F8231195B6C29E040007F01001B31-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--521F8231195B6C29E040007F01001B31--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--521F8231195B6C29E040007F01001B31--> <SEQNO><![CDATA[0]]></SEQNO>
<!--521F8231195B6C29E040007F01001B31--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--521F8231195B6C29E040007F01001B31-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--521F8231195B6C29E040007F01001B31-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
diff -r 916c4057ecd7 -r 2c75d71c8c16
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed Mar 24 23:55:49
2010 +0100
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Mar 25 15:55:43
2010 +0530
@@ -20641,6 +20641,17 @@
<!--819A66AA424F4169949E75C372C9938C-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--819A66AA424F4169949E75C372C9938C--></AD_TEXTINTERFACES>
+<!--829E2B2EFCBA3DFBE040007F01013C0D--><AD_TEXTINTERFACES>
+<!--829E2B2EFCBA3DFBE040007F01013C0D-->
<AD_TEXTINTERFACES_ID><![CDATA[829E2B2EFCBA3DFBE040007F01013C0D]]></AD_TEXTINTERFACES_ID>
+<!--829E2B2EFCBA3DFBE040007F01013C0D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--829E2B2EFCBA3DFBE040007F01013C0D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--829E2B2EFCBA3DFBE040007F01013C0D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--829E2B2EFCBA3DFBE040007F01013C0D--> <TEXT><![CDATA[Serial No /
Attribute.]]></TEXT>
+<!--829E2B2EFCBA3DFBE040007F01013C0D-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl.html]]></FILENAME>
+<!--829E2B2EFCBA3DFBE040007F01013C0D--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--829E2B2EFCBA3DFBE040007F01013C0D-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--829E2B2EFCBA3DFBE040007F01013C0D--></AD_TEXTINTERFACES>
+
<!--83138086E1BB4553A01995EE567C1BF5--><AD_TEXTINTERFACES>
<!--83138086E1BB4553A01995EE567C1BF5-->
<AD_TEXTINTERFACES_ID><![CDATA[83138086E1BB4553A01995EE567C1BF5]]></AD_TEXTINTERFACES_ID>
<!--83138086E1BB4553A01995EE567C1BF5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 916c4057ecd7 -r 2c75d71c8c16
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java Wed Mar 24
23:55:49 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java Thu Mar 25
15:55:43 2010 +0530
@@ -147,27 +147,27 @@
log4j.debug("priceActual:" +
Double.toString(priceActual.doubleValue()));
if ("Y".equals(cancelPriceAd)) {
priceStd = priceActual;
- resultado.append("new Array(\"inppricestd\", " + priceStd.toString() +
"),");
+ resultado.append("new Array(\"inppricestd\", \"" + priceStd.toString()
+ "\"),");
} else {
priceStd = new BigDecimal(SLOrderProductData.getOffersStdPrice(this,
dataOrder[0].cBpartnerId, priceActual.toString().replace("\"",
""), strProduct,
dataOrder[0].dateordered, strQty, dataOrder[0].mPricelistId,
dataOrder[0].id));
// priceList
- resultado.append("new Array(\"inppricestd\", " + priceStd.toString() +
"),");
+ resultado.append("new Array(\"inppricestd\", \"" + priceStd.toString()
+ "\"),");
}
}
if (strChanged.equals("inpcancelpricead")) {
if ("Y".equals(cancelPriceAd)) {
- resultado.append("new Array(\"inppriceactual\", " + strPriceStd +
"),");
+ resultado.append("new Array(\"inppriceactual\", \"" + strPriceStd +
"\"),");
} else {
strPriceActual = SLOrderProductData.getOffersPrice(this,
dataOrder[0].dateordered,
dataOrder[0].cBpartnerId, strProduct,
(strPriceStd.equals("undefined") ? "0"
: strPriceStd.replace("\"", "")), strQty,
dataOrder[0].mPricelistId,
dataOrder[0].id);
priceActual = new BigDecimal(strPriceActual);
- resultado.append("new Array(\"inppriceactual\", " + strPriceActual +
"),");
+ resultado.append("new Array(\"inppriceactual\", \"" + strPriceActual +
"\"),");
}
}
@@ -211,7 +211,7 @@
strQty, dataOrder[0].mPricelistId, dataOrder[0].id));
if (priceActual.scale() > PricePrecision)
priceActual = priceActual.setScale(PricePrecision,
BigDecimal.ROUND_HALF_UP);
- resultado.append("new Array(\"inppriceactual\", " +
priceActual.toString() + "),");
+ resultado.append("new Array(\"inppriceactual\", \"" +
priceActual.toString() + "\"),");
}
} else if (strChanged.equals("inpdiscount")) { // calculate std and actual
@@ -235,8 +235,8 @@
priceStd = priceStd.setScale(PricePrecision,
BigDecimal.ROUND_HALF_UP);
if (priceActual.scale() > PricePrecision)
priceActual = priceActual.setScale(PricePrecision,
BigDecimal.ROUND_HALF_UP);
- resultado.append("new Array(\"inppriceactual\", " +
priceActual.toString() + "),");
- resultado.append("new Array(\"inppricestd\", " + priceStd.toString() +
"),");
+ resultado.append("new Array(\"inppriceactual\", \"" +
priceActual.toString() + "\"),");
+ resultado.append("new Array(\"inppricestd\", \"" + priceStd.toString()
+ "\"),");
}
}
@@ -291,7 +291,7 @@
}
}
if (strChanged.equals("inplinenetamt"))
- resultado.append("new Array(\"inppriceactual\", " +
priceActual.toString() + "),");
+ resultado.append("new Array(\"inppriceactual\", \"" +
priceActual.toString() + "\"),");
if (!strChanged.equals("inplinenetamt") ||
priceActual.compareTo(BigDecimal.ZERO) == 0)
resultado.append("new Array(\"inplinenetamt\", " + LineNetAmt.toString()
+ "),");
resultado.append("new Array(\"inptaxbaseamt\", " + LineNetAmt.toString() +
")");
diff -r 916c4057ecd7 -r 2c75d71c8c16
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java Wed Mar
24 23:55:49 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java Thu Mar
25 15:55:43 2010 +0530
@@ -137,14 +137,14 @@
resultado.append("var calloutName='SL_Order_Product';\n\n");
resultado.append("var respuesta = new Array(");
resultado.append("new Array(\"inpcUomId\", \"" + strUOM + "\"),");
- resultado.append("new Array(\"inppricelist\", "
- + (strPriceList.equals("") ? "\"0\"" : strPriceList) + "),");
- resultado.append("new Array(\"inppricelimit\", "
- + (strPriceLimit.equals("") ? "\"0\"" : strPriceLimit) + "),");
- resultado.append("new Array(\"inppricestd\", "
- + (strPriceStd.equals("") ? "\"0\"" : strPriceStd) + "),");
- resultado.append("new Array(\"inppriceactual\", "
- + (strPriceActual.equals("") ? "\"0\"" : strPriceActual) + "),");
+ resultado.append("new Array(\"inppricelist\", \""
+ + (strPriceList.equals("") ? "0" : strPriceList) + "\"),");
+ resultado.append("new Array(\"inppricelimit\", \""
+ + (strPriceLimit.equals("") ? "0" : strPriceLimit) + "\"),");
+ resultado.append("new Array(\"inppricestd\", \""
+ + (strPriceStd.equals("") ? "0" : strPriceStd) + "\"),");
+ resultado.append("new Array(\"inppriceactual\", \""
+ + (strPriceActual.equals("") ? "0" : strPriceActual) + "\"),");
resultado.append("new Array(\"inpcCurrencyId\", "
+ (strCurrency.equals("") ? "\"\"" : strCurrency) + "),");
resultado.append("new Array(\"inpdiscount\", " + discount.toString() +
"),");
diff -r 916c4057ecd7 -r 2c75d71c8c16
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Wed Mar 24
23:55:49 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Thu Mar 25
15:55:43 2010 +0530
@@ -318,31 +318,9 @@
// New docLine created to assign C_Tax_ID value to the entry
DocLine docLine = new DocLine(DocumentType, Record_ID, "");
docLine.m_C_Tax_ID = m_taxes[i].m_C_Tax_ID;
- if (m_taxes[i].m_isTaxUndeductable) {
- DocInvoiceData[] data = null;
- data = DocInvoiceData.selectProductAcct(conn,
as.getC_AcctSchema_ID(),
- m_taxes[i].m_C_Tax_ID, Record_ID);
- for (int j = 0; j < data.length; j++) {
- /*
- * Sales has tax exempt for public/Not Tax Deductable
organization, so amount will be
- * zero. Sales tax will be product revenue account for
commercial/Not Tax deductable
- * configuration
- */
- fact.createLine(docLine, Account.getAccount(conn,
data[j].pRevenueAcct),
- this.C_Currency_ID, "", data[j].taxamt, Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
- DocumentType, conn);
- }
- } else {
- if (m_taxes[i].m_isTaxDeductable) {
- fact.createLine(docLine,
m_taxes[i].getAccount(DocTax.ACCTTYPE_TaxLiability, as, conn),
- this.C_Currency_ID, "", m_taxes[i].getAmount(),
Fact_Acct_Group_ID,
- nextSeqNo(SeqNo), DocumentType, conn);
- } else {// If Tax rate is not configured with any parameter
- fact.createLine(docLine,
m_taxes[i].getAccount(DocTax.ACCTTYPE_TaxDue, as, conn),
- this.C_Currency_ID, "", m_taxes[i].m_amount,
Fact_Acct_Group_ID, nextSeqNo(SeqNo),
- DocumentType, conn);
- }
- }
+ fact.createLine(docLine, m_taxes[i].getAccount(DocTax.ACCTTYPE_TaxDue,
as, conn),
+ C_Currency_ID, "", m_taxes[i].m_amount, Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
+ DocumentType, conn);
}
// Revenue CR
if (p_lines != null && p_lines.length > 0) {
@@ -387,39 +365,10 @@
// New docLine created to assign C_Tax_ID value to the entry
DocLine docLine = new DocLine(DocumentType, Record_ID, "");
docLine.m_C_Tax_ID = m_taxes[i].m_C_Tax_ID;
- if (m_taxes[i].m_isTaxUndeductable) {
- DocInvoiceData[] data = null;
- data = DocInvoiceData.selectProductAcct(conn,
as.getC_AcctSchema_ID(),
- m_taxes[i].m_C_Tax_ID, Record_ID);
- for (int j = 0; j < data.length; j++) {
- /*
- * Sales has tax exempt for public/Not Tax Deductable
organization, so amount will be
- * zero. Sales tax will be product revenue account for
commercial/Not Tax deductable
- * configuration
- */
- fact.createLine(docLine, Account.getAccount(conn,
data[j].pRevenueAcct),
- this.C_Currency_ID, data[j].taxamt, "", Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
- DocumentType, conn);
- }
- } else {
- if (m_taxes[i].m_isTaxDeductable) {
- fact.createLine(docLine,
m_taxes[i].getAccount(DocTax.ACCTTYPE_TaxLiability, as, conn),
- this.C_Currency_ID, m_taxes[i].getAmount(), "",
Fact_Acct_Group_ID,
- nextSeqNo(SeqNo), DocumentType, conn);
- } else {// If Tax rate is not configured with any parameter
- fact.createLine(docLine,
m_taxes[i].getAccount(DocTax.ACCTTYPE_TaxDue, as, conn),
- this.C_Currency_ID, m_taxes[i].getAmount(), "",
Fact_Acct_Group_ID,
- nextSeqNo(SeqNo), DocumentType, conn);
- }
- }
+ fact.createLine(docLine, m_taxes[i].getAccount(DocTax.ACCTTYPE_TaxDue,
as, conn),
+ this.C_Currency_ID, m_taxes[i].getAmount(), "",
Fact_Acct_Group_ID, nextSeqNo(SeqNo),
+ DocumentType, conn);
}
- /*
- *
- *
- * } else { fact.createLine(docLine,
m_taxes[i].getAccount(DocTax.ACCTTYPE_TaxDue, as, conn),
- * this.C_Currency_ID, m_taxes[i].getAmount(), "", Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
- * DocumentType, conn); } }
- */
// Revenue CR
for (int i = 0; p_lines != null && i < p_lines.length; i++)
fact.createLine(p_lines[i], ((DocLine_Invoice) p_lines[i]).getAccount(
@@ -477,15 +426,9 @@
}
} else {
- if (m_taxes[i].m_isTaxDeductable) {
- fact.createLine(docLine,
m_taxes[i].getAccount(DocTax.ACCTTYPE_TaxLiability, as, conn),
- this.C_Currency_ID, m_taxes[i].getAmount(), "",
Fact_Acct_Group_ID,
- nextSeqNo(SeqNo), DocumentType, conn);
- } else {// If Tax rate is not configured with any parameter
- fact.createLine(docLine,
m_taxes[i].getAccount(DocTax.ACCTTYPE_TaxCredit, as, conn),
- this.C_Currency_ID, m_taxes[i].getAmount(), "",
Fact_Acct_Group_ID,
- nextSeqNo(SeqNo), DocumentType, conn);
- }
+ fact.createLine(docLine,
m_taxes[i].getAccount(DocTax.ACCTTYPE_TaxCredit, as, conn),
+ this.C_Currency_ID, m_taxes[i].getAmount(), "",
Fact_Acct_Group_ID, nextSeqNo(SeqNo),
+ DocumentType, conn);
}
}
// Expense DR
@@ -540,15 +483,9 @@
}
} else {
- if (m_taxes[i].m_isTaxDeductable) {
- fact.createLine(docLine,
m_taxes[i].getAccount(DocTax.ACCTTYPE_TaxLiability, as, conn),
- this.C_Currency_ID, "", m_taxes[i].getAmount(),
Fact_Acct_Group_ID,
- nextSeqNo(SeqNo), DocumentType, conn);
- } else {// If Tax rate is not configured with any parameter
- fact.createLine(docLine,
m_taxes[i].getAccount(DocTax.ACCTTYPE_TaxCredit, as, conn),
- this.C_Currency_ID, "", m_taxes[i].getAmount(),
Fact_Acct_Group_ID,
- nextSeqNo(SeqNo), DocumentType, conn);
------------------------------------------------------------------------------
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
