diff --git a/PROYECTO/PRDIR/prprrp021.4rp b/PROYECTO/PRDIR/prprrp021.4rp
index 7c11701..3eaef14 100644
--- a/PROYECTO/PRDIR/prprrp021.4rp
+++ b/PROYECTO/PRDIR/prprrp021.4rp
@@ -18,7 +18,7 @@
                             <LAYOUTNODE name="Layout Node9" y="max-33.3652" width="214.531" length="26.3906" anchorY="1" alignment="center" layoutDirection="topToBottom" floatingBehavior="free">
                                 <WORDBOX name="WordBox34" width="213.984" length="14.3281" alignment="far" fontSize="20" fontBold="true" underline="true" layoutDirection="topToBottom" baselineType="leftleft" textAlignment="center" text="ANÁLISIS PRODUCCIÓN" trimText="both"/>
                             </LAYOUTNODE>
-                            <IMAGEBOX name="ImageBox1_1" y="6.5535" width="230.836" length="92.4741" floatingBehavior="enclosed" url="file:///F:/MARMOTECHC/IMAGENES/logo.png" intendedResolution="120"/>
+                            <IMAGEBOX name="ImageBox1_1" y="6.5535" width="230.836" length="92.4741" floatingBehavior="enclosed" url="IMAGENES/Logo.png" intendedResolution="120"/>
                             <rtl:input-variable name="fecha_reporte" type="FGLString" expectedLocation="expectedAhead"/>
                             <WORDBOX name="fecha_reporte Value1" class="grwDateValue" x="4.0943" y="414.196" width="103.969" anchorX="0" anchorY="0" floatingBehavior="enclosed" textAlignment="right" text="{{fecha_reporte}}"/>
                         </MINIPAGE>
diff --git a/PROYECTO/acdir/acprmt004.4gl b/PROYECTO/acdir/acprmt004.4gl
index d3b7fe1..0d1fe16 100644
--- a/PROYECTO/acdir/acprmt004.4gl
+++ b/PROYECTO/acdir/acprmt004.4gl
@@ -235,11 +235,12 @@ FUNCTION acpcmf004()
        RETURN
     END IF
 
+    -- G6: trans LIKE actb00004.* incluye rowid; sin el 2o a.rowid todo quedaba corrido una columna (-1213)
     LET SELEC = 
   
 
 
-         "SELECT a.rowid,a.codigo
+         "SELECT a.rowid,a.rowid,a.codigo
       ,a.num_doc
       ,CONVERT(VARCHAR(10),a.fecha,103)
       ,a.cod_mov
@@ -419,7 +420,7 @@ FUNCTION acpcmf004()
            CALL fgl_winmessage("INFO","NO SE ACTUALIZARON REGISTROS","INFO")
            EXIT PROGRAM
         END IF   
-        SELECT MIN(convert(varchar(10),a.fecha,103)) INTO fecha6 FROM actb00004 a
+        SELECT MIN(a.fecha) INTO fecha6 FROM actb00004 a   -- G6: MIN sobre texto dd/mm/yyyy no da la fecha menor
         WHERE a.codigo = trans.codigo AND a.status_t IS NULL
 
        IF fecha6 IS NULL THEN
diff --git a/PROYECTO/acdir/acprmt005.4gl b/PROYECTO/acdir/acprmt005.4gl
index fba6ccb..5bfa522 100644
--- a/PROYECTO/acdir/acprmt005.4gl
+++ b/PROYECTO/acdir/acprmt005.4gl
@@ -92,7 +92,8 @@ INPUT BY NAME p_ano1,p_mes1
          NEXT FIELD p_ano1
       END IF
 
-      SELECT MAX(CONVERT(VARCHAR(10),a.fecha,103)) INTO fecha_ant FROM actb00004 a
+      -- G6: MAX sobre texto dd/mm/yyyy devolvia 31/12 y no la ultima depreciacion (permitia duplicar el mes)
+      SELECT MAX(a.fecha) INTO fecha_ant FROM actb00004 a
       WHERE a.status_t IS NULL AND a.cod_mov = 5
 
       IF fecha_ant >= trans.fecha THEN
diff --git a/PROYECTO/bin/IMAGENES/LOGO.JPG b/PROYECTO/bin/IMAGENES/LOGO.JPG
new file mode 100644
index 0000000..b125c9d
Binary files /dev/null and b/PROYECTO/bin/IMAGENES/LOGO.JPG differ
diff --git a/PROYECTO/bin/IMAGENES/genero_logo.png b/PROYECTO/bin/IMAGENES/genero_logo.png
new file mode 100644
index 0000000..fd07ec8
Binary files /dev/null and b/PROYECTO/bin/IMAGENES/genero_logo.png differ
diff --git a/PROYECTO/bin/acprrp010.4rp b/PROYECTO/bin/acprrp010.4rp
index a339f2d..087f470 100644
--- a/PROYECTO/bin/acprrp010.4rp
+++ b/PROYECTO/bin/acprrp010.4rp
@@ -15,7 +15,7 @@
                 <rtl:match name="Group xcodigo" nameConstraint="Group" minOccurs="0" maxOccurs="unbounded">
                     <MINIPAGE name="Page Root" width="max" length="max">
                         <LAYOUTNODE name="Layout Node2" width="min" length="min">
-                            <IMAGEBOX name="ImageBox3" width="100" length="38.2134" url="{{&quot;file:///e:/marmotechc/BIN320/IMAGENES/compania/logo.png&quot;}}" intendedResolution="96"/>
+                            <IMAGEBOX name="ImageBox3" width="100" length="38.2134" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="96"/>
                             <MINIPAGE name="Separator" width="1" length="max" bgColor="#000000" layoutDirection="leftToRight" swapX="false"/>
                         </LAYOUTNODE>
                         <LAYOUTNODE name="Layout Node3" width="max" length="min" fontSize="10">
diff --git a/PROYECTO/bin/ccprmt003.4rp b/PROYECTO/bin/ccprmt003.4rp
index 1f37e47..f53b3e0 100644
--- a/PROYECTO/bin/ccprmt003.4rp
+++ b/PROYECTO/bin/ccprmt003.4rp
@@ -14,7 +14,7 @@
             <rtl:match name="Report" nameConstraint="Report" minOccurs="1" maxOccurs="1">
                 <MINIPAGE name="Page Root" width="max" length="min">
                     <MINIPAGE name="ENCABEZADOSGRAL" width="130" length="560.485" alignment="center" fontSize="9" layoutDirection="leftToRight">
-                        <IMAGEBOX name="ImageBox4" x="7" y="5" width="112.489" length="65.8341" anchorX="0" anchorY="0" url="file:///E:/MARMOTECHC/BIN320/IMAGENES/Logo_DCM.PNG" intendedResolution="96"/>
+                        <IMAGEBOX name="ImageBox4" x="7" y="5" width="112.489" length="65.8341" anchorX="0" anchorY="0" url="IMAGENES/Logo_DCM.png" intendedResolution="96"/>
                         <LAYOUTNODE name="Layout Node8" y="max-181.379" width="min" length="min" anchorY="1" floatingBehavior="enclosed">
                             <rtl:input-variable name="p_companias.nombre" type="FGLString" expectedLocation="expectedAhead"/>
                             <WORDWRAPBOX name="p_companias.nombre Value" width="width(&quot;M&quot;)*20" alignment="baseline" fontSize="12" fontBold="true" baselineType="leftleft" text="{{p_companias.nombre}}"/>
diff --git a/PROYECTO/bin/cgprcs024.4rp b/PROYECTO/bin/cgprcs024.4rp
new file mode 100644
index 0000000..b5f1106
--- /dev/null
+++ b/PROYECTO/bin/cgprcs024.4rp
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<report:Report xmlns:rtl="http://www.4js.com/2004/RTL" xmlns:report="http://www.4js.com/2007/REPORT" xmlns="http://www.4js.com/2004/PXML" gstVersion="31409" version="6.00">
+    <report:Settings RWPageWidth="letterwidth" RWPageLength="letterlength" RWLeftMargin="0.5inch" RWTopMargin="0.5inch" RWRightMargin="0.5inch" RWBottomMargin="0.5inch">
+        <report:FormatList>
+            <report:Format-SVG/>
+            <report:Format-PDF/>
+            <report:Format-image/>
+        </report:FormatList>
+    </report:Settings>
+    <report:Data RWDataLocation="../cgdir/cgprmt023.rdd" RWFglReportName="gastos_gral"/>
+    <report:Conflicts/>
+    <rtl:stylesheet>
+        <PXML>
+            <rtl:match name="Report" nameConstraint="Report">
+                <MINIPAGE name="Page Root" width="max" length="max" alignment="near" fontSize="7">
+                    <LAYOUTNODE name="page header" width="min" length="min" layoutDirection="topToBottom" port="anyPageHeader" floatingBehavior="enclosed">
+                        <rtl:match name="FirstPageHeader" nameConstraint="FirstPageHeader" minOccurs="0" maxOccurs="1">
+                            <LAYOUTNODE name="principal" width="min" length="min" floatingBehavior="enclosed">
+                                <LAYOUTNODE name="encabezado" width="min" length="min" layoutDirection="leftToRight" floatingBehavior="enclosed">
+                                    <WORDBOX name="WordBox" width="61" fontBold="true" floatingBehavior="enclosed" text="CGPRRP023"/>
+                                    <rtl:input-variable name="pcompanias.nombre" type="FGLString" expectedLocation="expectedHere"/>
+                                    <WORDWRAPBOX name="pcompanias.nombre Value" width="411" fontSize="9" fontBold="true" floatingBehavior="enclosed" text="{{pcompanias.nombre}}" textAlignment="center"/>
+                                    <WORDBOX name="WordBox1_1" width="38.5" length="15.9285" alignment="far" fontBold="true" floatingBehavior="enclosed" text="Pagina NO:">
+                                        <PAGENOBOX name="PageNoBox" x="39.1082" y="-0.0608" anchorX="0" anchorY="0" fontBold="true" floatingBehavior="enclosed"/>
+                                    </WORDBOX>
+                                </LAYOUTNODE>
+                                <LAYOUTNODE name="LayoutNode" width="min" length="min" layoutDirection="leftToRight" floatingBehavior="enclosed">
+                                    <rtl:input-variable name="fechas" type="FGLString" expectedLocation="expectedHere"/>
+                                    <WORDBOX name="fechas Value" width="3inch" fontBold="true" floatingBehavior="enclosed" text="{{fechas}}"/>
+                                </LAYOUTNODE>
+                            </LAYOUTNODE>
+                        </rtl:match>
+                        <MINIPAGE name="MiniPage3" width="min" length="min" layoutDirection="leftToRight" floatingBehavior="enclosed">
+                            <MINIPAGE name="Enc.Secundario" width="min" length="max" layoutDirection="leftToRight">
+                                <WORDBOX name="WordBox9" width="454.69" length="12.1284" fontBold="true" floatingBehavior="enclosed" textAlignment="center" text="GASTOS POR DEPARTAMENTO"/>
+                                <rtl:input-variable name="fecha_reporte" type="FGLString" expectedLocation="expectedBefore"/>
+                                <WORDBOX name="fecha_reporte Value" width="84.789" length="11.5" alignment="near" fontBold="true" floatingBehavior="enclosed" text="{{fecha_reporte}}"/>
+                            </MINIPAGE>
+                        </MINIPAGE>
+                        <MINIPAGE name="Enc.Cuerpo" width="9.357" length="max" alignment="near" layoutDirection="leftToRight" roundedCorners="true" borderWidth="1" borderStyle="solid">
+                            <WORDBOX name="WordBox10" width="47.0492" length="7.8409" fontSize="7" fontBold="true" floatingBehavior="enclosed" text="CUENTA"/>
+                            <WORDBOX name="WordBox3_1" width="160.598" length="8.26137" alignment="near" fontSize="7" fontBold="true" floatingBehavior="enclosed" text="DESCRIPCION"/>
+                            <WORDBOX name="WordBox4" width="83.5391" length="6.76763" alignment="baseline" fontSize="7" fontBold="true" floatingBehavior="enclosed" text="AC. MES ANTERIOR"/>
+                            <WORDBOX name="WordBox6" width="107.411" length="6.37421" alignment="baseline" fontSize="7" fontBold="true" floatingBehavior="enclosed" text="GASTOS RANGO FECHA"/>
+                            <WORDBOX name="WordBox7" width="71.1098" length="7.69521" alignment="baseline" fontSize="7" fontBold="true" floatingBehavior="enclosed" text="AC. FECHA ACT"/>
+                            <WORDBOX name="WordBox8" width="60.1435" length="9" alignment="baseline" fontSize="7" fontBold="true" floatingBehavior="enclosed" text="AÑO ANTERIOR"/>
+                        </MINIPAGE>
+                        <rtl:match name="OnEveryRow" nameConstraint="OnEveryRow" minOccurs="0" maxOccurs="unbounded">
+                            <MINIPAGE name="MiniPage" width="min" length="min" layoutDirection="leftToRight">
+                                <rtl:input-variable name="x.cuenta_no" type="FGLString" expectedLocation="expectedHere"/>
+                                <WORDBOX name="x.cuenta_no Value" class="grwStringValue" width="48.9847" floatingBehavior="enclosed" text="{{x.cuenta_no}}"/>
+                                <rtl:input-variable name="x.descripcion" type="FGLString" expectedLocation="expectedHere"/>
+                                <WORDWRAPBOX name="x.descripcion Value" class="grwStringValue" width="161.11" floatingBehavior="enclosed" text="{{x.descripcion}}"/>
+                                <rtl:input-variable name="x.ac_mes_anterior" type="FGLNumeric" expectedLocation="expectedHere"/>
+                                <DECIMALFORMATBOX name="x.ac_mes_anterior Value" class="grwNumericValue" width="63.9518" anchorX="1" floatingBehavior="enclosed" textAlignment="right" format="---,---,---,--&amp;.&amp;&amp;" value="{{x.ac_mes_anterior}}"/>
+                                <rtl:input-variable name="x.gastos_r_fecha" type="FGLNumeric" expectedLocation="expectedHere"/>
+                                <DECIMALFORMATBOX name="x.gastos_r_fecha Value" class="grwNumericValue" width="99.1426" anchorX="1" floatingBehavior="enclosed" textAlignment="right" format="---,---,---,--&amp;.&amp;&amp;" value="{{x.gastos_r_fecha}}"/>
+                                <rtl:input-variable name="x.ac_fecha_ac" type="FGLNumeric" expectedLocation="expectedHere"/>
+                                <DECIMALFORMATBOX name="x.ac_fecha_ac Value" class="grwNumericValue" width="77.6222" anchorX="1" alignment="baseline" floatingBehavior="enclosed" textAlignment="right" format="---,---,---,--&amp;.&amp;&amp;" value="{{x.ac_fecha_ac}}"/>
+                                <rtl:input-variable name="x.anio_anterior" type="FGLNumeric" expectedLocation="expectedHere"/>
+                                <DECIMALFORMATBOX name="x.anio_anterior Value1" class="grwNumericValue" width="73.0352" anchorX="1" floatingBehavior="enclosed" textAlignment="right" format="---,---,---,--&amp;.&amp;&amp;" value="{{x.anio_anterior}}"/>
+                            </MINIPAGE>
+                        </rtl:match>
+                    </LAYOUTNODE>
+                    <LAYOUTNODE name="totalGral" width="8.29946" length="min" layoutDirection="leftToRight" floatingBehavior="enclosed">
+                        <WORDBOX name="WordBox17_1" width="187.175" alignment="baseline" fontBold="true" floatingBehavior="enclosed" textAlignment="right" text="TOTAL GENERAL:   " borderStyle="none"/>
+                        <rtl:match name="OnLastRow" nameConstraint="OnLastRow" minOccurs="0" maxOccurs="1">
+                            <MINIPAGE name="MiniPage4" width="min" length="min" layoutDirection="leftToRight">
+                                <rtl:input-variable name="totalAc_mes_anterior" type="FGLNumeric" expectedLocation="expectedHere"/>
+                                <DECIMALFORMATBOX name="totalAc_mes_anterior Value" class="grwNumericValue" width="85.5869" length="8.28549" anchorX="1" alignment="near" fontSize="8" floatingBehavior="enclosed" textAlignment="right" format="---,---,---,--&amp;.&amp;&amp;" value="{{totalAc_mes_anterior}}"/>
+                                <rtl:input-variable name="totalGastos_r_fecha" type="FGLNumeric" expectedLocation="expectedHere"/>
+                                <DECIMALFORMATBOX name="totalGastos_r_fecha Value" class="grwNumericValue" width="99.4373" anchorX="1" fontSize="8" floatingBehavior="enclosed" textAlignment="right" format="---,---,---,--&amp;.&amp;&amp;" value="{{totalGastos_r_fecha}}"/>
+                                <rtl:input-variable name="totalAc_fecha_ac" type="FGLNumeric" expectedLocation="expectedHere"/>
+                                <DECIMALFORMATBOX name="totalAc_fecha_ac Value" class="grwNumericValue" width="77.779" anchorX="1" fontSize="8" floatingBehavior="enclosed" textAlignment="right" format="---,---,---,--&amp;.&amp;&amp;" value="{{totalAc_fecha_ac}}"/>
+                                <rtl:input-variable name="totaAnio_anterior" type="FGLNumeric" expectedLocation="expectedHere"/>
+                                <DECIMALFORMATBOX name="totaAnio_anterior Value" class="grwNumericValue" width="74.1127" anchorX="1" fontSize="8" floatingBehavior="enclosed" textAlignment="right" format="---,---,---,--&amp;.&amp;&amp;" value="{{totaAnio_anterior}}"/>
+                            </MINIPAGE>
+                        </rtl:match>
+                    </LAYOUTNODE>
+                </MINIPAGE>
+            </rtl:match>
+        </PXML>
+    </rtl:stylesheet>
+</report:Report>
diff --git a/PROYECTO/bin/coprmt009.4rp b/PROYECTO/bin/coprmt009.4rp
index 0cf9fdd..27abfa9 100644
--- a/PROYECTO/bin/coprmt009.4rp
+++ b/PROYECTO/bin/coprmt009.4rp
@@ -25,7 +25,7 @@
                     <LAYOUTNODE name="Layout Node7" width="min" length="min" swapX="true" port="firstPageHeader">
                         <MINIPAGE name="StripeLayouter11" width="min" layoutDirection="leftToRight">
                             <LAYOUTNODE name="Layout Node8" y=".5cm" width="4cm" length="min" bgColor="#c0c0c0" swapX="true" floatingBehavior="enclosed"/>
