[generarPedido] Indicador en prediccion, arreglo subtotal.
Conflicto StockControlador Merge branch 'develop' of https://github.com/jotaemepereira/PIS-GR4-2014 into develop

Conflicts:

sources/Prototipos/Java/DUSA/solr/home/articulos/conf/dataimport.propert
ies
	sources/Prototipos/Java/DUSA/src/controladores/StockControlador.java