jpegueroandClaude Sonnet 5.5 7dfed7798c Repara mbsERP.4pw: resuelve conflicto sin resolver del commit 93a4eb4 ...

El merge 93a4eb4 subio el .4pw con marcadores de conflicto (ambas versiones
pegadas). Se rehizo el merge de 16ef058 y 9bc9170 normalizando los saltos de
linea (16ef058 estaba en LF, el resto en CRLF). Resultado: XML valido, 233
aplicaciones sin duplicados, conserva registros de ipprmt044/045 y los de
adprmt001/017/027 y cpprrp002.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

2026-10-21 08:37:05 -04:00

..

acdir

JSOTO acprmt001: ALTER de actb00001 y arreglos de MaintainX y lista

2026-10-19 09:54:32 -04:00

addir

Registra adprmt027 (Formulario de Vacaciones) y corrige bugs

2026-10-20 10:20:42 -04:00

appflow

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

bin

lsoto prueba de programas

2026-10-20 21:53:39 -04:00

bindb

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

ccdir

lsoto prueba de programas

2026-10-20 21:53:39 -04:00

cgdir

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

2026-10-19 10:17:14 -04:00

classes

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

codir

Agregar noprmt003 (Maestra de Empleados) al modulo NOMINA

2026-09-03 16:51:11 -04:00

config

JSOTO QA G6 (.250): arreglos CG/Activos/Repuestos/Informatica, DBDATE, imagenes de reportes y cgprrp008

2026-10-16 15:30:24 -04:00

cpdir

cpprrp002 (Saldos por Antiguedad): exportacion a PDF/Excel/pantalla

2026-10-20 17:02:56 -04:00

ctdir

Corrige ctprrp014 (Reporte Produccion Mensual)

2026-10-15 16:07:11 -04:00

database

JSOTO schema smarmotech actualizado

2026-08-19 18:39:09 -04:00

databaseMaintenance

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

DB

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

distbin

JSOTO .gitignore: llaves y certificados fuera del repo

2026-10-19 10:35:51 -04:00

ecf

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

encuestas

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

gedir

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

images

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

indir

Prueba inprrp011 (completo) e inprrp028 (matricial completo, PDF pendiente)

2026-09-03 16:52:39 -04:00

ipdir

Bloqueados: enlazan prprmt006, ipprmt044 y lqprrp009 (licencia Genero activa)

2026-10-19 13:11:45 -04:00

irdir

lsoto

2026-10-19 10:11:40 -04:00

lqdir

lsoto prueba de programas

2026-10-20 21:53:39 -04:00

mainmenu

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

nodir

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

2026-10-16 17:07:28 -04:00

otrodir

lsoto prueba de programas

2026-10-20 21:53:39 -04:00

PRDIR

Bloqueados: enlazan prprmt006, ipprmt044 y lqprrp009 (licencia Genero activa)

2026-10-19 13:11:45 -04:00

REPORTES

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

resources

lsoto

2026-10-19 10:11:40 -04:00

seguridad2.0

JSOTO .gitignore: GAR e imagenes de ejecucion fuera del repo

2026-10-19 10:32:04 -04:00

tedir

JSOTO QA G6 (.250): arreglos CG/Activos/Repuestos/Informatica, DBDATE, imagenes de reportes y cgprrp008

2026-10-16 15:30:24 -04:00

tedirbk

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

TEST

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

tests

JSOTO Adicione los programas y funciones en FUNCIONES COMUNES

2026-08-20 15:43:12 -04:00

vedir

lsoto prueba de programas

2026-10-20 21:53:39 -04:00

webfirma

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

wservice/lowapis

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

acfmrp011.per

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

addir.rar

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

addir.zip

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

ADMINISTRACION DE PERSONAL.deps

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

cardnet.rar

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

cgprrp012.4rp

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

codir.rar

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

example.4pw

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

generodefault1.html

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

generodefault.html

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

INSERTCTTB013.sql

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

ipprrp010a_bk.4rp

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

iptb02.xls

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

logo.JPG

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

Logo.png

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

MainDisp.per

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

mainmenu1.tar.gz

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

mainmenu.4st

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

MainMenu.4gl

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

mainmenu.data

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

mainmenuform.per

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

mbsERP.4pw

Repara mbsERP.4pw: resuelve conflicto sin resolver del commit 93a4eb4

2026-10-21 08:37:05 -04:00

MBSVG211.deps

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

nodir.rar

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

nodir.zip

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

nominas.zip

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

RELACION PRODUCTOS II.xls

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

schema

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

seguridad.4pw

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

smarmotech_dbxconstraints.4gl

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

smarmotech_dbxconstraints.code

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

smarmotech.4db

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

smarmotech.sch

Revertir actualizacion de meta-esquema de smarmotech.sch/4db

2026-09-23 16:21:54 -04:00

smarmotech.xml

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

tedir.rar

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

test.4gl

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

vedir.zip

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

vefmwd112.4fd

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

veprmt001.4gl

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

veprmt112.4gl

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

veprrp001_3.4rp

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

veprrp049.4rp

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00

wservice.zip

Commit inicial: fuentes MBS ERP (Genero 6) + .gitignore + docs/SETUP_PC_MBS.md

2026-08-18 20:59:52 -04:00