commit para merge entity
commit para merge entity
Merge branch 'master' of https://github.com/tkMageztik/SICWEB_INDUMET
Merge branch 'master' of https://github.com/tkMageztik/SICWEB_INDUMET

Conflicts:
	SICSoftware/SICSoftware/SIC.EntityLayer/SICModel.Designer.cs
	SICSoftware/SICSoftware/SIC.EntityLayer/SICModel.edmx
Merge branch 'master' of https://github.com/tkMageztik/SICWEB_INDUMET

Conflicts:
	SICSoftware/SICSoftware/SIC.BusinessLayer/ProveedorBL.cs
	SICSoftware/SICSoftware/SIC.BusinessLayer/bin/Debug/ClassLibrary1.dll
	SICSoftware/SICSoftware/SIC.BusinessLayer/bin/Debug/ClassLibrary1.pdb
	SICSoftware/SICSoftware/SIC.BusinessLayer/bin/Debug/SIC.Data.dll
	SICSoftware/SICSoftware/SIC.BusinessLayer/bin/Debug/SIC.Data.pdb
	SICSoftware/SICSoftware/SIC.BusinessLayer/bin/Debug/SIC.DataLayer.dll
	SICSoftware/SICSoftware/SIC.BusinessLayer/bin/Debug/SIC.DataLayer.pdb
	SICSoftware/SICSoftware/SIC.BusinessLayer/bin/Debug/SIC.EntityLayer.dll
	SICSoftware/SICSoftware/SIC.BusinessLayer/bin/Debug/SIC.EntityLayer.pdb
	SICSoftware/SICSoftware/SIC.BusinessLayer/bin/Debug/SIC.UIGeneral.dll
	SICSoftware/SICSoftware/SIC.BusinessLayer/bin/Debug/SIC.UIGeneral.pdb
	SICSoftware/SICSoftware/SIC.BusinessLayer/obj/Debug/ClassLibrary1.dll
	SICSoftware/SICSoftware/SIC.BusinessLayer/obj/Debug/ClassLibrary1.pdb
	SICSoftware/SICSoftware/SIC.BusinessLayer/obj/Debug/SIC.BusinessLayer.csproj.FileListAbsolute.txt
	SICSoftware/SICSoftware/SIC.Data/bin/Debug/SIC.Data.dll
	SICSoftware/SICSoftware/SIC.Data/bin/Debug/SIC.Data.pdb
	SICSoftware/SICSoftware/SIC.Data/obj/Debug/SIC.Data.dll
	SICSoftware/SICSoftware/SIC.Data/obj/Debug/SIC.Data.pdb
	SICSoftware/SICSoftware/SIC.DataLayer/bin/Debug/SIC.Data.dll
	SICSoftware/SICSoftware/SIC.DataLayer/bin/Debug/SIC.Data.pdb
	SICSoftware/SICSoftware/SIC.DataLayer/bin/Debug/SIC.DataLayer.dll
	SICSoftware/SICSoftware/SIC.DataLayer/bin/Debug/SIC.DataLayer.pdb
	SICSoftware/SICSoftware/SIC.DataLayer/bin/Debug/SIC.EntityLayer.dll
	SICSoftware/SICSoftware/SIC.DataLayer/bin/Debug/SIC.EntityLayer.pdb
	SICSoftware/SICSoftware/SIC.DataLayer/bin/Debug/SIC.UIGeneral.dll
	SICSoftware/SICSoftware/SIC.DataLayer/bin/Debug/SIC.UIGeneral.pdb
	SICSoftware/SICSoftware/SIC.DataLayer/obj/Debug/SIC.DataLayer.dll
	SICSoftware/SICSoftware/SIC.DataLayer/obj/Debug/SIC.DataLayer.pdb
	SICSoftware/SICSoftware/SIC.EntityLayer/bin/Debug/SIC.EntityLayer.dll
	SICSoftware/SICSoftware/SIC.EntityLayer/bin/Debug/SIC.EntityLayer.pdb
	SICSoftware/SICSoftware/SIC.EntityLayer/obj/Debug/SIC.EntityLayer.dll
	SICSoftware/SICSoftware/SIC.EntityLayer/obj/Debug/SIC.EntityLayer.pdb
	SICSoftware/SICSoftware/SIC.EntityLayer/obj/Debug/TempPE/SICModel.Designer.cs.dll
	SICSoftware/SICSoftware/SIC.EntityLayer/obj/Debug/edmxResourcesToEmbed/SICModel.csdl
	SICSoftware/SICSoftware/SIC.EntityLayer/obj/Debug/edmxResourcesToEmbed/SICModel.msl
	SICSoftware/SICSoftware/SIC.EntityLayer/obj/Debug/edmxResourcesToEmbed/SICModel.ssdl
	SICSoftware/SICSoftware/SIC.UIGeneral/bin/Debug/SIC.Data.dll
	SICSoftware/SICSoftware/SIC.UIGeneral/bin/Debug/SIC.Data.pdb
	SICSoftware/SICSoftware/SIC.UIGeneral/bin/Debug/SIC.EntityLayer.dll
	SICSoftware/SICSoftware/SIC.UIGeneral/bin/Debug/SIC.EntityLayer.pdb
	SICSoftware/SICSoftware/SIC.UIGeneral/bin/Debug/SIC.UIGeneral.dll
	SICSoftware/SICSoftware/SIC.UIGeneral/bin/Debug/SIC.UIGeneral.pdb
	SICSoftware/SICSoftware/SIC.UIGeneral/obj/Debug/SIC.UIGeneral.dll
	SICSoftware/SICSoftware/SIC.UIGeneral/obj/Debug/SIC.UIGeneral.pdb
	SICSoftware/SICSoftware/SIC.UserLayer/bin/ClassLibrary1.dll
	SICSoftware/SICSoftware/SIC.UserLayer/bin/ClassLibrary1.pdb
	SICSoftware/SICSoftware/SIC.UserLayer/bin/SIC.Data.dll
	SICSoftware/SICSoftware/SIC.UserLayer/bin/SIC.Data.pdb
	SICSoftware/SICSoftware/SIC.UserLayer/bin/SIC.DataLayer.dll
	SICSoftware/SICSoftware/SIC.UserLayer/bin/SIC.DataLayer.pdb
	SICSoftware/SICSoftware/SIC.UserLayer/bin/SIC.EntityLayer.dll
	SICSoftware/SICSoftware/SIC.UserLayer/bin/SIC.EntityLayer.pdb
	SICSoftware/SICSoftware/SIC.UserLayer/bin/SIC.UIGeneral.dll
	SICSoftware/SICSoftware/SIC.UserLayer/bin/SIC.UIGeneral.pdb
	SICSoftware/SICSoftware/SIC.UserLayer/bin/SIC.UserLayer.dll
	SICSoftware/SICSoftware/SIC.UserLayer/bin/SIC.UserLayer.pdb
	SICSoftware/SICSoftware/SIC.UserLayer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SICSoftware/SICSoftware/SIC.UserLayer/obj/Debug/SIC.UserLayer.csproj.FileListAbsolute.txt
	SICSoftware/SICSoftware/SIC.UserLayer/obj/Debug/SIC.UserLayer.dll
	SICSoftware/SICSoftware/SIC.UserLayer/obj/Debug/SIC.UserLayer.pdb
	SICSoftware/SICSoftware/SICSoftware.suo
Merge branch 'master' of https://github.com/tkMageztik/SICWEB_INDUMET
Merge branch 'master' of https://github.com/tkMageztik/SICWEB_INDUMET
test
Merge branch 'master' of https://github.com/tkMageztik/SICWEB_INDUMET

Conflicts:
	SICSoftware/SICSoftware/SIC.DataLayer/OrdenCompraDA.cs