out_inv done
Merge remote-tracking branch 'origin/litup_eric'

Conflicts:
	dapt_pur/templates_c/9e6a507ca836cb1b0774624ad9722282c48ba5f0.file.top_area.tpl.php
	dapt_pur/templates_c/9fbfdaf83e6191ea3078fa8482239753446c77a8.file.pur_cfm.tpl.php
	dapt_pur/templates_c/b5dc9709554488cb4131e504feca5a2ade31883c.file.pur_req.tpl.php
	dapt_pur/templates_c/e43b807af9cc8df7d350c3baf9e47f167c9520a0.file.index.tpl.php
	dept_pc/templates_c/9e6a507ca836cb1b0774624ad9722282c48ba5f0.file.top_area.tpl.php
	dept_pc/templates_c/e43b807af9cc8df7d350c3baf9e47f167c9520a0.file.index.tpl.php
	dept_prop/templates_c/9e6a507ca836cb1b0774624ad9722282c48ba5f0.file.top_area.tpl.php
	dept_prop/templates_c/a474b983f8cede5a15b13dab137401d8e5d7f63d.file.out_inv.tpl.php
	dept_prop/templates_c/e43b807af9cc8df7d350c3baf9e47f167c9520a0.file.index.tpl.php
	templates_c/0b5cc7701bc6c869c4e01b66af4733c7fdef856a.file.login.tpl.php
	templates_c/57a496e9c671fedf49dc20e43e84d4cc684a192c.file.main_page.tpl.php
	templates_c/9e6a507ca836cb1b0774624ad9722282c48ba5f0.file.top_area.tpl.php
	tmpfile/pur_req.xlsx