Merge branch 'main' of https://git.fulldetord.com/jsoto/mbs

PROYECTO/lqdir/lqprrp009.4gl

@@ -14,6 +14,7 @@ GLOBALS
   "lqprgb000.4gl"
 ###### Variables para busqueda de rango de fecha
 DEFINE elije,imp,afecta CHAR(1)
+DEFINE hay_filas SMALLINT
 DEFINE m_mes,mes    SMALLINT 
 DEFINE chequea_ent,p_ano    CHAR(4)  
 DEFINE detalla CHAR(30)
@@ -144,16 +145,7 @@ CALL ui.Window.getCurrent().setText("Liquidacion Repuestos")
           LET r_filename = 'lqprrp009.4rp'
           LET preview = 1
 
-        IF fgl_report_loadCurrentSettings(r_filename) THEN                          
- 
-                 CALL seleccionarsalida() RETURNING r_output      -- load the .4rp file
-                 CALL fgl_report_selectDevice(r_output)           -- changing default
-                 CALL fgl_report_selectPreview(preview)           -- changing default
-                 LET handler = fgl_report_commitCurrentSettings() -- commit changes
-         END IF   
-
-         IF HANDLER IS NOT NULL THEN 
-                            START REPORT liquida7 TO XML HANDLER HANDLER
+         LET hay_filas = FALSE
 
 
 
@@ -180,6 +172,19 @@ CALL ui.Window.getCurrent().setText("Liquidacion Repuestos")
        d.status_t is null ORDER BY c.num_oc,a.cod_n,a.cod_grupo,a.cod_tipo,a.cod_sec
 
  FOREACH busca INTO busca_datos.*
+     IF NOT hay_filas THEN
+        IF fgl_report_loadCurrentSettings(r_filename) THEN
+           CALL seleccionarsalida() RETURNING r_output
+           CALL fgl_report_selectDevice(r_output)
+           CALL fgl_report_selectPreview(preview)
+           LET handler = fgl_report_commitCurrentSettings()
+        END IF
+        IF handler IS NULL THEN
+           EXIT FOREACH
+        END IF
+        START REPORT liquida7 TO XML HANDLER HANDLER
+        LET hay_filas = TRUE
+     END IF
      LET orden = busca_datos.num_oc USING "<<<<<<"
  IF elije != "L" THEN
 {# Busca el monto pagado al colector
@@ -240,9 +245,11 @@ CALL ui.Window.getCurrent().setText("Liquidacion Repuestos")
      OUTPUT TO REPORT liquida7(busca_datos.*)
  END FOREACH
 
+ IF hay_filas THEN
  FINISH REPORT liquida7
-
- END IF 
+ ELSE
+    CALL fgl_winmessage("INFO","NO EXISTEN REGISTROS PARA ESTOS PARAMETROS","INFO")
+ END IF
 
  #IF imp = "S" THEN
  #   RUN imprime

PROYECTO/mbsERP.4pw

@@ -686,10 +686,16 @@
         <File filePath="vedir/PUNTO VENTAS VER2/otrodir/almacenes.4fd"/>
         <File filePath="ipdir/estadosprocesos.4gl"/>
         <File compilerOptions="--build-rdd" filePath="ipdir/ipautorizareq.4gl"/>
+        <File filePath="ipdir/ipautorizareq.4fd"/>
         <File filePath="otrodir/codigoModificacion.4gl"/>
         <File filePath="ipdir/piking.4gl"/>
         <File filePath="ipdir/conduces.4gl"/>
         <File filePath="ipdir/ubicacionH.4gl"/>
+        <File filePath="ipdir/ipfmmt045.4fd"/>
+        <File filePath="ipdir/ipfmwd012.4fd"/>
+        <File filePath="ipdir/ipfmwd013.4fd"/>
+        <File filePath="ipdir/ipfmwd013a.4fd"/>
+        <File filePath="vedir/vefmwd100.4fd"/>
         <File filePath="otrodir/LlenarUbicaciones.4gl"/>
         <File filePath="otrodir/categorias.4gl"/>
         <File filePath="otrodir/pantalla_ip.4gl"/>
@@ -718,6 +724,12 @@
         <File compilerOptions="--build-rdd" filePath="ipdir/ipprmt044.4gl"/>
         <File filePath="otrodir/fotos.4gl"/>
         <File filePath="ipdir/ipfmwd015.4fd"/>
+        <File filePath="ipdir/ipfmmt044.4fd"/>
+        <File filePath="ipdir/ipfmwd001.4fd"/>
+        <File filePath="ipdir/ipfmwd004.per"/>
+        <File filePath="ipdir/ipfmwd009.per"/>
+        <File filePath="ipdir/ipfmwd010.4fd"/>
+        <File filePath="ipdir/ipfmwd011.per"/>
         <File filePath="bin/ipprmt020_1.4rp"/>
       </Application>
       <Application binaryName="ipprmt064" dependencies="1763548104,-1026233879,-764824792" externalDependencies="libgre.42x" id="-960000005" label="ipprmt064">