diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 7b1ceaa..3879607 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -1,10 +1,7 @@ { "ExpandedNodes": [ - "", - "\\database", - "\\Principal", - "\\Ventas" + "" ], - "SelectedNode": "\\Ventas\\vender.cs", + "SelectedNode": "\\Solution.sln", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/compabetoOG/v17/.wsuo b/.vs/compabetoOG/v17/.wsuo index 10b54de..bc1dbed 100644 Binary files a/.vs/compabetoOG/v17/.wsuo and b/.vs/compabetoOG/v17/.wsuo differ diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index 328831c..43fa886 100644 Binary files a/bin/Debug/compabetov2.exe and b/bin/Debug/compabetov2.exe differ diff --git a/bin/Debug/compabetov2.pdb b/bin/Debug/compabetov2.pdb index 5fe49f1..057a247 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 4382aa9..0000000 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and /dev/null differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d031cc8..951a680 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll deleted file mode 100644 index 9bf445e..0000000 Binary files a/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and /dev/null differ diff --git a/obj/Debug/compabetov2.csproj.AssemblyReference.cache b/obj/Debug/compabetov2.csproj.AssemblyReference.cache index 9e7d08c..cb43975 100644 Binary files a/obj/Debug/compabetov2.csproj.AssemblyReference.cache and b/obj/Debug/compabetov2.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache index 3cb2775..d707aad 100644 --- a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache +++ b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -43b38c5b699ca0e6d986d811fb909e5a6c11369182dd7220ae2319d2d16c7583 +8e6b3a0fad2ff0f974b5aeba910c4d36ca0face95e575d08e0cf8d0719fce555 diff --git a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt index 4952edf..fcdc3e8 100644 --- a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt +++ b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt @@ -1,28 +1,15 @@ -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\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\compabetov2.exe.config +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\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\Microsoft.SqlServer.Types.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 @@ -30,101 +17,31 @@ 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\compabetov2.exe.config -C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe.manifest -C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.application -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\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 -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.cuentas.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.personal.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.csproj.GenerateResource.cache -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.exe.manifest -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 +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.cuentas.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.envios.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.inventario.resources +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.mermas.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.personal.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.vender.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.verMerma.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.exe.manifest +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.application +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 diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache index 4648636..257e583 100644 Binary files a/obj/Debug/compabetov2.csproj.GenerateResource.cache and b/obj/Debug/compabetov2.csproj.GenerateResource.cache differ diff --git a/obj/Debug/compabetov2.exe b/obj/Debug/compabetov2.exe index 328831c..43fa886 100644 Binary files a/obj/Debug/compabetov2.exe and b/obj/Debug/compabetov2.exe differ diff --git a/obj/Debug/compabetov2.pdb b/obj/Debug/compabetov2.pdb index 5fe49f1..057a247 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