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

BF [2948632] - Unable to edit the default tax rate. 

https://sourceforge.net/tracker/?func=detail&atid=879332&aid=2948632&group_id=176962
This commit is contained in:
trifonnt 2010-02-09 22:26:35 +00:00
parent ddfa866f3d
commit dd1dc6ed92
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
base/src/org/compiere/model/MTax.java
View File

@ -31,7 +31,9 @@ import org.compiere.util.TimeUtil;
* *
* @author Jorg Janke * @author Jorg Janke
* @version $Id: MTax.java,v 1.3 2006/07/30 00:51:02 jjanke Exp $ * @version $Id: MTax.java,v 1.3 2006/07/30 00:51:02 jjanke Exp $
* red1 - FR: [ 2214883 ] Remove SQL code and Replace for Query * red1 - FR: [ 2214883 ] Remove SQL code and Replace for Query
* trifonnt - BF [2913276] - Allow only one Default Tax Rate per Tax Category
* mjmckay - BF [2948632] - Allow edits to the Defautl Tax Rate
*/ */
public class MTax extends X_C_Tax public class MTax extends X_C_Tax
{ {
@ -280,9 +282,12 @@ public class MTax extends X_C_Tax
protected boolean beforeSave(boolean newRecord) { protected boolean beforeSave(boolean newRecord) {
if (isDefault()) { if (isDefault()) {
// @Trifon - Ensure that only one tax rate is set as Default! // @Trifon - Ensure that only one tax rate is set as Default!
String whereClause = MTax.COLUMNNAME_C_TaxCategory_ID+"=? AND IsDefault='Y'"; // @Mckay - Allow edits to the Default tax rate
String whereClause = MTax.COLUMNNAME_C_TaxCategory_ID+"=? AND " +
MTax.COLUMNNAME_C_Tax_ID+"<>? AND "+
"IsDefault='Y'";
List<MTax> list = new Query(getCtx(), MTax.Table_Name, whereClause, get_TrxName()) List<MTax> list = new Query(getCtx(), MTax.Table_Name, whereClause, get_TrxName())
.setParameters(new Object[]{getC_TaxCategory_ID()}) .setParameters(new Object[]{getC_TaxCategory_ID(), getC_Tax_ID()})
.setOnlyActiveRecords(true) .setOnlyActiveRecords(true)
.list(); .list();
if (list.size() >= 1) { if (list.size() >= 1) {