Appliance Mst
Merge branch 'AdvantageWeb' of https://github.com/empiteKavinda/AdvantageSystem into AdvantageWeb

Conflicts:
	LatestERPAdvantage/ERPSolution/BLL/Service/ServiceBusinessCalls.cs
	LatestERPAdvantage/ERPSolution/BLL/bin/Debug/Advantage.ERP.BLL.dll
	LatestERPAdvantage/ERPSolution/BLL/bin/Debug/Advantage.ERP.BLL.pdb
	LatestERPAdvantage/ERPSolution/BLL/bin/Debug/Advantage.ERP.DAL.dll
	LatestERPAdvantage/ERPSolution/BLL/bin/Debug/Advantage.ERP.DAL.pdb
	LatestERPAdvantage/ERPSolution/BLL/obj/Debug/Advantage.ERP.BLL.dll
	LatestERPAdvantage/ERPSolution/BLL/obj/Debug/Advantage.ERP.BLL.pdb
	LatestERPAdvantage/ERPSolution/BLL/obj/Debug/BLL.csprojResolveAssemblyReference.cache
	LatestERPAdvantage/ERPSolution/DAL/Service/IServiceDatabaseCalls.cs
	LatestERPAdvantage/ERPSolution/DAL/bin/Debug/Advantage.ERP.DAL.dll
	LatestERPAdvantage/ERPSolution/DAL/bin/Debug/Advantage.ERP.DAL.pdb
	LatestERPAdvantage/ERPSolution/DAL/obj/Debug/Advantage.ERP.DAL.dll
	LatestERPAdvantage/ERPSolution/DAL/obj/Debug/Advantage.ERP.DAL.pdb
	LatestERPAdvantage/ERPSolution/DAL/obj/Debug/DAL.csproj.FileListAbsolute.txt
	LatestERPAdvantage/ERPSolution/DAL/obj/Debug/DAL.csprojResolveAssemblyReference.cache
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/Advantage.ERP.BLL.dll
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/Advantage.ERP.BLL.pdb
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/Advantage.ERP.DAL.dll
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/Advantage.ERP.DAL.pdb
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/ERPAdvantage.dll
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/ERPAdvantage.pdb
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/WSLibrary.dll
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/WSLibrary.pdb
	LatestERPAdvantage/ERPSolution/ERPAdvantage/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	LatestERPAdvantage/ERPSolution/ERPAdvantage/obj/Debug/ERPAdvantage.csproj.FileListAbsolute.txt
	LatestERPAdvantage/ERPSolution/ERPAdvantage/obj/Debug/ERPAdvantage.csprojResolveAssemblyReference.cache
	LatestERPAdvantage/ERPSolution/ERPAdvantage/obj/Debug/ERPAdvantage.dll
	LatestERPAdvantage/ERPSolution/ERPAdvantage/obj/Debug/ERPAdvantage.pdb
	LatestERPAdvantage/ERPSolution/ERPSolution.v11.suo
	LatestERPAdvantage/ERPSolution/WSLibrary/bin/Debug/Advantage.ERP.BLL.dll
	LatestERPAdvantage/ERPSolution/WSLibrary/bin/Debug/Advantage.ERP.BLL.pdb
	LatestERPAdvantage/ERPSolution/WSLibrary/bin/Debug/Advantage.ERP.DAL.dll
	LatestERPAdvantage/ERPSolution/WSLibrary/bin/Debug/Advantage.ERP.DAL.pdb
	LatestERPAdvantage/ERPSolution/WSLibrary/bin/Debug/WSLibrary.dll
	LatestERPAdvantage/ERPSolution/WSLibrary/bin/Debug/WSLibrary.pdb
	LatestERPAdvantage/ERPSolution/WSLibrary/obj/Debug/WSLibrary.csprojResolveAssemblyReference.cache
	LatestERPAdvantage/ERPSolution/WSLibrary/obj/Debug/WSLibrary.dll
	LatestERPAdvantage/ERPSolution/WSLibrary/obj/Debug/WSLibrary.pdb
