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

Some Parameterizing and Organize Imports

This commit is contained in:
Redhuan D. Oon 2008-11-20 05:46:18 +00:00
parent 6da2782aa1
commit e068b2ac08
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
base/src/org/eevolution/model/MHRMovement.java
View File

@ -14,13 +14,13 @@
* Contributor(s): Victor Perez www.e-evolution.com * * Contributor(s): Victor Perez www.e-evolution.com *
*****************************************************************************/ *****************************************************************************/
package org.eevolution.model; package org.eevolution.model;
import java.sql.*; import java.sql.PreparedStatement;
import java.text.*; import java.sql.ResultSet;
import java.util.*; import java.util.ArrayList;
import java.util.logging.*; import java.util.Properties;
import java.util.logging.Level;
import org.compiere.util.*; import org.compiere.util.DB;
import org.compiere.model.*;
/** /**
* Payroll Concept for HRayroll Module * Payroll Concept for HRayroll Module
@ -73,7 +73,7 @@ public class MHRMovement extends X_HR_Movement
*/ */
public MHRMovement[] getmovEmployeeok (int payroll, int department, int employee, String sqlWhere) public MHRMovement[] getmovEmployeeok (int payroll, int department, int employee, String sqlWhere)
{ {
ArrayList list = new ArrayList(); ArrayList<MHRMovement> list = new ArrayList<MHRMovement>();
String sql = "SELECT * FROM HR_Concept WHERE IsActive='Y' AND (HR_Payroll_ID=? OR HR_Payroll_ID IS NULL)"; String sql = "SELECT * FROM HR_Concept WHERE IsActive='Y' AND (HR_Payroll_ID=? OR HR_Payroll_ID IS NULL)";
if (department != 0 ) if (department != 0 )
sql += " AND HR_Department_ID = " + department + " "; sql += " AND HR_Department_ID = " + department + " ";
@ -121,7 +121,7 @@ public class MHRMovement extends X_HR_Movement
*/ */
public MHRMovement[] getMovementOk (int HR_Process_ID) public MHRMovement[] getMovementOk (int HR_Process_ID)
{ {
ArrayList list = new ArrayList(); ArrayList<MHRMovement> list = new ArrayList<MHRMovement>();
String sql = "SELECT * FROM HR_Movement m" + String sql = "SELECT * FROM HR_Movement m" +
" INNER JOIN HR_Concept_Acct ca ON (ca.HR_Concept_ID=m.HR_Concept_ID AND ca.IsActive = 'Y')"+ " INNER JOIN HR_Concept_Acct ca ON (ca.HR_Concept_ID=m.HR_Concept_ID AND ca.IsActive = 'Y')"+
" WHERE HR_Process_ID=? AND (m.Qty <> 0 OR m.Amount <> 0) "; " WHERE HR_Process_ID=? AND (m.Qty <> 0 OR m.Amount <> 0) ";