Conflicts:
	src/main/java/com/baosight/hggp/hg/wd/tools/HGWDTools.java

1、增加按钮功能，手工增加销售开票数据，等有合同和结算单时进行勾选，模式跟先收款后开票一样

# Conflicts:
#	src/main/webapp/HG/CW/HGCW008.jsp

 Conflicts:
	src/main/java/com/baosight/hggp/hg/cw/sql/HGCW009.xml
	src/main/webapp/HG/CW/HGCW008A.js
	src/main/webapp/HG/CW/HGCW008A.jsp
	src/main/webapp/HG/CW/HGCW008B.js
	src/main/webapp/HG/CW/HGCW008B.jsp
	src/main/webapp/HG/CW/HGCW008C.jsp
	src/main/webapp/HG/CW/HGCW008D.jsp

1、优化金额显示

1、提交或者审核需要校验是否提交

1、结算单添加选择租赁合同
2、结算单添加选择租赁合同清单

1、租赁合同增加合同类型字段
2、选择为需方时，甲方为公司，乙方供应商，当选择为供方时，甲方为客户，乙方为公司
3、甲方改为承租方，乙方改为出租方
4、租赁合同修改功能bug修复