正在写进货销售界面
Merge branch 'master' of
ssh://git@github.com/minusone13/InvoicingSystem.git

Conflicts:
	CashPaymentPO.txt
	LevelStrategyPO.txt
	PaymentPO.txt
	PurBackSheetPO.txt
	PurSheetPO.txt
	ReachStrategyPO.txt
	ReceiptPO.txt
	SaleBackSheetPO.txt
	SaleSheetPO.txt
	User.ser
	accountBuild/commodity/2014-12-18.ser
	src/main/java/presentation/commodityui/JPmanageBills2.java
	src/main/java/presentation/saleui/JPmanageBills2.java
	src/main/java/presentation/saleui/JPmanageCustomer.java