jsoto/MBS
1
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 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
jpeguero
2026-08-25 12:26:42 -04:00
parent 9ce99926e1
commit 18cf673753
10 changed files with 341 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PROYECTO/cpdir/cpfmrp017.per
+1 -1
View File
@@ -1,4 +1,4 @@
database marmotech
database smarmotech
screen
{
PROYECTO/cpdir/cpprrp011.4gl
+11 -2
View File
@@ -18,6 +18,8 @@ GLOBALS
decide CHAR(1),
entrada CHAR(14),
detalle1 CHAR(30)
DEFINE p_reportfile STRING
DEFINE p_ref_chk CHAR(50)
DEFINE prt_mvto11 RECORD
factura CHAR(10),
@@ -67,7 +69,8 @@ END MAIN
EXIT INPUT
END IF
AFTER FIELD entrada
SELECT UNIQUE a.ref FROM cgtb00004 a
display "DIAG AFTER FIELD entrada: [",entrada CLIPPED,"]"
SELECT UNIQUE a.ref INTO p_ref_chk FROM cgtb00004 a
WHERE a.ref = entrada
IF STATUS != NOTFOUND THEN
@@ -111,6 +114,7 @@ END MAIN
END IF
END INPUT
display "DIAG DESPUES DE INPUT: [",entrada CLIPPED,"]"
IF int_flag THEN
LET numero_msg = 2
@@ -119,7 +123,11 @@ END MAIN
RETURN
END IF
CALL configureoutput("SVG") RETURNING handler
-- La API de configuracion de reportes (fgl_report_*) no esta
-- disponible en este FGL; se escribe el XML directo a un archivo
-- en FGLSPOOL en lugar de la vista previa SVG.
LET p_reportfile = FGL_GETENV("FGLSPOOL"), "/cpprrp011_cuentasft.xml"
LET handler = om.XmlWriter.createFileWriter(p_reportfile)
START REPORT cuenta_ft TO XML HANDLER handler
DECLARE movto CURSOR FOR
@@ -355,6 +363,7 @@ END MAIN
LET t_debito = t_debito + reg_final.debito
LET t_credito = t_credito + reg_final.credito
IF decide = "S" THEN
display "DIAGNOSTICO decide=[",decide,"] entrada=[",entrada CLIPPED,"]"
INSERT INTO cgtb00004 (fecha, tipo, ref, cuenta_no,departamento, num_doc,
cod_aux, cod_sec, detalles, detalle_1, detalle_2, debito, credito, status_t,
us_crea, fech_crea, us_mod, fech_mod)
PROYECTO/cpdir/cpprrp017.4gl
+21 -4
View File
@@ -10,6 +10,7 @@
GLOBALS
"cpprgb000.4gl"
DEFINE selec1 CHAR(500)
DEFINE p_reportfile STRING
DEFINE mvto RECORD
fecha_in DATE,
@@ -34,6 +35,17 @@ GLOBALS
id INTEGER
END RECORD
MAIN
DEFER INTERRUPT
CALL ARG_VAL(1) RETURNING usuarios
CALL ARG_VAL(2) RETURNING clave
CONNECT to "smarmotech" user usuarios USING clave
SELECT a.* INTO p_companias.* FROM companias a
CALL cpprrp017()
END MAIN
FUNCTION cpprrp017()
CLEAR SCREEN
OPTIONS
@@ -41,7 +53,6 @@ GLOBALS
#WHENEVER ERROR CONTINUE
OPEN FORM cpfmrp017 FROM "cpfmrp017"
DISPLAY FORM cpfmrp017
CALL PANTALLA()
DISPLAY "cpprrp017" AT 4,3 ATTRIBUTE(blue)
DISPLAY "Validacion de Facturas" AT 6,29
LET int_flag = FALSE
@@ -60,7 +71,10 @@ GLOBALS
LET selec =
"SELECT a.factura,a.cod_sp,a.cod_sp_sec,b.nom_sp,a.fecha,c.valor, ",
" a.cuenta_no,a.departamento,a.cod_aux,a.cod_sec,a.num_doc, ",
" a.debito,a.credito,a.rowid ",
" a.debito,a.credito, ",
-- a.rowid es una pseudo-columna de Informix, no existe en SQL Server;
-- se sustituye por un numero de fila equivalente para el orden del reporte.
" ROW_NUMBER() OVER (ORDER BY a.factura) ",
"FROM cptb00003 a,cotb00001 b,cptb00001 c ",
"WHERE (a.cod_sp = b.cod_sp AND a.cod_sp_sec = b.cod_sp_sec) and ",
" (a.cod_sp = c.cod_sp AND a.cod_sp_sec = c.cod_sp_sec) and ",
@@ -74,7 +88,10 @@ GLOBALS
DECLARE movto CURSOR FOR comando
OPEN movto
START REPORT val_ctas TO "C:\\archivo"
-- La ruta original "C:\archivo" no es escribible sin privilegios de
-- administrador; se usa un archivo en FGLSPOOL en su lugar.
LET p_reportfile = FGL_GETENV("FGLSPOOL"), "/cpprrp017_valctas.txt"
START REPORT val_ctas TO p_reportfile
DISPLAY "<< " AT 19,14
DISPLAY "<< Impresion En Proceso .... Espere Por Favor. >>" AT 19,14
@@ -88,7 +105,7 @@ GLOBALS
OUTPUT TO REPORT val_ctas(prt_mvto11.*)
END WHILE
FINISH REPORT val_ctas
RUN "type C:\\archivo > %USPRINT%" END FUNCTION
END FUNCTION
REPORT val_ctas(x)
DEFINE x RECORD
PROYECTO/mbsERP.4pw
+18
View File
@@ -158,11 +158,19 @@
<Configuration binaryName="CreateDatabase" id="-341630738" label="CreateDatabase"/>
</Application>
</Group>
<Group id="1339562636" label="DOCUMENTACION" language="Genero">
<Library binaryName="SCRIPTS" id="-1793415793" label="SCRIPTS">
<File filePath="../scripts/build_mbs.cmd"/>
<File filePath="../scripts/deploy_mbs.cmd"/>
<File filePath="../scripts/README.md"/>
</Library>
</Group>
<Group environment="value:CLASSPATH=$(ProjectDir)\\classes\\javax.mail.jar;$(CLASSPATH)" id="788649802" label="MODULOS" language="Genero">
<Group id="446189093" label="ACTIVOS FIJOS">
<Library binaryName="FORMULARIOS_AC" id="749078683" label="FORMULARIOS_AC"/>
<Library binaryName="FUNCIONES_AC" id="1581383228" label="FUNCIONES_AC"/>
</Group>
<Group id="634755826" label="COMPRAS"/>
<Group id="-1298100213" label="CONTABILIDAD GENERAL">
<Application binaryName="cgprmt001" dependencies="2055924299,-1026233879" id="-1385997751" label="cgprmt001">
<Configuration id="-340886821" label="Configuration"/>
@@ -234,6 +242,14 @@
<Configuration commandLineArguments="alopez Lopez2023 70" id="-700000010" label="Configuration"/>
<File filePath="cpdir/cpprrp004.4gl"/>
</Application>
<Application binaryName="cpprrp011" dependencies="-594793224,-1026233879,-764824792,1811699727,-1423229125" environment="dir:FGLSPOOL=$(ProjectDir)/spool" id="-700000011" label="cpprrp011">
<Configuration commandLineArguments="alopez Lopez2023 70" id="-700000012" label="Configuration"/>
<File filePath="cpdir/cpprrp011.4gl"/>
</Application>
<Application binaryName="cpprrp017" dependencies="-594793224,-1026233879,-764824792,1811699727,-1423229125" environment="dir:FGLSPOOL=$(ProjectDir)/spool" id="-700000013" label="cpprrp017">
<Configuration commandLineArguments="alopez Lopez2023" id="-700000014" label="Configuration"/>
<File filePath="cpdir/cpprrp017.4gl"/>
</Application>
<Library binaryName="FORMULARIOS_CP" id="1811699727" label="FORMULARIOS_CP">
<File filePath="cpdir/cpfmmt001.4fd"/>
<File filePath="cpdir/cpfmmt002.4fd"/>
@@ -244,6 +260,8 @@
<File filePath="cpdir/cpfmrp002.per"/>
<File filePath="cpdir/cpfmrp003.per"/>
<File filePath="cpdir/cpfmrp004.per"/>
<File filePath="cpdir/cpfmrp010.per"/>
<File filePath="cpdir/cpfmrp017.per"/>
</Library>
<Library binaryName="FUNCIONES_CP" dependencies="-1026233879" id="-594793224" label="FUNCIONES_CP">
<File filePath="cpdir/cpprgb000.4gl"/>
PROYECTO/resources/mainmenu.4st
+98
View File
@@ -0,0 +1,98 @@
<StyleList>
<Style name="Window" >
<StyleAttribute value="normal" name="windowType" />
</Style>
<Style name="Window.main" >
<StyleAttribute value="normal" name="windowType" />
<StyleAttribute value="menu" name="startMenuPosition" />
</Style>
<Style name="Window.main-mbs" >
<StyleAttribute value="center" name="position" />
<StyleAttribute value="normal" name="windowType" />
<StyleAttribute value="none" name="actionPanelPosition" />
<StyleAttribute value="none" name="ringMenuPosition" />
<StyleAttribute value="none" name="statusBarType" />
</Style>
<Style name="Window.dialog" >
<StyleAttribute value="modal" name="windowType" />
<StyleAttribute value="no" name="sizable" />
<StyleAttribute value="center" name="position" />
<StyleAttribute value="bottom" name="actionPanelPosition" />
<StyleAttribute value="bottom" name="ringMenuPosition" />
<StyleAttribute value="none" name="toolBarPosition" />
<StyleAttribute value="none" name="statusBarType" />
<StyleAttribute value="popup" name="errorMessagePosition" />
</Style>
<Style name="Window.dialog2" >
<StyleAttribute value="modal" name="windowType" />
<StyleAttribute value="no" name="sizable" />
<StyleAttribute value="center" name="position" />
<StyleAttribute value="none" name="actionPanelPosition" />
<StyleAttribute value="none" name="ringMenuPosition" />
<StyleAttribute value="none" name="toolBarPosition" />
<StyleAttribute value="none" name="statusBarType" />
<StyleAttribute value="popup" name="errorMessagePosition" />
</Style>
<Style name="Window.dialog3" >
<StyleAttribute value="modal" name="windowType" />
<StyleAttribute value="yes" name="sizable" />
<StyleAttribute value="none" name="toolBarPosition" />
<StyleAttribute value="none" name="actionPanelPosition" />
<StyleAttribute value="none" name="ringMenuPosition" />
<StyleAttribute value="none" name="statusBarType" />
<StyleAttribute value="popup" name="errorMessagePosition" />
</Style>
<Style name="Window.dialog4" >
<StyleAttribute value="modal" name="windowType" />
<StyleAttribute value="yes" name="sizable" />
<StyleAttribute value="bottom" name="actionPanelPosition" />
<StyleAttribute value="none" name="ringMenuPosition" />
<StyleAttribute value="none" name="statusBarType" />
<StyleAttribute value="popup" name="errorMessagePosition" />
</Style>
<Style name="Window.naked" >
<StyleAttribute value="modal" name="windowType" />
<StyleAttribute value="tool" name="border" />
<StyleAttribute value="none" name="actionPanelPosition" />
<StyleAttribute value="none" name="ringMenuPosition" />
<StyleAttribute value="none" name="toolBarPosition" />
<StyleAttribute value="none" name="statusBarType" />
</Style>
<Style name="Window.viewer" >
<StyleAttribute value="modal" name="windowType" />
<StyleAttribute value="yes" name="windowSystemMenu" />
<StyleAttribute value="no" name="windowOptionMinimize" />
<StyleAttribute value="no" name="windowOptionMaximize" />
<StyleAttribute value="yes" name="sizable" />
<StyleAttribute value="none" name="actionPanelPosition" />
<StyleAttribute value="none" name="ringMenuPosition" />
<StyleAttribute value="none" name="toolBarPosition" />
<StyleAttribute value="none" name="statusBarType" />
</Style>
<Style name="edit:title" >
<StyleAttribute value="large" name="fontSize" />
<StyleAttribute value="fantasy" name="fontFamily" />
<StyleAttribute value="bold" name="textDecoration" />
</Style>
<Style name="programas" >
<StyleAttribute value="large" name="fontSize" />
<StyleAttribute value="fantasy" name="fontFamily" />
<StyleAttribute value="bold" name="textDecoration" />
</Style>
<Style name="Label:title" >
<StyleAttribute value="sans-serif" name="fontFamily" />
<StyleAttribute value="large" name="fontSize" />
<StyleAttribute value="normal" name="fontStyle" />
<StyleAttribute value="bold" name="fontWeight" />
</Style>
<Style name="Table:focus" >
<StyleAttribute value="#7E0C6E" name="highlightColor" />
</Style>
<Style name="Table.detail:even" >
<StyleAttribute value="#DECFDB" name="backgroundColor" />
</Style>
<Style name="Image.title" >
<StyleAttribute value="no" name="border" />
</Style>
</StyleList>
PROYECTO/resources/mainmenu_A.4st
+41
View File
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- MBS ERP - Look&Feel A : "Marmo" (marca corporativa, purpura) -->
<StyleList>
<Style name="Window"><StyleAttribute name="windowType" value="normal" /></Style>
<Style name="Window.main">
<StyleAttribute name="windowType" value="normal" />
<StyleAttribute name="startMenuPosition" value="menu" />
</Style>
<Style name="Window.main-mbs">
<StyleAttribute name="position" value="center" />
<StyleAttribute name="windowType" value="normal" />
<StyleAttribute name="backgroundColor" value="#FFFFFF" />
<StyleAttribute name="actionPanelPosition" value="none" />
<StyleAttribute name="ringMenuPosition" value="none" />
<StyleAttribute name="statusBarType" value="none" />
</Style>
<Style name="Window.dialog">
<StyleAttribute name="windowType" value="modal" />
<StyleAttribute name="sizable" value="no" />
<StyleAttribute name="position" value="center" />
<StyleAttribute name="actionPanelPosition" value="bottom" />
<StyleAttribute name="ringMenuPosition" value="bottom" />
<StyleAttribute name="toolBarPosition" value="none" />
<StyleAttribute name="statusBarType" value="none" />
<StyleAttribute name="errorMessagePosition" value="popup" />
</Style>
<Style name="Label:title">
<StyleAttribute name="fontSize" value="xx-large" />
<StyleAttribute name="fontFamily" value="sans-serif" />
<StyleAttribute name="fontWeight" value="bold" />
<StyleAttribute name="textColor" value="#7E0C6E" />
</Style>
<Style name="Table:focus">
<StyleAttribute name="highlightColor" value="#7E0C6E" />
<StyleAttribute name="highlightTextColor" value="#FFFFFF" />
</Style>
<Style name="Table.detail:even">
<StyleAttribute name="backgroundColor" value="#DECFDB" />
</Style>
<Style name="Image.title"><StyleAttribute name="border" value="no" /></Style>
</StyleList>
PROYECTO/resources/mainmenu_B.4st
+48
View File
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- MBS ERP - Look&Feel B : "Claro / Dashboard" (azul, aireado) -->
<StyleList>
<Style name="Window"><StyleAttribute name="windowType" value="normal" /></Style>
<Style name="Window.main">
<StyleAttribute name="windowType" value="normal" />
<StyleAttribute name="startMenuPosition" value="menu" />
</Style>
<Style name="Window.main-mbs">
<StyleAttribute name="position" value="center" />
<StyleAttribute name="windowType" value="normal" />
<StyleAttribute name="backgroundColor" value="#F4F6FB" />
<StyleAttribute name="actionPanelPosition" value="none" />
<StyleAttribute name="ringMenuPosition" value="none" />
<StyleAttribute name="statusBarType" value="none" />
</Style>
<Style name="Window.dialog">
<StyleAttribute name="windowType" value="modal" />
<StyleAttribute name="sizable" value="no" />
<StyleAttribute name="position" value="center" />
<StyleAttribute name="actionPanelPosition" value="bottom" />
<StyleAttribute name="ringMenuPosition" value="bottom" />
<StyleAttribute name="toolBarPosition" value="none" />
<StyleAttribute name="statusBarType" value="none" />
<StyleAttribute name="errorMessagePosition" value="popup" />
</Style>
<Style name="Label:title">
<StyleAttribute name="fontSize" value="xx-large" />
<StyleAttribute name="fontFamily" value="sans-serif" />
<StyleAttribute name="fontWeight" value="bold" />
<StyleAttribute name="textColor" value="#1E3A8A" />
</Style>
<Style name="Table:focus">
<StyleAttribute name="highlightColor" value="#2563EB" />
<StyleAttribute name="highlightTextColor" value="#FFFFFF" />
</Style>
<Style name="Table.detail:even">
<StyleAttribute name="backgroundColor" value="#E8EEF9" />
</Style>
<Style name="Table.detail:odd">
<StyleAttribute name="backgroundColor" value="#FFFFFF" />
</Style>
<Style name="TextEdit">
<StyleAttribute name="backgroundColor" value="#FFFFFF" />
<StyleAttribute name="textColor" value="#334155" />
</Style>
<Style name="Image.title"><StyleAttribute name="border" value="no" /></Style>
</StyleList>
PROYECTO/resources/mainmenu_C.4st
+38
View File
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- MBS ERP - Look&Feel C : "Nativo" (GBC neutro, con action panel) -->
<StyleList>
<Style name="Window"><StyleAttribute name="windowType" value="normal" /></Style>
<Style name="Window.main">
<StyleAttribute name="windowType" value="normal" />
<StyleAttribute name="startMenuPosition" value="menu" />
</Style>
<Style name="Window.main-mbs">
<StyleAttribute name="position" value="center" />
<StyleAttribute name="windowType" value="normal" />
<StyleAttribute name="actionPanelPosition" value="right" />
<StyleAttribute name="ringMenuPosition" value="none" />
<StyleAttribute name="statusBarType" value="default" />
</Style>
<Style name="Window.dialog">
<StyleAttribute name="windowType" value="modal" />
<StyleAttribute name="sizable" value="no" />
<StyleAttribute name="position" value="center" />
<StyleAttribute name="actionPanelPosition" value="bottom" />
<StyleAttribute name="ringMenuPosition" value="bottom" />
<StyleAttribute name="toolBarPosition" value="none" />
<StyleAttribute name="statusBarType" value="none" />
<StyleAttribute name="errorMessagePosition" value="popup" />
</Style>
<Style name="Label:title">
<StyleAttribute name="fontSize" value="x-large" />
<StyleAttribute name="fontFamily" value="sans-serif" />
</Style>
<Style name="Table:focus">
<StyleAttribute name="highlightColor" value="#316AC5" />
<StyleAttribute name="highlightTextColor" value="#FFFFFF" />
</Style>
<Style name="Table.detail:even">
<StyleAttribute name="backgroundColor" value="#F0F0F0" />
</Style>
<Style name="Image.title"><StyleAttribute name="border" value="no" /></Style>
</StyleList>
PROYECTO/resources/mainmenu_D.4st
+57
View File
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- MBS ERP - Look&Feel D : "Oscuro" (re-skin dark) -->
<StyleList>
<Style name="Window"><StyleAttribute name="windowType" value="normal" /></Style>
<Style name="Window.main">
<StyleAttribute name="windowType" value="normal" />
<StyleAttribute name="startMenuPosition" value="menu" />
</Style>
<Style name="Window.main-mbs">
<StyleAttribute name="position" value="center" />
<StyleAttribute name="windowType" value="normal" />
<StyleAttribute name="backgroundColor" value="#1E1E1E" />
<StyleAttribute name="textColor" value="#E0E0E0" />
<StyleAttribute name="actionPanelPosition" value="none" />
<StyleAttribute name="ringMenuPosition" value="none" />
<StyleAttribute name="statusBarType" value="none" />
</Style>
<Style name="Window.dialog">
<StyleAttribute name="windowType" value="modal" />
<StyleAttribute name="sizable" value="no" />
<StyleAttribute name="position" value="center" />
<StyleAttribute name="actionPanelPosition" value="bottom" />
<StyleAttribute name="ringMenuPosition" value="bottom" />
<StyleAttribute name="toolBarPosition" value="none" />
<StyleAttribute name="statusBarType" value="none" />
<StyleAttribute name="errorMessagePosition" value="popup" />
</Style>
<Style name="Label:title">
<StyleAttribute name="fontSize" value="xx-large" />
<StyleAttribute name="fontFamily" value="sans-serif" />
<StyleAttribute name="fontWeight" value="bold" />
<StyleAttribute name="textColor" value="#BB86FC" />
</Style>
<Style name="Table">
<StyleAttribute name="backgroundColor" value="#252526" />
<StyleAttribute name="textColor" value="#E0E0E0" />
</Style>
<Style name="Table:focus">
<StyleAttribute name="highlightColor" value="#BB86FC" />
<StyleAttribute name="highlightTextColor" value="#1E1E1E" />
</Style>
<Style name="Table.detail:even">
<StyleAttribute name="backgroundColor" value="#2A2A2A" />
</Style>
<Style name="Table.detail:odd">
<StyleAttribute name="backgroundColor" value="#252526" />
</Style>
<Style name="TextEdit">
<StyleAttribute name="backgroundColor" value="#252526" />
<StyleAttribute name="textColor" value="#E0E0E0" />
</Style>
<Style name="Edit">
<StyleAttribute name="backgroundColor" value="#2A2A2A" />
<StyleAttribute name="textColor" value="#E0E0E0" />
</Style>
<Style name="Image.title"><StyleAttribute name="border" value="no" /></Style>
</StyleList>
scripts/build_mbs.cmd
+1 -1
View File
@@ -10,7 +10,7 @@ REM Luego ese .gar se lleva al server .251 y se corre deploy_mbs.cmd
REM ===========================================================================
REM --- AJUSTA estas 2 rutas a tu PC ---
set "REPO=C:\MBS"
set "REPO=C:\Users\jsoto\Documents\NACE\proyectos\Fuentes\MARMOTECH\"
set "GSMAKE=C:\Program Files\FourJs\Genero Studio603\gst\bin\gsmake.exe"
REM --- (normalmente no cambian) ---