Author: mallon Date: 2012-07-06 16:51:49 +0200 (Fri, 06 Jul 2012) New Revision: 3502 Url: http://chorem.org/repositories/revision/lima/3502 Log: refs #684 : Correction sur les montants, quand la m?\195?\170me ligne est d?\195?\169-/s?\195?\169lectionn?\195?\169e (Ecritures non-lettr?\195?\169es.). Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 14:32:58 UTC (rev 3501) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 14:51:49 UTC (rev 3502) @@ -177,6 +177,7 @@ if (entry.getLettering().equals(entryAt.getLettering())){ int entryToSelect = model.getIndexOfEntry(entry); super.addSelectionInterval(entryToSelect, entryToSelect); + //TODO add debit / credit / balance of entry with same letters } } } @@ -210,7 +211,7 @@ /**Managing components when n rows are selected * */ - if (!isSelectionEmpty() /*&& selectedEntry != currentEntry*/){ + if (!isSelectionEmpty()){ boolean debitSelected = selectedEntry.getDebit(); BigDecimal amountSelected = selectedEntry.getAmount(); @@ -225,12 +226,22 @@ if (debitVal == BigDecimal.ZERO){ BigDecimal creditVal = debitSelected ? BigDecimal.ZERO : amountSelected; if (creditVal != BigDecimal.ZERO){ - creditTotal = creditTotal.add(creditVal); - soldeTotal = soldeTotal.subtract(creditVal); + if (selectedEntry != currentEntry){ + creditTotal = creditTotal.subtract(creditVal); + soldeTotal = soldeTotal.add(creditVal); + }else{ + creditTotal = creditTotal.add(creditVal); + soldeTotal = soldeTotal.subtract(creditVal); + } } }else{ - debitTotal = debitTotal.add(debitVal); - soldeTotal = soldeTotal.add(debitVal); + if (selectedEntry != currentEntry){ + debitTotal = debitTotal.subtract(debitVal); + soldeTotal = soldeTotal.subtract(debitVal); + }else{ + debitTotal = debitTotal.add(debitVal); + soldeTotal = soldeTotal.add(debitVal); + } } if (log.isInfoEnabled()) {