diff --git a/modules/Reports/models/Chart.php b/modules/Reports/models/Chart.php
index d31a32c35c276183cda3c9c7cc1b7ce17b1b3808..195469f18ca66690fb41524ec157cd35ab6afd93 100644
--- a/modules/Reports/models/Chart.php
+++ b/modules/Reports/models/Chart.php
@@ -218,6 +218,14 @@ abstract class Base_Chart extends Vtiger_Base_Model{
 
 		$columnSQL = $reportRunObject->getColumnSQL($selectedfields);
 
+		// Fix for http://code.vtiger.com/vtiger/vtigercrm/issues/4
+		switch ($selectedfields[count($selectedfields)-1]) {
+			case 'MY':
+				$columnSQL = str_replace('%M', '%m', $columnSQL); // %M (yields Jan), %m - 01
+				break;
+		}
+		// End
+
 		$reportRunObject->append_currency_symbol_to_value = $append_currency_symbol_to_value;
 		return $columnSQL;
 	}
@@ -601,4 +609,4 @@ class HorizontalbarChart extends VerticalbarChart {
 
 class LineChart extends VerticalbarChart{
 
-}
\ No newline at end of file
+}
diff --git a/modules/Vtiger/uitypes/Date.php b/modules/Vtiger/uitypes/Date.php
index 0d7280ad78534cffa409142be13a22d4b078370e..f8c9cc5442fec6878580e0aeecafd1de05086e24 100644
--- a/modules/Vtiger/uitypes/Date.php
+++ b/modules/Vtiger/uitypes/Date.php
@@ -101,6 +101,13 @@ class Vtiger_Date_UIType extends Vtiger_Base_UIType {
 	 * @return <String>
 	 */
 	public static function getDisplayDateValue($date) {
+		// Fix for http://code.vtiger.com/vtiger/vtigercrm/issues/4
+		// Handle (MonthNumber Year) format value conversion.
+		if (preg_match("/([0-9]{1,2}) ([0-9]{1,4})/", $date, $m)) {
+        	return date("M Y", strtotime($m[2].'-'.$m[1].'-'.'1'));
+    	}
+		// End
+
 		$date = new DateTimeField($date);
 		return $date->getDisplayDate();
 	}
@@ -111,6 +118,13 @@ class Vtiger_Date_UIType extends Vtiger_Base_UIType {
 	 * @return <String>
 	 */
 	public static function getDisplayDateTimeValue($dateTime) {
+		// Fix for http://code.vtiger.com/vtiger/vtigercrm/issues/4
+		// Handle (MonthNumber Year) format value conversion.
+		if (preg_match("/([0-9]{1,2}) ([0-9]{1,4})/", $date, $m)) {
+			return date("M Y", strtotime($m[2].'-'.$m[1].'-'.'1'));
+		}
+		// End
+
 		$date = new DateTimeField($dateTime);
 		return $date->getDisplayDateTimeValue();
 	}
@@ -119,4 +133,4 @@ class Vtiger_Date_UIType extends Vtiger_Base_UIType {
         return 'uitypes/DateFieldSearchView.tpl';
     }
 
-}
\ No newline at end of file
+}