-                            <IMAGEBOX name="ImageBox1" y="40.9988" width="191.836" length="92.4741" floatingBehavior="enclosed" url="file:///E:/MARMOTECHC/IMAGENES/logo.png" intendedResolution="120"/>
+                            <IMAGEBOX name="ImageBox1" y="40.9988" width="191.836" length="92.4741" floatingBehavior="enclosed" url="IMAGENES/Logo.png" intendedResolution="120"/>
                             <LAYOUTNODE name="Layout Node9" y="max-1cm" width="min" length="min" anchorY="1" floatingBehavior="enclosed">
                                 <WORDBOX name="WordBox9" alignment="near" fontBold="true" baselineType="leftleft" text="MARMOTECH, S. A."/>
                                 <WORDBOX name="WordBox10" alignment="near" baselineType="leftleft" text="Madre Vieja"/>
diff --git a/PROYECTO/bin/coprmt009_1.4rp b/PROYECTO/bin/coprmt009_1.4rp
index 0249bcc..54cb143 100644
--- a/PROYECTO/bin/coprmt009_1.4rp
+++ b/PROYECTO/bin/coprmt009_1.4rp
@@ -28,7 +28,7 @@
                     <LAYOUTNODE name="Layout Node7" width="min" length="min" swapX="true" port="firstPageHeader">
                         <MINIPAGE name="StripeLayouter11" width="min" layoutDirection="leftToRight">
                             <LAYOUTNODE name="Layout Node8" y=".5cm" width="4cm" length="min" bgColor="#c0c0c0" swapX="true" floatingBehavior="enclosed"/>
-                            <IMAGEBOX name="ImageBox1" y=".5cm" width="139.836" length="82.4741" floatingBehavior="enclosed" url="file:///E:/marmotechc/imagenes/genero_logo.png" intendedResolution="120"/>
+                            <IMAGEBOX name="ImageBox1" y=".5cm" width="139.836" length="82.4741" floatingBehavior="enclosed" url="IMAGENES/genero_logo.png" intendedResolution="120"/>
                             <LAYOUTNODE name="Layout Node9" y="max-1cm" width="min" length="min" anchorY="1" floatingBehavior="enclosed">
                                 <WORDBOX name="WordBox9" alignment="near" fontBold="true" baselineType="leftleft" text="MARMOTECH, S. A."/>
                                 <WORDBOX name="WordBox10" alignment="near" baselineType="leftleft" text="Madre Vieja"/>
diff --git a/PROYECTO/bin/cumpleanos.4rp b/PROYECTO/bin/cumpleanos.4rp
index e9a8d20..8c52666 100644
--- a/PROYECTO/bin/cumpleanos.4rp
+++ b/PROYECTO/bin/cumpleanos.4rp
@@ -14,7 +14,7 @@
                 <MINIPAGE name="Page Root" width="max" length="max">
                     <LAYOUTNODE name="Page Header" width="max" length="min" port="anyPageHeader">
                         <MINIPAGE name="StripeLayouter3" width="min" length="max" layoutDirection="leftToRight">
-                            <IMAGEBOX name="ImageBox" floatingBehavior="enclosed" url="{{&quot;file:///e:/marmotechc/IMAGENES/logo_cumple.png&quot;}}" intendedResolution="120"/>
+                            <IMAGEBOX name="ImageBox" floatingBehavior="enclosed" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="120"/>
                         </MINIPAGE>
                         <LAYOUTNODE name="LayoutNode1" width="min" length="min" alignment="near" layoutDirection="leftToRight" floatingBehavior="enclosed">
                             <rtl:input-variable name="chlable" type="FGLString" expectedLocation="expectedAhead"/>
diff --git a/PROYECTO/bin/cumpleanos_1.4rp b/PROYECTO/bin/cumpleanos_1.4rp
index a0a51bd..046383f 100644
--- a/PROYECTO/bin/cumpleanos_1.4rp
+++ b/PROYECTO/bin/cumpleanos_1.4rp
@@ -15,7 +15,7 @@
                 <MINIPAGE name="Page Root" width="max" length="max">
                     <LAYOUTNODE name="Page Header" width="max" length="min" port="anyPageHeader">
                         <MINIPAGE name="StripeLayouter3" width="min" length="max" layoutDirection="leftToRight">
-                            <IMAGEBOX name="ImageBox" width="219.37" length="57.51" floatingBehavior="enclosed" url="{{&quot;file:///E:/MARMOTECHC/BIN320/IMAGENES/logo.png&quot;}}" intendedResolution="120"/>
+                            <IMAGEBOX name="ImageBox" width="219.37" length="57.51" floatingBehavior="enclosed" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="120"/>
                         </MINIPAGE>
                         <LAYOUTNODE name="LayoutNode1" width="min" length="min" alignment="near" layoutDirection="leftToRight" floatingBehavior="enclosed">
                             <rtl:input-variable name="chlable" type="FGLString" expectedLocation="expectedAhead"/>
diff --git a/PROYECTO/bin/ipprrp010a.4rp b/PROYECTO/bin/ipprrp010a.4rp
index c30cc86..906f796 100644
--- a/PROYECTO/bin/ipprrp010a.4rp
+++ b/PROYECTO/bin/ipprrp010a.4rp
@@ -15,7 +15,7 @@
                 <MINIPAGE name="Page Root" width="max" length="max">
                     <rtl:match name="Group xcodigo" nameConstraint="Group" minOccurs="0" maxOccurs="unbounded">
                         <LAYOUTNODE name="Layout Node2" width="min" length="min">
-                            <IMAGEBOX name="ImageBox3" width="5cm" length="1.5cm" url="{{&quot;file:///e:/marmotechc/BIN320/IMAGENES/compania/logo.png&quot;}}" intendedResolution="111"/>
+                            <IMAGEBOX name="ImageBox3" width="5cm" length="1.5cm" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="111"/>
                             <MINIPAGE name="Separator" width="1" length="max" bgColor="#000000" layoutDirection="leftToRight" swapX="false"/>
                         </LAYOUTNODE>
                         <LAYOUTNODE name="Layout Node3" width="max" length="min" fontSize="10">
diff --git a/PROYECTO/bin/ipprrp010a1.4rp b/PROYECTO/bin/ipprrp010a1.4rp
index 393685d..f90f055 100644
--- a/PROYECTO/bin/ipprrp010a1.4rp
+++ b/PROYECTO/bin/ipprrp010a1.4rp
@@ -15,7 +15,7 @@
                 <MINIPAGE name="Page Root" width="min" length="min" layoutDirection="topToBottom">
                     <rtl:match name="Group xcodigo" nameConstraint="Group" minOccurs="0" maxOccurs="unbounded">
                         <LAYOUTNODE name="Layout Node2" width="min" length="min">
-                            <IMAGEBOX name="ImageBox3" width="5cm" length="1cm" alignment="near" url="{{&quot;file:///e:/marmotechc/BIN320/IMAGENES/compania/logo.png&quot;}}" intendedResolution="111"/>
+                            <IMAGEBOX name="ImageBox3" width="5cm" length="1cm" alignment="near" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="111"/>
                             <MINIPAGE name="Separator" width="1" length="max" bgColor="#000000" layoutDirection="leftToRight" swapX="false"/>
                         </LAYOUTNODE>
                         <LAYOUTNODE name="Layout Node3" width="max" length="min" fontSize="10">
diff --git a/PROYECTO/bin/ipprrp010e.4rp b/PROYECTO/bin/ipprrp010e.4rp
index e27f168..70ecb15 100644
--- a/PROYECTO/bin/ipprrp010e.4rp
+++ b/PROYECTO/bin/ipprrp010e.4rp
@@ -15,7 +15,7 @@
                 <rtl:match name="Group xcodigo" nameConstraint="Group" minOccurs="0" maxOccurs="unbounded">
                     <MINIPAGE name="Page Root" width="max" length="max">
                         <LAYOUTNODE name="Layout Node2" width="min" length="min">
-                            <IMAGEBOX name="ImageBox3" width="100" length="38.2134" url="{{&quot;file:///e:/marmotechc/BIN320/IMAGENES/compania/logo.png&quot;}}" intendedResolution="96"/>
+                            <IMAGEBOX name="ImageBox3" width="100" length="38.2134" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="96"/>
                             <MINIPAGE name="Separator" width="1" length="max" bgColor="#000000" layoutDirection="leftToRight" swapX="false"/>
                         </LAYOUTNODE>
                         <LAYOUTNODE name="Layout Node3" width="max" length="min" fontSize="10">
diff --git a/PROYECTO/bin/ipprrp010f.4rp b/PROYECTO/bin/ipprrp010f.4rp
index 4a41e00..1c725e9 100644
--- a/PROYECTO/bin/ipprrp010f.4rp
+++ b/PROYECTO/bin/ipprrp010f.4rp
@@ -16,7 +16,7 @@
                     <MINIPAGE name="Page Root" width="max" length="min" layoutDirection="topToBottom">
                         <LAYOUTNODE name="Layout Node1" width="min" length="min" layoutDirection="topToBottom">
                             <LAYOUTNODE name="Layout Node6" width="min" length="min" layoutDirection="leftToRight">
-                                <IMAGEBOX name="ImageBox3" width="5cm" length="1cm" url="{{&quot;file:///e:/marmotechc/BIN320/IMAGENES/compania/logo.png&quot;}}" intendedResolution="111"/>
+                                <IMAGEBOX name="ImageBox3" width="5cm" length="1cm" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="111"/>
                             </LAYOUTNODE>
                             <LAYOUTNODE name="LayoutNode1" width="min" length="min" alignment="near" floatingBehavior="enclosed">
                                 <MINIPAGE name="Separator" width="1" length="max" bgColor="#000000" layoutDirection="leftToRight" swapX="false"/>
