This is an automated email from the git hooks/post-receive script. New change to branch feature/1168-Diminuer_la_largeur_des_filtres in repository lima. See http://git.chorem.org/lima.git at b0cf424 fixes #1174 création de transaction pour chaque changement de date puis de pièce comptable (déplacement de branche) This branch includes the following new commits: new b0cf424 fixes #1174 création de transaction pour chaque changement de date puis de pièce comptable (déplacement de branche) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b0cf424b962ee8ea4c39663544b2d5d489b870af Author: dcosse <japbiw74> Date: Wed Feb 25 22:52:40 2015 +0100 fixes #1174 création de transaction pour chaque changement de date puis de pièce comptable (déplacement de branche) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1168-Diminuer_la_largeur_des_filtres in repository lima. See http://git.chorem.org/lima.git commit b0cf424b962ee8ea4c39663544b2d5d489b870af Author: dcosse <japbiw74> Date: Wed Feb 25 22:52:40 2015 +0100 fixes #1174 création de transaction pour chaque changement de date puis de pièce comptable (déplacement de branche) --- .../main/java/org/chorem/lima/ui/common/EntryBookListRenderer.java | 2 +- .../org/chorem/lima/ui/common/FinancialPeriodListRenderer.java | 7 ++++--- .../java/org/chorem/lima/ui/common/FiscalPeriodListRenderer.java | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookListRenderer.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookListRenderer.java index e8f300b..9c6f0e5 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookListRenderer.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookListRenderer.java @@ -48,7 +48,7 @@ public class EntryBookListRenderer extends DefaultListCellRenderer { EntryBook entryBook = (EntryBook)value; Object newValue = entryBook; if (entryBook != null) { - newValue = entryBook.getCode() + " - " + entryBook.getLabel(); + newValue = entryBook.getCode(); } return super.getListCellRendererComponent(list, newValue, index, isSelected, cellHasFocus); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodListRenderer.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodListRenderer.java index b8e4433..e6fcdd2 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodListRenderer.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodListRenderer.java @@ -26,7 +26,7 @@ import org.chorem.lima.entity.FinancialPeriod; import javax.swing.*; import java.awt.*; -import java.text.DateFormat; +import java.text.SimpleDateFormat; /** * Financial period list renderer. @@ -42,6 +42,8 @@ public class FinancialPeriodListRenderer extends DefaultListCellRenderer { /** serialVersionUID. */ private static final long serialVersionUID = -9089182547408397051L; + protected SimpleDateFormat df = new SimpleDateFormat("MM"); + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -49,8 +51,7 @@ public class FinancialPeriodListRenderer extends DefaultListCellRenderer { FinancialPeriod financialPeriod = (FinancialPeriod)value; Object newValue = financialPeriod; if (financialPeriod != null) { - DateFormat df = DateFormat.getDateInstance(); - newValue = df.format(financialPeriod.getBeginDate()) + " - " + df.format(financialPeriod.getEndDate()); + newValue = df.format(financialPeriod.getBeginDate()); } return super.getListCellRendererComponent(list, newValue, index, isSelected, cellHasFocus); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodListRenderer.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodListRenderer.java index 0237743..5e103d1 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodListRenderer.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodListRenderer.java @@ -26,7 +26,7 @@ import org.chorem.lima.entity.FiscalPeriod; import javax.swing.*; import java.awt.*; -import java.text.DateFormat; +import java.text.SimpleDateFormat; /** * Fiscal period list renderer. @@ -42,6 +42,8 @@ public class FiscalPeriodListRenderer extends DefaultListCellRenderer { /** serialVersionUID. */ private static final long serialVersionUID = -9089182547408397051L; + protected SimpleDateFormat df = new SimpleDateFormat("yyyy"); + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -49,8 +51,7 @@ public class FiscalPeriodListRenderer extends DefaultListCellRenderer { FiscalPeriod fiscalPeriod = (FiscalPeriod)value; Object newValue = fiscalPeriod; if (fiscalPeriod != null) { - DateFormat df = DateFormat.getDateInstance(); - newValue = df.format(fiscalPeriod.getBeginDate()) + " - " + df.format(fiscalPeriod.getEndDate()); + newValue = df.format(fiscalPeriod.getBeginDate()); } return super.getListCellRendererComponent(list, newValue, index, isSelected, cellHasFocus); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm