feat: Cambios Varios (mirar Desc)

- Añadidas referencias faltantes
- Arreglado FormProveedores
- Empiezo el codeo del Form Facturas
This commit is contained in:
2024-08-11 18:20:59 -03:00
parent de217e2d8a
commit 11bd93e016
42 changed files with 7151 additions and 179 deletions

View File

@@ -1,6 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
<<<<<<< HEAD
=======
// Runtime Version:4.0.30319.42000
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -15,6 +19,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
@@ -22,9 +27,12 @@ using System.Reflection;
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")]
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
[assembly: System.Reflection.AssemblyProductAttribute("Modelo")]
[assembly: System.Reflection.AssemblyTitleAttribute("Modelo")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// Generado por la clase WriteCodeFragment de MSBuild.
// Generated by the MSBuild WriteCodeFragment class.

View File

@@ -1,5 +1,6 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
19528923356c4738a962f057922a97a48b791eef234ebbc88765733e95d58587
=======
6c9da482cd44cc74518e5bd440e7d4a72fa32487ea46c6d9bb7a9bacf4043c2b
@@ -7,3 +8,6 @@
=======
099b8681c0fe3ea241c3236b037e92bb2b80c449b64984e5089c2c47a48ee0b9
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
96d0d59bfa69a3c27ef653a551fb81c45157d195
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))

View File

@@ -10,6 +10,7 @@ build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Modelo
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Modelo/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Modelo\
@@ -19,3 +20,6 @@ build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Modelo\
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
=======
build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Modelo\
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))