diff --git a/PROYECTO/bin/ipprrp010f_1.4rp b/PROYECTO/bin/ipprrp010f_1.4rp
index 898a1ef..b20ca52 100644
--- a/PROYECTO/bin/ipprrp010f_1.4rp
+++ b/PROYECTO/bin/ipprrp010f_1.4rp
@@ -16,7 +16,7 @@
                     <MINIPAGE name="Page Root" width="max" length="min" layoutDirection="topToBottom">
                         <LAYOUTNODE name="Layout Node1" width="min" length=".8cm" layoutDirection="topToBottom">
                             <LAYOUTNODE name="Layout Node6" width="min" length="min" layoutDirection="leftToRight">
-                                <IMAGEBOX name="ImageBox3" width="44.7697" length="23.3465" url="{{&quot;file:///e:/marmotechc/BIN320/IMAGENES/compania/logo.png&quot;}}" intendedResolution="96"/>
+                                <IMAGEBOX name="ImageBox3" width="44.7697" length="23.3465" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="96"/>
                             </LAYOUTNODE>
                             <LAYOUTNODE name="LayoutNode1" width="min" length="1cm" alignment="near" floatingBehavior="enclosed">
                                 <MINIPAGE name="Separator" width="1" length="max" bgColor="#000000" layoutDirection="leftToRight" swapX="false"/>
diff --git a/PROYECTO/bin/ipprrp010h.4rp b/PROYECTO/bin/ipprrp010h.4rp
index 5aeed0f..b5b93bf 100644
--- a/PROYECTO/bin/ipprrp010h.4rp
+++ b/PROYECTO/bin/ipprrp010h.4rp
@@ -16,7 +16,7 @@
                     <MINIPAGE name="Page Root" width="max" length="max" layoutDirection="topToBottom">
                         <LAYOUTNODE name="Layout Node1" width="min" length="min" layoutDirection="topToBottom">
                             <LAYOUTNODE name="Layout Node6" width="min" length="min" layoutDirection="leftToRight">
-                                <IMAGEBOX name="ImageBox3" width="2cm" length="1cm" url="{{&quot;file:///e:/marmotechc/BIN320/IMAGENES/compania/logo.png&quot;}}" intendedResolution="120"/>
+                                <IMAGEBOX name="ImageBox3" width="2cm" length="1cm" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="120"/>
                                 <rtl:input-variable name="descripcion" type="FGLString" expectedLocation="expectedHere"/>
                                 <WORDWRAPBOX name="WordWrapBox1" width="width(&quot;M&quot;)*11.5" length="1cm" alignment="baseline" fontSize="12" fontBold="true" baselineType="leftleft" text="{{descripcion.trim()}}"/>
                             </LAYOUTNODE>
diff --git a/PROYECTO/bin/irprrpcs008.4rp b/PROYECTO/bin/irprrpcs008.4rp
index 99a7b9b..b218fb6 100644
--- a/PROYECTO/bin/irprrpcs008.4rp
+++ b/PROYECTO/bin/irprrpcs008.4rp
@@ -15,7 +15,7 @@
                 <MINIPAGE name="Page Root" width="min" length="max" alignment="center">
                     <LAYOUTNODE name="Page Header" width="min" length="min" fontSize="12" fontBold="true" layoutDirection="topToBottom" baselineType="leftleft" port="anyPageHeader" floatingBehavior="enclosed">
                         <LAYOUTNODE name="LayoutNode" width="min" length="max" layoutDirection="leftToRight" floatingBehavior="enclosed">
-                            <IMAGEBOX name="ImageBox1" length="39.7106" anchorX="0" anchorY="0" url="{{&quot;file:///E:/MARMOTECHC/IMAGENES/genero_logo.png&quot;}}" intendedResolution="96"/>
+                            <IMAGEBOX name="ImageBox1" length="39.7106" anchorX="0" anchorY="0" url="{{&quot;IMAGENES/genero_logo.png&quot;}}" intendedResolution="96"/>
                             <rtl:input-variable name="nombre_cia" type="FGLString" expectedLocation="expectedAhead"/>
                             <WORDBOX name="WordBox47" width="12cm" floatingBehavior="enclosed" textAlignment="center" text="{{nombre_cia.value}}"/>
                             <rtl:input-variable name="chfecha" type="FGLString" expectedLocation="expectedAhead"/>
diff --git a/PROYECTO/bin/noprrp044_1_otros_ant.4rp b/PROYECTO/bin/noprrp044_1_otros_ant.4rp
index 0e406db..96f40ed 100644
--- a/PROYECTO/bin/noprrp044_1_otros_ant.4rp
+++ b/PROYECTO/bin/noprrp044_1_otros_ant.4rp
@@ -16,7 +16,7 @@
                     <MINIPAGE name="MiniPage" width="min" length="min">
                         <rtl:match name="OnEveryRow" nameConstraint="OnEveryRow" minOccurs="0" maxOccurs="unbounded">
                             <MINIPAGE name="MiniPage1" width="min" length="min" alignment="near">
-                                <IMAGEBOX name="ImageBox" width="1.9inch" length=".6inch" port="anyPageHeader" floatingBehavior="enclosed" url="{{&quot;file:///E:/MARMOTECHC/BIN320/IMAGENES/Logo_dcm.png&quot;}}" intendedResolution="50"/>
+                                <IMAGEBOX name="ImageBox" width="1.9inch" length=".6inch" port="anyPageHeader" floatingBehavior="enclosed" url="{{&quot;IMAGENES/Logo_DCM.png&quot;}}" intendedResolution="50"/>
                                 <LAYOUTNODE name="LayoutNode" width="min" length="max" color="#909090" fontSize="7" fontBold="true" layoutDirection="leftToRight" floatingBehavior="enclosed">
                                     <rtl:input-variable name="p_companias.direccion" type="FGLString" expectedLocation="expectedHere"/>
                                     <WORDBOX name="WordBox" width="max" fontBold="true" floatingBehavior="enclosed" textAlignment="center" text="{{p_companias.direccion.trim()}}"/>
diff --git a/PROYECTO/bin/noprrp044_2.4rp b/PROYECTO/bin/noprrp044_2.4rp
index 232d45a..ee41fdc 100644
--- a/PROYECTO/bin/noprrp044_2.4rp
+++ b/PROYECTO/bin/noprrp044_2.4rp
@@ -15,7 +15,7 @@
                 <MINIPAGE name="Page Root" width="max" length="min">
                     <MINIPAGE name="MiniPage" width="min" length="min">
                         <MINIPAGE name="MiniPage1" width="min" length="min">
-                            <IMAGEBOX name="ImageBox" width="1.9inch" length=".6inch" alignment="near" floatingBehavior="enclosed" url="{{&quot;file:///E:/MARMOTECHC/BIN320/IMAGENES/Logo_DCM.png&quot;}}" intendedResolution="50"/>
+                            <IMAGEBOX name="ImageBox" width="1.9inch" length=".6inch" alignment="near" floatingBehavior="enclosed" url="{{&quot;IMAGENES/Logo_DCM.png&quot;}}" intendedResolution="50"/>
                             <LAYOUTNODE name="LayoutNode" width="min" length="max" color="#909090" fontSize="6.5" fontBold="true" layoutDirection="leftToRight" floatingBehavior="enclosed">
                                 <rtl:input-variable name="p_companias.direccion" type="FGLString" expectedLocation="expectedAhead"/>
                                 <WORDBOX name="WordBox" width="max" fontBold="true" floatingBehavior="enclosed" textAlignment="center" text="{{p_companias.direccion.trim()}}"/>
diff --git a/PROYECTO/bin/pretiqueta4x3.4rp b/PROYECTO/bin/pretiqueta4x3.4rp
index c061e68..ede0b57 100644
--- a/PROYECTO/bin/pretiqueta4x3.4rp
+++ b/PROYECTO/bin/pretiqueta4x3.4rp
@@ -15,7 +15,7 @@
                 <MINIPAGE name="Page Root" width="max" length="max">
                     <rtl:match name="OnEveryRow" nameConstraint="OnEveryRow" minOccurs="0" maxOccurs="unbounded">
                         <LAYOUTNODE name="Layout Node2" width="min" length="min">
-                            <IMAGEBOX name="ImageBox3" width="5cm" length="1.5cm" url="{{&quot;file:///E:/MARMOTECHC/BIN320/IMAGENES/LOGO_DCM.png&quot;}}" intendedResolution="111"/>
+                            <IMAGEBOX name="ImageBox3" width="5cm" length="1.5cm" url="{{&quot;IMAGENES/Logo_DCM.png&quot;}}" intendedResolution="111"/>
                             <MINIPAGE name="Separator" width="1" length="max" bgColor="#000000" layoutDirection="leftToRight" swapX="false"/>
                         </LAYOUTNODE>
                         <LAYOUTNODE name="Layout Node3" width="max" length="min" fontSize="10">
diff --git a/PROYECTO/bin/prprmt003.4rp b/PROYECTO/bin/prprmt003.4rp
index 422079d..ec046ee 100644
--- a/PROYECTO/bin/prprmt003.4rp
+++ b/PROYECTO/bin/prprmt003.4rp
@@ -18,7 +18,7 @@
                             <LAYOUTNODE name="Layout Node9" y="max-33.3652" width="214.531" length="26.3906" anchorY="1" alignment="center" layoutDirection="topToBottom" floatingBehavior="free">
                                 <WORDBOX name="WordBox9" width="213.984" length="14.3281" alignment="far" fontSize="20" fontBold="true" underline="true" layoutDirection="topToBottom" baselineType="leftleft" textAlignment="center" text="PRODUCCIÓN DIARIA" trimText="both"/>
                             </LAYOUTNODE>
-                            <IMAGEBOX name="ImageBox1_1" y="40.5932" width="221.836" length="92.4741" floatingBehavior="enclosed" url="file:///E:/MARMOTECHC/IMAGENES/logo.png" intendedResolution="120"/>
+                            <IMAGEBOX name="ImageBox1_1" y="40.5932" width="221.836" length="92.4741" floatingBehavior="enclosed" url="IMAGENES/Logo.png" intendedResolution="120"/>
                         </MINIPAGE>
                         <MINIPAGE name="StripeLayouter12" width=".5cm" layoutDirection="leftToRight"/>
                         <MINIPAGE name="StripeLayouter13" width="min" alignment="near" layoutDirection="leftToRight">
diff --git a/PROYECTO/bin/sendemail.4rp b/PROYECTO/bin/sendemail.4rp
index d12e5f9..9faac85 100644
--- a/PROYECTO/bin/sendemail.4rp
+++ b/PROYECTO/bin/sendemail.4rp
@@ -15,7 +15,7 @@
                 <MINIPAGE name="Page Root" width="max" length="max" lengthAdjustment="shrinkToChildren" layoutDirection="topToBottom" swapX="false">
                     <rtl:match name="Group num_emp" nameConstraint="Group" minOccurs="0" maxOccurs="unbounded">
                         <MINIPAGE name="encabezado" width="max" length="min" alignment="near" layoutDirection="topToBottom" floatingBehavior="free">
-                            <IMAGEBOX name="ImageBox1" width="77.9666" alignment="near" url="{{&quot;file:///C://Users//jsoto//Documents//PROYECTOS//BDL320//MARMOTECH//PROYECTO//bin//IMAGENES//LOGO_DCM.PNG&quot;}}" intendedResolution="96"/>
+                            <IMAGEBOX name="ImageBox1" width="77.9666" alignment="near" url="{{&quot;IMAGENES/Logo_DCM.png&quot;}}" intendedResolution="96"/>
                             <LAYOUTNODE name="Layout Node6" width="min" length="max" fontBold="true" layoutDirection="leftToRight">
                                 <rtl:input-variable name="c_entra.nombre_tipo" type="FGLString" expectedLocation="expectedHere"/>
                                 <WORDBOX name="WordBox10" alignment="near" baselineType="leftleft" text="{{&quot;TIPO NOMINA: &quot;+c_entra.nombre_tipo}}"/>
diff --git a/PROYECTO/bin/svprmt001.4rp b/PROYECTO/bin/svprmt001.4rp
index 8dabd65..dcf4acb 100644
--- a/PROYECTO/bin/svprmt001.4rp
+++ b/PROYECTO/bin/svprmt001.4rp
@@ -13,7 +13,7 @@
             <rtl:match nameConstraint="Report">
                 <MINIPAGE name="Page Root" width="max" length="max">
                     <LAYOUTNODE name="LayoutNode" width="min" length="max" layoutDirection="leftToRight" floatingBehavior="enclosed">
-                        <IMAGEBOX name="ImageBox" width="4cm" length="2.7cm" floatingBehavior="enclosed" url="{{&quot;file:///F:/master/imagenes/genero_logo.png&quot;}}" intendedResolution="120"/>
+                        <IMAGEBOX name="ImageBox" width="4cm" length="2.7cm" floatingBehavior="enclosed" url="{{&quot;IMAGENES/genero_logo.png&quot;}}" intendedResolution="120"/>
                         <rtl:input-variable name="p_compania.nombre" type="FGLString" expectedLocation="expectedAhead"/>
                         <WORDWRAPBOX name="p_compania.nombre Value" width="max-7cm" floatingBehavior="enclosed" text="{{p_compania.nombre}}" textAlignment="center"/>
                         <rtl:input-variable name="fecha" type="FGLString" expectedLocation="expectedAhead"/>
diff --git a/PROYECTO/bin/vefactura.4rp b/PROYECTO/bin/vefactura.4rp
index 7c47aa8..a1bbf27 100644
--- a/PROYECTO/bin/vefactura.4rp
+++ b/PROYECTO/bin/vefactura.4rp
@@ -15,7 +15,7 @@
                 <MINIPAGE name="MiniPage1" width="max" length="min" fontName="Arial">
                     <LAYOUTNODE name="Layout Node7" width="min" length="min" swapX="true" port="firstPageHeader">
                         <MINIPAGE name="StripeLayouter11" width="min" layoutDirection="leftToRight">
-                            <IMAGEBOX name="ImageBox1" y="14.2264" width="5cm" length="3cm" floatingBehavior="enclosed" url="{{&quot;file:///E:/MARMOTECHC/BIN320/IMAGENES/Logo_DCM.PNG&quot;}}" intendedResolution="120"/>
+                            <IMAGEBOX name="ImageBox1" y="14.2264" width="5cm" length="3cm" floatingBehavior="enclosed" url="{{&quot;IMAGENES/Logo_DCM.png&quot;}}" intendedResolution="120"/>
                             <LAYOUTNODE name="Layout Node9" y="max-5cm" width="min" length="min" anchorY="1" floatingBehavior="enclosed">
                                 <rtl:input-variable name="p_companias.nombre" type="FGLString" expectedLocation="expectedAhead"/>
                                 <WORDBOX name="WordBox9" alignment="near" fontBold="true" baselineType="leftleft" text="{{p_companias.nombre.trim()}}"/>
