1
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service.git
2014 4 24 hyx冲突
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc
1
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc

Conflicts:
	OPCApp/OPCApp.TransManage/OPCApp.TransManage.csproj
	OPCApp/OPCApp.TransManage/Print/PrintInvoice.rdlc
	OPCApp/OPCApp.TransManage/ViewModels/StoreOutViewModel.cs
备注改进　报表修改
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc

Conflicts:
	OPCApp/OPCApp.TransManage/Print/PrintWin.xaml
	OPCApp/OPCApp_Main/App.config