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

IDEMPIERE-2221 Method Tax.get should be public

This commit is contained in:
Nicolas Micoud 2014-10-15 13:46:36 -05:00
parent 212cfc4a0f
commit 020ca7fce7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.base/src/org/compiere/model/Tax.java
View File

@ -508,12 +508,12 @@ public class Tax
* @return C_Tax_ID * @return C_Tax_ID
* @throws TaxNoExemptFoundException if no tax exempt found * @throws TaxNoExemptFoundException if no tax exempt found
*/ */
private static int getExemptTax (Properties ctx, int AD_Org_ID, String trxName) public static int getExemptTax (Properties ctx, int AD_Org_ID, String trxName)
{ {
final String sql = "SELECT t.C_Tax_ID " final String sql = "SELECT t.C_Tax_ID "
+ "FROM C_Tax t" + "FROM C_Tax t"
+ " INNER JOIN AD_Org o ON (t.AD_Client_ID=o.AD_Client_ID) " + " INNER JOIN AD_Org o ON (t.AD_Client_ID=o.AD_Client_ID) "
+ "WHERE t.IsTaxExempt='Y' AND o.AD_Org_ID=? " + "WHERE t.IsTaxExempt='Y' AND o.AD_Org_ID=? AND t.IsActive='Y' "
+ "ORDER BY t.Rate DESC"; + "ORDER BY t.Rate DESC";
int C_Tax_ID = DB.getSQLValueEx(trxName, sql, AD_Org_ID); int C_Tax_ID = DB.getSQLValueEx(trxName, sql, AD_Org_ID);
if (log.isLoggable(Level.FINE)) log.fine("getExemptTax - TaxExempt=Y - C_Tax_ID=" + C_Tax_ID); if (log.isLoggable(Level.FINE)) log.fine("getExemptTax - TaxExempt=Y - C_Tax_ID=" + C_Tax_ID);
@ -543,7 +543,7 @@ public class Tax
* @return C_Tax_ID * @return C_Tax_ID
* @throws TaxNotFoundException if no tax found for given criteria * @throws TaxNotFoundException if no tax found for given criteria
*/ */
protected static int get (Properties ctx, public static int get (Properties ctx,
int C_TaxCategory_ID, boolean IsSOTrx, int C_TaxCategory_ID, boolean IsSOTrx,
Timestamp shipDate, int shipFromC_Location_ID, int shipToC_Location_ID, Timestamp shipDate, int shipFromC_Location_ID, int shipToC_Location_ID,
Timestamp billDate, int billFromC_Location_ID, int billToC_Location_ID, String trxName) Timestamp billDate, int billFromC_Location_ID, int billToC_Location_ID, String trxName)