warehouseTrans.png
StockDischarge.png
930607
Merge branch 'Version3' of https://github.com/T1Easyware/Soheil into version3

Conflicts:
	Soheil/Soheil.Common/Properties/Resources.en.resx
	Soheil/Soheil.Common/Properties/Resources.resx
	Soheil/Soheil.Core/DataServices/Storage/WarehouseTransactionDataService.cs
	Soheil/Soheil.Core/Soheil.Core.csproj
	Soheil/Soheil.Core/ViewModels/PP/Report/WarehouseTransactionVm.cs
	Soheil/Soheil.Dal/SoheilEdm.edmx
	Soheil/Soheil.Dal/SoheilEdm.edmx.sql
	Soheil/Soheil.Dal/SqlScripts/Test - All in one.sql
	Soheil/Soheil.Model/UnitSet.cs
	Soheil/Soheil.Model/WarehouseTransaction.cs