This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 6df0048c00bee684bd6396cd658c6753cc1e511b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Jan 16 16:18:31 2015 +0100 fix #1121 : Lettrage - afficher le journal --- .../org/chorem/lima/ui/celleditor/EntryBookTableCellRender.java | 6 +++++- .../java/org/chorem/lima/ui/lettering/LetteringTableModel.java | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryBookTableCellRender.java b/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryBookTableCellRender.java index 157ee4d..af7e1d7 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryBookTableCellRender.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryBookTableCellRender.java @@ -34,7 +34,11 @@ public class EntryBookTableCellRender extends DefaultLimaTableCellRenderer { Object result = value; if (value != null && value instanceof EntryBook) { EntryBook entryBook= (EntryBook) value; - result = entryBook.getCode() + " - " + entryBook.getLabel(); + String label = entryBook.getCode(); + if (entryBook.getLabel() != null) { + label += " - " + entryBook.getLabel(); + } + result = label; } super.setValue(result); } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java index 865259e..c89fffa 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java @@ -24,6 +24,7 @@ package org.chorem.lima.ui.lettering; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.EntryBook; import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.AbstractLimaTableModel; @@ -54,6 +55,14 @@ public class LetteringTableModel extends AbstractLimaTableModel<Entry> { } }); + addColumn(new AbstractColumn<LetteringTableModel>(EntryBook.class, t("lima.table.entryBook"), false) { + @Override + public Object getValueAt(int row) { + Entry entry = tableModel.get(row); + return entry.getFinancialTransaction().getEntryBook(); + } + }); + addColumn(new AbstractColumn<LetteringTableModel>(Account.class, t("lima.table.account"), false) { @Override public Object getValueAt(int row) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.