Renombrar selectOutput() a selectOutputSimple() para evitar choque
otrodir/selectoutput_simple.4gl definia FUNCTION selectOutput(), mismo nombre que otrodir/vesalidaimpresora.4gl (ya usado por Abel en noprcs006, ipprrp002, ipprrp003, ipprrp039, ipprrp044). Al mezclar ambos commits, cualquier programa que dependiera de FUNCIONESREPORT mas la libreria de Abel rompia por simbolo duplicado. Se renombra la funcion (y se actualizan sus 4 unicos llamados: ipprrp005, ipprrp009, ipprrp035, ipprrp036) sin tocar vesalidaimpresora.4gl, para no afectar los programas que Abel ya tiene funcionando con esa version. Recompilados y verificados los 4 programas tras el cambio. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -157,7 +157,7 @@ END IF
|
|||||||
LET r_filename ='ipprrp005.4rp'
|
LET r_filename ='ipprrp005.4rp'
|
||||||
LET preview = 1
|
LET preview = 1
|
||||||
|
|
||||||
CALL selectOutput() RETURNING r_output
|
CALL selectOutputSimple() RETURNING r_output
|
||||||
|
|
||||||
IF fgl_report_loadCurrentSettings(r_filename) THEN -- load the .4rp file
|
IF fgl_report_loadCurrentSettings(r_filename) THEN -- load the .4rp file
|
||||||
CALL fgl_report_selectDevice(r_output) -- changing default
|
CALL fgl_report_selectDevice(r_output) -- changing default
|
||||||
|
|||||||
@@ -393,7 +393,7 @@ END IF
|
|||||||
IF grafico = "SI" THEN
|
IF grafico = "SI" THEN
|
||||||
LET r_filename ='ipprrp009.4rp'
|
LET r_filename ='ipprrp009.4rp'
|
||||||
LET preview = 1
|
LET preview = 1
|
||||||
CALL selectOutput() RETURNING r_output
|
CALL selectOutputSimple() RETURNING r_output
|
||||||
|
|
||||||
IF fgl_report_loadCurrentSettings(r_filename) THEN -- load the .4rp file
|
IF fgl_report_loadCurrentSettings(r_filename) THEN -- load the .4rp file
|
||||||
CALL fgl_report_selectDevice(r_output) -- changing default
|
CALL fgl_report_selectDevice(r_output) -- changing default
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
===============================================================
|
===============================================================
|
||||||
PROGRAMA : IPPRRP035
|
PROGRAMA : IPPRRP035
|
||||||
OBJETIVO : COSTOS DE CALIDAD
|
OBJETIVO : COSTOS DE CALIDAD
|
||||||
DESARROLLADOR : Ing. Elvis García
|
DESARROLLADOR : Ing. Elvis Garc�a
|
||||||
===============================================================
|
===============================================================
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -177,7 +177,7 @@ FUNCTION ipprrp035()
|
|||||||
LET r_filename = "ipprrp035.4rp"
|
LET r_filename = "ipprrp035.4rp"
|
||||||
IF fgl_report_loadCurrentSettings(r_filename) THEN
|
IF fgl_report_loadCurrentSettings(r_filename) THEN
|
||||||
LET preview=1
|
LET preview=1
|
||||||
CALL selectoutput() RETURNING r_output
|
CALL selectOutputSimple() RETURNING r_output
|
||||||
CALL fgl_report_selectDevice(r_output) -- changing default
|
CALL fgl_report_selectDevice(r_output) -- changing default
|
||||||
CALL fgl_report_selectPreview(preview) -- changing default
|
CALL fgl_report_selectPreview(preview) -- changing default
|
||||||
LET handler = fgl_report_commitCurrentSettings() -- commit changes
|
LET handler = fgl_report_commitCurrentSettings() -- commit changes
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ FUNCTION ipprrp036()
|
|||||||
LET r_filename = "ipprrp036.4rp"
|
LET r_filename = "ipprrp036.4rp"
|
||||||
IF fgl_report_loadCurrentSettings(r_filename) THEN
|
IF fgl_report_loadCurrentSettings(r_filename) THEN
|
||||||
LET preview=1
|
LET preview=1
|
||||||
CALL selectoutput() RETURNING r_output
|
CALL selectOutputSimple() RETURNING r_output
|
||||||
CALL fgl_report_selectDevice(r_output) -- changing default
|
CALL fgl_report_selectDevice(r_output) -- changing default
|
||||||
CALL fgl_report_selectPreview(preview) -- changing default
|
CALL fgl_report_selectPreview(preview) -- changing default
|
||||||
LET handler = fgl_report_commitCurrentSettings() -- commit changes
|
LET handler = fgl_report_commitCurrentSettings() -- commit changes
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FUNCTION selectOutput()
|
FUNCTION selectOutputSimple()
|
||||||
DEFINE
|
DEFINE
|
||||||
r_output STRING, -- output format option
|
r_output STRING, -- output format option
|
||||||
r_action STRING, -- used to set preview option
|
r_action STRING, -- used to set preview option
|
||||||
|
|||||||
Reference in New Issue
Block a user