diff --git a/PROYECTO/mbsERP.4pw b/PROYECTO/mbsERP.4pw index e98a7a8..4838a6d 100644 --- a/PROYECTO/mbsERP.4pw +++ b/PROYECTO/mbsERP.4pw @@ -494,6 +494,7 @@ + @@ -586,6 +587,11 @@ + + + + + diff --git a/PROYECTO/nodir/noprrp043.4gl b/PROYECTO/nodir/noprrp043.4gl index 2a9a53f..2170a78 100644 --- a/PROYECTO/nodir/noprrp043.4gl +++ b/PROYECTO/nodir/noprrp043.4gl @@ -39,10 +39,6 @@ OPEN WINDOW w1 WITH FORM "nofmrp043" ON ACTION CANCEL ATTRIBUTE(TEXT="Cancelar", IMAGE="cancel") EXIT PROGRAM ON ACTION imprimir ATTRIBUTE(TEXT="Imprime", IMAGE="printer") - IF fecha_inicial IS NULL THEN - CALL msg(16) - NEXT FIELD fecha_inicial - END IF IF xfecha1 IS NULL THEN CALL msg(16) NEXT FIELD xfecha1 @@ -77,7 +73,7 @@ FUNCTION reporte() CAST(a.checktime as date) FROM CHECKINOUT a,adtb00001 b ,adtb00003 c WHERE c.departamento = b.departamento AND a.num_emp = c.num_emp AND - c.status_t is null and a.CHECKTIME between '",xfecha1 USING 'yyyy-mm-dd',"' and '",xfecha2 USING 'yyyy-mm-dd',"' and ", + c.status_t is null and a.CHECKTIME >= '",xfecha1 USING 'yyyy-mm-dd',"' and a.CHECKTIME < '",(xfecha2+1) USING 'yyyy-mm-dd',"' and ", criterio CLIPPED, " order by '('+CAST(c.departamento AS CHAR(20))+') '+b.nom_dpto,a.num_emp,cast(a.checktime as date) " {