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

Fix some non active records at Concept and Employee.

This commit is contained in:
vpj-cd 2008-10-18 16:11:10 +00:00
parent 87b3ede10d
commit 80ad0fd3f6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/src/org/eevolution/model/MHRPayrollConcept.java
View File

@ -83,7 +83,7 @@ public class MHRPayrollConcept extends X_HR_PayrollConcept
List<Object> params = new ArrayList<Object>(); List<Object> params = new ArrayList<Object>();
whereClause.append("IsActive='Y' AND HR_Payroll_ID=?"); whereClause.append("IsActive='Y' AND HR_Payroll_ID=?");
params.add(Env.getAD_Client_ID(Env.getCtx())); params.add(p.getHR_Payroll_ID());
List<MHRPayrollConcept> list = new Query(Env.getCtx(), Table_Name, whereClause.toString(), null) List<MHRPayrollConcept> list = new Query(Env.getCtx(), Table_Name, whereClause.toString(), null)
.setParameters(params) .setParameters(params)

9
base/src/org/eevolution/model/MHRProcess.java
View File

@ -272,6 +272,7 @@ public class MHRProcess extends X_HR_Process implements DocAction {
String attSql = "SELECT att.HR_Attribute_ID FROM HR_Attribute att" String attSql = "SELECT att.HR_Attribute_ID FROM HR_Attribute att"
+ " WHERE " + m_From + ">= att.ValidFrom AND (" + m_To + " <= att.ValidTo OR att.ValidTo IS NULL)" + " WHERE " + m_From + ">= att.ValidFrom AND (" + m_To + " <= att.ValidTo OR att.ValidTo IS NULL)"
+ " AND att.HR_Concept_ID =" + m_concept + " AND att.HR_Concept_ID =" + m_concept
+ " AND att.isActive ='Y'"
+ " AND EXISTS (SELECT * FROM HR_Concept conc WHERE conc.HR_Concept_ID = att.HR_Concept_ID )"; + " AND EXISTS (SELECT * FROM HR_Concept conc WHERE conc.HR_Concept_ID = att.HR_Concept_ID )";
if (concept.isEmployee()) if (concept.isEmployee())
attSql += " AND att.C_BPartner_ID = " + employee.getC_BPartner_ID(); attSql += " AND att.C_BPartner_ID = " + employee.getC_BPartner_ID();
@ -743,7 +744,7 @@ public class MHRProcess extends X_HR_Process implements DocAction {
if(m_movement.get(new Integer(pc.getHR_Concept_ID())).getColumnType().equals(MHRConcept.COLUMNTYPE_Amount)) if(m_movement.get(new Integer(pc.getHR_Concept_ID())).getColumnType().equals(MHRConcept.COLUMNTYPE_Amount))
value += m_movement.get(new Integer(pc.getHR_Concept_ID())).getAmount().doubleValue(); value += m_movement.get(new Integer(pc.getHR_Concept_ID())).getAmount().doubleValue();
else if (m_movement.get(new Integer(pc.getHR_Concept_ID())).getColumnType().equals(MHRConcept.COLUMNTYPE_Quantity)) else if (m_movement.get(new Integer(pc.getHR_Concept_ID())).getColumnType().equals(MHRConcept.COLUMNTYPE_Quantity))
value += m_movement.get(new Integer(pc.getHR_Concept_ID())).getAmount().doubleValue(); value += m_movement.get(new Integer(pc.getHR_Concept_ID())).getQty().doubleValue();
} }
} }
return value; return value;
@ -970,10 +971,8 @@ public class MHRProcess extends X_HR_Process implements DocAction {
+" INNER JOIN hr_period pr ON pr.hr_period_id=p.hr_period_id" +" INNER JOIN hr_period pr ON pr.hr_period_id=p.hr_period_id"
+" WHERE m.C_BPartner_ID=" +m_bpartner + " AND p.HR_Payroll_ID=?" +" WHERE m.C_BPartner_ID=" +m_bpartner + " AND p.HR_Payroll_ID=?"
+" AND m.HR_Concept_ID = " +HR_Concept_ID+ " AND m.AD_Client_ID =" + Env.getAD_Client_ID(Env.getCtx()); +" AND m.HR_Concept_ID = " +HR_Concept_ID+ " AND m.AD_Client_ID =" + Env.getAD_Client_ID(Env.getCtx());
if (periodFrom < 0) sql += " AND pr.PeriodNo >= " + (p.getPeriodNo() + periodFrom);
sql += " AND pr.PeriodNo >= " +p.getPeriodNo() +periodFrom; sql += " AND pr.PeriodNo <= " + (p.getPeriodNo() + periodTo);
if (periodTo > 0)
sql += " AND pr.PeriodNo <= " +p.getPeriodNo() +periodTo;
// //
int record = DB.getSQLValue(null,sql,DB.getSQLValue(null,"SELECT HR_PAYROLL_ID FROM HR_PAYROLL WHERE VALUE=?", pPayroll)); int record = DB.getSQLValue(null,sql,DB.getSQLValue(null,"SELECT HR_PAYROLL_ID FROM HR_PAYROLL WHERE VALUE=?", pPayroll));
if (record > 0) if (record > 0)