diff --git a/PROYECTO/bin/vefactura_1.4rp b/PROYECTO/bin/vefactura_1.4rp
index aa0bd50..fbc64e6 100644
--- a/PROYECTO/bin/vefactura_1.4rp
+++ b/PROYECTO/bin/vefactura_1.4rp
@@ -16,7 +16,7 @@
                     <LAYOUTNODE name="Layout Node7" width="min" length="min" swapX="true" port="firstPageHeader">
                         <MINIPAGE name="StripeLayouter11" width="min" layoutDirection="leftToRight">
                             <LAYOUTNODE name="Layout Node8" y=".5cm" width="4cm" length="min" bgColor="#c0c0c0" swapX="true" floatingBehavior="enclosed"/>
-                            <IMAGEBOX name="ImageBox1" y="14.2264" width="4cm" length="3cm" floatingBehavior="enclosed" url="{{&quot;file:///C:/Users/jsoto/Documents/PROYECTOS/BDL320/MARMOTECH/PROYECTO/bin/IMAGENES/Logo_DCM.PNG&quot;}}" intendedResolution="120"/>
+                            <IMAGEBOX name="ImageBox1" y="14.2264" width="4cm" length="3cm" floatingBehavior="enclosed" url="{{&quot;IMAGENES/Logo_DCM.png&quot;}}" intendedResolution="120"/>
                             <LAYOUTNODE name="Layout Node9" y="max-29.9908" width="min" length="min" anchorY="1" fontSize="12" floatingBehavior="enclosed">
                                 <rtl:input-variable name="p_companias.nombre" type="FGLString" expectedLocation="expectedAhead"/>
                                 <WORDBOX name="WordBox9" alignment="near" fontBold="true" baselineType="leftleft" text="{{p_companias.nombre.trim()}}"/>
diff --git a/PROYECTO/bin/veprcs001.4rp b/PROYECTO/bin/veprcs001.4rp
index 35e4059..c736778 100644
--- a/PROYECTO/bin/veprcs001.4rp
+++ b/PROYECTO/bin/veprcs001.4rp
@@ -20,7 +20,7 @@
                             <rtl:input-variable name="visualiza" type="FGLString" expectedLocation="expectedAhead"/>
                             <LAYOUTNODE name="LayoutNode40" rtl:condition="visualiza==&quot;SI&quot;" width="min" length="min" alignment="far" layoutDirection="topToBottom" floatingBehavior="enclosed">
                                 <LAYOUTNODE name="imagen" width="min" length="min" layoutDirection="leftToRight" floatingBehavior="enclosed">
-                                    <IMAGEBOX name="ImageBox1_1_1" length="70" alignment="near" floatingBehavior="enclosed" url="{{&quot;file:///C:/Users/jsoto/Documents/PROYECTOS/BDL320/MARMOTECH/PROYECTO/bin/IMAGENES/logo.png&quot;}}" intendedResolution="120"/>
+                                    <IMAGEBOX name="ImageBox1_1_1" length="70" alignment="near" floatingBehavior="enclosed" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="120"/>
                                 </LAYOUTNODE>
                                 <LAYOUTNODE name="infocia" width="min" length="min" anchorY="1" fontSize="12" floatingBehavior="enclosed">
                                     <rtl:input-variable name="sucnombre" type="FGLString" expectedLocation="expectedAhead"/>
diff --git a/PROYECTO/bin/veprmt022.4rp b/PROYECTO/bin/veprmt022.4rp
index 2112d0d..180edb0 100644
--- a/PROYECTO/bin/veprmt022.4rp
+++ b/PROYECTO/bin/veprmt022.4rp
@@ -21,7 +21,7 @@
                         <LAYOUTNODE name="Encabezado" width="min" length="max" alignment="near" layoutDirection="leftToRight" floatingBehavior="enclosed">
                             <LAYOUTNODE name="LayoutNode40" width="min" length="min" alignment="far" layoutDirection="topToBottom" floatingBehavior="enclosed">
                                 <LAYOUTNODE name="imagen" width="min" length="min" layoutDirection="leftToRight" floatingBehavior="enclosed">
-                                    <IMAGEBOX name="ImageBox1_1_1" length="70" alignment="near" floatingBehavior="enclosed" url="{{&quot;file:///E:/MARMOTECHC/BIN320/IMAGENES/logo.png&quot;}}" intendedResolution="120"/>
+                                    <IMAGEBOX name="ImageBox1_1_1" length="70" alignment="near" floatingBehavior="enclosed" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="120"/>
                                 </LAYOUTNODE>
                                 <LAYOUTNODE name="infocia" width="min" length="min" anchorY="1" fontSize="12" floatingBehavior="enclosed">
                                     <WORDBOX name="WordBox9" alignment="near" fontBold="true" baselineType="leftleft" text="{{sucnombre.trim()}}"/>
diff --git a/PROYECTO/bin/veprmt022_1.4rp b/PROYECTO/bin/veprmt022_1.4rp
index c2f3b5e..99442c2 100644
--- a/PROYECTO/bin/veprmt022_1.4rp
+++ b/PROYECTO/bin/veprmt022_1.4rp
@@ -19,7 +19,7 @@
                         <LAYOUTNODE name="LayoutNode35" width="min" length="max" alignment="near" layoutDirection="leftToRight" floatingBehavior="enclosed">
                             <LAYOUTNODE name="LayoutNode40" width="min" length="min" alignment="far" layoutDirection="topToBottom" floatingBehavior="enclosed">
                                 <LAYOUTNODE name="imagen" width="min" length="min" layoutDirection="leftToRight" floatingBehavior="enclosed">
-                                    <IMAGEBOX name="ImageBox1_1_1" length="70" alignment="near" floatingBehavior="enclosed" url="{{&quot;file:///F:/MARMOTECHC/BIN320/IMAGENES/logo.png&quot;}}" intendedResolution="120"/>
+                                    <IMAGEBOX name="ImageBox1_1_1" length="70" alignment="near" floatingBehavior="enclosed" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="120"/>
                                 </LAYOUTNODE>
                                 <LAYOUTNODE name="infocia" width="min" length="min" anchorY="1" fontSize="12" floatingBehavior="enclosed">
                                     <rtl:input-variable name="sucnombre" type="FGLString" expectedLocation="expectedAhead"/>
diff --git a/PROYECTO/bin/veprmt049.4rp b/PROYECTO/bin/veprmt049.4rp
index e9733f7..1b79ee2 100644
--- a/PROYECTO/bin/veprmt049.4rp
+++ b/PROYECTO/bin/veprmt049.4rp
@@ -15,7 +15,7 @@
                 <MINIPAGE name="Page Root" width="max" length="min" alignment="near">
                     <MINIPAGE name="ENCABEZADOSGRAL" width="130" length="560.485" alignment="center" fontSize="9" layoutDirection="leftToRight">
                         <rtl:input-variable name="y.monto_itbis" type="FGLNumeric" expectedLocation="expectedAhead"/>
-                        <IMAGEBOX name="ImageBox4" rtl:condition="y.monto_itbis&gt;0" x="0" y="-11.5843" width="4cm" length="2.7cm" anchorX="0" anchorY="0" url="{{&quot;file:///E:/MARMOTECHC/BIN320/imagenes/logo.png&quot;}}" intendedResolution="96"/>
+                        <IMAGEBOX name="ImageBox4" rtl:condition="y.monto_itbis&gt;0" x="0" y="-11.5843" width="4cm" length="2.7cm" anchorX="0" anchorY="0" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="96"/>
                         <rtl:input-variable name="y.monto_itbis" type="FGLNumeric" expectedLocation="expectedAhead"/>
                         <LAYOUTNODE name="Layout Node8" rtl:condition="y.monto_itbis&gt;0" y="max-7.5cm" width="8cm" length="min" anchorY="1" floatingBehavior="enclosed">
                             <rtl:input-variable name="p_companias.nombre" type="FGLString" expectedLocation="expectedAhead"/>
diff --git a/PROYECTO/bin/veprmt049_GR.4rp b/PROYECTO/bin/veprmt049_GR.4rp
index 7d068c2..2bb181f 100644
--- a/PROYECTO/bin/veprmt049_GR.4rp
+++ b/PROYECTO/bin/veprmt049_GR.4rp
@@ -13,7 +13,7 @@
             <rtl:match nameConstraint="Report">
                 <MINIPAGE name="Page Root" width="max" length="min">
                     <MINIPAGE name="ENCABEZADOSGRAL" width="130" length="560.485" alignment="center" fontSize="9" layoutDirection="leftToRight">
-                        <IMAGEBOX name="ImageBox4" x="5" y="2" width="4cm" length="2.7cm" anchorX="0" anchorY="0" url="{{&quot;file:///F:/master/imagenes/genero_logo.png&quot;}}" intendedResolution="96"/>
+                        <IMAGEBOX name="ImageBox4" x="5" y="2" width="4cm" length="2.7cm" anchorX="0" anchorY="0" url="{{&quot;IMAGENES/genero_logo.png&quot;}}" intendedResolution="96"/>
                         <LAYOUTNODE name="Layout Node8" y="max-7.5cm" width="8cm" length="min" anchorY="1" floatingBehavior="enclosed">
                             <rtl:input-variable name="p_companias.nombre" type="FGLString" expectedLocation="expectedAhead"/>
                             <WORDWRAPBOX name="p_companias.nombre Value" width="width(&quot;M&quot;)*20" alignment="baseline" fontSize="12" fontBold="true" baselineType="leftleft" text="{{p_companias.nombre}}"/>
diff --git a/PROYECTO/bin/veprrp049 (copy).4rp b/PROYECTO/bin/veprrp049 (copy).4rp
index 7d68e9e..359e650 100644
--- a/PROYECTO/bin/veprrp049 (copy).4rp	
+++ b/PROYECTO/bin/veprrp049 (copy).4rp	
@@ -13,7 +13,7 @@
             <PXML name="veprrp049.4rp">
                 <MINIPAGE name="Page Root" width="max" length="min">
                     <MINIPAGE name="ENCABEZADOSGRAL" width="130" length="560.485" alignment="center" fontSize="9" layoutDirection="leftToRight">
-                        <IMAGEBOX name="ImageBox4" x="7" y="5" width="112.489" length="65.8341" anchorX="0" anchorY="0" url="{{&quot;file:///c:/genero/IMAGENES/LOGO.JPG&quot;}}"></IMAGEBOX>
+                        <IMAGEBOX name="ImageBox4" x="7" y="5" width="112.489" length="65.8341" anchorX="0" anchorY="0" url="{{&quot;IMAGENES/LOGO.JPG&quot;}}"></IMAGEBOX>
                         <LAYOUTNODE name="Layout Node8" y="max-181.379" width="min" length="min" anchorY="1" floatingBehavior="enclosed">
                             <WORDWRAPBOX name="p_companias.nombre Value" width="width(&quot;M&quot;)*20" alignment="baseline" fontSize="12" fontBold="true" baselineType="leftleft" text="{{p_companias.nombre}}"></WORDWRAPBOX>
                             <WORDBOX name="WordBox3" width="144.562" alignment="baseline" fontSize="9" baselineType="leftleft" text="{{p_companias.direccion.value}}"></WORDBOX>
diff --git a/PROYECTO/bin/veprrp049.4rp b/PROYECTO/bin/veprrp049.4rp
index e61a681..a5ad784 100644
--- a/PROYECTO/bin/veprrp049.4rp
+++ b/PROYECTO/bin/veprrp049.4rp
@@ -13,7 +13,7 @@
             <rtl:match nameConstraint="Report">
                 <MINIPAGE name="Page Root" width="max" length="min">
                     <MINIPAGE name="ENCABEZADOSGRAL" width="130" length="560.485" alignment="center" fontSize="9" layoutDirection="leftToRight">
-                        <IMAGEBOX name="ImageBox4" x="7" y="5" width="97.489" length="66.5841" anchorX="0" anchorY="0" url="{{&quot;file:///f:/master/IMAGENES/LOGO.JPG&quot;}}" intendedResolution="96"/>
+                        <IMAGEBOX name="ImageBox4" x="7" y="5" width="97.489" length="66.5841" anchorX="0" anchorY="0" url="{{&quot;IMAGENES/LOGO.JPG&quot;}}" intendedResolution="96"/>
                         <LAYOUTNODE name="Layout Node8" y="max-181.379" width="193.25" length="84.75" anchorY="1" floatingBehavior="enclosed">
                             <rtl:input-variable name="p_companias.nombre" type="FGLString" expectedLocation="expectedAhead"/>
                             <WORDWRAPBOX name="p_companias.nombre Value" width="width(&quot;M&quot;)*20" alignment="baseline" fontSize="12" fontBold="true" baselineType="leftleft" text="{{p_companias.nombre}}"/>
diff --git a/PROYECTO/bin/veprrp049back.4rp b/PROYECTO/bin/veprrp049back.4rp
index bac305f..54f636a 100644
--- a/PROYECTO/bin/veprrp049back.4rp
+++ b/PROYECTO/bin/veprrp049back.4rp
@@ -13,7 +13,7 @@
             <PXML name="veprrp049.4rp">
                 <MINIPAGE name="Page Root" width="max" length="min">
                     <MINIPAGE name="ENCABEZADOSGRAL" width="130" length="560.485" alignment="center" fontSize="9" layoutDirection="leftToRight">
-                        <IMAGEBOX name="ImageBox4" x="7" y="5" width="112.489" length="65.8341" anchorX="0" anchorY="0" url="{{&quot;file:///f:/master/IMAGENES/LOGO.JPG&quot;}}"></IMAGEBOX>
+                        <IMAGEBOX name="ImageBox4" x="7" y="5" width="112.489" length="65.8341" anchorX="0" anchorY="0" url="{{&quot;IMAGENES/LOGO.JPG&quot;}}"></IMAGEBOX>
                         <LAYOUTNODE name="Layout Node8" y="max-181.379" width="min" length="min" anchorY="1" floatingBehavior="enclosed">
                             <WORDWRAPBOX name="p_companias.nombre Value" width="width(&quot;M&quot;)*20" alignment="baseline" fontSize="12" fontBold="true" baselineType="leftleft" text="{{p_companias.nombre}}"></WORDWRAPBOX>
                             <WORDBOX name="WordBox3" width="6cm" alignment="baseline" fontSize="9" baselineType="leftleft" text="{{p_companias.direccion.value}}"></WORDBOX>
