Author: mallon Date: 2012-07-17 17:51:28 +0200 (Tue, 17 Jul 2012) New Revision: 3534 Url: http://chorem.org/repositories/revision/lima/3534 Log: fixes #700 Colonne des comptes remise (Panneau de lettrage), afin de savoir auquel appartient l'entr?\195?\169e; correction sur l'accessibilit?\195?\169 du bouton 'lettrer'. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-07-17 15:15:23 UTC (rev 3533) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-07-17 15:51:28 UTC (rev 3534) @@ -61,7 +61,7 @@ public void setLettred(boolean lettred) { boolean oldLettrer = isLettred(); - if(lettred && (solde == BigDecimal.ZERO || solde.intValue() == 0)){ + if(lettred && (solde == BigDecimal.ZERO || solde.doubleValue() == 0)){ this.lettred = lettred; }else{ this.lettred = false; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2012-07-17 15:15:23 UTC (rev 3533) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2012-07-17 15:51:28 UTC (rev 3534) @@ -62,6 +62,10 @@ //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor()); + + //Get new account editor + setDefaultEditor(String.class, new DefaultCellEditor(new JTextField())); + //Get new entry book editor setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); //Get new account editor Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-07-17 15:15:23 UTC (rev 3533) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-07-17 15:51:28 UTC (rev 3534) @@ -116,6 +116,9 @@ case 1: result = String.class; break; + case 2: + result = String.class; + break; case 3: result = Account.class; break; @@ -142,7 +145,7 @@ result = _("lima.table.date"); break; case 1: - result = _("lima.table.entrybook"); + result = _("lima.table.account"); break; case 2: result = _("lima.table.voucher"); @@ -182,8 +185,8 @@ case 0: result = datesEntree.get(row); // date break; - case 1: // entry book - result = entryBooks.get(row); + case 1: + result = currentEntry.getAccount().getAccountNumber(); break; case 2: result = currentEntry.getVoucher();