Appliance
aPPLIANCE mASTER DATA pOPULATION
Appliance master Edit and View
Merge branch 'AdvantageWeb' of https://github.com/empiteKavinda/AdvantageSystem into AdvantageWeb

Conflicts:
	LatestERPAdvantage/ERPSolution/BLL/bin/Debug/Advantage.ERP.BLL.dll
	LatestERPAdvantage/ERPSolution/BLL/bin/Debug/Advantage.ERP.BLL.pdb
	LatestERPAdvantage/ERPSolution/BLL/bin/Debug/Advantage.ERP.DAL.dll
	LatestERPAdvantage/ERPSolution/BLL/bin/Debug/Advantage.ERP.DAL.pdb
	LatestERPAdvantage/ERPSolution/BLL/obj/Debug/Advantage.ERP.BLL.dll
	LatestERPAdvantage/ERPSolution/BLL/obj/Debug/Advantage.ERP.BLL.pdb
	LatestERPAdvantage/ERPSolution/BLL/obj/Debug/BLL.csprojResolveAssemblyReference.cache
	LatestERPAdvantage/ERPSolution/DAL/bin/Debug/Advantage.ERP.DAL.dll
	LatestERPAdvantage/ERPSolution/DAL/bin/Debug/Advantage.ERP.DAL.pdb
	LatestERPAdvantage/ERPSolution/DAL/obj/Debug/Advantage.ERP.DAL.dll
	LatestERPAdvantage/ERPSolution/DAL/obj/Debug/Advantage.ERP.DAL.pdb
	LatestERPAdvantage/ERPSolution/DAL/obj/Debug/DAL.csprojResolveAssemblyReference.cache
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/Advantage.ERP.BLL.dll
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/Advantage.ERP.BLL.pdb
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/Advantage.ERP.DAL.dll
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/Advantage.ERP.DAL.pdb
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/ERPAdvantage.dll
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/ERPAdvantage.pdb
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/WSLibrary.dll
	LatestERPAdvantage/ERPSolution/ERPAdvantage/bin/WSLibrary.pdb
	LatestERPAdvantage/ERPSolution/ERPAdvantage/obj/Debug/ERPAdvantage.csprojResolveAssemblyReference.cache
	LatestERPAdvantage/ERPSolution/ERPAdvantage/obj/Debug/ERPAdvantage.dll
	LatestERPAdvantage/ERPSolution/ERPAdvantage/obj/Debug/ERPAdvantage.pdb
	LatestERPAdvantage/ERPSolution/ERPSolution.v11.suo
	LatestERPAdvantage/ERPSolution/Libraries/bin/Debug/Libraries.dll
	LatestERPAdvantage/ERPSolution/Libraries/bin/Debug/Libraries.pdb
	LatestERPAdvantage/ERPSolution/Libraries/obj/Debug/Libraries.dll
	LatestERPAdvantage/ERPSolution/Libraries/obj/Debug/Libraries.pdb
	LatestERPAdvantage/ERPSolution/WSLibrary/bin/Debug/Advantage.ERP.BLL.dll
	LatestERPAdvantage/ERPSolution/WSLibrary/bin/Debug/Advantage.ERP.BLL.pdb
	LatestERPAdvantage/ERPSolution/WSLibrary/bin/Debug/Advantage.ERP.DAL.dll
	LatestERPAdvantage/ERPSolution/WSLibrary/bin/Debug/Advantage.ERP.DAL.pdb
	LatestERPAdvantage/ERPSolution/WSLibrary/bin/Debug/WSLibrary.dll
	LatestERPAdvantage/ERPSolution/WSLibrary/bin/Debug/WSLibrary.pdb
	LatestERPAdvantage/ERPSolution/WSLibrary/obj/Debug/WSLibrary.csprojResolveAssemblyReference.cache
	LatestERPAdvantage/ERPSolution/WSLibrary/obj/Debug/WSLibrary.dll
	LatestERPAdvantage/ERPSolution/WSLibrary/obj/Debug/WSLibrary.pdb