jsoto/MBS
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.40.251:3000/jsoto/MBS

Browse Source
This commit is contained in:
jpeguero
2026-08-28 19:22:35 -04:00
parent 6f50812bb1 052b80de34
commit 0d17478789
8 changed files with 56 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PROYECTO/codir/cofmcs009.per
+5 -5
View File
@@ -1,4 +1,4 @@
database marmotech database smarmotech
screen size 24 by 80 screen size 24 by 80
{ {
@@ -9,10 +9,10 @@ screen size 24 by 80
\g-----------------------------------------------------------------------------\g \g-----------------------------------------------------------------------------\g
Requi. Codigo Cantidad Precio Valor Requi. Codigo Cantidad Precio Valor
\g-----------------------------------------------------------------------------\g \g-----------------------------------------------------------------------------\g
[r1 ][c1 ][c2 ] [p1 ][v1 ] [r1 ][c1 ][c2 ] [p1 ][v1 ]
[r1 ][c1 ][c2 ] [p1 ][v1 ] [r1 ][c1 ][c2 ] [p1 ][v1 ]
[r1 ][c1 ][c2 ] [p1 ][v1 ] [r1 ][c1 ][c2 ] [p1 ][v1 ]
[r1 ][c1 ][c2 ] [p1 ][v1 ] [r1 ][c1 ][c2 ] [p1 ][v1 ]
Descripcion [d1 ] Descripcion [d1 ]
} }
end end
PROYECTO/codir/cofmwd016.per
+1 -1
View File
@@ -1,4 +1,4 @@
DATABASE marmotech DATABASE smarmotech
screen screen
{ {
Ship To [st ] Ship To [st ]
PROYECTO/codir/coprcs009.4gl
+4 -4
View File
@@ -243,10 +243,10 @@ LET idx = 1
FOREACH buscate INTO detalle1.* FOREACH buscate INTO detalle1.*
LET cs_ordena[idx].num_req = detalle1.num_req LET cs_ordena[idx].num_req = detalle1.num_req
LET cs_ordena[idx].codigo = detalle1.cod_n using "&","-", LET cs_ordena[idx].codigo = detalle1.cod_n using "##","-",
detalle1.cod_grupo using "&","-", detalle1.cod_grupo using "####","-",
detalle1.cod_tipo using "&&","-", detalle1.cod_tipo using "####","-",
detalle1.cod_sec using "&&&" detalle1.cod_sec using "#####"
LET cs_ordena[idx].cantidad = detalle1.cantidad using "##########.##" LET cs_ordena[idx].cantidad = detalle1.cantidad using "##########.##"
LET cs_ordena[idx].precio = detalle1.precio using "##########.##" LET cs_ordena[idx].precio = detalle1.precio using "##########.##"
PROYECTO/codir/coprgb000.4gl
+1 -1
View File
@@ -27,7 +27,7 @@ GLOBALS
DEFINE cs_ordena ARRAY [20] OF RECORD DEFINE cs_ordena ARRAY [20] OF RECORD
num_req INTEGER, num_req INTEGER,
codigo CHAR(10), codigo CHAR(20),
cantidad CHAR(14), cantidad CHAR(14),
precio CHAR(13), precio CHAR(13),
valor CHAR(14) valor CHAR(14)
PROYECTO/codir/coprmt009.4gl
+7 -5
View File
@@ -1037,6 +1037,9 @@ FUNCTION copcmf009()
CALL lugarentregas() CALL lugarentregas()
# Aqui se prepara para la captura del criterio de seleccion # Aqui se prepara para la captura del criterio de seleccion
-- cotb00014.bodega excluido: es el mismo combo oculto (tabIndex=-1) en
-- cofmmt009 que ya se excluye en copcad009(); el CONSTRUCT fallaba con
-- "Field (bodega) not found in form".
CONSTRUCT criterio CONSTRUCT criterio
ON cotb00014.num_oc, ON cotb00014.num_oc,
cotb00014.tipo, cotb00014.tipo,
@@ -1049,8 +1052,7 @@ FUNCTION copcmf009()
cotb00014.fech_enviada, cotb00014.fech_enviada,
cotb00014.pago, cotb00014.pago,
cotb00014.fech_pago, cotb00014.fech_pago,
cotb00014.cierre, cotb00014.cierre
cotb00014.bodega
FROM num_oc, FROM num_oc,
tipo, tipo,
fech_oc, fech_oc,
@@ -1062,8 +1064,7 @@ FUNCTION copcmf009()
fech_enviada, fech_enviada,
pago, pago,
fech_pago, fech_pago,
cierre, cierre
bodega
IF int_flag THEN IF int_flag THEN
LET numero_msg = 2 LET numero_msg = 2
@@ -2360,7 +2361,8 @@ FUNCTION escoge()
ordenes.pago, ordenes.pago,
ordenes.fech_pago ordenes.fech_pago
DISPLAY BY NAME ordenes.bodega -- ordenes.bodega excluido (ver nota en copcad009()): no esta en el
-- formulario, DISPLAY BY NAME fallaba con "Field (bodega) not found in form".
IF ordenes.cod_sp = 22 OR ordenes.cod_sp = 24 THEN IF ordenes.cod_sp = 22 OR ordenes.cod_sp = 24 THEN
LET flete1.total_1 = LET flete1.total_1 =
PROYECTO/codir/coprrp001.4gl
+5 -13
View File
@@ -144,19 +144,11 @@ FUNCTION coprrp001()
archivo, archivo,
copia copia
LET r_filename = 'coprrp001.4rp' -- La API de configuracion de reportes (fgl_report_*) no esta
CALL seleccionarSalida() RETURNING r_output -- disponible en este FGL; se escribe el XML directo a un archivo
-- en FGLSPOOL en lugar de usar la plantilla .4rp con vista previa.
LET preview = 1 LET r_filename = FGL_GETENV("FGLSPOOL"), "/coprrp001_catalogo.xml"
LET handler = om.XmlWriter.createFileWriter(r_filename)
IF fgl_report_loadCurrentSettings(r_filename) THEN -- load the .4rp file
CALL fgl_report_selectDevice(r_output) -- changing default
CALL fgl_report_selectPreview(preview) -- changing default
LET handler = fgl_report_commitCurrentSettings() -- commit changes
END IF
START REPORT catalogo2 TO XML HANDLER handler START REPORT catalogo2 TO XML HANDLER handler
#### Enviando la informacion al registro del reporte #### Enviando la informacion al registro del reporte
PROYECTO/codir/coprrp004.4gl
+9 -2
View File
@@ -35,6 +35,8 @@ FUNCTION coprrp004()
monto DECIMAL(12,2) monto DECIMAL(12,2)
END RECORD END RECORD
DEFINE r_filename STRING
#WHENEVER ERROR CONTINUE #WHENEVER ERROR CONTINUE
OPTIONS OPTIONS
@@ -115,8 +117,13 @@ END IF
# doce,normal,archivo,copia # doce,normal,archivo,copia
CALL seleccionarsalida() RETURNING salida -- La API de configuracion de reportes (fgl_report_*) no esta
CALL configureoutput(salida) RETURNING HANDLER -- disponible en este FGL; seleccionarsalida()/configureoutput()
-- tampoco estan definidas en este programa. Se escribe el XML
-- directo a un archivo en FGLSPOOL en lugar de usar la plantilla
-- .4rp con vista previa.
LET r_filename = FGL_GETENV("FGLSPOOL"), "/coprrp004_cronologico.xml"
LET handler = om.XmlWriter.createFileWriter(r_filename)
START REPORT cronologico TO XML HANDLER handler START REPORT cronologico TO XML HANDLER handler
PROYECTO/mbsERP.4pw
+23 -1
View File
@@ -190,12 +190,17 @@
<File filePath="codir/cofmwd015.per"/> <File filePath="codir/cofmwd015.per"/>
<File filePath="codir/cofmmt025.per"/> <File filePath="codir/cofmmt025.per"/>
<File filePath="codir/cofmcs005.per"/> <File filePath="codir/cofmcs005.per"/>
<File filePath="codir/cofmcs010.4fd"/>
<File filePath="codir/cofmcs009.per"/>
<File filePath="codir/cofmwd016.per"/>
<File filePath="codir/cofmrp001.per"/>
<File filePath="codir/cofmrp004.4fd"/>
</Library> </Library>
<Application binaryName="coprmt001" dependencies="-1026233879,-764824792,-700000015,-700000016" id="-700000017" label="coprmt001"> <Application binaryName="coprmt001" dependencies="-1026233879,-764824792,-700000015,-700000016" id="-700000017" label="coprmt001">
<Configuration commandLineArguments="alopez Lopez2023" id="-700000018" label="Configuration"/> <Configuration commandLineArguments="alopez Lopez2023" id="-700000018" label="Configuration"/>
<File filePath="codir/coprmt001.4gl"/> <File filePath="codir/coprmt001.4gl"/>
</Application> </Application>
<Application binaryName="coprmt009" dependencies="-1026233879,-764824792,-700000015,-700000016" externalDependencies="libgre.42x" id="-700000019" label="coprmt009"> <Application binaryName="coprmt009" dependencies="-1026233879,-764824792,-700000015,-700000016" environment="dir:FGLSPOOL=$(ProjectDir)/spool" externalDependencies="libgre.42x" id="-700000019" label="coprmt009">
<Configuration commandLineArguments="alopez Lopez2023 70" id="-700000020" label="Configuration"/> <Configuration commandLineArguments="alopez Lopez2023 70" id="-700000020" label="Configuration"/>
<File filePath="codir/coprmt009.4gl"/> <File filePath="codir/coprmt009.4gl"/>
<File filePath="bin/coprmt009.4rp"/> <File filePath="bin/coprmt009.4rp"/>
@@ -221,6 +226,23 @@
<Configuration commandLineArguments="alopez Lopez2023" id="-700000030" label="Configuration"/> <Configuration commandLineArguments="alopez Lopez2023" id="-700000030" label="Configuration"/>
<File filePath="codir/coprcs005.4gl"/> <File filePath="codir/coprcs005.4gl"/>
</Application> </Application>
<Application binaryName="coprcs010" dependencies="-1026233879,-764824792,-700000015,-700000016" id="-700000031" label="coprcs010">
<Configuration commandLineArguments="alopez Lopez2023" id="-700000032" label="Configuration"/>
<File filePath="codir/coprcs010.4gl"/>
</Application>
<Application binaryName="coprcs009" dependencies="-1026233879,-764824792,-700000015,-700000016" id="-700000033" label="coprcs009">
<Configuration commandLineArguments="alopez Lopez2023" id="-700000034" label="Configuration"/>
<File filePath="codir/coprcs009.4gl"/>
</Application>
<Application binaryName="coprrp001" dependencies="-1026233879,-764824792,-700000015,-700000016,-1423229125" environment="dir:FGLSPOOL=$(ProjectDir)/spool" externalDependencies="libgre.42x" id="-700000035" label="coprrp001">
<Configuration commandLineArguments="alopez Lopez2023 70" id="-700000036" label="Configuration"/>
<File filePath="codir/coprrp001.4gl"/>
<File filePath="bin/coprrp001.4rp"/>
</Application>
<Application binaryName="coprrp004" dependencies="-1026233879,-764824792,-700000015,-700000016,-1423229125" environment="dir:FGLSPOOL=$(ProjectDir)/spool" id="-700000037" label="coprrp004">
<Configuration commandLineArguments="alopez Lopez2023 70" id="-700000038" label="Configuration"/>
<File filePath="codir/coprrp004.4gl"/>
</Application>
</Group> </Group>
<Group id="-1298100213" label="CONTABILIDAD GENERAL"> <Group id="-1298100213" label="CONTABILIDAD GENERAL">
<Application binaryName="cgprmt001" dependencies="2055924299,-1026233879" id="-1385997751" label="cgprmt001"> <Application binaryName="cgprmt001" dependencies="2055924299,-1026233879" id="-1385997751" label="cgprmt001">