popular banco
popular banco
grafico rh
demonstrativo de perdas e lucros
funcao drawChartLine
grafico rh quantidade funcionarios
Merge branch 'ricardo' of github.com:damaral/projetoBI into daniel

Conflicts:
	app/models/calendario_mes.rb
	app/models/departamento.rb
	lib/tasks/popular_banco.rake
	log/development.log
	tmp/pids/server.pid
rh kpi quantidade
gráficos colunas
Merge branch 'master' of github.com:damaral/projetoBI into ricardo

Conflicts:
	log/development.log
	tmp/cache/assets/CF9/BC0/sprockets%2F4b87195db26a2d9e59a9cdd383652798
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D69/C50/sprockets%2Ffb15c70fa08d477b0eb42d06bc79a845
	tmp/cache/assets/D88/A10/sprockets%2Fed3a9eebb2c6a06851aa662111770aea
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/pids/server.pid
gráfico de colunas
merge master
relatorio sac