diff --git a/PROYECTO/cgdir/cgfmrp013.4fd b/PROYECTO/cgdir/cgfmrp013.4fd
index 402e398..11e0a95 100644
--- a/PROYECTO/cgdir/cgfmrp013.4fd
+++ b/PROYECTO/cgdir/cgfmrp013.4fd
@@ -4,7 +4,7 @@
   <Record additionalTables="" joinLeft="" joinOperator="" joinRight="" name="Undefined" order="" uid="{b4e41e18-a1ab-44ca-b0d2-21d63ec0b26b}" where="">
     <RecordField colName="fecha_inicial" fieldIdRef="0" name="p_ano" sqlTabName="formonly" sqlType="CHAR" table_alias_name="" uid="{8833f641-6222-46a4-ba92-53eb1fdc87ba}"/>
     <RecordField colName="fecha_final" defaultValue="01" fieldIdRef="1" name="p_mes" sqlTabName="formonly" sqlType="CHAR" table_alias_name="" uid="{a63991d6-4abf-4198-b711-b6a40886ffe1}"/>
-    <RecordField colName="" defaultValue="BALANCE GENERAL" fieldIdRef="2" name="estado" sqlTabName="" table_alias_name="" uid="{07465cbc-3322-43fb-ab48-4f22dde68501}"/>
+    <RecordField colName="" defaultValue="cgprrp012.4rp" fieldIdRef="2" name="estado" sqlTabName="" table_alias_name="" uid="{07465cbc-3322-43fb-ab48-4f22dde68501}"/>
     <RecordField colName="" defaultValue="ACTIVOS" fieldIdRef="3" name="tipo_estado" sqlTabName="" table_alias_name="" uid="{1846db6d-746f-4998-9702-857110865eac}"/>
   </Record>
   <Form gridHeight="10" gridWidth="55" name="cgfmrp012">
@@ -27,7 +27,7 @@
         <Item lstrtext="false" name="12" text="DICIEMBRE"/>
       </ComboBox>
       <Label gridHeight="1" gridWidth="10" name="Label1" posX="2" posY="3" text="Estado"/>
-      <ComboBox aggregateColName="" aggregateName="" aggregateTableAliasName="" aggregateTableName="" colName="" columnCount="" defaultValue="BALANCE GENERAL" fieldId="2" gridHeight="1" gridWidth="17" items="BALANCE GENERAL, INGRESOS Y EGRESOS" name="estado" posX="17" posY="3" rowCount="" sqlTabName="" stepX="" stepY="" tabIndex="3" table_alias_name="" title="ComboBox1" widget="ComboBox">
+      <ComboBox aggregateColName="" aggregateName="" aggregateTableAliasName="" aggregateTableName="" colName="" columnCount="" defaultValue="cgprrp012.4rp" fieldId="2" gridHeight="1" gridWidth="17" items="BALANCE GENERAL, INGRESOS Y EGRESOS" name="estado" posX="17" posY="3" rowCount="" sqlTabName="" stepX="" stepY="" tabIndex="3" table_alias_name="" title="ComboBox1" widget="ComboBox">
         <Item lstrtext="false" name="cgprrp012.4rp" text="BALANCE GENERAL"/>
         <Item lstrtext="false" name="cgprrp013.4rp" text="INGRESOS Y EGRESOS"/>
       </ComboBox>
diff --git a/PROYECTO/cgdir/cgprmt004.4gl b/PROYECTO/cgdir/cgprmt004.4gl
index 13fa029..909ec5c 100644
--- a/PROYECTO/cgdir/cgprmt004.4gl
+++ b/PROYECTO/cgdir/cgprmt004.4gl
@@ -76,7 +76,7 @@ MAIN
     CALL ARG_VAL(3) RETURNING impresor
 # LET usuarios = "jsoto"
 # LET clave = "1234"
-    CONNECT TO "marmotech" AS "IFMX" USER usuarios USING clave
+#    CONNECT TO "marmotech" AS "IFMX" USER usuarios USING clave   -- G6: -6366; EXTERIOR se lee cross-DB (exterior.dbo.*)
     CONNECT TO "smarmotech" AS "MSSQL" USER usuarios USING clave
     SELECT a.* INTO p_compania.* FROM companias a
 
@@ -126,6 +126,7 @@ FUNCTION cgpcad004()
         fecha1, fecha2 DATE,
 
         pdescripcion CHAR(30)
+    DEFINE l_sql STRING, l_cnt INTEGER   -- G6: SQL dinamico cross-DB a EXTERIOR
 
     LET hoy = TODAY
     LABEL vuelve:
@@ -199,17 +200,18 @@ FUNCTION cgpcad004()
         CALL transac.clear()
     END IF
     IF cheques = "ED" THEN
-        SET CONNECTION "IFMX"
+        -- G6: antes SET CONNECTION "IFMX" (EXTERIOR); ahora cross-DB sobre la conexion unica
         INPUT BY NAME xentrada
             AFTER FIELD xentrada
                 IF xentrada IS NULL THEN
                     CALL msg(16)
                     NEXT FIELD xentrada
                 END IF
-                SELECT DISTINCT a.ref
-                    FROM cgtb00004 a
-                    WHERE a.ref = xentrada AND a.status_t IS NULL
-                IF STATUS = NOTFOUND THEN
+                LET l_sql = "SELECT COUNT(*) FROM exterior.dbo.cgtb00004 a",
+                    " WHERE a.ref = ? AND a.status_t IS NULL"
+                PREPARE p_ex_ed FROM l_sql
+                EXECUTE p_ex_ed USING xentrada INTO l_cnt
+                IF l_cnt = 0 OR l_cnt IS NULL THEN
                     CALL msg(3)
                     NEXT FIELD xentrada
                 END IF
@@ -219,19 +221,14 @@ FUNCTION cgpcad004()
                     LET INT_FLAG = FALSE
                     EXIT INPUT
                 ELSE
-                    DECLARE busca_entrada1 CURSOR FOR
-                        SELECT A.CUENTA_NO,
-                            c.DEPARTAMENTO,
-                            SUM(c.DEBITO),
-                            SUM(c.CREDITO)
-                            FROM cgtb00001 a, cgtb00004 c
-                            WHERE a.cuenta_no = c.cuenta_no
-                                AND c.status_t IS NULL
-                                AND c.ref = xentrada
-                            GROUP BY A.CUENTA_NO, c.DEPARTAMENTO
+                    LET l_sql = "SELECT a.cuenta_no, c.departamento, SUM(c.debito), SUM(c.credito)",
+                        " FROM exterior.dbo.cgtb00001 a, exterior.dbo.cgtb00004 c",
+                        " WHERE a.cuenta_no = c.cuenta_no AND c.status_t IS NULL AND c.ref = ?",
+                        " GROUP BY a.cuenta_no, c.departamento"
+                    DECLARE busca_entrada1 CURSOR FROM l_sql
 
                     LET idx = 1
-                    FOREACH busca_entrada1
+                    FOREACH busca_entrada1 USING xentrada
                         INTO transac[idx].cuenta,
                             transac[idx].departamento,
                             transac[idx].debito,
@@ -244,15 +241,16 @@ FUNCTION cgpcad004()
     END IF
 
     IF cheques = "CK" THEN
-        SET CONNECTION "IFMX"
+        -- G6: antes SET CONNECTION "IFMX" (EXTERIOR); ahora cross-DB sobre la conexion unica
         INPUT BY NAME fecha1, fecha2, pcuenta_no
             AFTER FIELD pcuenta_no
-                SELECT a.descripcion
-                    INTO pdescripcion
-                    FROM cgtb00001 a
-                    WHERE a.cuenta_no = pcuenta_no AND a.status_t IS NULL
+                LET l_sql = "SELECT a.descripcion FROM exterior.dbo.cgtb00001 a",
+                    " WHERE a.cuenta_no = ? AND a.status_t IS NULL"
+                PREPARE p_ex_ck FROM l_sql
+                LET pdescripcion = NULL
+                EXECUTE p_ex_ck USING pcuenta_no INTO pdescripcion
 
-                IF STATUS = NOTFOUND THEN
+                IF pdescripcion IS NULL THEN
                     CALL msg(3)
                     NEXT FIELD pcuenta_no
                 END IF
@@ -262,18 +260,15 @@ FUNCTION cgpcad004()
                 EXIT INPUT
         END INPUT
 
-        DECLARE busca_cheques CURSOR FOR
-            SELECT A.CUENTA_NO, c.DEPARTAMENTO, SUM(c.DEBITO), SUM(c.CREDITO)
-                FROM cgtb00001 a, cgtb00004 c
-                WHERE a.cuenta_no = c.cuenta_no
-                    AND c.status_t IS NULL
-                    AND c.fecha BETWEEN fecha1 AND fecha2
-                    AND detalles = pcuenta_no
-                GROUP BY A.CUENTA_NO, c.DEPARTAMENTO
-                ORDER BY a.cuenta_no
+        LET l_sql = "SELECT a.cuenta_no, c.departamento, SUM(c.debito), SUM(c.credito)",
+            " FROM exterior.dbo.cgtb00001 a, exterior.dbo.cgtb00004 c",
+            " WHERE a.cuenta_no = c.cuenta_no AND c.status_t IS NULL",
+            " AND c.fecha BETWEEN ? AND ? AND c.detalles = ?",
+            " GROUP BY a.cuenta_no, c.departamento ORDER BY a.cuenta_no"
+        DECLARE busca_cheques CURSOR FROM l_sql
 
         LET idx = 1
-        FOREACH busca_cheques
+        FOREACH busca_cheques USING fecha1, fecha2, pcuenta_no
             INTO transac[idx].cuenta,
                 transac[idx].departamento,
                 transac[idx].debito,
@@ -283,7 +278,7 @@ FUNCTION cgpcad004()
 
     END IF
     IF cheques = "CP" THEN
-        SET CONNECTION "IFMX"
+        -- G6: antes SET CONNECTION "IFMX" (EXTERIOR); ahora cross-DB sobre la conexion unica
         INPUT BY NAME pcod_sp, fecha1, fecha2
             AFTER FIELD pcod_sp
                 IF pcod_sp IS NULL THEN
@@ -291,12 +286,10 @@ FUNCTION cgpcad004()
                     NEXT FIELD pcod_sp
                 END IF
             AFTER FIELD fecha2
-                SELECT COUNT(*)
-                    INTO registros
-                    FROM cptb00003 a
-                    WHERE a.fecha BETWEEN fecha1 AND fecha2
-                        AND a.cod_sp = pcod_sp
-                        AND a.status_t IS NULL
+                LET l_sql = "SELECT COUNT(*) FROM exterior.dbo.cptb00003 a",
+                    " WHERE a.fecha BETWEEN ? AND ? AND a.cod_sp = ? AND a.status_t IS NULL"
+                PREPARE p_ex_cxp FROM l_sql
+                EXECUTE p_ex_cxp USING fecha1, fecha2, pcod_sp INTO registros
 
                 IF registros < 0 OR registros IS NULL THEN
                     CALL msg(3)
@@ -306,27 +299,15 @@ FUNCTION cgpcad004()
                 EXIT INPUT
         END INPUT
 
-        DECLARE busca_cxp CURSOR FOR
-            SELECT A.CUENTA_NO,
-                a.DEPARTAMENTO,
-                a.cod_aux,
-                a.cod_sec,
-                a.num_doc,
-                SUM(a.DEBITO),
-                SUM(a.CREDITO)
-                FROM cptb00003 a
-                WHERE a.status_t IS NULL
-                    AND a.cod_sp = pcod_sp
-                    AND a.fecha BETWEEN fecha1 AND fecha2
-                GROUP BY A.CUENTA_NO,
-                    a.DEPARTAMENTO,
-                    a.cod_aux,
-                    a.cod_Sec,
-                    a.num_doc
-                ORDER BY a.num_doc DESC, 6 DESC, 2
+        LET l_sql = "SELECT a.cuenta_no, a.departamento, a.cod_aux, a.cod_sec, a.num_doc,",
+            " SUM(a.debito), SUM(a.credito) FROM exterior.dbo.cptb00003 a",
+            " WHERE a.status_t IS NULL AND a.cod_sp = ? AND a.fecha BETWEEN ? AND ?",
+            " GROUP BY a.cuenta_no, a.departamento, a.cod_aux, a.cod_sec, a.num_doc",
+            " ORDER BY a.num_doc DESC, 6 DESC, 2"
+        DECLARE busca_cxp CURSOR FROM l_sql
 
         LET idx = 1
-        FOREACH busca_cxp
+        FOREACH busca_cxp USING pcod_sp, fecha1, fecha2
             INTO transac[idx].cuenta,
                 transac[idx].departamento,
                 transac[idx].cod_aux,
@@ -711,18 +692,22 @@ FUNCTION cgpcad004()
         END IF
      
         LET r_filename = "cgprmt004.4rp"
-        LET r_output = "SVG"
+        -- G6: el visor SVG (GRV) solo existe en GDC; en el navegador (GBC) se cuelga -> PDF
+        LET r_output = getPreviewDevice()
         #LET preview = 1
 
         -- configure report engine; the functions prefixed fgl that are called here are part of the GRW API
         IF fgl_report_loadCurrentSettings(r_filename) THEN -- load the .4rp file
             CALL fgl_report_selectDevice(r_output) -- changing default
-            IF preview = 0 THEN
+            IF r_output <> "SVG" THEN
+                CALL fgl_report_selectPreview(1)
+            ELSE IF preview = 0 THEN
                 CALL fgl_report_selectPreview(1) -- changing default
                 CALL fgl_report_configureSVGPreview("PrintOnDefaultPrinter")
             ELSE
                 CALL fgl_report_selectPreview(preview)
             END IF
+            END IF
 
             LET handler = fgl_report_commitCurrentSettings() -- commit changes
         ELSE
@@ -896,11 +881,12 @@ FUNCTION cgpcmf004()
     END IF
 
     LET selec =
