Subo cambios en plena produccion

This commit is contained in:
Michael Robles
2024-02-02 10:57:07 -07:00
parent 804c7b09db
commit 17d66fa4d3
19 changed files with 173 additions and 146 deletions
Binary file not shown.
Binary file not shown.
+17 -100
View File
@@ -1,63 +1,7 @@
C:\Users\Googl\Documents\compabetov2\bin\Debug\compabetov2.exe.config
C:\Users\Googl\Documents\compabetov2\bin\Debug\compabetov2.exe
C:\Users\Googl\Documents\compabetov2\bin\Debug\compabetov2.pdb
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.csproj.AssemblyReference.cache
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.Properties.Resources.resources
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.csproj.GenerateResource.cache
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.exe
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.pdb
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.login.resources
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.MenuPrincipal.resources
C:\Users\Googl\Documents\compabetov2\bin\Debug\EntityFramework.dll
C:\Users\Googl\Documents\compabetov2\bin\Debug\EntityFramework.SqlServer.dll
C:\Users\Googl\Documents\compabetov2\bin\Debug\System.Data.SQLite.dll
C:\Users\Googl\Documents\compabetov2\bin\Debug\System.Data.SQLite.EF6.dll
C:\Users\Googl\Documents\compabetov2\bin\Debug\System.Data.SQLite.Linq.dll
C:\Users\Googl\Documents\compabetov2\bin\Debug\EntityFramework.xml
C:\Users\Googl\Documents\compabetov2\bin\Debug\EntityFramework.SqlServer.xml
C:\Users\Googl\Documents\compabetov2\bin\Debug\System.Data.SQLite.xml
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.csproj.CopyComplete
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.exe.config
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.exe
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.pdb
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\EntityFramework.dll
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\EntityFramework.SqlServer.dll
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\System.Data.SQLite.dll
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\System.Data.SQLite.EF6.dll
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\System.Data.SQLite.Linq.dll
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\EntityFramework.xml
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\EntityFramework.SqlServer.xml
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\System.Data.SQLite.xml
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.AssemblyReference.cache
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.login.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.MenuPrincipal.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.GenerateResource.cache
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.CopyComplete
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.exe
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.pdb
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.inventario.resources
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.cuentas.resources
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.mermas.resources
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.personal.resources
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.vender.resources
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.cuentas.resources
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.inventario.resources
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.mermas.resources
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.personal.resources
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.vender.resources
C:\Users\Googl\Documents\compabetov2\bin\Debug\compabetov2.exe.manifest
C:\Users\Googl\Documents\compabetov2\bin\Debug\compabetov2.application
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.exe.manifest
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.application
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.envios.resources
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.exe.manifest
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.application
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.exe.manifest
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.application
C:\Users\Googl\Documents\compabetov2\obj\Debug\compabetov2.envios.resources
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe.config
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe.manifest
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.application
@@ -65,6 +9,7 @@ C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.pdb
C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.SqlServer.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.EF6.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.Linq.dll
@@ -72,15 +17,27 @@ C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.xml
C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.SqlServer.xml
C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.xml
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.AssemblyReference.cache
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarEmpleado1.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin1.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.EditarEmpleado1.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.cuentas.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.envios.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.inventario.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.login.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.MenuPrincipal.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.mermas.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.personal.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.vender.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.verMerma.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.GenerateResource.cache
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.exe.manifest
@@ -88,43 +45,3 @@ C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.application
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.CopyComplete
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.exe
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.pdb
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources
<<<<<<< HEAD
=======
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources
>>>>>>> c224b1f121cf870873d6bc2414ec92b69d8a3668
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.verMerma.resources
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.verMerma.resources
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll
C:\Users\Googl\Documents\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.verproductos.resources
C:\Users\carsu\source\repos\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll
C:\Users\carsu\source\repos\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll
C:\Users\carsu\source\repos\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll
C:\Users\carsu\source\repos\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll
C:\Users\carsu\source\repos\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarEmpleado1.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarLogin1.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.EditarEmpleado1.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin1.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarEmpleado1.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.AgregarLogin1.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Empleados.EditarEmpleado1.resources
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources
>>>>>>> 50722c223445e6db2543329a4b1d825e6fc26343
Binary file not shown.
Binary file not shown.
Binary file not shown.