litesoft

Explore

Commits

Diff Revisions 853 vs 860 for /trunk/Java/core/Server/src/org/litesoft/orsup/DB_ImportSupport.java

		@@ -454,9 +454,9 @@
454	454		{
455	455		throw new IllegalArgumentException( "No Delta Date Sep '" + DELTA_DATE_SEP + "'" );
456	456		}
457		-	SimpleDate zDesiredDate = to_SimpleDate( "Desired Date", pValue.substring( 0, zAt ) );
458		-	SimpleDate zDeltaDate = to_SimpleDate( "Delta Date", pValue.substring( zAt + DELTA_DATE_SEP.length() ) );
459		-	SimpleDate zToday = SimpleDate.today();
	457	+	CalendarYMD zDesiredDate = to_SimpleDate( "Desired Date", pValue.substring( 0, zAt ) );
	458	+	CalendarYMD zDeltaDate = to_SimpleDate( "Delta Date", pValue.substring( zAt + DELTA_DATE_SEP.length() ) );
	459	+	CalendarYMD zToday = CalendarYMD.today();
460	460		zDesiredDate = zDesiredDate.addDays( zDeltaDate.daysTill( zToday ) );
461	461		return zDesiredDate.toString();
462	462		}
		@@ -500,7 +500,7 @@
500	500		int iMonths = parseInt( "Month", zMonths );
501	501		int iDays = parseInt( "Day", zDays );
502	502
503		-	SimpleDate zDesiredDate = SimpleDate.today();
	503	+	CalendarYMD zDesiredDate = CalendarYMD.today();
504	504
505	505		if ( zAdd )
506	506		{
		@@ -518,7 +518,7 @@
518	518		return zDesiredDate.toString();
519	519		}
520	520
521		-	private SimpleDate to_SimpleDate( String pWhat, String pString )
	521	+	private CalendarYMD to_SimpleDate( String pWhat, String pString )
522	522		{
523	523		try
524	524		{