-        "SELECT DISTINCT CONVERT(char(10),a.fecha,103),a.ref,a.tipo,a.detalle_1,a.detalle_2 ",
+        -- G6: sin CONVERT(char(10),fecha,103): el texto dd/mm/aaaa no entra en un DATE (-1205)
+        "SELECT DISTINCT a.fecha,a.ref,a.tipo,a.detalle_1,a.detalle_2 ",
         "FROM cgtb00004 a  ",
         "WHERE  ",
         criterio CLIPPED,
-        "  AND a.tipo IN(1,3) ORDER BY CONVERT(char(10),a.fecha,103),a.ref"
+        "  AND a.tipo IN(1,3) ORDER BY a.fecha,a.ref"
     DISPLAY "seleccion: ", selec
     PREPARE busca FROM selec
     DECLARE datos SCROLL CURSOR FOR busca
@@ -1684,21 +1670,21 @@ FUNCTION cheques1()
             debito DEC(12, 2),
             credito DEC(12, 2)
         END RECORD
+    DEFINE l_sql STRING   -- G6: SQL dinamico cross-DB a EXTERIOR
 
     OPEN WINDOW cgfmwd011
         AT 15, 10
         WITH FORM "cgfmwd011"
         ATTRIBUTE(BORDER, FORM LINE FIRST + 1, COMMENT LINE LAST)
-    SET CONNECTION "IFMX"
+    -- G6: antes SET CONNECTION "IFMX" (EXTERIOR); ahora cross-DB sobre la conexion unica
     INPUT BY NAME kfecha1, kfecha2, kcuenta_no
         AFTER FIELD kcuenta_no
             IF kcuenta_no IS NOT NULL THEN
-                SELECT a.descripcion
-                    INTO kdescripcion
-                    FROM cgtb00001 a
-                    WHERE a.cuenta_no = kcuenta_no
-
-                IF STATUS = NOTFOUND THEN
+                LET l_sql = "SELECT a.descripcion FROM exterior.dbo.cgtb00001 a WHERE a.cuenta_no = ?"
+                PREPARE p_ex_cta FROM l_sql
+                LET kdescripcion = NULL
+                EXECUTE p_ex_cta USING kcuenta_no INTO kdescripcion
+                IF kdescripcion IS NULL THEN
                     CALL msg(3)
                     NEXT FIELD kcuenta_no
                 END IF
@@ -1715,22 +1701,15 @@ FUNCTION cheques1()
             END IF
     END INPUT
 
-    DECLARE busca_ex CURSOR FOR
-        SELECT A.CUENTA_NO,
-            A.DESCRIPCION,
-            c.DEPARTAMENTO,
-            SUM(c.DEBITO),
-            SUM(c.CREDITO)
-            FROM cgtb00001 a, cgtb00004 c
-            WHERE a.cuenta_no = c.cuenta_no
-                AND c.status_t IS NULL
-                AND c.fecha BETWEEN kfecha1 AND kfecha2
-                AND detalles = kcuenta_no
-            GROUP BY A.CUENTA_NO, A.DESCRIPCION, c.DEPARTAMENTO
-            ORDER BY a.cuenta_no
+    LET l_sql = "SELECT a.cuenta_no, a.descripcion, c.departamento, SUM(c.debito), SUM(c.credito)",
+        " FROM exterior.dbo.cgtb00001 a, exterior.dbo.cgtb00004 c",
+        " WHERE a.cuenta_no = c.cuenta_no AND c.status_t IS NULL",
+        " AND c.fecha BETWEEN ? AND ? AND c.detalles = ?",
+        " GROUP BY a.cuenta_no, a.descripcion, c.departamento ORDER BY a.cuenta_no"
+    DECLARE busca_ex CURSOR FROM l_sql
 
     LET idx = 1
-    FOREACH busca_ex INTO kdetalle[idx].*
+    FOREACH busca_ex USING kfecha1, kfecha2, kcuenta_no INTO kdetalle[idx].*
         LET transac[idx].cuenta = kdetalle[idx].cuenta_no
         LET transac[idx].departamento = kdetalle[idx].departamento
         LET transac[idx].debito = kdetalle[idx].debito
diff --git a/PROYECTO/cgdir/cgprmt022.4gl b/PROYECTO/cgdir/cgprmt022.4gl
index bca5c36..2e95654 100644
--- a/PROYECTO/cgdir/cgprmt022.4gl
+++ b/PROYECTO/cgdir/cgprmt022.4gl
@@ -19,7 +19,8 @@ GLOBALS
    CALL ARG_VAL(1) RETURNING usuarios
    CALL ARG_VAL(2) RETURNING clave
 
-   CONNECT to "marmotech" AS "MSSQL" USER  usuarios USING clave
+   -- G6: "marmotech" no existe en el fglprofile (-6366); el binario de produccion (E:\MARMOTECH\BIN320 = EXTERIOR) conecta a smarmotech
+   CONNECT to "smarmotech" AS "MSSQL" USER  usuarios USING clave
    CALL cgprmt022()
 END MAIN
 FUNCTION cgprmt022()
diff --git a/PROYECTO/cgdir/cgprmt037.4gl b/PROYECTO/cgdir/cgprmt037.4gl
index 597a218..dd41e31 100644
--- a/PROYECTO/cgdir/cgprmt037.4gl
+++ b/PROYECTO/cgdir/cgprmt037.4gl
@@ -471,7 +471,7 @@ DISPLAY solicitud.cuenta_no1
           ELSE
            COMMIT WORK 
             LET r_filename ="cgprmt037.4rp"
-  LET r_output = "SVG"
+  LET r_output = getPreviewDevice()   -- G6: SVG (GRV) solo en GDC; en web cuelga -> PDF
   #LET preview = 1
 
    -- configure report engine; the functions prefixed fgl that are called here are part of the GRW API
@@ -880,7 +880,7 @@ DIALOG ATTRIBUTES (UNBUFFERED,FIELD ORDER FORM )
 
     ON ACTION imprimir
      LET r_filename ="cgprmt037.4rp"
-  LET r_output = "SVG"
+  LET r_output = getPreviewDevice()   -- G6: SVG (GRV) solo en GDC; en web cuelga -> PDF
      IF fgl_report_loadCurrentSettings(r_filename) THEN    -- load the .4rp file
      CALL fgl_report_selectDevice(r_output)                          -- changing default
           CALL fgl_report_selectPreview(true)                          
@@ -940,7 +940,7 @@ DIALOG ATTRIBUTES (UNBUFFERED,FIELD ORDER FORM )
           ELSE
            COMMIT WORK 
              LET r_filename ="cgprmt037.4rp"
-  LET r_output = "SVG"
+  LET r_output = getPreviewDevice()   -- G6: SVG (GRV) solo en GDC; en web cuelga -> PDF
      IF fgl_report_loadCurrentSettings(r_filename) THEN    -- load the .4rp file
      CALL fgl_report_selectDevice(r_output)                          -- changing default
           CALL fgl_report_selectPreview(true)                          
diff --git a/PROYECTO/cgdir/cgprrp008.4gl b/PROYECTO/cgdir/cgprrp008.4gl
index fbd8a9a..d075eb1 100644
--- a/PROYECTO/cgdir/cgprrp008.4gl
+++ b/PROYECTO/cgdir/cgprrp008.4gl
@@ -48,6 +48,7 @@ GLOBALS
    clave        CHAR(16)
   END RECORD
   DEFINE fecha_inicial,fecha_final DATE
+  DEFINE regenera SMALLINT   -- TRUE = corrida sin filtro: actualiza cgtb00016
 MAIN
  DEFER INTERRUPT
  CALL ARG_VAL(1) RETURNING usuarios
@@ -112,9 +113,15 @@ FUNCTION cgprrp008()
     END IF
     EXIT CONSTRUCT
    END CONSTRUCT
+    -- cgtb00016 (base de cgprrp012/013) solo se regenera cuando se corre el mes
+    -- COMPLETO; con filtro de cuenta se borraba el mes y se reinsertaban solo
+    -- las cuentas filtradas (balance incompleto).
+    LET regenera = (criterio.trim() = "1=1")
+    IF regenera THEN
     DELETE FROM cgtb00016 WHERE ano = p_ano AND mes=p_mes  AND programa='cgprrp012.4rp'
     DELETE FROM cgtb00016 WHERE ano = p_ano AND mes=p_mes  AND programa='cgprrp013.4rp' AND
                                 estado_m='390'
+    END IF
 
   LET p = 1
   LET selec = 
@@ -132,7 +139,7 @@ DISPLAY "cuenta ",cuenta_reg
   LET selec = 
      "SELECT b.cuenta_no,b.descripcion,b.estado_a,b.estado_m, ",
      "       ISNULL(SUM(a.debito),0),ISNULL(SUM(a.credito),0),b.nivel,b.analitico,b.aplica_a ",
-     "FROM cgtb00001 b LEFT OUTER JOIN cgtb00004_tmp a ON (a.cuenta_no = b.cuenta_no) AND (a.fecha BETWEEN ? AND ?) ",
+     "FROM cgtb00001 b LEFT OUTER JOIN cgtb00004 a ON (a.cuenta_no = b.cuenta_no) AND (a.fecha BETWEEN ? AND ?) ",
      "                                             AND (a.status_t IS NULL) ",
      "WHERE (a.status_t IS NULL) AND ",
      
@@ -290,7 +297,7 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
 # Balance Anterior
         LET x.cuenta_no = x.cuenta_no clipped
 
-        SELECT sum(debito-credito) INTO balan_ant FROM cgtb00004_tmp 
+        SELECT sum(debito-credito) INTO balan_ant FROM cgtb00004 
         WHERE (fecha < fecha1) and (cuenta_no[1] = x.cuenta_no) and
               status_t is null
 
@@ -300,7 +307,7 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
 
 # Actividades del mes
        SELECT SUM(a.debito),SUM(a.credito) INTO x.debito,x.credito 
-       FROM cgtb00004_tmp a
+       FROM cgtb00004 a
        WHERE (a.cuenta_no[1] = x.cuenta_no) and a.status_t IS NULL AND 
              (a.fecha between fecha1 and fecha2) 
 
@@ -316,7 +323,7 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
 # Para Las Sub-control
     IF x.nivel > 1 THEN
        LET x.cuenta_no = x.cuenta_no clipped
-       SELECT SUM(a.debito-a.credito) INTO balan_ant FROM cgtb00004_tmp a
+       SELECT SUM(a.debito-a.credito) INTO balan_ant FROM cgtb00004 a
        WHERE (a.cuenta_no[1,2] = x.cuenta_no) and a.status_t IS NULL AND 
              (a.fecha < fecha1 )
         IF balan_ant is null THEN
@@ -325,14 +332,14 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
 
 # Actividades del mes
        SELECT SUM(a.debito),SUM(a.credito) INTO x.debito,x.credito 
-       FROM cgtb00004_tmp a
+       FROM cgtb00004 a
        WHERE (a.cuenta_no[1,2] = x.cuenta_no) and a.status_t IS NULL AND 
              (a.fecha between fecha1 and fecha2) 
 
 
 # Otras cuentas sub-controles (Balance Anterior)
         IF x.cuenta_no[3] != " "      THEN
-        SELECT SUM(a.debito-a.credito) INTO balan_ant FROM cgtb00004_tmp a
+        SELECT SUM(a.debito-a.credito) INTO balan_ant FROM cgtb00004 a
         WHERE (a.cuenta_no[1,3] = x.cuenta_no) and a.status_t IS NULL AND 
               (a.fecha < fecha1 )
         IF balan_ant is null THEN
@@ -340,13 +347,13 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
         END IF
 # Actividades del mes
        SELECT SUM(a.debito),SUM(a.credito) INTO x.debito,x.credito 
-       FROM cgtb00004_tmp a
+       FROM cgtb00004 a
        WHERE (a.cuenta_no[1,3] = x.cuenta_no) and a.status_t IS NULL AND 
              (a.fecha between fecha1 and fecha2) 
         END IF
 # Otras cuentas sub-controles (Actividades del mes)
        IF x.cuenta_no[4] != " "      THEN
-        SELECT SUM(a.debito-a.credito) INTO balan_ant FROM cgtb00004_tmp a
+        SELECT SUM(a.debito-a.credito) INTO balan_ant FROM cgtb00004 a
         WHERE (a.cuenta_no[1,4] = x.cuenta_no)  and a.status_t IS NULL AND 
               (a.fecha < fecha1 )
         IF balan_ant is null THEN
@@ -354,7 +361,7 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
         END IF
       
        SELECT SUM(a.debito),SUM(a.credito) INTO x.debito,x.credito 
-       FROM cgtb00004_tmp a
+       FROM cgtb00004 a
        WHERE (a.cuenta_no[1,4] = x.cuenta_no) and a.status_t IS NULL AND 
              (a.fecha between fecha1 and fecha2) 
        END IF
@@ -382,11 +389,13 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
      #END IF
      LET balan_act = balan_ant + actividad
 
+       IF regenera THEN
          INSERT INTO cgtb00016(ano,mes,cuenta_no,estado_a,estado_m,balance_ant,actividad,balance_act,programa,descripcion,
                                primern,debito,credito)
          VALUES (p_ano,p_mes,x.cuenta_no,x.estado_a,x.estado_m,
                                        balan_ant,actividad,balan_act,'cgprrp012.4rp',x.descripcion,x.nivel,
                                        x.debito,x.credito)
+       END IF
 
          IF valor_88_act is null THEN
             LET valor_88_act = 0
@@ -408,7 +417,7 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
     IF x.nivel > 2 THEN
 
  # Balance Inicial
-     SELECT SUM(b.debito - b.credito) INTO balance FROM cgtb00004_tmp b
+     SELECT SUM(b.debito - b.credito) INTO balance FROM cgtb00004 b
      WHERE (b.cuenta_no=x.cuenta_no) AND b.status_t IS NULL AND (b.fecha < fecha1) 
 
          IF balance IS NULL THEN
@@ -435,11 +444,13 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
                   COLUMN 112, balance + actividad USING "((,(((,(((,(((.##)"
       #   END IF         
          LET balan_act = balance + actividad
+       IF regenera THEN
          INSERT INTO cgtb00016 (ano,mes,cuenta_no,estado_a,estado_m,balance_ant,actividad,balance_act,programa,
                                 descripcion,primern,debito,credito)
          VALUES (p_ano,p_mes,x.cuenta_no,x.estado_a,x.estado_m,
                                        balance,actividad,balan_act,'cgprrp012.4rp',x.descripcion,x.nivel,
                                        x.debito,x.credito)
+       END IF
      END IF
 
 # Busca las cuentas que tienen que ver con el beneficio neto  
@@ -482,7 +493,7 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
          FOREACH busca INTO x.cuenta_no,x.descripcion,x.estado_a,x.estado_m
 
         LET x.cuenta_no = x.cuenta_no clipped
-        SELECT sum(a.debito-a.credito) INTO balan_ant FROM cgtb00004_tmp a
+        SELECT sum(a.debito-a.credito) INTO balan_ant FROM cgtb00004 a
         WHERE (a.cuenta_no[1] = x.cuenta_no) and (a.fecha < fecha1) and
               a.status_t is null
 
@@ -492,7 +503,7 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
 
 # Actividades del mes
         SELECT SUM(a.debito),SUM(a.credito) INTO x.debito,x.credito 
-        FROM cgtb00004_tmp a
+        FROM cgtb00004 a
         WHERE (a.cuenta_no[1] = x.cuenta_no) and a.status_t IS NULL AND 
               (a.fecha between fecha1 and fecha2) 
 
@@ -557,8 +568,10 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
         PRINT COLUMN 1, "---------------------------------------------------",
                         "---------------------------------------------------",
                         "-------------------------------"
+    IF regenera THEN
     INSERT INTO cgtb00016 (ano,mes,estado_a,balance_ant,actividad,balance_act,programa,debito,credito)
         VALUES (p_ano,p_mes,'275',t_balan_ant,t_actividad,t_balan_act,'cgprrp012.4rp',t_debito,t_credito)
+    END IF
 
          SKIP TO TOP OF PAGE
          LET t_debito = 0
@@ -610,8 +623,10 @@ REPORT mayor_anal_gral(x,fecha1,fecha2)
 
         END IF
         
+        IF regenera THEN
         INSERT INTO cgtb00016 (ano,mes,estado_m,balance_ant,actividad,balance_act,programa,debito,credito)
         VALUES (p_ano,p_mes,'390',t_balan_ant,t_actividad,t_balan_act,'cgprrp013.4rp',t_debito,t_credito)
+        END IF
 
         
         PRINT COLUMN 1, "---------------------------------------------------",
diff --git a/PROYECTO/cgdir/cgprrp014.4gl b/PROYECTO/cgdir/cgprrp014.4gl
index 1dac34e..054afc3 100644
--- a/PROYECTO/cgdir/cgprrp014.4gl
+++ b/PROYECTO/cgdir/cgprrp014.4gl
@@ -90,7 +90,7 @@ END MAIN
      END IF
 
      CONSTRUCT criterio ON a.cuenta_no,a.num_doc,a.cod_aux,a.cod_Sec
-                         FROM cuenta_no,cod_sp,cod_sp_Sec,num_doc
+                         FROM cuenta_no,num_doc,cod_sp,cod_sp_sc   -- G6: el form tiene cod_sp_sc (no cod_sp_Sec, -1102) y el orden debe seguir a las columnas
 
      IF int_flag THEN
         LET numero_msg = 2
diff --git a/PROYECTO/cgdir/cgprrp022.4gl b/PROYECTO/cgdir/cgprrp022.4gl
index 89e8401..ae2bcf0 100644
--- a/PROYECTO/cgdir/cgprrp022.4gl
+++ b/PROYECTO/cgdir/cgprrp022.4gl
@@ -89,7 +89,7 @@ FUNCTION cgprrp022()
 }
 
 
-    CALL configureoutput("SVG") RETURNING HANDLER
+    CALL configureoutput(getPreviewDevice()) RETURNING HANDLER   -- G6: SVG (GRV) solo en GDC; en web cuelga -> PDF
     
     START REPORT imp_entrada TO XML HANDLER handler
    
diff --git a/PROYECTO/cgdir/edprrp029.4gl b/PROYECTO/cgdir/edprrp029.4gl
index 51ce951..a400ff7 100644
--- a/PROYECTO/cgdir/edprrp029.4gl
+++ b/PROYECTO/cgdir/edprrp029.4gl
@@ -191,7 +191,7 @@ FUNCTION edprrp029()
                RETURN
             END IF
             IF idx = 1 THEN
-               CALL configureoutput("SVG") RETURNING handler 
+               CALL configureoutput(getPreviewDevice()) RETURNING handler   -- G6: SVG (GRV) solo en GDC; en web cuelga -> PDF 
                START REPORT prn_credito TO XML HANDLER HANDLER
       
             END IF
