fede/Final_Das
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

feat: Cambios Varios (mirar Desc)

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

10
Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs
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.

4
Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache
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))

4
Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig
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))

55
Modelo/obj/Modelo.csproj.nuget.dgspec.json
View File

@@ -2,6 +2,7 @@
"format": 1,
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {}
},
@@ -19,13 +20,17 @@
=======
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {}
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": {}
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
},
"projects": {
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
<<<<<<< HEAD
@@ -37,11 +42,24 @@
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
=======
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
<<<<<<< HEAD
=======
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
"https://api.nuget.org/v3/index.json": {},
"https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {}
},
@@ -86,6 +104,7 @@
"privateAssets": "all"
}
},
<<<<<<< HEAD
"runtimeIdentifierGraphPath": "/var/run/host/usr/share/dotnet/sdk/8.0.106/RuntimeIdentifierGraph.json"
}
}
@@ -105,10 +124,18 @@
=======
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
}
}
},
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": {
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
"projectName": "Modelo",
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
<<<<<<< HEAD
@@ -120,11 +147,24 @@
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
=======
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
<<<<<<< HEAD
=======
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
"https://api.nuget.org/v3/index.json": {},
"https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {}
},
@@ -133,6 +173,7 @@
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -144,6 +185,10 @@
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj"
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
}
}
}
@@ -183,7 +228,11 @@
"privateAssets": "all"
}
},
<<<<<<< HEAD
"runtimeIdentifierGraphPath": "/var/run/host/usr/share/dotnet/sdk/8.0.106/RuntimeIdentifierGraph.json"
=======
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
}
}
}

10
Modelo/obj/Modelo.csproj.nuget.g.props
View File

@@ -4,6 +4,7 @@
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<<<<<<< HEAD
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/home/fede/.nuget/packages/</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/home/fede/.nuget/packages/</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
@@ -11,5 +12,14 @@
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="/home/fede/.nuget/packages/" />
=======
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\fedpo\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\fedpo\.nuget\packages\" />
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
</ItemGroup>
</Project>

29
Modelo/obj/project.assets.json
View File

@@ -27,12 +27,17 @@
]
},
"packageFolders": {
<<<<<<< HEAD
"/home/fede/.nuget/packages/": {}
=======
"C:\\Users\\fedpo\\.nuget\\packages\\": {}
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
},
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj",
"projectName": "Modelo",
@@ -56,11 +61,26 @@
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
=======
"projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
<<<<<<< HEAD
=======
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
"https://api.nuget.org/v3/index.json": {},
"https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {}
},
@@ -69,6 +89,7 @@
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -80,6 +101,10 @@
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj"
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
}
}
}
@@ -119,7 +144,11 @@
"privateAssets": "all"
}
},
<<<<<<< HEAD
"runtimeIdentifierGraphPath": "/var/run/host/usr/share/dotnet/sdk/8.0.106/RuntimeIdentifierGraph.json"
=======
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
}
}
}

6
Modelo/obj/project.nuget.cache
View File

@@ -1,6 +1,7 @@
{
"version": 2,
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "druJUlWKmOp0ZDp0BX75o9Fs1GyoqoIkTLLMStpqDmZBEy8hoSreNrR/4qjyFeX2PbXxwtpQp0hY2GY2ewsTOQ==",
"success": true,
@@ -14,8 +15,11 @@
=======
"dgSpecHash": "GHvzI31gpq3LC5PsFVAyJd0HJLioNTu1zueIve1esILQ9QlNaZAenRITvunQ0HsZ06NONsSYihAL5kiY+8UONw==",
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
"dgSpecHash": "Lbp3ldB0Hrw5pXllkp+TBPvDxt/9rPRNHHKZTqTlG4g88ELwAzlQEuFOATRGWgN+sSkhjGassnHFTlqrUfwaQA==",
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
"success": true,
"projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
"projectFilePath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
"expectedPackageFiles": [],
>>>>>>> 8ad9dc6 (faltan controladoras)
"logs": []