Merge branch '1638-Si-creamos-una-gráfica-combinada-con-un-intervalo-pequeño-sale-vacía-dev' into 'develop'

Fixed interval when the period is less than resolution in custom graph

See merge request artica/pandorafms!1118

pandora_console/include/functions_graph.php

@@ -1176,6 +1176,9 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 		$datelimit = $date - $period;
 		
 		$resolution = $config['graph_res'] * 50; //Number of points of the graph
+		if($resolution > $period){
+			$resolution = $period;
+		}
 		$interval = (int) ($period / $resolution);
 		
 		// If projection graph, fill with zero previous data to projection interval