@@ -226,7 +226,7 @@ FUNCTION edprrp029()
        CALL fgl_winmessage("INFO","NO EXISTEN REGISTROS CON ESTAS CONDICIONES","INFO")     
      END IF
  {    IF fgl_report_loadCurrentSettings("formato_entrada.4rp") THEN    -- load the .4rp file
-        CALL fgl_report_selectDevice("SVG")                          -- changing default
+        CALL fgl_report_selectDevice(getPreviewDevice())                          -- changing default
         CALL fgl_report_selectPreview(1)                          
         LET handler = fgl_report_commitCurrentSettings()
         START REPORT prn_credito TO XML HANDLER HANDLER
@@ -250,7 +250,7 @@ FUNCTION edprrp029()
                RETURN
             END IF
             IF idx = 1 THEN
-               CALL configureoutput("SVG") RETURNING HANDLER 
+               CALL configureoutput(getPreviewDevice()) RETURNING HANDLER 
    
                START REPORT ed29 TO XML HANDLER HANDLER       
             END IF
diff --git a/PROYECTO/cgdir/edprrp080.4gl b/PROYECTO/cgdir/edprrp080.4gl
index 6125c85..b0eec82 100644
--- a/PROYECTO/cgdir/edprrp080.4gl
+++ b/PROYECTO/cgdir/edprrp080.4gl
@@ -238,9 +238,17 @@ FUNCTION ipprrp004()
     LET idx = 1
     LET acumulado.nombre_Cia = p_compania.nombre
 
-    CALL controlNumericoED(
-        numero_ent, fecha_final, usuarios)
-        RETURNING entrada_d
+    -- Solo se consume la secuencia en cgtb00011 si se AFECTA el mayor;
+    -- con afecta = "NO" se pide el numero en modo consulta (sin INSERT/UPDATE).
+    IF afecta = "SI" THEN
+        CALL controlNumericoED(
+            numero_ent, fecha_final, usuarios)
+            RETURNING entrada_d
+    ELSE
+        CALL controlNumericoED(
+            numero_ent, fecha_final, NULL)
+            RETURNING entrada_d
+    END IF
     DISPLAY "entrada real: ", entrada_d
 
     DISPLAY BY NAME entrada_d
diff --git a/PROYECTO/config/Application.xcf b/PROYECTO/config/Application.xcf
index d3ce934..8fd7962 100644
--- a/PROYECTO/config/Application.xcf
+++ b/PROYECTO/config/Application.xcf
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <APPLICATION Parent="defaultgwc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://4js.com/ns/gas/4.00/cfextwa.xsd">
   <EXECUTION>
+    <ENVIRONMENT_VARIABLE Id="DBDATE">dmy4</ENVIRONMENT_VARIABLE>
     <PATH>$(res.deployment.path)</PATH>
     <MODULE>Application.42r</MODULE>
   </EXECUTION>
diff --git a/PROYECTO/config/Main_prg.xcf b/PROYECTO/config/Main_prg.xcf
index 52ca544..4afe93c 100644
--- a/PROYECTO/config/Main_prg.xcf
+++ b/PROYECTO/config/Main_prg.xcf
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <APPLICATION Parent="defaultgwc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://4js.com/ns/gas/4.00/cfextwa.xsd">
   <EXECUTION>
+    <ENVIRONMENT_VARIABLE Id="DBDATE">dmy4</ENVIRONMENT_VARIABLE>
     <PATH>$(res.deployment.path)</PATH>
     <MODULE>Main_prg</MODULE>
   </EXECUTION>
diff --git a/PROYECTO/irdir/irprcs001.4gl b/PROYECTO/irdir/irprcs001.4gl
index 86452a1..8a8c2e7 100644
--- a/PROYECTO/irdir/irprcs001.4gl
+++ b/PROYECTO/irdir/irprcs001.4gl
@@ -12,6 +12,10 @@ GLOBALS
   
 MAIN                
    DEFER INTERRUPT
+   -- G6: no conectaba (solo SCHEMA en irprgb000) y el VM terminaba al arrancar
+   CALL ARG_VAL(1) RETURNING usuarios
+   CALL ARG_VAL(2) RETURNING clave
+   CONNECT TO "smarmotech" USER usuarios USING clave
    SELECT * INTO p_companias.* FROM companias
    CALL irprcs001()
 END MAIN
diff --git a/PROYECTO/irdir/irprmt021.4gl b/PROYECTO/irdir/irprmt021.4gl
index 4bc895f..dcfd725 100644
--- a/PROYECTO/irdir/irprmt021.4gl
+++ b/PROYECTO/irdir/irprmt021.4gl
@@ -91,7 +91,7 @@ FUNCTION ipprmt021()
           
               
                      UPDATE irtb00057 SET us_mod=usuarios,fech_mod=getdate(),
-                                          estado_proceso = arr_busqueda[arr_curr()].idestado
+                                          idestado = arr_busqueda[arr_curr()].idestado   -- G6: estado_proceso no existe en irtb00057 (-207)
                       WHERE numero_doc = arr_busqueda[arr_curr()].numeroid AND
                             cod_mov = arr_busqueda[arr_curr()].cod_mov 
 
diff --git a/PROYECTO/irdir/irprmt066.4gl b/PROYECTO/irdir/irprmt066.4gl
index 44e327d..53bcf56 100644
--- a/PROYECTO/irdir/irprmt066.4gl
+++ b/PROYECTO/irdir/irprmt066.4gl
@@ -186,8 +186,9 @@ FUNCTION irprmt066()
             DISPLAY answer 
 
             IF answer IS NULL THEN 
-            DISPLAY "AQUI 1"
-                ROLLBACK WORK 
+            -- G6: sin id MaintainX no hay nada que sincronizar; antes hacia ROLLBACK
+            -- (deshacia la anulacion) y luego el COMMIT caia -255 Not in transaction
+                CONTINUE FOR
             ELSE
 
                 select sum(cantidad_2) INTO APIexistencia from irtb00006 
@@ -206,8 +207,9 @@ FUNCTION irprmt066()
             CALL ApiMaintainR('PATCH',answer, m_articulos.*, usuarios) RETURNING answer
 
             IF answer != 1 THEN 
-                                        DISPLAY "AQUI 6"
-                ROLLBACK WORK
+                ROLLBACK WORK   -- G6: fallo MaintainX: no seguir al COMMIT
+                CALL fgl_winmessage("ERROR","NO SE PUDO ACTUALIZAR MAINTAINX, ANULACION CANCELADA","stop")
+                GOTO salir
             ELSE
                 DISPLAY "SUCCESS"
             END IF
diff --git a/PROYECTO/irdir/irprrpcs008C.4rp b/PROYECTO/irdir/irprrpcs008C.4rp
index 3d7d599..aa88b37 100644
--- a/PROYECTO/irdir/irprrpcs008C.4rp
+++ b/PROYECTO/irdir/irprrpcs008C.4rp
@@ -15,7 +15,7 @@
                 <MINIPAGE name="Page Root" width="max" length="min" alignment="center">
                     <LAYOUTNODE name="Page Header" width="max" length="min" fontSize="12" fontBold="true" layoutDirection="topToBottom" baselineType="leftleft" port="anyPageHeader" floatingBehavior="enclosed">
                         <LAYOUTNODE name="LayoutNode16" width="min" length="max" alignment="near" layoutDirection="leftToRight" floatingBehavior="enclosed">
-                            <IMAGEBOX name="ImageBox1" length="39.7106" anchorX="0" anchorY="0" url="{{&quot;file:///E:/MASTER/IMAGENES/LOGO.JPG&quot;}}" intendedResolution="96"/>
+                            <IMAGEBOX name="ImageBox1" length="39.7106" anchorX="0" anchorY="0" url="{{&quot;IMAGENES/LOGO.JPG&quot;}}" intendedResolution="96"/>
                             <rtl:input-variable name="nombre_cia" type="FGLString" expectedLocation="expectedAhead"/>
                             <WORDBOX name="WordBox47" y="max-13cm" floatingBehavior="enclosed" text="{{nombre_cia.value}}"/>
                             <rtl:input-variable name="chfecha" type="FGLString" expectedLocation="expectedAhead"/>
diff --git a/PROYECTO/mbsERP.4pw b/PROYECTO/mbsERP.4pw
index c6250d2..3b22743 100644
--- a/PROYECTO/mbsERP.4pw
+++ b/PROYECTO/mbsERP.4pw
@@ -169,7 +169,7 @@
       <File filePath="../scripts/README.md"/>
     </Library>
   </Group>
-  <Group environment="value:CLASSPATH=$(ProjectDir)\\classes\\javax.mail.jar;$(CLASSPATH),file:FGLJVMPATH=C:\\Users\\alopez\\Java\\jdk8u504-b01-jre\\bin\\server\\jvm.dll,dir:JAVA_HOME=C:\\Users\\alopez\\Java\\jdk8u504-b01-jre,dirlist:PATH=C:\\Users\\alopez\\Java\\jdk8u504-b01-jre\\bin;C:\\Users\\alopez\\Java\\jdk8u504-b01-jre\\bin\\server;$(PATH)" id="788649802" label="MODULOS" language="Genero">
+  <Group environment="value:CLASSPATH=$(ProjectDir)\\classes\\javax.mail.jar;$(CLASSPATH),file:FGLJVMPATH=C:\\Users\\alopez\\Java\\jdk8u504-b01-jre\\bin\\server\\jvm.dll,dir:JAVA_HOME=C:\\Users\\alopez\\Java\\jdk8u504-b01-jre,dirlist:PATH=C:\\Users\\alopez\\Java\\jdk8u504-b01-jre\\bin;C:\\Users\\alopez\\Java\\jdk8u504-b01-jre\\bin\\server;$(PATH),value:DBDATE=dmy4" id="788649802" label="MODULOS" language="Genero">
     <Group id="446189093" label="ACTIVOS FIJOS">
       <Application binaryName="acprmt001" dependencies="-1026233879,-764824792,1581383228,493047263,749078683" id="-1582265126" label="acprmt001">
         <Configuration id="-1841901578" label="Configuration"/>
@@ -339,6 +339,7 @@
       <Application binaryName="cgprcs024" dependencies="-1026233879,2055924299,-764824792,-1423229125,-1298477600" environment="dir:FGLSPOOL=$(ProjectDir)/spool" externalDependencies="libgre.42x" id="-1284105049" label="cgprcs024">
         <Configuration id="-1111498947" label="Configuration"/>
         <File filePath="cgdir/cgprcs024.4gl"/>
+        <File filePath="bin/cgprcs024.4rp"/>
       </Application>
       <Application binaryName="cgprcs025" dependencies="-1026233879,2055924299,-764824792,-1298477600" id="-1718075300" label="cgprcs025">
         <Configuration id="-1429141437" label="Configuration"/>
@@ -444,6 +445,7 @@
         <File filePath="cgdir/cgfmmt037.4fd"/>
         <File filePath="cgdir/cgfmwd006.per"/>
         <File filePath="cgdir/cgfmrp017.per"/>
+        <File filePath="cgdir/cgfmcs026.4fd"/>
       </Library>
       <Library dependencies="-1026233879" binaryName="FUNCIONES_CG" id="2055924299" label="FUNCIONES_CG">
         <File filePath="cgdir/cgprgb000.4gl"/>
@@ -1455,7 +1457,8 @@
     <Package binaryName="mbs" dependencies="159917928,212784684,400358049" id="9486100" label="mbs" platform="Genero Application Server">
       <DynamicProperty name="packageId" value="mbsERP"/>
       <DynamicProperty name="packageLabel" value="mbsERP"/>
-      <Directory excludedFiles="Test.42r,*.4pdb" includedFiles="*.42?" label="Binaries" sourceDirectory="$(ProjectDir)/bin"/>
+      <Directory excludedFiles="Test.42r,*.4pdb" includedFiles="*.42?,*.4rp" label="Binaries" sourceDirectory="$(ProjectDir)/bin"/>
+      <Directory destinationDirectory="$(RootDir)/IMAGENES" includedFiles="*.png,*.PNG,*.jpg,*.JPG" label="Imagenes reportes" sourceDirectory="$(ProjectDir)/bin/IMAGENES"/>
       <Directory includedFiles="fglprofile,*.xcf,MANIFEST" label="Config" sourceDirectory="$(ProjectDir)/config"/>
       <Directory includedFiles="*.png,*.jpg,*.ttf,*.svg,image2font.txt" label="Images" sourceDirectory="$(ProjectDir)/images"/>
       <Directory includedFiles="*.42?" label="libgst" sourceDirectory="$(GSTLIBRARYDIR)/bin"/>
diff --git a/PROYECTO/nodir/cumpleanos1.4rp b/PROYECTO/nodir/cumpleanos1.4rp
index 4198ad7..295abd2 100644
--- a/PROYECTO/nodir/cumpleanos1.4rp
+++ b/PROYECTO/nodir/cumpleanos1.4rp
@@ -14,7 +14,7 @@
                 <MINIPAGE name="Page Root" width="max" length="max">
                     <LAYOUTNODE name="Page Header" width="max" length="min" port="anyPageHeader">
                         <MINIPAGE name="StripeLayouter3" width="min" length="max" layoutDirection="leftToRight">
-                            <IMAGEBOX name="ImageBox" floatingBehavior="enclosed" url="{{&quot;file:///f:/master/IMAGENES/logo_cumple.png&quot;}}" intendedResolution="120"/>
+                            <IMAGEBOX name="ImageBox" floatingBehavior="enclosed" url="{{&quot;IMAGENES/Logo.png&quot;}}" intendedResolution="120"/>
                             <WORDBOX name="WordBox1" width="15cm" color="#af1f59" fontSize="14" fontBold="true" floatingBehavior="enclosed" textAlignment="center" text="CUMPLEAÑOS DEL DIA"/>
                         </MINIPAGE>
                         <MINIPAGE name="Table Header" width="min" length="max" layoutDirection="leftToRight">
diff --git a/PROYECTO/otrodir/bodegas.4gl b/PROYECTO/otrodir/bodegas.4gl
index 1a3281d..3e9d0b5 100644
--- a/PROYECTO/otrodir/bodegas.4gl
+++ b/PROYECTO/otrodir/bodegas.4gl
@@ -31,10 +31,26 @@ FUNCTION bodegas(cb2)
     END IF
 
     IF cb2 = '2' THEN
+        -- G6: en 3.20 los programas de PROYECTOS (irprmt020/ipprmt020/inprmt020) usaban
+        -- la bodegas() de PROYECTOS\otrodir\funciones.4gl, que con '2' llena origen y
+        -- destino (solo activas); aqui solo llenaba destino y el combo bodega quedaba vacio
+        LET cbodegas = ui.combobox.forname("formonly.bodega")
+        DECLARE bbodegas2o CURSOR FOR
+            SELECT a.cod_bodega, a.descripcion
+                FROM intb00009 a
+                WHERE a.status_t IS NULL
+                ORDER BY a.descripcion
+        CALL cbodegas.clear()
+
+        FOREACH bbodegas2o INTO ketiquetas, detiquetas
+            CALL cbodegas.additem(ketiquetas, detiquetas)
+        END FOREACH
+
         LET cbodegas = ui.combobox.forname("formonly.bodega_destino")
         DECLARE bbodegas2 CURSOR FOR
             SELECT a.cod_bodega, a.descripcion
                 FROM intb00009 a
+                WHERE a.status_t IS NULL
                 ORDER BY a.descripcion
         CALL cbodegas.clear()
 
diff --git a/PROYECTO/resources/Application.xcf b/PROYECTO/resources/Application.xcf
index 31bd6cf..af18d7b 100644
--- a/PROYECTO/resources/Application.xcf
+++ b/PROYECTO/resources/Application.xcf
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <APPLICATION Parent="defaultgwc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.4js.com/ns/gas/3.20/cfextwa.xsd">
   <EXECUTION>
+    <ENVIRONMENT_VARIABLE Id="DBDATE">dmy4</ENVIRONMENT_VARIABLE>
     <PATH>$(res.deployment.path)</PATH>
     <MODULE>Application.42r</MODULE>
   </EXECUTION>
diff --git a/PROYECTO/resources/TopMenu.4st b/PROYECTO/resources/TopMenu.4st
new file mode 100644
index 0000000..2e7595e
--- /dev/null
+++ b/PROYECTO/resources/TopMenu.4st
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ANSI_X3.4-1968"?>
+<StyleList>
+  <Style name="Window.basic">
+     <StyleAttribute name="actionPanelPosition" value="none" />
+     <StyleAttribute name="ringMenuPosition" value="none" />
+  </Style>
+  
+  <Style name="encabezado">
+     <StyleAttribute name="backgroundColor" value="white" />
+     <StyleAttribute name="fontWeight" value="bold" />
+     <StyleAttribute name="fontSize" value="large" />
+  </Style>
+
+</StyleList>
diff --git a/PROYECTO/seguridad2.0/segprmt0001.4gl b/PROYECTO/seguridad2.0/segprmt0001.4gl
index e7bfc02..024dba2 100644
--- a/PROYECTO/seguridad2.0/segprmt0001.4gl
+++ b/PROYECTO/seguridad2.0/segprmt0001.4gl
@@ -26,7 +26,8 @@ MAIN --login y programa
 
     CALL ARG_VAL(1) RETURNING usuario
     CALL ARG_VAL(2) RETURNING clave
-    CONNECT TO "marmotech" AS "IFMX" USER usuario USING clave
+    -- G6: "marmotech" no esta en el fglprofile (-6366) y la conexion IFMX no se usa en el programa
+    #CONNECT TO "marmotech" AS "IFMX" USER usuario USING clave
     CONNECT TO "smarmotech" AS "MSSQL" USER usuario USING clave
 
     CALL segprmt0001()
@@ -248,7 +249,8 @@ FUNCTION segprmt0001()
 
         END INPUT
 
-        INPUT BY NAME propiedades.* ATTRIBUTES(WITHOUT DEFAULTS)
+        -- G6: seg0003.actualiza_controlcalidad (columna nueva) no esta en el form (-1102); no se edita aqui
+        INPUT BY NAME propiedades.nom_puesto THRU propiedades.requisicionescompras ATTRIBUTES(WITHOUT DEFAULTS)
 
             ON ACTION actualizar 
             ATTRIBUTES(TEXT = "actualizar", IMAGE = "fa-refresh")
diff --git a/PROYECTO/tedir/teprmt001.4gl b/PROYECTO/tedir/teprmt001.4gl
index 3bdfb88..95bbbf5 100644
--- a/PROYECTO/tedir/teprmt001.4gl
+++ b/PROYECTO/tedir/teprmt001.4gl
@@ -374,63 +374,17 @@ FUNCTION tepcad001()
 
         INPUT ARRAY documentos FROM record4.* ATTRIBUTES(WITHOUT DEFAULTS)
             BEFORE INPUT
-                # LET suma=0
-                IF tt_recibos != deposito.monto THEN
-                    CALL fgl_winmessage(
-                        "ERROR",
-                        "CANTIDAD DE RECIBOS DIFERENTE AL MONTO DEL DEPOSITO",
-                        "STOP")
+                -- G6: en GBC esta grilla (solo lectura) puede no recibir foco; la carga
+                -- vive en llena_documentos() y se repite al guardar
+                IF NOT llena_documentos() THEN
                     NEXT FIELD check1
                 END IF
-                FOR idx = 1 TO recibos.getLength()
-                    IF recibos[idx].check1 = "S" THEN
-
-                        IF recibos[idx].documento1 IS NOT NULL THEN
-                            LET documentos[idx].fecha = recibos[idx].fecha_doc
-                            LET documentos[idx].documento =
-                                recibos[idx].documento1
-                            LET documentos[idx].tipo_cliente =
-                                recibos[idx].tipo_cliente1
-                            LET documentos[idx].sec_cliente =
-                                recibos[idx].sec_cliente1
-                            LET documentos[idx].cliente =
-                                recibos[idx].nom_cliente
-                            LET documentos[idx].tipodocumento =
-                                recibos[idx].tipo_doc
-
-                            IF recibos[idx].valor1 < 0 THEN
-                                LET documentos[idx].valor =
-                                    recibos[idx].valor1 * -1
-
-                            ELSE
-
-                                LET documentos[idx].valor = recibos[idx].valor1
-                            END IF
-                            IF documentos[idx].documento IS NULL THEN
-                                CALL documentos.clear()
-                            END IF
-
-                        END IF
-                        # IF recibos[idx].check1="S" THEN
-
-                        # END IF
-                    END IF
-
-                END FOR
-
-                IF total IS NULL THEN
-                    LET total = 0
-                END IF
-                #IF suma IS NULL THEN
-                LET suma = 0
-                #END IF
-                FOR idx = 1 TO documentos.getLength()
-                    LET suma = suma + documentos[idx].valor
-                END FOR
-                DISPLAY BY NAME suma
-
         END INPUT
         ON ACTION guardar
+            -- G6: asegurar el detalle aunque la grilla nunca haya recibido foco
+            IF NOT llena_documentos() THEN
+                NEXT FIELD check1
+            END IF
 
             SELECT num_doc INTO deposito.num_doc FROM tetb00009
 
@@ -441,7 +395,7 @@ FUNCTION tepcad001()
             END IF
 
             DISPLAY BY NAME deposito.num_doc
-            IF suma != deposito.monto THEN
+            IF suma IS NULL OR suma = 0 OR suma != deposito.monto THEN   -- G6: NULL pasaba la validacion
                 CALL fgl_winmessage(
                     "ERROR",
                     "EL VALOR SUMADO DE LOS RECIBOS NO PUEDE SER DIFERENTE AL MONTO DEL DEPOSITO",
@@ -1275,3 +1229,66 @@ FUNCTION prd(p_fechas, puser)
     RETURN bandera
 END FUNCTION
 
+
+
+# G6: copia los recibos marcados (check1='S') a documentos y totaliza en suma.
+# Devuelve FALSE si el total de recibos no cuadra con el monto del deposito.
+FUNCTION llena_documentos()
+        CALL documentos.clear()
+        # LET suma=0
+        IF tt_recibos != deposito.monto THEN
+            CALL fgl_winmessage(
+                "ERROR",
+                "CANTIDAD DE RECIBOS DIFERENTE AL MONTO DEL DEPOSITO",
+                "STOP")
+            RETURN FALSE
+        END IF
+        FOR idx = 1 TO recibos.getLength()
+            IF recibos[idx].check1 = "S" THEN
+
+                IF recibos[idx].documento1 IS NOT NULL THEN
+                    LET documentos[idx].fecha = recibos[idx].fecha_doc
+                    LET documentos[idx].documento =
+                        recibos[idx].documento1
+                    LET documentos[idx].tipo_cliente =
+                        recibos[idx].tipo_cliente1
+                    LET documentos[idx].sec_cliente =
+                        recibos[idx].sec_cliente1
+                    LET documentos[idx].cliente =
+                        recibos[idx].nom_cliente
+                    LET documentos[idx].tipodocumento =
+                        recibos[idx].tipo_doc
+
+                    IF recibos[idx].valor1 < 0 THEN
+                        LET documentos[idx].valor =
+                            recibos[idx].valor1 * -1
+
+                    ELSE
+
+                        LET documentos[idx].valor = recibos[idx].valor1
+                    END IF
+                    IF documentos[idx].documento IS NULL THEN
+                        CALL documentos.clear()
+                    END IF
+
+                END IF
+                # IF recibos[idx].check1="S" THEN
+
+                # END IF
+            END IF
+
+        END FOR
+
+        IF total IS NULL THEN
+            LET total = 0
+        END IF
+        #IF suma IS NULL THEN
+        LET suma = 0
+        #END IF
+        FOR idx = 1 TO documentos.getLength()
+            LET suma = suma + documentos[idx].valor
+        END FOR
+        DISPLAY BY NAME suma
+
+    RETURN TRUE
+END FUNCTION