-
Merge branch '7.0' of https://github.com/kittiu/addons-eco into 7.0

Conflicts:
	job_cost_sheet/report/job_cost_sheet_report.py
-
-