details: https://code.openbravo.com/erp/devel/pi/rev/35648d50070b
changeset: 24333:35648d50070b
user: Atul Gaware <atul.gaware <at> openbravo.com>
date: Tue Aug 26 00:15:39 2014 +0530
summary: Fixes Issue 27460
diffstat:
src/org/openbravo/erpCommon/utility/CashVATUtil.java | 37 +++++++++----------
1 files changed, 18 insertions(+), 19 deletions(-)
diffs (83 lines):
diff -r 80ea64c4143f -r 35648d50070b
src/org/openbravo/erpCommon/utility/CashVATUtil.java
--- a/src/org/openbravo/erpCommon/utility/CashVATUtil.java Tue Aug 26
08:51:09 2014 +0200
+++ b/src/org/openbravo/erpCommon/utility/CashVATUtil.java Tue Aug 26
00:15:39 2014 +0530
@@ -74,8 +74,8 @@
try {
OBContext.setAdminMode(true);
final Organization org = OBDal.getInstance().get(Organization.class,
strOrgId);
- final Organization legalEntity = OBContext.getOBContext()
-
.getOrganizationStructureProvider(org.getClient().getId()).getLegalEntity(org);
+ final Organization legalEntity =
OBContext.getOBContext().getOrganizationStructureProvider(
+ org.getClient().getId()).getLegalEntity(org);
if (legalEntity != null && legalEntity.getOrganizationInformationList()
!= null
&& !legalEntity.getOrganizationInformationList().isEmpty()) {
return legalEntity.getOrganizationInformationList().get(0).isCashVAT()
? "Y" : "N";
@@ -101,8 +101,8 @@
try {
OBContext.setAdminMode(true);
final Organization org = OBDal.getInstance().get(Organization.class,
strOrgId);
- final Organization legalEntity = OBContext.getOBContext()
-
.getOrganizationStructureProvider(org.getClient().getId()).getLegalEntity(org);
+ final Organization legalEntity =
OBContext.getOBContext().getOrganizationStructureProvider(
+ org.getClient().getId()).getLegalEntity(org);
if (legalEntity != null && legalEntity.getOrganizationInformationList()
!= null
&& !legalEntity.getOrganizationInformationList().isEmpty()) {
return
legalEntity.getOrganizationInformationList().get(0).isDoubleCash() ? "Y" : "N";
@@ -161,8 +161,8 @@
orgCountryId =
org.getOrganizationInformationList().get(0).getLocationAddress()
.getCountry().getId();
} catch (Exception noOrgLocation) {
- final Organization legalEntity = OBContext.getOBContext()
-
.getOrganizationStructureProvider(org.getClient().getId()).getLegalEntity(org);
+ final Organization legalEntity =
OBContext.getOBContext().getOrganizationStructureProvider(
+ org.getClient().getId()).getLegalEntity(org);
legalEntity.getOrganizationInformationList().get(0).getLocationAddress().getCountry()
.getId();
}
@@ -452,7 +452,8 @@
FactLine factLine2 = null;
for (final InvoiceTaxCashVAT_V itcv : line.getInvoiceTaxCashVAT_V()) {
final TaxRate tax = itcv.getInvoiceTax().getTax();
- if (tax.isCashVAT()) {
+ Invoice inv = itcv.getInvoiceTax().getInvoice();
+ if (tax.isCashVAT() && inv.equals(invoice)) {
final BigDecimal taxAmt = itcv.getTaxAmount();
if (taxAmt.compareTo(BigDecimal.ZERO) != 0) {
final DocTax m_tax = new DocTax(tax.getId(), tax.getName(),
tax.getRate().toString(),
@@ -463,12 +464,11 @@
String dateFormatString =
OBPropertiesProvider.getInstance().getOpenbravoProperties()
.getProperty("dateFormat.java");
SimpleDateFormat dateFormat = new
SimpleDateFormat(dateFormatString);
- String taxAmountConverted = fact
- .getM_doc()
- .convertAmount(taxAmt, invoice.isSalesTransaction(),
- dateFormat.format(invoice.getAccountingDate()),
AcctServer.TABLEID_Invoice,
- invoice.getId(), invoice.getCurrency().getId(),
as.m_C_Currency_ID, line, as,
- fact, Fact_Acct_Group_ID, nextSeqNo(SeqNo),
conn).toString();
+ String taxAmountConverted = fact.getM_doc().convertAmount(taxAmt,
+ invoice.isSalesTransaction(),
dateFormat.format(invoice.getAccountingDate()),
+ AcctServer.TABLEID_Invoice, invoice.getId(),
invoice.getCurrency().getId(),
+ as.m_C_Currency_ID, line, as, fact, Fact_Acct_Group_ID,
nextSeqNo(SeqNo), conn)
+ .toString();
// ARI, ARF, ARI_RM
if (invoicedocumentType.equals(AcctServer.DOCTYPE_ARInvoice)
|| invoicedocumentType.equals(AcctServer.DOCTYPE_ARProForma)
@@ -510,13 +510,12 @@
conn), invoice.getCurrency().getId(), "",
taxAmt.toString(),
Fact_Acct_Group_ID, nextSeqNo(factLine1.m_SeqNo),
documentType, conn);
} else {
- final FactLine factLine1 = fact.createLine(line,
- m_tax.getAccount(DocTax.ACCTTYPE_TaxCredit_Trans, as,
conn), cCurrencyID, "",
+ final FactLine factLine1 = fact.createLine(line,
m_tax.getAccount(
+ DocTax.ACCTTYPE_TaxCredit_Trans, as, conn), cCurrencyID,
"",
taxAmountConverted, Fact_Acct_Group_ID,
nextSeqNo(SeqNo), documentType, conn);
- factLine2 = fact.createLine(line,
- m_tax.getAccount(DocTax.ACCTTYPE_TaxCredit, as, conn),
cCurrencyID,
- taxAmt.toString(), "", Fact_Acct_Group_ID,
nextSeqNo(factLine1.m_SeqNo),
- documentType, conn);
+ factLine2 = fact.createLine(line,
m_tax.getAccount(DocTax.ACCTTYPE_TaxCredit, as,
+ conn), cCurrencyID, taxAmt.toString(), "",
Fact_Acct_Group_ID,
+ nextSeqNo(factLine1.m_SeqNo), documentType, conn);
}
}
// APC
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
