Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/js/app/config.js

@@ -1184,7 +1184,9 @@ function itp_fn_get_today_ko(split) {
 };
 
 function itp_fn_get_before_month(dateStr, addMonth, split) {
+	if (!addMonth) addMonth=1;
 	if (split == null || split == undefined) split = '.';
+	if (dateStr == null || dateStr == undefined) dateStr = itp_fn_get_today_ko();
 	dateStr = itp_fn_delete_date_format(dateStr);
 	var yyyy = dateStr.substring(0,4),
 		mm = parseInt(dateStr.substring(4,6), 10),
@@ -1200,7 +1202,9 @@ function itp_fn_get_before_month(dateStr, addMonth, split) {
 };
 
 function itp_fn_get_after_month(dateStr, addMonth, split) {
+	if (!addMonth) addMonth=1;
 	if (split == null || split == undefined) split = '.';
+	if (dateStr == null || dateStr == undefined) dateStr = itp_fn_get_today_ko();
 	dateStr = itp_fn_delete_date_format(dateStr);
 	var yyyy = dateStr.substring(0,4),
 		mm = parseInt(dateStr.substring(4,6), 10),