midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert 12710 Allow the entry the Tax amount manually the same way PO - 6345 b330695a3a58 

It was reverted with revision 13840 because it's causing big issues
This commit is contained in:
Carlos Ruiz 2011-02-26 20:55:17 -05:00
parent bae99d6364
commit 04579bc676
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.base/src/org/compiere/model/MInvoiceLine.java
View File

@ -432,7 +432,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
return; return;
// setLineNetAmt(); // setLineNetAmt();
MTax tax = MTax.get (getCtx(), getC_Tax_ID()); MTax tax = MTax.get (getCtx(), getC_Tax_ID());
if (tax.isDocumentLevel() && m_IsSOTrx || getTaxAmt().signum() > 0)// AR Inv Tax if (tax.isDocumentLevel() && m_IsSOTrx) // AR Inv Tax
return; return;
// //
TaxAmt = tax.calculateTax(getLineNetAmt(), isTaxIncluded(), getPrecision()); TaxAmt = tax.calculateTax(getLineNetAmt(), isTaxIncluded(), getPrecision());

2
org.adempiere.base/src/org/compiere/model/MInvoiceTax.java
View File

@ -209,7 +209,7 @@ public class MInvoiceTax extends X_C_InvoiceTax
// //
// phib [ 1702807 ]: manual tax should never be amended // phib [ 1702807 ]: manual tax should never be amended
// on line level taxes // on line level taxes
if (!documentLevel && amt.signum() != 0) // manually entered if (!documentLevel && amt.signum() != 0 && !isSOTrx) // manually entered
; ;
else if (documentLevel || baseAmt.signum() == 0) else if (documentLevel || baseAmt.signum() == 0)
amt = Env.ZERO; amt = Env.ZERO;