Author: vsalaun Date: 2011-05-04 11:47:02 +0200 (Wed, 04 May 2011) New Revision: 3096 Url: http://chorem.org/repositories/revision/lima/3096 Log: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-02 10:24:47 UTC (rev 3095) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-04 09:47:02 UTC (rev 3096) @@ -58,8 +58,8 @@ /** * Basic transaction table model. * - * Le modele est filtré sur {@link #selectedFinancialPeriod} et - * {@link #selectedFinancialPeriod} (montée en charge !). + * Le modele est filtr� sur {@link #selectedFinancialPeriod} et + * {@link #selectedFinancialPeriod} (mont�e en charge !). * * @author ore * @author chatellier @@ -370,13 +370,15 @@ // get the financial period date Date transactionDate = selectedFinancialPeriod.getBeginDate(); - Calendar selectedPeriodCal = Calendar.getInstance(); - selectedPeriodCal.setTime(transactionDate); - int dayMax = selectedPeriodCal.getActualMaximum(Calendar.DAY_OF_MONTH); - + Calendar calEnd = Calendar.getInstance(); + calEnd.setTime(selectedFinancialPeriod.getEndDate()); + int dayMax = calEnd.get(Calendar.DAY_OF_MONTH); + Calendar calBegin = Calendar.getInstance(); + calBegin.setTime(selectedFinancialPeriod.getBeginDate()); + int dayMin = calBegin.get(Calendar.DAY_OF_MONTH); int toDay = actualCalendar.get(Calendar.DAY_OF_MONTH); - if (toDay>dayMax){ + if ((toDay>dayMax) || (toDay<dayMin)){ // change the day transactionDate = DateUtils.setDays(transactionDate, dayMax); } @@ -510,7 +512,7 @@ currentEntry.setLetter((Letter)value); break; case 6: - //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName + //FIXME jpepin 20101231 transtypage "superflu" pour �viter un bug de getColumnName // qui ne fonctionne plus avec les BigDecimal currentEntry.setAmount(new BigDecimal((Double)value)); currentEntry.setDebit(true);