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 04240b794d8982c25c8d4dc2b80eb6c255da485c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 29 17:34:53 2014 +0100 refs #875 #1043 : lettering --- .../ui/celleditor/BigDecimalTableCellRenderer.java | 39 +--- .../FinancialTransactionUnbalancedView.jaxx | 5 +- .../lima/ui/lettering/LetteringEditModel.java | 40 ++-- .../org/chorem/lima/ui/lettering/LetteringView.css | 100 +++++++++ .../chorem/lima/ui/lettering/LetteringView.jaxx | 249 +++++++++------------ .../lima/ui/lettering/LetteringViewHandler.java | 64 ++++-- .../org/chorem/lima/util/BigDecimalToString.java | 40 ++++ .../resources/i18n/lima-swing_en_GB.properties | 11 + .../resources/i18n/lima-swing_fr_FR.properties | 20 +- 9 files changed, 344 insertions(+), 224 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java b/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java index 16591aa..5aab64e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java @@ -21,45 +21,18 @@ */ package org.chorem.lima.ui.celleditor; -import org.chorem.lima.LimaSwingApplicationContext; -import org.chorem.lima.LimaSwingConfig; +import org.chorem.lima.util.BigDecimalToString; -import javax.swing.*; -import java.awt.*; +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.SwingConstants; +import java.awt.Component; import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; public class BigDecimalTableCellRenderer extends DefaultLimaTableCellRenderer { private static final long serialVersionUID = -2499433026151065390L; - public static String format(BigDecimal value) { - - LimaSwingConfig config = LimaSwingApplicationContext.getContext().getConfig(); - StringBuilder scale = new StringBuilder(); - for (int i = 0; i < config.getScale(); i++) { - scale.append("0"); - } - String currency = ""; - if (config.getCurrency()) { - currency = " ¤"; - } - DecimalFormat formatter = new DecimalFormat("##0." + scale.toString() + currency); - DecimalFormatSymbols symbol = new DecimalFormatSymbols(); - //set decimalSeparator and thousandSeparator preferences - symbol.setDecimalSeparator(config.getDecimalSeparator()); - symbol.setMonetaryDecimalSeparator(config.getDecimalSeparator()); - symbol.setGroupingSeparator(config.getThousandSeparator()); - formatter.setDecimalFormatSymbols(symbol); - //always set grouping - formatter.setGroupingUsed(true); - formatter.setGroupingSize(3); - String result = formatter.format(value); - return result; - } - - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { @@ -73,7 +46,7 @@ public class BigDecimalTableCellRenderer extends DefaultLimaTableCellRenderer { public void setValue(Object aValue) { Object result = aValue; if (aValue != null && aValue instanceof BigDecimal) { - result = format((BigDecimal)result); + result = BigDecimalToString.format((BigDecimal)result); } super.setValue(result); } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx index 6c37e76..179d39c 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx @@ -9,6 +9,7 @@ published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + $Id: FinancialTransactionUnbalancedView.jaxx 3921 2014-09-19 15:21:43Z sbavencoff $ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -84,7 +85,7 @@ </JToolBar> - <JScrollPane> + <JScrollPane constraints="BorderLayout.CENTER"> <FinancialTransactionUnbalancedTableModel id="financialTransactionUnbalancedTableModel"/> <FinancialTransactionUnbalancedTable @@ -94,4 +95,4 @@ model="{getFinancialTransactionUnbalancedTableModel()}"/> </JScrollPane> -</JPanel> +</JPanel> \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java index 5e437b6..c400009 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java @@ -31,17 +31,17 @@ import java.math.BigDecimal; */ public class LetteringEditModel implements Serializable { - public static final String DEBIT_PROPERTY = "debit"; + public static final String PROPERTY_DEBIT = "debit"; - public static final String CREDIT_PROPERTY = "credit"; + public static final String PROPERTY_CREDIT = "credit"; - public static final String SOLDE_PROPERTY = "solde"; + public static final String PROPERTY_SOLD = "sold"; - public static final String LETTRED_PROPERTY = "lettred"; + public static final String PROPERTY_LETTRED = "lettred"; - public static final String UNLETTRED_PROPERTY = "unLettred"; + public static final String PROPERTY_UNLETTRED = "unLettred"; - public static final String EQUALIZED_PROPERTY = "equalized"; + public static final String PROPERTY_EQUALIZED = "equalized"; protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); @@ -51,7 +51,7 @@ public class LetteringEditModel implements Serializable { protected boolean equalized; protected BigDecimal debit = BigDecimal.ZERO; protected BigDecimal credit = BigDecimal.ZERO; - protected BigDecimal solde = BigDecimal.ZERO; + protected BigDecimal sold = BigDecimal.ZERO; public boolean isEqualized() { return equalized; @@ -60,7 +60,7 @@ public class LetteringEditModel implements Serializable { public void setEqualized(boolean equalized) { boolean oldEqualized = isEqualized(); this.equalized = equalized; - firePropertyChange(EQUALIZED_PROPERTY, oldEqualized, this.equalized); + firePropertyChange(PROPERTY_EQUALIZED, oldEqualized, this.equalized); } public boolean isLettred() { @@ -69,12 +69,12 @@ public class LetteringEditModel implements Serializable { public void setLettred(boolean lettred) { boolean oldLettrer = isLettred(); - if(lettred && (solde == BigDecimal.ZERO || solde.doubleValue() == 0)){ + if(lettred && (sold == BigDecimal.ZERO || sold.doubleValue() == 0)){ this.lettred = lettred; }else{ this.lettred = false; } - firePropertyChange(LETTRED_PROPERTY, oldLettrer, this.lettred); + firePropertyChange(PROPERTY_LETTRED, oldLettrer, this.lettred); } public boolean isUnLettred() { @@ -84,7 +84,7 @@ public class LetteringEditModel implements Serializable { public void setUnLettred(boolean unLettred) { boolean oldDelettrer = isUnLettred(); this.unLettred = unLettred; - firePropertyChange(UNLETTRED_PROPERTY, oldDelettrer, this.unLettred); + firePropertyChange(PROPERTY_UNLETTRED, oldDelettrer, this.unLettred); } public BigDecimal getDebit() { @@ -100,7 +100,7 @@ public class LetteringEditModel implements Serializable { this.debit = BigDecimal.ZERO; } - firePropertyChange(DEBIT_PROPERTY, oldDebit, this.debit); + firePropertyChange(PROPERTY_DEBIT, oldDebit, this.debit); } public BigDecimal getCredit() { @@ -116,27 +116,27 @@ public class LetteringEditModel implements Serializable { this.credit=BigDecimal.ZERO; } - firePropertyChange(CREDIT_PROPERTY, oldCredit, this.credit); + firePropertyChange(PROPERTY_CREDIT, oldCredit, this.credit); } - public BigDecimal getSolde() { - return solde; + public BigDecimal getSold() { + return sold; } public void setSolde(BigDecimal solde, boolean credit) { - BigDecimal oldSolde = getSolde(); + BigDecimal oldSolde = getSold(); if (solde != BigDecimal.ZERO){ if (credit){ - this.solde = oldSolde.subtract(solde); + this.sold = oldSolde.subtract(solde); }else{ - this.solde = oldSolde.add(solde); + this.sold = oldSolde.add(solde); } }else{ - this.solde=BigDecimal.ZERO; + this.sold =BigDecimal.ZERO; } - firePropertyChange(SOLDE_PROPERTY, oldSolde, this.solde); + firePropertyChange(PROPERTY_SOLD, oldSolde, this.sold); } public void resetDebitCreditBalance(){ diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css new file mode 100644 index 0000000..0ad9584 --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css @@ -0,0 +1,100 @@ +.toolbar { + floatable : false; +} + +#lettered { + toolTipText : "lima.lettering.lettered"; + enabled : {editModel.lettred}; + actionIcon : "lettering"; +} + +#noLettered { + toolTipText : "lima.lettering.unLettered"; + enabled : {editModel.unLettred}; + actionIcon : "un-lettering"; +} + +#round { + toolTipText : "lima.lettering.equalize"; + enabled : {editModel.equalized}; + actionIcon : "balance"; +} + +#accountLabel { + actionIcon : "choose-account"; + labelFor : {accountComboBox}; +} + +#accountComboBox { + toolTipText : "lima.lettering.account"; + model : {accountComboBoxModel}; + renderer : {new org.chorem.lima.ui.common.AccountListRenderer()}; +} + +#back { + toolTipText : "lima.lettering.account.back"; + actionIcon : "previous"; +} + +#next { + toolTipText : "lima.lettering.account.next"; + actionIcon : "next"; +} + +#beginPeriodLabel { + text : "lima.lettering.period.begin"; + labelFor : {beginPeriodPicker}; +} + +#endPeriodLabel { + text : "lima.lettering.period.end"; + labelFor : {endPeriodPicker}; +} + +#letteredEntryLabel { + actionIcon : "choose-entry"; + labelFor : {letteredEntryComboBox}; +} + +#letteredEntryComboBox { + toolTipText : "lima.lettering.entry"; +} + +#refresh { + toolTipText : "lima.lettering.refresh"; + actionIcon : "refresh"; +} + +#debitLabel { + text : "lima.lettering.selection.debit"; + labelFor : {debitTextField}; +} + +#debitTextField { + enabled : false; + focusable : false; +} + +#creditLabel { + text : "lima.lettering.selection.credit"; + labelFor : {creditTextField}; +} + +#creditTextField { + enabled : false; + focusable : false; +} + +#soldLabel { + text : "lima.lettering.selection.sold"; + labelFor : {soldTextField}; +} + +#soldTextField { + enabled : false; + focusable : false; +} +#table { + sortable : false; + rowHeight : 22; +} diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx index d3fafd0..7b7d935 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx @@ -18,149 +18,106 @@ #L% --> -<Table > - - <import> - org.chorem.lima.ui.common.AccountComboBoxModel - org.chorem.lima.ui.common.FinancialPeriodComboBoxModel - org.chorem.lima.ui.lettering.TypeEntry - org.chorem.lima.entity.Account - javax.swing.ListSelectionModel - org.jdesktop.swingx.JXDatePicker - static org.nuiton.i18n.I18n.t - </import> - - <LetteringViewHandler id="handler" constructorParams="this"/> - - - <LetteringEditModel id='editModel'/> - - - - <script> - <![CDATA[ - void $afterCompleteSetup() { - handler.init(); - } - ]]> - </script> - - <row> - <cell fill="horizontal"> - <JToolBar floatable="false"> - - <JButton id="lettered" - toolTipText="{ t("lima.lettering.buttonLettered") + " (Ctrl+L)"}" - enabled="{editModel.isLettred()}" - actionIcon='lettering' - onActionPerformed="handler.addLetter()"/> - - <JButton id="noLettered" - toolTipText="{ t("lima.lettering.buttonNoLettered") + " (Del)"}" - enabled="{editModel.isUnLettred()}" - actionIcon='un-lettering' - onActionPerformed="handler.removeLetter()"/> - - <JButton id="round" - toolTipText="{ t("lima.lettering.buttonEqualize") + " (Ctrl+B)"}" - enabled="{editModel.isEqualized()}" - actionIcon='balance' - onActionPerformed="handler.roundAndCreateEntry()"/> - - <JToolBar.Separator/> - - <JLabel actionIcon='choose-account' - labelFor='{accountComboBox}'/> - <org.chorem.lima.ui.common.AccountComboBoxModel id="accountComboBoxModel"/> - <JComboBox id="accountComboBox" - model="{accountComboBoxModel}" - toolTipText="lima.lettering.account" - renderer="{new org.chorem.lima.ui.common.AccountListRenderer()}" - onItemStateChanged="handler.setAccount((Account)accountComboBoxModel.getSelectedItem())" /> - <JButton id="back" actionIcon="previous" - toolTipText="lima.account.buttonback" - onActionPerformed="handler.back(accountComboBox)"/> - <JButton id="next" actionIcon="next" - toolTipText="lima.account.buttonnext" - onActionPerformed="handler.next(accountComboBox)"/> - - <JToolBar.Separator/> - - <JLabel text="lima.lettering.beginFinancialPeriod" - labelFor='{pickerDebut}'/> - <JXDatePicker id="pickerDebut" - onActionPerformed="handler.setDateStart(pickerDebut.getDate())"/> - - <JLabel text="lima.lettering.endFinancialPeriod" - labelFor="{pickerFin}"/> - <JXDatePicker id="pickerFin" - onActionPerformed="handler.setDateEnd(pickerFin.getDate())"/> - - <JToolBar.Separator/> - - <JLabel actionIcon='choose-entry' - labelFor='{lettredEntryComboBox}'/> - <EnumEditor id='lettredEntryComboBox' - genericType='TypeEntry' - constructorParams='TypeEntry.class' - toolTipText="lima.lettering.entry" - onItemStateChanged="handler.setTypeEntry(lettredEntryComboBox.getSelectedItem())" /> - - <JToolBar.Separator/> - - <JButton id="refresh" - toolTipText="{ t("lima.lettering.buttonRefresh") + " (F5)"}" - actionIcon='refresh' - onActionPerformed="handler.updateAllEntries()"/> - - </JToolBar> - </cell> - </row> - <row> - <cell fill="horizontal" > - <JToolBar floatable="false"> - <JLabel text="lima.lettering.selectDebit" - labelFor='{debitTexttField}'/> - <JTextField id="debitTexttField" - enabled="false" - text="{editModel.getDebit().toString()}" - focusable="false"/> - - <JToolBar.Separator/> - - <JLabel text="lima.lettering.selectCredit" - labelFor='{creditTextField}'/> - <JTextField id="creditTextField" - enabled="false" - text="{editModel.getCredit().toString()}" - focusable="false"/> - - <JToolBar.Separator/> - - <JLabel text="lima.lettering.selectSolde" - labelFor='{soldeTextField}'/> - <JTextField id="soldeTextField" - enabled="false" - text="{editModel.getSolde().toString()}" - focusable="false"/> - - </JToolBar> - </cell> - </row> - <row> - <cell fill="both" weightx="1" weighty="1" > - <JScrollPane> - <LetteringTableModel id="tableModel"/> - <LettringSelectionModel id='lettringSelectionModel' constructorParams='tableModel' - onValueChanged="handler.balanceAndActions()"/> - - <LetteringTable id="table" - sortable="false" - rowHeight="22" - constructorParams="handler" - model="{tableModel}" - selectionModel="{lettringSelectionModel}" /> - </JScrollPane> - </cell> - </row> -</Table> +<JPanel layout="{new BorderLayout()}"> + + <import> + org.chorem.lima.ui.common.AccountComboBoxModel + org.chorem.lima.ui.common.FinancialPeriodComboBoxModel + org.chorem.lima.util.BigDecimalToString + org.chorem.lima.ui.lettering.TypeEntry + org.chorem.lima.entity.Account + javax.swing.ListSelectionModel + org.jdesktop.swingx.JXDatePicker + static org.nuiton.i18n.I18n.t + </import> + + <LetteringViewHandler id="handler" constructorParams="this"/> + + <LetteringEditModel id='editModel'/> + + <script> + <![CDATA[ + void $afterCompleteSetup() { + handler.init(); + } + ]]> + </script> + + <JToolBar styleClass="toolbar" + constraints="BorderLayout.PAGE_START"> + + <JButton id="lettered" + onActionPerformed="handler.addLetter()"/> + + <JButton id="noLettered" + onActionPerformed="handler.removeLetter()"/> + + <JButton id="round" + onActionPerformed="handler.roundAndCreateEntry()"/> + + <JToolBar.Separator/> + + <JLabel id="accountLabel"/> + <org.chorem.lima.ui.common.AccountComboBoxModel id="accountComboBoxModel"/> + <JComboBox id="accountComboBox" + onItemStateChanged="handler.setAccount((Account)accountComboBoxModel.getSelectedItem())" /> + <JButton id="back" + onActionPerformed="handler.back(accountComboBox)"/> + <JButton id="next" + onActionPerformed="handler.next(accountComboBox)"/> + + <JToolBar.Separator/> + + <JLabel id="beginPeriodLabel"/> + <JXDatePicker id="beginPeriodPicker" + onActionPerformed="handler.setDateStart(beginPeriodPicker.getDate())"/> + + <JLabel id="endPeriodLabel"/> + <JXDatePicker id="endPeriodPicker" + onActionPerformed="handler.setDateEnd(endPeriodPicker.getDate())"/> + + <JToolBar.Separator/> + + <JLabel id='letteredEntryLabel' actionIcon='choose-entry' + labelFor='{letteredEntryComboBox}'/> + <EnumEditor id='letteredEntryComboBox' + genericType='TypeEntry' + constructorParams='TypeEntry.class' + onItemStateChanged="handler.setTypeEntry(letteredEntryComboBox.getSelectedItem())" /> + + <JToolBar.Separator/> + + <JButton id="refresh" + onActionPerformed="handler.updateAllEntries()"/> + + </JToolBar> + <JPanel constraints="BorderLayout.CENTER" + layout="{new BorderLayout()}"> + <JToolBar styleClass="toolbar" + constraints="BorderLayout.PAGE_START"> + <JLabel id="debitLabel"/> + <JFormattedTextField id="debitTextField"/> + + <JToolBar.Separator/> + + <JLabel id="creditLabel"/> + <JTextField id="creditTextField"/> + + <JToolBar.Separator/> + + <JLabel id="soldLabel"/> + <JTextField id="soldTextField"/> + + </JToolBar> + <JScrollPane constraints="BorderLayout.CENTER"> + <LetteringTableModel id="tableModel"/> + <LettringSelectionModel id='letteringSelectionModel' constructorParams='tableModel' + onValueChanged="handler.balanceAndActions()"/> + + <LetteringTable id="table" + constructorParams="handler" + model="{tableModel}" + selectionModel="{letteringSelectionModel}"/> + </JScrollPane> + </JPanel> +</JPanel> \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java index b68c8c5..a2cec45 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java @@ -6,15 +6,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -43,12 +43,20 @@ import org.chorem.lima.entity.AccountImpl; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.util.BigDecimalToString; import org.chorem.lima.util.ErrorHelper; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.ActionMap; +import javax.swing.InputMap; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.math.BigDecimal; import java.util.Calendar; import java.util.Date; @@ -108,8 +116,36 @@ public class LetteringViewHandler{ public void init() { filter = new LetteringFilterImpl(); editModel = view.getEditModel(); - lettringSelectionModel = view.getLettringSelectionModel(); + lettringSelectionModel = view.getLetteringSelectionModel(); loadComboAndRows(); + + editModel.addPropertyChangeListener(LetteringEditModel.PROPERTY_DEBIT, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + BigDecimal debit = (BigDecimal) evt.getNewValue(); + String text = BigDecimalToString.format(debit); + view.getDebitTextField().setText(text); + } + }); + + editModel.addPropertyChangeListener(LetteringEditModel.PROPERTY_CREDIT, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + BigDecimal credit = (BigDecimal) evt.getNewValue(); + String text = BigDecimalToString.format(credit); + view.getCreditTextField().setText(text); + } + }); + + editModel.addPropertyChangeListener(LetteringEditModel.PROPERTY_SOLD, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + BigDecimal sold = (BigDecimal) evt.getNewValue(); + String text = BigDecimalToString.format(sold); + view.getSoldTextField().setText(text); + } + }); + } protected void initShortCuts() { @@ -218,7 +254,7 @@ public class LetteringViewHandler{ //Unlettred entries onBalanceChanged(null); //treatment unuseful if no rows are selected - if (!view.getLettringSelectionModel().isSelectionEmpty()) { + if (!view.getLetteringSelectionModel().isSelectionEmpty()) { if (log.isDebugEnabled()) { log.debug("Rows selected"); } @@ -272,7 +308,7 @@ public class LetteringViewHandler{ Entry selectedEntry; LetteringTableModel tableModel = view.getTableModel(); for (int i = 0; i < tableModel.getRowCount(); i ++){ - if (view.getLettringSelectionModel().isSelectedIndex(i)){ + if (view.getLetteringSelectionModel().isSelectedIndex(i)){ selectedEntry = tableModel.get(i); //Set values for calculation (By LetteringEditModel) of balance onBalanceChanged(selectedEntry); @@ -351,13 +387,13 @@ public class LetteringViewHandler{ Date defaultDateEndCurrent = DateUtils.setDays(new Date(), dernierJourMoisCourant); - view.getPickerDebut().setDate(defaultDateBegFiscalPeriod); - view.getPickerFin().setDate(defaultDateEndCurrent); + view.getBeginPeriodPicker().setDate(defaultDateBegFiscalPeriod); + view.getEndPeriodPicker().setDate(defaultDateEndCurrent); filter.setDateStart(defaultDateBegFiscalPeriod); filter.setDateEnd(defaultDateEndCurrent); - TypeEntry type = view.getLettredEntryComboBox().getSelectedItem(); + TypeEntry type = view.getLetteredEntryComboBox().getSelectedItem(); setTypeEntry(type); updateAllEntries(); @@ -429,7 +465,7 @@ public class LetteringViewHandler{ /*Re-select the two entries (firstSelectedEntry and secondSelectedEntry) * and the new sameAccountEntry * */ - view.getLettringSelectionModel().selectRoundedAndNewEntries(selectedRows[0], selectedRows[1], newSameAccountEntry); + view.getLetteringSelectionModel().selectRoundedAndNewEntries(selectedRows[0], selectedRows[1], newSameAccountEntry); } catch (LockedFinancialPeriodException e) { errorHelper.showErrorMessage(t("lima.lettering.roundAndCreateEntry.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), @@ -455,7 +491,7 @@ public class LetteringViewHandler{ if (row > 0) { comboBox.setSelectedIndex(row - 1); } - view.getLettringSelectionModel().clearSelection(); + view.getLetteringSelectionModel().clearSelection(); } /** @@ -470,7 +506,7 @@ public class LetteringViewHandler{ if (row < size - 1) { comboBox.setSelectedIndex(row + 1); } - view.getLettringSelectionModel().clearSelection(); + view.getLetteringSelectionModel().clearSelection(); } /**Add a group of three letters to n entries*/ diff --git a/lima-swing/src/main/java/org/chorem/lima/util/BigDecimalToString.java b/lima-swing/src/main/java/org/chorem/lima/util/BigDecimalToString.java new file mode 100644 index 0000000..f04e506 --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/util/BigDecimalToString.java @@ -0,0 +1,40 @@ +package org.chorem.lima.util; + +import org.chorem.lima.LimaSwingApplicationContext; +import org.chorem.lima.LimaSwingConfig; + +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class BigDecimalToString { + + public static String format(BigDecimal value) { + + LimaSwingConfig config = LimaSwingApplicationContext.getContext().getConfig(); + StringBuilder scale = new StringBuilder(); + for (int i = 0; i < config.getScale(); i++) { + scale.append("0"); + } + String currency = ""; + if (config.getCurrency()) { + currency = " ¤"; + } + DecimalFormat formatter = new DecimalFormat("##0." + scale.toString() + currency); + DecimalFormatSymbols symbol = new DecimalFormatSymbols(); + //set decimalSeparator and thousandSeparator preferences + symbol.setDecimalSeparator(config.getDecimalSeparator()); + symbol.setMonetaryDecimalSeparator(config.getDecimalSeparator()); + symbol.setGroupingSeparator(config.getThousandSeparator()); + formatter.setDecimalFormatSymbols(symbol); + //always set grouping + formatter.setGroupingUsed(true); + formatter.setGroupingSize(3); + String result = formatter.format(value); + return result; + } + +} diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index 206b059..531f06c 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -557,6 +557,8 @@ lima.init.errorclosing=Error during Lima close lima.label=Label lima.ledger.documentcreationerror=Enable to create document lima.lettering.account=Accounts +lima.lettering.account.back= +lima.lettering.account.next= lima.lettering.accountRegularization=Lettering regularization lima.lettering.actions=Actions lima.lettering.beginFinancialPeriod=From @@ -572,14 +574,23 @@ lima.lettering.checkNoLettredEntry=Unlettered lima.lettering.checkNoLettredEntrye= lima.lettering.endFinancialPeriod=To lima.lettering.entry=Entries +lima.lettering.equalize= +lima.lettering.lettered= lima.lettering.listerror=Can't get entries list lima.lettering.period=Periods +lima.lettering.period.begin= +lima.lettering.period.end= +lima.lettering.refresh= lima.lettering.roundAndCreateEntry.error.lockedEntryBook= lima.lettering.roundAndCreateEntry.error.lockedFinancialPeriod= lima.lettering.selectCredit= lima.lettering.selectDebit= lima.lettering.selectEntry=Actual selection lima.lettering.selectSolde=Balance +lima.lettering.selection.credit= +lima.lettering.selection.debit= +lima.lettering.selection.sold= +lima.lettering.unLettered= lima.list.seeAll=ALL lima.locale= lima.mainview.title=Lutin Invoice Monitoring and Accounting diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index c2a661f..4c60004 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -478,29 +478,31 @@ lima.init.errorclosing=Erreur lors de la fermeture lima.label=Libellé lima.ledger.documentcreationerror=Erreur lors de la création du document lima.lettering.account=Comptes +lima.lettering.account.back=← +lima.lettering.account.next=→ lima.lettering.accountRegularization=Régularisation lettrage lima.lettering.actions=Actions -lima.lettering.beginFinancialPeriod=De lima.lettering.buttonAuto=Auto -lima.lettering.buttonEqualize=Equilibrer -lima.lettering.buttonLettered=Lettrer -lima.lettering.buttonNoLettered=Délettrer -lima.lettering.buttonRefresh=Rafraîchir lima.lettering.checkAll=Toutes lima.lettering.checkLettredEntry=Lettrées lima.lettering.checkLettredEntrye= lima.lettering.checkNoLettredEntry=Non-lettrées lima.lettering.checkNoLettredEntrye= -lima.lettering.endFinancialPeriod=A lima.lettering.entry=Écritures +lima.lettering.equalize=Equilibrer (Ctrl+B) +lima.lettering.lettered=Lettrer (Ctrl+L) lima.lettering.listerror=Erreur lors de la récupération des données de la liste lima.lettering.period=Périodes +lima.lettering.period.begin=De +lima.lettering.period.end=A +lima.lettering.refresh=Rafraîchir (F5) lima.lettering.roundAndCreateEntry.error.lockedEntryBook=Impossible de modifier le lettrage d'une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.lettering.roundAndCreateEntry.error.lockedFinancialPeriod=Impossible de modifier le lettrage d'une entré car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.lettering.selectCredit=Crédit -lima.lettering.selectDebit=Débit lima.lettering.selectEntry=Sélection courante -lima.lettering.selectSolde=Solde +lima.lettering.selection.credit=Crédit +lima.lettering.selection.debit=Débit +lima.lettering.selection.sold=Solde +lima.lettering.unLettered=Délettrer (Suppr) lima.list.seeAll=TOUS lima.mainview.title=Lutin Invoice Monitoring and Accounting lima.message.help.usage=Options (set with --option <key> <value>\: -- 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 develop in repository lima. See http://git.chorem.org/lima.git commit 29ee0f5bb6035972d89abcf37ec8738ac71e4107 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 30 10:58:21 2014 +0100 refs #875 #1043 : report --- .../java/org/chorem/lima/util/ReportDialogView.css | 11 ++++++ .../org/chorem/lima/util/ReportDialogView.jaxx | 46 +++++++++++----------- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.css b/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.css new file mode 100644 index 0000000..772781d --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.css @@ -0,0 +1,11 @@ +#reportDialog { + modal : true; +} + +#textArea { + editable : false; +} + +#okButton { + text : "lima.ok"; +} \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.jaxx b/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.jaxx index 3cf4c51..c87a633 100644 --- a/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.jaxx @@ -20,28 +20,26 @@ #L% --> -<JDialog modal="true"> - <script> - <![CDATA[ - protected void performOk() { - dispose(); - } - ]]> - </script> - - <Table> - <row weightx="1" weighty="1"> - <cell fill="both"> - <JScrollPane id="scrollPane"> - <JTextArea id="textArea" editable="false"/> - </JScrollPane> - </cell> - </row> - <row anchor="east"> - <cell> - <JButton id="okButton" text="lima.ok" - onActionPerformed="performOk()"/> - </cell> - </row> - </Table> +<JDialog id="reportDialog" + layout="{new BorderLayout()}"> + + <import> + java.awt.FlowLayout + </import> + + <JScrollPane id="scrollPane" + constraints="BorderLayout.CENTER"> + + <JTextArea id="textArea"/> + + </JScrollPane> + + <JPanel constraints="BorderLayout.PAGE_END" + layout="{new FlowLayout(FlowLayout.RIGHT)}"> + + <JButton id="okButton" + onActionPerformed="dispose()"/> + + </JPanel> + </JDialog> -- 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 develop in repository lima. See http://git.chorem.org/lima.git commit 81333e777ba685a031ecc919a401592c37461de4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 31 09:22:44 2014 +0100 refs #1043 : refactor traduction key , remove unused class --- .../src/main/java/org/chorem/lima/LimaMain.java | 8 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 34 +- .../chorem/lima/enums/ComboBoxAccountsEnum.java | 65 --- .../org/chorem/lima/enums/ComboBoxDatesEnum.java | 78 ---- .../chorem/lima/enums/ComboBoxEntryBooksEnum.java | 64 --- .../org/chorem/lima/enums/ComboBoxLetterEnum.java | 64 --- .../chorem/lima/enums/ComboBoxOperatorsEnum.java | 77 ---- .../org/chorem/lima/enums/ComboBoxPeriodEnum.java | 66 --- .../BigDecimalCondition/CreditConditionView.java | 2 +- .../BigDecimalCondition/DebitConditionView.java | 2 +- .../StringCondition/DescriptionConditionView.java | 2 +- .../StringCondition/LetteringConditionView.java | 2 +- .../Filter/StringCondition/StringConditionView.css | 1 - .../src/main/java/org/chorem/lima/ui/MainView.css | 14 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 2 +- .../org/chorem/lima/ui/account/AccountForm.css | 2 +- .../chorem/lima/ui/account/AccountImportForm.css | 10 +- .../chorem/lima/ui/account/AccountViewHandler.java | 10 +- .../chorem/lima/ui/account/UpdateAccountForm.css | 2 +- .../lima/ui/common/AbstractLimaTableModel.java | 2 +- .../org/chorem/lima/ui/common/IntervalPanel.java | 245 ---------- .../lima/ui/entrybook/EntryBookViewHandler.java | 6 +- .../financialperiod/FinancialPeriodTableModel.java | 6 +- .../FinancialPeriodViewHandler.java | 4 +- .../FinancialStatementChartTreeTableModel.java | 8 +- .../FinancialStatementChartViewHandler.java | 6 +- .../FinancialStatementImportForm.css | 8 +- .../ui/financialtransaction/AccountColumn.java | 2 +- .../lima/ui/financialtransaction/CreditColumn.java | 2 +- .../lima/ui/financialtransaction/DebitColumn.java | 2 +- .../ui/financialtransaction/DescriptionColumn.java | 4 +- .../ui/financialtransaction/EntryBookColumn.java | 2 +- .../FinancialTransactionView.css | 6 +- .../FinancialTransactionViewHandler.java | 50 +-- .../FinancialTransactionSearchView.jaxx | 6 - .../FinancialTransactionUnbalancedView.css | 2 +- .../FinancialTransactionUnbalancedViewHandler.java | 20 +- .../org/chorem/lima/ui/fiscalperiod/AddPeriod.css | 4 +- .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 10 +- .../fiscalperiod/RetainedEarningsEntryBookForm.css | 2 +- .../chorem/lima/ui/importexport/ImportExport.java | 57 ++- .../lima/ui/lettering/LetteringViewHandler.java | 2 +- .../chorem/lima/ui/opening/CreateAccountsPanel.css | 10 +- .../lima/ui/opening/CreateEntryBookPanel.css | 4 +- .../lima/ui/opening/CreateFiscalPeriodPanel.css | 6 +- .../lima/ui/vatchart/VatChartTreeTableModel.java | 4 +- .../lima/ui/vatchart/VatChartViewHandler.java | 13 +- .../java/org/chorem/lima/util/ErrorHelper.java | 2 +- .../resources/i18n/lima-swing_en_GB.properties | 492 ++++++--------------- .../resources/i18n/lima-swing_fr_FR.properties | 398 ++++++----------- 50 files changed, 429 insertions(+), 1461 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java index ba63d07..b83de13 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java @@ -124,12 +124,12 @@ public class LimaMain { } catch (Exception e) { // could not find nimbus look-and-feel if (log.isWarnEnabled()) { - log.warn(t("lima.warning.nimbus.landf")); + log.warn(t("lima.lookAndFeel.nimbus.warning")); } } splash.drawVersion(config.getVersion()); - splash.updateProgression(0.1, t("lima.splash.1")); + splash.updateProgression(0.1, t("lima.launch.services")); LimaServiceFactory.initFactory(config); // do init ui @@ -142,7 +142,7 @@ public class LimaMain { // load accounts and test if there is an account plan defined // if not, call #loadDefaultAccount() - splash.updateProgression(0.7, t("lima.splash.2")); + splash.updateProgression(0.7, t("lima.launch.accounting")); //start http server LimaServiceFactory.getService(HttpServerService.class).start(); @@ -159,7 +159,7 @@ public class LimaMain { openingView.setLocationRelativeTo(null); openingView.setVisible(true); } else { - splash.updateProgression(1, t("lima.splash.3")); + splash.updateProgression(1, t("lima.launch.finished")); } // show ui SwingUtilities.invokeLater(new Runnable() { diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java index 28b33c7..18695df 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java @@ -305,7 +305,7 @@ public class LimaSwingConfig extends ApplicationConfig { * @return {@code true} if remote mode should be used */ public boolean isEJBRemoteMode() { - boolean result = getOptionAsBoolean(Option.OPENEJB_REMOTEMODE.key); + boolean result = getOptionAsBoolean(Option.OPENEJB_REMOTE_MODE.key); return result; } @@ -412,8 +412,8 @@ public class LimaSwingConfig extends ApplicationConfig { Locale.class, false, false), DECIMAL_SEPARATOR("lima.data.bigDecimal.decimalSeparator", - t("lima.config.decimalseparator.label"), - n("lima.config.decimalseparator.description"), + t("lima.config.decimalSeparator.label"), + n("lima.config.decimalSeparator.description"), ",", Character.class, false, false), @@ -424,8 +424,8 @@ public class LimaSwingConfig extends ApplicationConfig { Integer.class, false, false), THOUSAND_SEPARATOR("lima.thousandSeparator", - t("limma.config.thousandseparator.label"), - n("limma.config.thousandseparator.description"), + t("lima.config.thousandSeparator.label"), + n("lima.config.thousandSeparator.description"), " ", Character.class, false, false), @@ -436,25 +436,25 @@ public class LimaSwingConfig extends ApplicationConfig { Boolean.class, false, false), LAUNCH_UI("lima.ui.launchui", - t("lima.config.ui.flaunchui.label"), - n("lima.config.ui.flaunchui.description"), + t("lima.config.ui.launchUi.label"), + n("lima.config.ui.launchUi.description"), "true", Boolean.class, true, true), - SUPPORT_EMAIL("lima.misc.supportemail", - t("lima.misc.supportemail.label"), - n("lima.misc.supportemail.description"), + SUPPORT_EMAIL("lima.email.support", + t("lima.email.support.label"), + n("lima.email.support.description"), "support@codelutin.com", String.class, false, false), - OPENEJB_REMOTEMODE("lima.openejb.remotemode", - t("lima.openejb.remotemode.label"), - n("lima.openejb.remotemode.description"), + OPENEJB_REMOTE_MODE("lima.openEjb.remote.mode", + t("lima.openEjb.remote.mode.label"), + n("lima.openEjb.remote.mode.description"), "false", String.class, false, false), LIMA_HOST_ADDRESS("lima.host.address", - t("lima.config.host.adress.label"), - n("lima.config.host.adress.description"), + t("lima.config.host.address.label"), + n("lima.config.host.address.description"), "localhost", String.class, false, false), @@ -465,8 +465,8 @@ public class LimaSwingConfig extends ApplicationConfig { String.class, false, false), COLOR_SELECTION_FOCUS("lima.ui.table.cell.colorSelectionFocus", - t("lima.config.colorselectionfocus.label"), - n("lima.config.colorselectionfocus.description"), + t("lima.config.color.selection.focus.label"), + n("lima.config.color.selection.focus.description"), "#000000", Color.class, false, false), diff --git a/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxAccountsEnum.java b/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxAccountsEnum.java deleted file mode 100644 index f4cbbcd..0000000 --- a/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxAccountsEnum.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * #%L - * Lima :: Swing - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.enums; - -import static org.nuiton.i18n.I18n.t; - - -public enum ComboBoxAccountsEnum { - - ALL(t("lima.enum.comboboxaccount.allaccount")), - ACCOUNT(t("lima.enum.comboboxaccount.account")), - ACCOUNT_LIST(t("lima.enum.comboboxaccount.accountlist")); - - private final String description; - - ComboBoxAccountsEnum(String description) { - this.description = description; - } - - public String getDescription() { - return description; - } - - public static String[] descriptions() { - int nbElts = ComboBoxAccountsEnum.values().length; - String[] descriptions = new String[nbElts]; - ComboBoxAccountsEnum[] enums = ComboBoxAccountsEnum.values(); - for (int i = 0; i < nbElts; i++) { - descriptions[i] = enums[i].getDescription(); - } - return descriptions; - } - - public static ComboBoxAccountsEnum valueOfDescription(String description) { - ComboBoxAccountsEnum value = null; - - for (ComboBoxAccountsEnum enums : ComboBoxAccountsEnum.values()) { - if (description.equals(enums.description)) { - value = enums; - break; - } - } - return value; - } -} diff --git a/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxDatesEnum.java b/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxDatesEnum.java deleted file mode 100644 index 6bd8d2e..0000000 --- a/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxDatesEnum.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * #%L - * Lima :: Swing - * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.enums; - -import static org.nuiton.i18n.I18n.t; - -/** - * Enumeration representant un choix de type de periode. - * - * Actuellement: - * - Exercice - * - Period financiere - * - Period par interval de date. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public enum ComboBoxDatesEnum { - - FISCAL_PERIOD(t("lima.enum.comboboxperiod.fiscalperiod")), - FINANCIAL_PERIOD(t("lima.enum.comboboxperiod.financialperiod")), - PERIOD(t("lima.enum.comboboxperiod.period")); - - protected String description; - - ComboBoxDatesEnum(String description) { - this.description = description; - } - - public String getDescription() { - return description; - } - - public static String[] descriptions() { - int nbElts = ComboBoxDatesEnum.values().length; - String[] descriptions = new String[nbElts]; - ComboBoxDatesEnum[] enums = ComboBoxDatesEnum.values(); - for (int i = 0; i < nbElts; i++) { - descriptions[i] = enums[i].getDescription(); - } - return descriptions; - } - - public static ComboBoxDatesEnum valueOfDescription(String description) { - ComboBoxDatesEnum value = null; - - for (ComboBoxDatesEnum enums : ComboBoxDatesEnum.values()) { - if (description.equals(enums.description)) { - value = enums; - break; - } - } - return value; - } -} diff --git a/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxEntryBooksEnum.java b/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxEntryBooksEnum.java deleted file mode 100644 index df569a5..0000000 --- a/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxEntryBooksEnum.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * #%L - * Lima :: Swing - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.enums; - -import static org.nuiton.i18n.I18n.t; - - -public enum ComboBoxEntryBooksEnum { - - ALL(t("lima.enum.comboboxentrybook.all")), - SELECT_ONE(t("lima.enum.comboboxentrybook.select_one")); - - private final String description; - - ComboBoxEntryBooksEnum(String description) { - this.description = description; - } - - public String getDescription() { - return description; - } - - public static String[] descriptions() { - int nbElts = ComboBoxEntryBooksEnum.values().length; - String[] descriptions = new String[nbElts]; - ComboBoxEntryBooksEnum[] enums = ComboBoxEntryBooksEnum.values(); - for (int i = 0; i < nbElts; i++) { - descriptions[i] = enums[i].getDescription(); - } - return descriptions; - } - - public static ComboBoxEntryBooksEnum valueOfDescription(String description) { - ComboBoxEntryBooksEnum value = null; - - for (ComboBoxEntryBooksEnum enums : ComboBoxEntryBooksEnum.values()) { - if (description.equals(enums.description)) { - value = enums; - break; - } - } - return value; - } -} diff --git a/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxLetterEnum.java b/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxLetterEnum.java deleted file mode 100644 index 9b011d2..0000000 --- a/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxLetterEnum.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * #%L - * Lima :: Swing - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.enums; - -import static org.nuiton.i18n.I18n.t; - - -public enum ComboBoxLetterEnum { - - ALL(t("lima.enum.comboboxletter.all")), - SELECT_ONE(t("lima.enum.comboboxletter.selectone")); - - private final String description; - - ComboBoxLetterEnum(String description) { - this.description = description; - } - - public String getDescription() { - return description; - } - - public static String[] descriptions() { - int nbElts = ComboBoxLetterEnum.values().length; - String[] descriptions = new String[nbElts]; - ComboBoxLetterEnum[] enums = ComboBoxLetterEnum.values(); - for (int i = 0; i < nbElts; i++) { - descriptions[i] = enums[i].getDescription(); - } - return descriptions; - } - - public static ComboBoxLetterEnum valueOfDescription(String description) { - ComboBoxLetterEnum value = null; - - for (ComboBoxLetterEnum enums : ComboBoxLetterEnum.values()) { - if (description.equals(enums.description)) { - value = enums; - break; - } - } - return value; - } -} diff --git a/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxOperatorsEnum.java b/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxOperatorsEnum.java deleted file mode 100644 index d7eb404..0000000 --- a/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxOperatorsEnum.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * #%L - * Lima :: Swing - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.enums; - -import static org.nuiton.i18n.I18n.t; - - -public enum ComboBoxOperatorsEnum { - - EQUAL(t("lima.enum.comboboxoperator.equal"), "="), - SUPERIOR_OR_EQUAL(t("lima.enum.comboboxoperator.superiororequal"), ">="), - INFERIOR_OR_EQUAL(t("lima.enum.comboboxoperator.inferiororequal"), "<="), - SUPERIOR(t("lima.enum.comboboxoperator.superior"), ">"), - INFERIOR(t("lima.enum.comboboxoperator.inferior"), "<"), - INTERVAL(t("lima.enum.comboboxoperator.interval"), ""), - NOT_EQUAL(t("lima.enum.comboboxoperator.notequal"), "!="); - - private final String description; - - private final String symbol; - - ComboBoxOperatorsEnum(String description, String symbol) { - this.description = description; - this.symbol = symbol; - } - - public String getDescription() { - return description; - } - - public String getSymbol() { - return symbol; - } - - public static String[] descriptions() { - int nbElts = ComboBoxOperatorsEnum.values().length; - String[] descriptions = new String[nbElts]; - ComboBoxOperatorsEnum[] enums = ComboBoxOperatorsEnum.values(); - for (int i = 0; i < nbElts; i++) { - descriptions[i] = enums[i].getDescription(); - } - return descriptions; - } - - - public static ComboBoxOperatorsEnum valueOfDescription(String description) { - ComboBoxOperatorsEnum value = null; - - for (ComboBoxOperatorsEnum enums : ComboBoxOperatorsEnum.values()) { - if (description.equals(enums.description)) { - value = enums; - break; - } - } - return value; - } -} diff --git a/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxPeriodEnum.java b/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxPeriodEnum.java deleted file mode 100644 index 23f4874..0000000 --- a/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxPeriodEnum.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * #%L - * Lima :: Swing - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.enums; - -import static org.nuiton.i18n.I18n.t; - - -public enum ComboBoxPeriodEnum { - - PERIOD(t("lima.enum.comboboxperiod.period")), - DATE(t("lima.enum.comboboxperiod.date")), - FISCAL_PERIOD(t("lima.enum.comboboxperiod.fiscalperiod")), - FINANCIAL_PERIOD(t("lima.enum.comboboxperiod.financialperiod")); - - private final String description; - - ComboBoxPeriodEnum(String description) { - this.description = description; - } - - public String getDescription() { - return description; - } - - public static String[] descriptions() { - int nbElts = ComboBoxPeriodEnum.values().length; - String[] descriptions = new String[nbElts]; - ComboBoxPeriodEnum[] enums = ComboBoxPeriodEnum.values(); - for (int i = 0; i < nbElts; i++) { - descriptions[i] = enums[i].getDescription(); - } - return descriptions; - } - - public static ComboBoxPeriodEnum valueOfDescription(String description) { - ComboBoxPeriodEnum value = null; - - for (ComboBoxPeriodEnum enums : ComboBoxPeriodEnum.values()) { - if (description.equals(enums.description)) { - value = enums; - break; - } - } - return value; - } -} diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java index f9d7f82..a24e248 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java @@ -32,7 +32,7 @@ public class CreditConditionView extends BigDecimalConditionView { public CreditConditionView() { super(); setHandler(new CreditConditionHandler(this)); - setTitle(t("lima.financialTransaction.credit")); + setTitle(t("lima.entry.credit")); getBigDecimalEditor().setBean(handler); getBigDecimalEditor().init(); } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java index aed05a7..4ccddc4 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java @@ -32,7 +32,7 @@ public class DebitConditionView extends BigDecimalConditionView { public DebitConditionView() { super(); setHandler(new DebitConditionHandler(this)); - setTitle(t("lima.financialTransaction.debit")); + setTitle(t("lima.entry.debit")); getBigDecimalEditor().setBean(handler); getBigDecimalEditor().init(); } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java index f1e12eb..1890fca 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java @@ -32,6 +32,6 @@ public class DescriptionConditionView extends StringConditionView { public DescriptionConditionView() { super(); setHandler(new DescriptionConditionHandler(this)); - setTitle(t("lima.financialTransaction.description")); + setTitle(t("lima.entry.description")); } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java index e74f73f..5d63249 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java @@ -32,6 +32,6 @@ public class LetteringConditionView extends StringConditionView { public LetteringConditionView() { super(); setHandler(new LetteringConditionHandler(this)); - setTitle(t("lima.financialTransaction.letter")); + setTitle(t("lima.entry.letter")); } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.css index 07dc9e0..cd5334e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.css @@ -1,5 +1,4 @@ #stringConditionFrame { - title : "lima.filter.date.window"; preferredSize : {new Dimension(200, 100)}; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css b/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css index 026d081..48984f7 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css @@ -21,7 +21,7 @@ */ #mainView { - title : "lima.mainview.title"; + title : "lima.title"; width : 800; height : 600; resizable : true; @@ -35,7 +35,7 @@ #csvImport { text : "lima.importExport.import"; actionIcon : "import"; } #csvImportAll { text : "lima.importExport.all"; } -#csvImportAccounts { text : "lima.accounts.plan"; actionIcon : "accounts"; } +#csvImportAccounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } #csvImportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } #csvImportFinancialStatements { text : "lima.financialStatements"; actionIcon : "financialStatements"; } #csvImportVatStatements { text : "lima.vatStatements"; actionIcon : "vatStatements"; } @@ -43,7 +43,7 @@ #csvExport { text : "lima.importExport.export"; actionIcon : "export"; } #csvExportAll { text : "lima.importExport.all"; } -#csvExportAccounts { text : "lima.accounts.plan"; actionIcon : "accounts"; } +#csvExportAccounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } #csvExportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } #csvExportFinancialStatements { text : "lima.financialStatements"; actionIcon : "financialStatements"; } #csvExportVatStatements { text : "lima.vatStatements"; actionIcon : "vatStatements"; } @@ -53,12 +53,12 @@ #ebp { text : "lima.importExport.ebp"; } #ebpImport { text : "lima.importExport.import"; actionIcon : "import"; } -#ebpImportAccounts { text : "lima.accounts.plan"; actionIcon : "accounts"; } +#ebpImportAccounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } #ebpImportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } #ebpImportEntries { text : "lima.entries"; actionIcon : "entries" } #ebpExport { text : "lima.importExport.export"; actionIcon : "export"; } -#ebpExportAccounts { text : "lima.accounts.plan"; actionIcon : "accounts"; } +#ebpExportAccounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } #ebpExportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } #ebpExportEntries { text : "lima.entries"; actionIcon : "entries" } @@ -70,7 +70,7 @@ #structure { text : "lima.structure"; mnemonic : "S"; } -#accounts { text : "lima.accounts.plan"; actionIcon : "accounts"; } +#accounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } #entryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } #fiscalYears { text : "lima.fiscalYears"; actionIcon : "fiscalPeriods"; } #financialPeriods { text : "lima.financialPeriods"; actionIcon : "financialPeriods"; } @@ -78,7 +78,7 @@ #vatStatements { text : "lima.vatStatements"; actionIcon : "vatStatements"; } -#enter { text : "lima.enterEntries"; mnemonic : "E"; } +#enter { text : "lima.entries"; mnemonic : "E"; } #entries { text : "lima.entries.enter"; actionIcon : "entries"; } #unbalanced { text : "lima.entries.unbalanced"; actionIcon : "entries-unbalanced"; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java index 5e3c65d..d9a3180 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java @@ -156,7 +156,7 @@ public class MainViewHandler { ConfigUIHelper helper = new ConfigUIHelper(config); - helper.registerCallBack(LimaSwingConfig.Option.COLOR_SELECTION_FOCUS.getKey(), t("lima.config.colorselectionfocus"), new ImageIcon(), new Runnable() { + helper.registerCallBack(LimaSwingConfig.Option.COLOR_SELECTION_FOCUS.getKey(), t("lima.config.color.selection.focus"), new ImageIcon(), new Runnable() { @Override public void run() { UIManager.put("Table.focusCellHighlightBorder", new BorderUIResource(new LineBorder(config.getColorSelectionFocus(), 2))); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css index 00d02c7..dd784d5 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css @@ -24,7 +24,7 @@ } #numberLabel { - text : "lima.charts.account.number"; + text : "lima.account.number"; labelFor : "{numberTextField}"; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css index 875ea77..ca10320 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css @@ -28,32 +28,32 @@ } #shortened { - text : "lima.charts.account.shortened"; + text : "lima.chart.accounts.shortened"; value : "{AccountsChartEnum.SHORTENED}"; buttonGroup : buttonGroup; selected : true; } #accountsBase { - text : "lima.charts.account.base"; + text : "lima.chart.accounts.base"; value : "{AccountsChartEnum.BASE}"; buttonGroup : buttonGroup; } #developed { - text : "lima.charts.account.developed"; + text : "lima.chart.accounts.developed"; value : "{AccountsChartEnum.DEVELOPED}"; buttonGroup : buttonGroup; } #importcsv { - text : "lima.charts.account.importcsv"; + text : "lima.chart.accounts.import.csv"; value : "{AccountsChartEnum.IMPORT}"; buttonGroup : buttonGroup; } #importebp { - text : "lima.charts.account.importebp"; + text : "lima.chart.accounts.import.ebp"; value : "{AccountsChartEnum.IMPORTEBP}"; buttonGroup : buttonGroup; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java index 7c07005..54e3122 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java @@ -283,9 +283,9 @@ public class AccountViewHandler implements ServiceListener { } catch (InvalidAccountNumberException e) { errorHelper.showErrorMessage(t("lima.account.add.error.InvalidAccountNumber", e.getAccountNumber())); } catch (NotNumberAccountNumberException e) { - errorHelper.showErrorMessage(t("lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException", e.getAccountNumber())); + errorHelper.showErrorMessage(t("lima.account.error.notNumberAccountNumber", e.getAccountNumber())); } catch (NotAllowedLabelException e) { - errorHelper.showErrorMessage(t("lima.all.notAllowedLabel", e.getLabel())); + errorHelper.showErrorMessage(t("lima.error.notAllowedLabel", e.getLabel())); } finally { dialog.dispose(); } @@ -395,7 +395,7 @@ public class AccountViewHandler implements ServiceListener { } catch (InvalidAccountNumberException e) { errorHelper.showErrorMessage(t("lima.account.update.error.invalidAccountNumber", e.getAccountNumber())); } catch (NotNumberAccountNumberException e) { - errorHelper.showErrorMessage(t("lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException", e.getAccountNumber())); + errorHelper.showErrorMessage(t("lima.account.error.notNumberAccountNumber", e.getAccountNumber())); } finally { // close dialog dialog.dispose(); @@ -415,8 +415,8 @@ public class AccountViewHandler implements ServiceListener { Account account = (Account)lastNode.getUserObject(); int response = JOptionPane.showConfirmDialog(view, - t("lima.account.removeaccountconfirm", account.getAccountNumber()), - t("lima.account.removeaccounttitle"), + t("lima.account.remove.confirm", account.getAccountNumber()), + t("lima.account.remove.confirm.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css index b319839..0e0a832 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css @@ -24,7 +24,7 @@ } #numberLabel { - text : "lima.charts.account.number"; + text : "lima.account.number"; labelFor : "{numberTextField}"; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java index 906c25d..e94eeab 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java @@ -177,7 +177,7 @@ public abstract class AbstractLimaTableModel<E> extends AbstractTableModel { @Override public String getColumnName(int column) { - String result = t("lima.nonaffect"); + String result = t("lima.noAffect"); if (column >= 0 && column < columns.size()) { result = columns.get(column).getColumnName(); } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalPanel.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalPanel.java deleted file mode 100644 index 97814bb..0000000 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalPanel.java +++ /dev/null @@ -1,245 +0,0 @@ -/* - * #%L - * Lima :: Swing - * %% - * Copyright (C) 2012 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package org.chorem.lima.ui.common; - -import org.apache.commons.lang3.time.DateUtils; -import org.chorem.lima.entity.FinancialPeriod; -import org.chorem.lima.entity.FiscalPeriod; -import org.chorem.lima.enums.ComboBoxDatesEnum; -import org.jdesktop.swingx.JXDatePicker; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import static org.nuiton.i18n.I18n.t; - -/** - * Panel permettant de selectionner un interval de date suivant plusieurs type - * possible: - * <ul> - * <li>date d'un exercice - * <li>date d'une perdiode comptable - * <li>deux dates - * </ul> - * - * Il supporte les listeners, donc on peut être notifié d'un changement - * d'interval. - * - * @author echatellier - */ -public class IntervalPanel extends JPanel implements ActionListener, ItemListener { - - /** serialVersionUID. */ - private static final long serialVersionUID = 5973427750255668999L; - - protected List<IntervalListener> listeners; - - protected JComboBox typeComboBox; - - protected CardLayout typeLayout; - - protected JPanel specificTypePanel; - - protected FiscalPeriodComboBoxModel fiscalPeriodComoboBoxModel; - - protected FinancialPeriodComboBoxModel financialPeriodComoboBoxModel; - - protected JXDatePicker beginDatePicker; - - protected JXDatePicker endDatePicker; - - public IntervalPanel() { - super(new BorderLayout()); - listeners = new ArrayList<IntervalListener>(); - initUI(); - } - - public void addIntervalListener(IntervalListener listener) { - listeners.add(listener); - } - - public void removeIntervalListener(IntervalListener listener) { - listeners.remove(listener); - } - - private void initUI() { - - // type combo box - typeComboBox = new JComboBox(ComboBoxDatesEnum.descriptions()); - add(typeComboBox, BorderLayout.WEST); - typeComboBox.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - ComboBoxDatesEnum type = ComboBoxDatesEnum.valueOfDescription((String) typeComboBox.getSelectedItem()); - // show corresponding component in layout - typeLayout.show(specificTypePanel, type.name()); - } - }); - - typeLayout = new CardLayout(); - specificTypePanel = new JPanel(typeLayout); - - fiscalPeriodComoboBoxModel = new FiscalPeriodComboBoxModel(); - JComboBox fiscalPeriodComboBox = new JComboBox(fiscalPeriodComoboBoxModel); - fiscalPeriodComboBox.setRenderer(new FiscalPeriodListRenderer()); - fiscalPeriodComboBox.addItemListener(this); - specificTypePanel.add(fiscalPeriodComboBox, ComboBoxDatesEnum.FISCAL_PERIOD.name()); - - financialPeriodComoboBoxModel = new FinancialPeriodComboBoxModel(); - JComboBox financialPeriodComboBox = new JComboBox(financialPeriodComoboBoxModel); - financialPeriodComboBox.setRenderer(new FinancialPeriodListRenderer()); - financialPeriodComboBox.addItemListener(this); - specificTypePanel.add(financialPeriodComboBox, ComboBoxDatesEnum.FINANCIAL_PERIOD.name()); - - JPanel periodPanel = new JPanel(new GridBagLayout()); - JLabel beginLabel = new JLabel(t("lima.beginDate")); - periodPanel.add(beginLabel, new GridBagConstraints(0, 0, 1, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - - beginDatePicker = new JXDatePicker(); - beginDatePicker.addActionListener(this); - periodPanel.add(beginDatePicker, new GridBagConstraints(1, 0, 1, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - - JLabel endLabel = new JLabel(t("lima.endDate")); - periodPanel.add(endLabel, new GridBagConstraints(2, 0, 1, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - - endDatePicker = new JXDatePicker(); - endDatePicker.addActionListener(this); - periodPanel.add(endDatePicker, new GridBagConstraints(3, 0, 1, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - specificTypePanel.add(periodPanel, ComboBoxDatesEnum.PERIOD.name()); - - // get begin date - Date beginDate = DateUtils.truncate(new Date(), Calendar.YEAR); - beginDatePicker.setDate(beginDate); - endDatePicker.setDate(new Date()); - - add(specificTypePanel, BorderLayout.CENTER); - } - - /** - * Init component combo models. - * - * @param fiscalPeriods fiscal periods - * @param financialPeriods financial periods - */ - public void init(List<FiscalPeriod> fiscalPeriods, List<FinancialPeriod> financialPeriods) { - fiscalPeriodComoboBoxModel.setObjects(fiscalPeriods); - financialPeriodComoboBoxModel.setObjects(financialPeriods); - } - - /** - * Return selected begin date. - * - * @return begin date, or {@code null} with no valid selection. - */ - public Date getBeginDate() { - Date beginDate = null; - - ComboBoxDatesEnum type = ComboBoxDatesEnum.valueOfDescription((String) typeComboBox.getSelectedItem()); - switch (type) { - case PERIOD: - beginDate = beginDatePicker.getDate(); - break; - case FINANCIAL_PERIOD: { - FinancialPeriod period = (FinancialPeriod)financialPeriodComoboBoxModel.getSelectedItem(); - if (period != null) { - beginDate = period.getBeginDate(); - } - break; - } - case FISCAL_PERIOD: { - FiscalPeriod period = (FiscalPeriod)fiscalPeriodComoboBoxModel.getSelectedItem(); - if (period != null) { - beginDate = period.getBeginDate(); - } - break; - } - } - - return beginDate; - } - - /** - * Return selected end date. - * - * @return end date, or {@code null} with no valid selection. - */ - public Date getEndDate() { - Date endDate = null; - - ComboBoxDatesEnum type = ComboBoxDatesEnum.valueOfDescription((String) typeComboBox.getSelectedItem()); - switch (type) { - case PERIOD: - endDate = endDatePicker.getDate(); - break; - case FINANCIAL_PERIOD: { - FinancialPeriod period = (FinancialPeriod)financialPeriodComoboBoxModel.getSelectedItem(); - if (period != null) { - endDate = period.getEndDate(); - } - break; - } - case FISCAL_PERIOD: { - FiscalPeriod period = (FiscalPeriod)fiscalPeriodComoboBoxModel.getSelectedItem(); - if (period != null) { - endDate = period.getEndDate(); - } - break; - } - } - - return endDate; - } - - @Override - public void itemStateChanged(ItemEvent e) { - if (e.getStateChange() == ItemEvent.SELECTED) { - fireEvent(); - } - } - - protected void fireEvent() { - for (IntervalListener l : listeners) { - l.intervalChanged(null); - } - } - - @Override - public void actionPerformed(ActionEvent e) { - fireEvent(); - } -} diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java index 110e718..6e2c278 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java @@ -176,7 +176,7 @@ public class EntryBookViewHandler implements ServiceListener { try { newEntryBook = entryBookService.createEntryBook(newEntryBook); } catch (AlreadyExistEntryBookException e) { - errorHelper.showErrorMessage(t("lima.entryBook.alreadyExistEntryBookException", e.getEntryBook().getCode())); + errorHelper.showErrorMessage(t("lima.entryBook.alreadyExistEntryBook", e.getEntryBook().getCode())); } // ui refresh @@ -241,8 +241,8 @@ public class EntryBookViewHandler implements ServiceListener { EntryBook selectedEntryBook = entryBookTableModel.get(selectedRow); int response = JOptionPane.showConfirmDialog(view, - t("lima.entryBook.deletemessage", selectedEntryBook.getLabel()), - t("lima.entryBook.deletetitle"), JOptionPane.YES_NO_OPTION, + t("lima.entryBook.remove.confirm", selectedEntryBook.getLabel()), + t("lima.entryBook.remove.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java index c28e926..e492eb7 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java @@ -67,7 +67,7 @@ public class FinancialPeriodTableModel extends AbstractLimaTableModel<ClosedPeri } }); - addColumn(new AbstractColumn<FinancialPeriodTableModel>(EntryBook.class, t("lima.financialPeriod.entrybook"), false) { + addColumn(new AbstractColumn<FinancialPeriodTableModel>(EntryBook.class, t("lima.financialPeriod.entryBook"), false) { @Override public Object getValueAt(int row) { ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); @@ -79,9 +79,9 @@ public class FinancialPeriodTableModel extends AbstractLimaTableModel<ClosedPeri @Override public Object getValueAt(int row) { ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); - String status = t("lima.open"); + String status = t("lima.financialPeriod.open"); if (closedPeriodicEntryBook.isLocked()) { - status = t("lima.closed"); + status = t("lima.financialPeriod.closed"); } return status; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java index 11a9030..887f476 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java @@ -127,8 +127,8 @@ public class FinancialPeriodViewHandler implements ServiceListener { // blocked it ClosedPeriodicEntryBook closedPeriodicEntryBook = model.get(selectedRow); - int response = JOptionPane.showConfirmDialog(view, t("lima.financialPeriod.blockmessage"), - t("lima.financialPeriod.blocktitle"), + int response = JOptionPane.showConfirmDialog(view, t("lima.financialPeriod.block.confirm"), + t("lima.financialPeriod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java index 7ebc084..5f9a878 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java @@ -84,7 +84,7 @@ public class FinancialStatementChartTreeTableModel extends AbstractTreeTableMode res = t("lima.table.label"); break; case 1: - res = t("lima.table.debitcredit"); + res = t("lima.table.debitCredit"); break; case 2: res = t("lima.table.debit"); @@ -93,7 +93,7 @@ public class FinancialStatementChartTreeTableModel extends AbstractTreeTableMode res = t("lima.table.credit"); break; case 4: - res = t("lima.table.provisiondeprecationamount"); + res = t("lima.table.provisionDeprecation"); break; } return res; @@ -211,10 +211,10 @@ public class FinancialStatementChartTreeTableModel extends AbstractTreeTableMode financialStatementService.createFinancialStatement( parentFinancialStatementHeader, financialStatement); } catch (AlreadyExistFinancialStatement alreadyExistFinancialStatement) { - errorHelper.showErrorMessage(t("lima.importExport.import.alreadyExistFinancialStatement", + errorHelper.showErrorMessage(t("lima.financialStatement.error.alreadyExistFinancialStatement", alreadyExistFinancialStatement.getFinancialStatementLabel(), alreadyExistFinancialStatement.getMasterLabel())); } catch (NotAllowedLabelException notAllowedLabel) { - errorHelper.showErrorMessage(t("lima.financialStatement.notAllowedLabel", + errorHelper.showErrorMessage(t("lima.error.notAllowedLabel", notAllowedLabel.getLabel())); } modelSupport.fireTreeStructureChanged(path); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java index 4b37360..eddc402 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java @@ -336,7 +336,7 @@ public class FinancialStatementChartViewHandler implements ServiceListener { int selectedRow = view.treeTable.getSelectedRow(); if (selectedRow != -1) { int n = JOptionPane.showConfirmDialog(view, - t("lima.charts.account.question.remove"), + t("lima.financialStatement.remove.confirm"), t("lima.confirmation"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -398,12 +398,12 @@ public class FinancialStatementChartViewHandler implements ServiceListener { public void financialStatementChartCheck() { java.util.List<Account> unusedAccounts = financialStatementService.checkFinancialStatementChart(); - StringBuilder result = new StringBuilder(t("lima.financialStatements.check.warn")); + StringBuilder result = new StringBuilder(t("lima.financialStatements.check.warn") + "\n\n"); for (Account account : unusedAccounts) { result.append(t("lima.financialStatements.check.nothing", - account.getAccountNumber(), account.getLabel())); + account.getAccountNumber(), account.getLabel()) + "\n"); } showReportDialog(result.toString(), t("lima.financialStatements.check"), view); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css index 767619e..0a62fae 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css @@ -24,24 +24,24 @@ } #nothing { - text : "lima.charts.financialStatement.nothing"; + text : "lima.financialStatement.nothing"; } #shortened { - text : "lima.charts.financialStatement.shortened"; + text : "lima.financialStatement.shortened"; value : "{FinancialStatementsChartEnum.SHORTENED}"; buttonGroup : "{getRadioButtons()}"; selected : "true"; } #statementBase { - text : "lima.charts.financialStatement.base"; + text : "lima.financialStatement.base"; value : "{FinancialStatementsChartEnum.BASE}"; buttonGroup : "{getRadioButtons()}"; } #developed { - text : "lima.charts.financialStatement.developed"; + text : "lima.financialStatement.developed"; value : "{FinancialStatementsChartEnum.DEVELOPED}"; buttonGroup : "{getRadioButtons()}"; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java index ace9aa8..765661d 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java @@ -35,7 +35,7 @@ import static org.nuiton.i18n.I18n.t; public class AccountColumn extends AbstractColumn<FinancialTransactionTableModel> { public AccountColumn() { - super(Account.class, t("lima.financialTransaction.account"), true); + super(Account.class, t("lima.entry.account"), true); } @Override diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java index 2f84cc2..e3d317e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java @@ -36,7 +36,7 @@ import static org.nuiton.i18n.I18n.t; public class CreditColumn extends AbstractColumn<FinancialTransactionTableModel> { public CreditColumn() { - super(BigDecimal.class, t("lima.financialTransaction.credit"), true); + super(BigDecimal.class, t("lima.entry.credit"), true); } @Override diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java index 087d6f8..8f0bb34 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java @@ -36,7 +36,7 @@ import static org.nuiton.i18n.I18n.t; public class DebitColumn extends AbstractColumn<FinancialTransactionTableModel> { public DebitColumn() { - super(BigDecimal.class, t("lima.financialTransaction.debit"), true); + super(BigDecimal.class, t("lima.entry.debit"), true); } @Override diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java index 8bb776a..4fc180e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java @@ -35,8 +35,8 @@ import static org.nuiton.i18n.I18n.t; public class DescriptionColumn<T extends FinancialTransactionTableModel> extends AbstractColumn<T> { public DescriptionColumn() { - super(String.class, t("lima.financialTransaction.description"), true); - setCellEditor(new AutoCompleteTableCellEditor("lima.financialTransaction.description")); + super(String.class, t("lima.entry.description"), true); + setCellEditor(new AutoCompleteTableCellEditor("lima.entry.description")); } @Override public Object getValueAt(int row) { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/EntryBookColumn.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/EntryBookColumn.java index eabf1f5..bca0006 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/EntryBookColumn.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/EntryBookColumn.java @@ -36,7 +36,7 @@ import static org.nuiton.i18n.I18n.t; public class EntryBookColumn extends AbstractColumn<FinancialTransactionTableModel> { public EntryBookColumn() { - super(EntryBook.class, t("lima.table.entrybook"), true); + super(EntryBook.class, t("lima.table.entryBook"), true); } @Override diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.css index a1900fb..3be927b 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.css @@ -88,7 +88,7 @@ } #fiscalPeriodComboBox { - toolTipText : "lima.financialTransaction.fiscalYear"; + toolTipText : "lima.entries.fiscalYear"; renderer : "{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}"; } @@ -98,7 +98,7 @@ } #financialPeriodComboBox { - toolTipText : "lima.financialTransaction.financialPeriod"; + toolTipText : "lima.entries.financialPeriod"; renderer : "{new org.chorem.lima.ui.common.FinancialPeriodListRenderer()}"; } @@ -118,7 +118,7 @@ } #entryBookComboBox { - toolTipText : "lima.financialTransaction.entryBook"; + toolTipText : "lima.entries.entryBook"; renderer : "{new org.chorem.lima.ui.common.EntryBookListRenderer()}" } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java index cd45633..dddd98a 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java @@ -447,17 +447,17 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo selectionModel.setSelectionInterval(index, index); table.editCellAt(index, 1); } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.paste.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.entries.paste.transaction.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (AfterLastFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.paste.error.afterLastFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entries.paste.transaction.error.afterLastFiscalPeriod", e.getDate())); } catch (BeforeFirstFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.paste.error.beforeFirstFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entries.paste.transaction.error.beforeFirstFiscalPeriod", e.getDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.paste.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.entries.paste.transaction.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -502,17 +502,17 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo table.changeSelection(index, 1, false, false); table.editCellAt(index, 1); } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.entry.paste.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.entries.paste.entry.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (AfterLastFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.entry.paste.error.afterLastFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entries.paste.entry.error.afterLastFiscalPeriod", e.getDate())); } catch (BeforeFirstFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.entry.paste.error.beforeFirstFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entries.paste.entry.error.beforeFirstFiscalPeriod", e.getDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.entry.paste.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.entries.paste.entry.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -553,17 +553,17 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo table.changeSelection(addIndex, 1, false, false); table.editCellAt(addIndex, 1); } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.add.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.entries.add.transaction.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (AfterLastFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.add.error.afterLastFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entries.add.transaction.error.afterLastFiscalPeriod", e.getDate())); } catch (BeforeFirstFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.add.error.beforeFirstFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entries.add.transaction.error.beforeFirstFiscalPeriod", e.getDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.add.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.entries.add.transaction.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -657,17 +657,17 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo table.changeSelection(row, 1, false, false); table.editCellAt(row, 1); } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.entry.add.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.entries.add.entry.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (AfterLastFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.entry.add.error.afterLastFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entries.add.entry.error.afterLastFiscalPeriod", e.getDate())); } catch (BeforeFirstFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.entry.add.error.beforeFirstFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entries.add.entry.error.beforeFirstFiscalPeriod", e.getDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.entry.add.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.entries.add.entry.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -692,8 +692,8 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo cellEditor.cancelCellEditing(); } int response = JOptionPane.showConfirmDialog( - view, t("lima.financialTransaction.messageremovetransaction"), - t("lima.financialTransaction.titleremovetransaction"), JOptionPane.YES_NO_OPTION); + view, t("lima.entries.remove.transaction.confirm"), + t("lima.entries.remove.transaction.title"), JOptionPane.YES_NO_OPTION); if (response == JOptionPane.YES_OPTION) { try { @@ -709,11 +709,11 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo table.editCellAt(indexSelectedRow, 1); } } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.entries.remove.transaction.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.entries.remove.transaction.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -737,8 +737,8 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo cellEditor.cancelCellEditing(); } int response = JOptionPane.showConfirmDialog( - view, t("lima.financialTransaction.messageremoveentry"), - t("lima.financialTransaction.titleremoveentry"), JOptionPane.YES_NO_OPTION); + view, t("lima.entries.remove.entry.confirm"), + t("lima.entries.remove.entry.title"), JOptionPane.YES_NO_OPTION); if (response == JOptionPane.YES_OPTION) { try { @@ -754,11 +754,11 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo table.editCellAt(indexSelectedRow, 1); } } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.entries.remove.entry.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.entries.remove.entry.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -808,7 +808,7 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo tableModel.fireTableRowsUpdated(firstRow, lastRow); table.editCellAt(selectedRow, selectedColumn); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.entries.assign.closed.entryBook.error", + errorHelper.showErrorMessage(t("lima.entries.assign.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx index 355618e..d2a4965 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx @@ -28,12 +28,6 @@ javax.swing.text.Document javax.swing.ScrollPaneConstants org.chorem.lima.ui.Filter.financialTransactionCondition.FinancialTransactionConditionView - org.chorem.lima.enums.ComboBoxPeriodEnum - org.chorem.lima.enums.ComboBoxAccountsEnum - org.chorem.lima.enums.ComboBoxEntryBooksEnum - org.chorem.lima.enums.ComboBoxLetterEnum - org.chorem.lima.FinancialStatementWayEnum - org.chorem.lima.enums.ComboBoxOperatorsEnum org.chorem.lima.ui.financialtransaction.FinancialTransactionDefaultTable org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTableModel org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTable diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css index f5c2d22..c93d385 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css @@ -53,7 +53,7 @@ } #fiscalPeriodComboBox { - toolTipText : "lima.financialTransaction.fiscalYear"; + toolTipText : "lima.entries.fiscalYear"; renderer : "{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}"; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java index 332c44c..38422d5 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java @@ -179,17 +179,17 @@ public class FinancialTransactionUnbalancedViewHandler { table.changeSelection(row, 1, false, false); table.editCellAt(row, 1); } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.entry.add.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.entries.add.entry.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (AfterLastFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.entry.add.error.afterLastFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entries.add.entry.error.afterLastFiscalPeriod", e.getDate())); } catch (BeforeFirstFiscalPeriodException e) { - errorHelper.showErrorMessage(t("lima.entry.add.error.beforeFirstFiscalPeriod", + errorHelper.showErrorMessage(t("lima.entries.add.entry.error.beforeFirstFiscalPeriod", e.getDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.entry.add.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.entries.add.entry.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -220,7 +220,7 @@ public class FinancialTransactionUnbalancedViewHandler { cellEditor.cancelCellEditing(); } - String message = t("lima.charts.financialtransaction.question.removeentry"); + String message = t("lima.entry.remove.confirm"); int response = JOptionPane.showConfirmDialog(view, message, t("lima.confirmation"), JOptionPane.YES_NO_OPTION); @@ -241,11 +241,11 @@ public class FinancialTransactionUnbalancedViewHandler { table.editCellAt(indexSelectedRow, 1); } } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.entries.remove.entry.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.entries.remove.entry.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), @@ -277,7 +277,7 @@ public class FinancialTransactionUnbalancedViewHandler { cellEditor.cancelCellEditing(); } - String message = t("lima.charts.financialtransaction.question.removetransaction"); + String message = t("lima.financialTransaction.remove.confirm"); int response = JOptionPane.showConfirmDialog(view, message, t("lima.confirmation"), JOptionPane.YES_NO_OPTION); @@ -298,11 +298,11 @@ public class FinancialTransactionUnbalancedViewHandler { table.editCellAt(indexSelectedRow, 1); } } catch (LockedFinancialPeriodException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedFinancialPeriod", + errorHelper.showErrorMessage(t("lima.entries.remove.transaction.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), e.getFinancialPeriod().getEndDate())); } catch (LockedEntryBookException e) { - errorHelper.showErrorMessage(t("lima.financialTransaction.delete.error.lockedEntryBook", + errorHelper.showErrorMessage(t("lima.entries.remove.transaction.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css index 90e764d..b99c328 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css @@ -24,7 +24,7 @@ } #beginDateLabel { - text : "lima.beginDate"; + text : "lima.date.begin"; labelFor : "{beginDatePicker}"; } @@ -33,7 +33,7 @@ } #endDateLabel { - text : "lima.endDate"; + text : "lima.date.end"; labelFor : "{endDatePicker}"; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java index ca4efe1..b322e4e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java @@ -180,7 +180,7 @@ public class FiscalPeriodViewHandler implements ServiceListener { AddPeriod addPeriodDialog = new AddPeriod(view); - addPeriodDialog.setTitle(t("lima.fiscalPeriod.addfiscalperiodtitle")); + addPeriodDialog.setTitle(t("lima.fiscalPeriod.add.form")); addPeriodDialog.getBeginDatePicker().setDate(beginDate); addPeriodDialog.getEndDatePicker().setDate(endDate); addPeriodDialog.setLocationRelativeTo(view); @@ -226,7 +226,7 @@ public class FiscalPeriodViewHandler implements ServiceListener { int response = JOptionPane.YES_OPTION; if (nbMonth != 12) { response = JOptionPane.showConfirmDialog(view, - t("lima.fiscalPeriod.addfiscalperiod.morethan12"), + t("lima.fiscalPeriod.add.confirm.moreThan12"), title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); } @@ -255,7 +255,7 @@ public class FiscalPeriodViewHandler implements ServiceListener { if (!selectedFiscalPeriod.isLocked()) { AddPeriod addPeriodDialog = new AddPeriod(view); - addPeriodDialog.setTitle(t("lima.fiscalPeriod.modifyfiscalperiodtitle")); + addPeriodDialog.setTitle(t("lima.fiscalPeriod.update.form")); addPeriodDialog.getBeginDatePicker().setDate(selectedFiscalPeriod.getBeginDate()); addPeriodDialog.getEndDatePicker().setDate(selectedFiscalPeriod.getEndDate()); addPeriodDialog.setModifyPeriod(true); @@ -344,7 +344,7 @@ public class FiscalPeriodViewHandler implements ServiceListener { //check if the user wants to create a new fiscal year int answerCreate = JOptionPane.showConfirmDialog(view, - t("lima.fiscalPeriod.block.newyear"), + t("lima.fiscalPeriod.block.newYear"), t("lima.fiscalPeriod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -368,7 +368,7 @@ public class FiscalPeriodViewHandler implements ServiceListener { //check if the user wants to report datas int answerRetainedEarnings = JOptionPane.showConfirmDialog(view, - t("lima.fiscalPeriod.block.addretainedearnings"), + t("lima.fiscalPeriod.block.addRetainedEarnings"), t("lima.fiscalPeriod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css index d951e58..190ab4d 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css @@ -45,7 +45,7 @@ } #codeLabel { - text : "lima.code"; + text : "lima.entryBook.code"; } #codeField { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java index d3fd756..c07d034 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java @@ -258,8 +258,8 @@ public class ImportExport { if (verboseMode) { ImportExportResults results = get(); if (importMode && results == null) { - JOptionPane.showMessageDialog(viewComponent, t("lima.importExport.importerror"), - t("lima.importExport.importtitle"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(viewComponent, t("lima.import.error"), + t("lima.import.title"), JOptionPane.ERROR_MESSAGE); } else { if (importMode) { @@ -296,7 +296,7 @@ public class ImportExport { List<ExportException> exportExceptions = result.getExportExceptions(); if (exportExceptions != null && !exportExceptions.isEmpty()) { - message.append(t("lima.importExport.export.exceptions")); + message.append(t("lima.export.exceptions") + "\n"); } } @@ -305,16 +305,13 @@ public class ImportExport { protected void ComputeImportResultMessage(List<ImportResult> resultList) { StringBuilder message = new StringBuilder(); - message.append(t("lima.importExport.import.terminated")); + message.append(t("lima.import.terminated") + "\n"); StringBuilder errorMessage = null; for (ImportResult result : resultList) { Class fromSource = result.getFromSource(); message.append("Import "); message.append(getFromSourceMessage(fromSource)); - message.append(t("lima.importExport.import.nbCreated", result.getNbCreated())); - message.append(t("lima.importExport.import.nbUpdated", result.getNbUpdated())); - message.append(t("lima.importExport.import.nbIgnored", result.getNbIgnored())); - + message.append(t("lima.import.report", result.getNbCreated(), result.getNbUpdated(), result.getNbIgnored()) + "\n"); Map<Integer, LimaException> exceptionsByLine = result.getAllExceptionsByLine(); errorMessage = displayErrorMessage(exceptionsByLine); // message is null if import failed @@ -335,7 +332,7 @@ public class ImportExport { log.debug(message.toString()); } - String title = importMode ? t("lima.importExport.import.terminated") : t("lima.importExport.export.terminated"); + String title = importMode ? t("lima.import.terminated") : t("lima.export.terminated"); JOptionPane.showMessageDialog( waitView, message.toString(), @@ -347,33 +344,33 @@ public class ImportExport { StringBuilder result = new StringBuilder(); if (exceptionsByLine != null) { for (Map.Entry<Integer, LimaException> e:exceptionsByLine.entrySet()) { - result.append(t("lima.importExport.import.line", e.getKey())); + result.append(t("lima.import.line", e.getKey()) + "\n"); LimaException importException = e.getValue(); if (importException instanceof InvalidAccountNumberException) { - result.append(t("lima.fiscalPeriod.franceAccountingRules.invalidAccountNumberException", ((InvalidAccountNumberException) importException).getAccountNumber())); + result.append(t("lima.account.error.invalidAccountNumber", ((InvalidAccountNumberException) importException).getAccountNumber()) + "\n"); } else if (importException instanceof NotNumberAccountNumberException) { - result.append(t("lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException", ((NotNumberAccountNumberException) importException).getAccountNumber())); + result.append(t("lima.account.error.notNumberAccountNumber", ((NotNumberAccountNumberException) importException).getAccountNumber()) + "\n"); } else if (importException instanceof NotAllowedLabelException) { - result.append(t("lima.all.NotAllowedLabel", ((NotAllowedLabelException) importException).getLabel())); + result.append(t("lima.error.notAllowedLabel", ((NotAllowedLabelException) importException).getLabel()) + "\n"); } else if (importException instanceof MoreOneUnlockFiscalPeriodException) { - result.append(t("lima.fiscalPeriod.franceAccountingRules.moreOneUnlockFiscalPeriodException", ((MoreOneUnlockFiscalPeriodException) importException).getBeginDate(), ((MoreOneUnlockFiscalPeriodException) importException).getEndDate())); + result.append(t("lima.fiscalPeriod.error.moreOneUnlockFiscalPeriod", ((MoreOneUnlockFiscalPeriodException) importException).getBeginDate(), ((MoreOneUnlockFiscalPeriodException) importException).getEndDate()) + "\n"); } else if (importException instanceof BeginAfterEndFiscalPeriodException) { - result.append(t("lima.fiscalPeriod.defaultAccountingRules.beginAfterEndFiscalPeriodException", ((BeginAfterEndFiscalPeriodException) importException).getFiscalPeriod().getBeginDate(), ((BeginAfterEndFiscalPeriodException) importException).getFiscalPeriod().getEndDate())); + result.append(t("lima.fiscalPeriod.error.beginAfterEndFiscalPeriod", ((BeginAfterEndFiscalPeriodException) importException).getFiscalPeriod().getBeginDate(), ((BeginAfterEndFiscalPeriodException) importException).getFiscalPeriod().getEndDate()) + "\n"); } else if (importException instanceof NotBeginNextDayOfLastFiscalPeriodException) { - result.append(t("lima.fiscalPeriod.franceAccountingRules.notBeginNextDayOfLastFiscalPeriodException", ((NotBeginNextDayOfLastFiscalPeriodException) importException).getFiscalPeriod().getBeginDate(), ((NotBeginNextDayOfLastFiscalPeriodException) importException).getFiscalPeriod().getEndDate())); + result.append(t("lima.fiscalPeriod.error.notBeginNextDayOfLastFiscalPeriod", ((NotBeginNextDayOfLastFiscalPeriodException) importException).getFiscalPeriod().getBeginDate(), ((NotBeginNextDayOfLastFiscalPeriodException) importException).getFiscalPeriod().getEndDate()) + "\n"); } else if (importException instanceof LockedFinancialPeriodException) { - result.append(t("lima.financialTransaction.lockedFinancialPeriodException")); + result.append(t("lima.fiscalPeriod.error.lockedFinancialPeriod") + "\n"); } else if (importException instanceof LockedEntryBookException) { - result.append(t("lima.financialTransaction.lockedEntryBookException", ((LockedEntryBookException) importException).getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), ((LockedEntryBookException) importException).getClosedPeriodicEntryBook().getFinancialPeriod().getEndDate())); + result.append(t("lima.entryBook.error.lockedEntryBook", ((LockedEntryBookException) importException).getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), ((LockedEntryBookException) importException).getClosedPeriodicEntryBook().getFinancialPeriod().getEndDate()) + "\n"); } else if (importException instanceof AlreadyExistFinancialStatement) { - result.append(t("lima.financialStatement.alreadyExistFinancialStatement", ((AlreadyExistFinancialStatement) importException).getFinancialStatementLabel())); + result.append(t("lima.financialStatement.error.alreadyExistFinancialStatement", ((AlreadyExistFinancialStatement) importException).getFinancialStatementLabel()) + "\n"); } else if (importException instanceof AlreadyExistVatStatementException) { - result.append(t("lima.vatStatement.alreadyExistVatStatement", ((AlreadyExistVatStatementException) importException).getVatStatementLabel())); + result.append(t("lima.vatStatement.error.alreadyExistVatStatement", ((AlreadyExistVatStatementException) importException).getVatStatementLabel()) + "\n"); } else if (importException instanceof NoFiscalPeriodFoundException) { - result.append(t("lima.import.entries.noFiscalPeriodFoundException")); + result.append(t("lima.error.noFiscalPeriodFound") + "\n"); } else if (importException instanceof NoDataToImportException) { - errorHelper.showErrorMessage(t("lima.import.noDataToImportException")); - log.warn(t("lima.import.noDataToImportException")); + errorHelper.showErrorMessage(t("lima.import.error.noDataToImport")); + log.warn(t("lima.import.error.noDataToImport")); result = null; break; } else if (importException instanceof ImportFileException){ @@ -382,7 +379,7 @@ public class ImportExport { result = null; break; } else { - result.append(t("lima.import.unknownError")); + result.append(t("lima.import.error.unknown") + "\n"); } try { throw importException; @@ -407,7 +404,7 @@ public class ImportExport { } else if (fromSource.equals(Account.class)){ message = t("lima.importExport.account")+"\n"; } else if (fromSource.equals(EntryBook.class)) { - message = t("lima.importExport.entrybook")+"\n"; + message = t("lima.importExport.entryBook")+"\n"; } else if (fromSource.equals(Entry.class)) { message = t("lima.importExport.entry")+"\n"; } else if (fromSource.equals(FinancialStatement.class)) { @@ -445,7 +442,7 @@ public class ImportExport { if (importExportMethod.getEncodingOption()) { JPanel panel = new JPanel(); panel.setLayout(new BorderLayout()); - panel.add(new JLabel(t("lima.importExport.choiceencoding")), BorderLayout.WEST); + panel.add(new JLabel(t("lima.importExport.encoding.choice")), BorderLayout.WEST); panel.add(comboBox, BorderLayout.CENTER); ((Container) chooser.getComponent(2)).add(panel, BorderLayout.SOUTH); } @@ -562,8 +559,8 @@ public class ImportExport { export.flush(); } catch (IOException e) { - errorHelper.showErrorMessage(t("lima.importExport.export.failed")); - log.error(t("lima.importExport.export.failed"), e); + errorHelper.showErrorMessage(t("lima.export.failed")); + log.error(t("lima.export.failed"), e); } finally { IOUtils.closeQuietly(export); IOUtils.closeQuietly(result); @@ -611,7 +608,7 @@ public class ImportExport { } } } catch (Exception e) { - result.addInitException(new ImportFileException(t("lima.importExport.import.extractFileError"))); + result.addInitException(new ImportFileException(t("lima.import.error.extractFile"))); log.error(e.getStackTrace()); } finally { IOUtils.closeQuietly(zipInputStream); @@ -655,7 +652,7 @@ public class ImportExport { if(log.isInfoEnabled()) { log.info(ex); } - result.addInitException(new ImportFileException(t("lima.importExport.import.extractFileError"))); + result.addInitException(new ImportFileException(t("lima.import.error.extractFile"))); } finally { IOUtils.closeQuietly(entryBooksStream); IOUtils.closeQuietly(transactionsStream); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java index a2cec45..bce6335 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java @@ -359,7 +359,7 @@ public class LetteringViewHandler{ List<Account> allAccounts = accountService.getAllAccounts(); Account seeAllAccounts = new AccountImpl(); seeAllAccounts.setAccountNumber("-"); - seeAllAccounts.setLabel(t("lima.list.seeAll")); + seeAllAccounts.setLabel(t("lima.lettering.account.aAll")); allAccounts.add(seeAllAccounts); view.getAccountComboBoxModel().setObjects(allAccounts); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.css b/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.css index 60db041..aaa30f6 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.css @@ -24,32 +24,32 @@ } #shortened { - text : "lima.charts.account.shortened"; + text : "lima.chart.accounts.shortened"; value : "{AccountsChartEnum.SHORTENED}"; buttonGroup : buttonGroup; selected : true; } #base { - text : "lima.charts.account.base"; + text : "lima.chart.accounts.base"; value : "{AccountsChartEnum.BASE}"; buttonGroup : buttonGroup; } #developed { - text : "lima.charts.account.developed"; + text : "lima.chart.accounts.developed"; value : "{AccountsChartEnum.DEVELOPED}"; buttonGroup : buttonGroup; } #importcsv { - text : "lima.charts.account.importcsv"; + text : "lima.chart.accounts.import.csv"; value : "{AccountsChartEnum.IMPORT}"; buttonGroup : buttonGroup; } #importebp { - text : "lima.charts.account.importebp"; + text : "lima.chart.accounts.import.ebp"; value : "{AccountsChartEnum.IMPORTEBP}"; buttonGroup : buttonGroup; } \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.css b/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.css index 4efd5ae..ee620d9 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.css @@ -20,10 +20,10 @@ * #L% */ #entryBookLabel { - text : "lima.opening.entrybook"; + text : "lima.opening.entryBook"; } #importEntryBook { - text : "lima.importExport.defaultentrybooks"; + text : "lima.importExport.entryBooks.default"; selected : true; } \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.css b/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.css index 00c3ae9..9220d03 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.css @@ -20,13 +20,13 @@ * #L% */ #fiscalPeriodLabel { - text : "lima.charts.fiscalperiod.create" + text : "lima.opening.fiscalPeriod" } #beginDateLabel { - text : "lima.beginDate"; + text : "lima.date.begin"; } #endDateLabel { - text : "lima.endDate"; + text : "lima.date.end"; } \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java index 66b972c..f02f13f 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java @@ -178,10 +178,10 @@ public class VatChartTreeTableModel extends AbstractTreeTableModel { vatStatementService.createVatStatement( parentVatStatementHeader, vatStatement); } catch (AlreadyExistVatStatementException alreadyExistVatStatement) { - errorHelper.showErrorMessage(t("lima.importExport.import.alreadyExistFinancialStatement", + errorHelper.showErrorMessage(t("lima.financialStatement.error.alreadyExistFinancialStatement", alreadyExistVatStatement.getVatStatementLabel(), alreadyExistVatStatement.getMasterLabel())); } catch (NotAllowedLabelException notAllowedLabel) { - errorHelper.showErrorMessage(t("lima.importExport.import.alreadyExistFinancialStatement", + errorHelper.showErrorMessage(t("lima.error.notAllowedLabel", notAllowedLabel.getLabel())); } modelSupport.fireTreeStructureChanged(path); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java index 4fe9b78..78a918c 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java @@ -34,7 +34,12 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.importexport.ImportExport; import org.jdesktop.swingx.JXTreeTable; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.ActionMap; +import javax.swing.InputMap; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; import javax.swing.tree.TreePath; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -243,8 +248,8 @@ public class VatChartViewHandler implements ServiceListener { int selectedRow = view.treeTable.getSelectedRow(); if (selectedRow != -1) { int n = JOptionPane.showConfirmDialog(view, - t("lima.vatStatement.question.remove"), - t("lima.confirmation"), + t("lima.vatStatement.remove.confirm"), + t("lima.vatStatement.remove.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (n == JOptionPane.YES_OPTION) { @@ -255,7 +260,7 @@ public class VatChartViewHandler implements ServiceListener { if (!treeTableModel.isLeaf(vatStatement)) { JOptionPane.showMessageDialog( view, - t("lima.vatStatement.deleteparent"), + t("lima.vatStatement.delete.parent"), t("lima.info"), JOptionPane.INFORMATION_MESSAGE); } else { diff --git a/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java b/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java index 8d9b4fc..5547706 100644 --- a/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java +++ b/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java @@ -76,7 +76,7 @@ public class ErrorHelper implements ErrorReporter { Throwable cause) { JXErrorPane pane = new JXErrorPane(); ErrorInfo info = new ErrorInfo(t("lima.error"), - t("lima.error.errorpane.htmlmessage", message), null, null, + t("lima.error.message", message), null, null, cause, null, null); pane.setErrorInfo(info); pane.setErrorReporter(this); diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index 42fdd9c..6559df7 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -1,87 +1,32 @@ -Date= -Fitre= -Piece= -lima-business.document.entrybooks= -lima-business.document.generalentrybook= -lima.Filter.account= -lima.Filter.amount= -lima.Filter.date= -lima.Filter.description= -lima.Filter.entrybook= -lima.Filter.letter= -lima.Filter.voucher= -lima.about.translate.content=<h3>How to translate Lima</h3>You can help us to translate or improve label in Lima.<br/><ul><li>Get the <strong>lima-i18n.csv</strong> file in the <strong>i18n</strong> directory</li><li>open it in Libre office (separator caracter is <strong>Tab</strong>)</li><li>Do you work \:)</li><li>At last, send us back the modified file</li></ul><br/>We will apply the patch before next release. -lima.account=Account +lima.account= lima.account.add= lima.account.add.error.InvalidAccountNumber= lima.account.add.error.alreadyExist= lima.account.add.form= -lima.account.base= -lima.account.buttonback=← -lima.account.buttonnext=→ -lima.account.developed= +lima.account.error.invalidAccountNumber= +lima.account.error.notNumberAccountNumber= lima.account.import= lima.account.import.description= -lima.account.label= lima.account.number= +lima.account.remove.confirm= +lima.account.remove.confirm.title= lima.account.remove.error.usedAccount= -lima.account.removeaccountconfirm= -lima.account.removeaccounttitle= -lima.account.shortened= lima.account.update.error.invalidAccountNumber= lima.account.update.form= lima.accounts= -lima.accounts.plan= -lima.accountsreports.listerror=Can't get entries list lima.action.commandline.help=Show help in console -lima.all.NotAllowedLabel= -lima.all.notAllowedLabel=Not allowed char "\\" found in account name %s. -lima.amount=Amount -lima.amountcredit=Credit amount -lima.amountdebit=Debit amount -lima.autocomplete=Autocomplete lima.balance=Balance -lima.balance.documentcreationerror=Enable to create document -lima.balance.documentcreationfiscalerror=Can't create document on an open fiscal year -lima.balance.listerror=Can't get entries list -lima.beginDate=Begin -lima.buttonback=← -lima.buttonnext=→ lima.cancel=Cancel -lima.charts.account=Accounts chart -lima.charts.account.base=Base accountchart -lima.charts.account.developed=Developped accountchart -lima.charts.account.importcsv= -lima.charts.account.importebp= -lima.charts.account.number=Account Number -lima.charts.account.question.remove=Do you really remove this account ? -lima.charts.account.shortened=Shorthened accountchart -lima.charts.financialStatement.base= -lima.charts.financialStatement.developed= -lima.charts.financialStatement.nothing= -lima.charts.financialStatement.shortened= -lima.charts.financialperiod=Financial Periods -lima.charts.financialstatement=Financialstatement chart -lima.charts.financialstatement.base=Base financialstatement chart -lima.charts.financialstatement.developed=Developped financialstatement chart -lima.charts.financialstatement.nothing=NO financialstatement chart -lima.charts.financialstatement.shortened=Shortened financialstatement chart -lima.charts.financialtransaction.question.removeentry=Do you really remove this entry ? -lima.charts.financialtransaction.question.removetransaction=Do you really remove this transaction ? -lima.charts.fiscalperiod.add=Add fiscalperiod -lima.charts.fiscalperiod.block=Block fiscalperiod -lima.charts.fiscalperiod.create=Create fiscalperiod -lima.charts.fiscalperiod.delete=Delete fiscalperiod -lima.charts.fiscalperiod.update=Updated fiscal -lima.charts.fiscalyear=Fiscal Years -lima.charts.vatpdf=PDF structure +lima.chart.accounts=Accounts chart +lima.chart.accounts.base=Base accountchart +lima.chart.accounts.developed=Developped accountchart +lima.chart.accounts.import.csv= +lima.chart.accounts.import.ebp= +lima.chart.accounts.shortened=Shorthened accountchart lima.closed=Closed -lima.closedPeriodicEntryBook.franceAccountingRules.unbalancedFinancialTransactionsException=Fiscal Period has unbalanced transactions. -lima.closedPeriodicEntryBook.franceAccountingRules.withoutEntryBookFinancialTransactionsException=Can't block financialperiod / missing EntryBook in transactions lima.code=Code lima.config.category.directories=Directories lima.config.category.directories.description=Directories used by LIMA -lima.config.category.directories.table= lima.config.category.other=Other lima.config.category.other.description=Other configuration properties lima.config.category.table= @@ -134,152 +79,131 @@ lima.config.cell.selected.mandatory.background.description= lima.config.cell.selected.mandatory.background.label= lima.config.cell.selected.mandatory.foreground.description= lima.config.cell.selected.mandatory.foreground.label= -lima.config.colorselectionfocus=Cadring color of the selection of a cell -lima.config.colorselectionfocus.description= -lima.config.colorselectionfocus.label= -lima.config.comportmenteditingcell=Comportment selection of the containing on the edition of a cell +lima.config.color.selection.focus= +lima.config.color.selection.focus.description= +lima.config.color.selection.focus.label= lima.config.configFileName.description= lima.config.configFileName.label= -lima.config.currency= lima.config.currency.description= lima.config.currency.label= lima.config.data.dir.description= lima.config.data.dir.label= -lima.config.decimalseparator.description= -lima.config.decimalseparator.label= -lima.config.host.adress=Host adress -lima.config.host.adress.description= -lima.config.host.adress.label= +lima.config.decimalSeparator.description= +lima.config.decimalSeparator.label= +lima.config.host.address.description= +lima.config.host.address.label= lima.config.i18n.dir.description= lima.config.i18n.dir.label= lima.config.locale.description=Localization used by LIMA lima.config.locale.label= -lima.config.numberSeparator.comma= -lima.config.numberSeparator.dot= -lima.config.numberSeparator.semicolon= -lima.config.numberSeparator.space= lima.config.resources.dir.description= lima.config.resources.dir.label= lima.config.scale.description= lima.config.scale.label= -lima.config.selectAllEditingCell= lima.config.selectAllEditingCell.description= lima.config.selectAllEditingCell.label= -lima.config.state.file=State file of LIMA lima.config.state.file.description= lima.config.state.file.label= -lima.config.ui.flaunchui.description= -lima.config.ui.flaunchui.label= -lima.config.ui.fullscreen.description=FullScreen -lima.config.ui.fullscreen.label= +lima.config.thousandSeparator.description= +lima.config.thousandSeparator.label= +lima.config.ui.launchUi.description= +lima.config.ui.launchUi.label= lima.confirmation=Confirmation -lima.cop= lima.copy=Copy -lima.data.bigDecimal.decimalSeparator= -lima.data.bigDecimal.scale= lima.date= +lima.date.begin= +lima.date.end= lima.dates.interval= lima.dates.interval.in= lima.dates.interval.to= lima.documents=Documents… -lima.endDate=End -lima.enterEntries= +lima.email.support.description= +lima.email.support.label= lima.entries=Entries +lima.entries.add.entry.error.afterLastFiscalPeriod= +lima.entries.add.entry.error.beforeFirstFiscalPeriod= +lima.entries.add.entry.error.lockedEntryBook= +lima.entries.add.entry.error.lockedFinancialPeriod= +lima.entries.add.transaction.error.afterLastFiscalPeriod= +lima.entries.add.transaction.error.beforeFirstFiscalPeriod= +lima.entries.add.transaction.error.lockedEntryBook= +lima.entries.add.transaction.error.lockedFinancialPeriod= lima.entries.addEntry=New entry lima.entries.addTransaction=New transaction -lima.entries.assign.closed.entryBook.error= lima.entries.assign.entries=Assign this value in all entries in transaction +lima.entries.assign.error.lockedEntryBook= lima.entries.balance=Balance transaction with this entry lima.entries.copy.entry=Copy entry lima.entries.copy.transaction=Copy transaction lima.entries.enter= +lima.entries.entryBook= +lima.entries.financialPeriod= +lima.entries.fiscalYear= lima.entries.letter.closed.entryBook.error= lima.entries.letter.unbalanced.error= lima.entries.lettering=Lettering -lima.entries.lettering.add=Add letter -lima.entries.lettering.noletterselected=Error \: No selected letter -lima.entries.lettering.radiobutton.list=Existing letters -lima.entries.lettering.radiobutton.new=New letter -lima.entries.lettering.remove=Remove letter lima.entries.paste.entry=Paste entry +lima.entries.paste.entry.error.afterLastFiscalPeriod= +lima.entries.paste.entry.error.beforeFirstFiscalPeriod= +lima.entries.paste.entry.error.lockedEntryBook= +lima.entries.paste.entry.error.lockedFinancialPeriod= lima.entries.paste.transaction=Paste transaction +lima.entries.paste.transaction.error.afterLastFiscalPeriod= +lima.entries.paste.transaction.error.beforeFirstFiscalPeriod= +lima.entries.paste.transaction.error.lockedEntryBook= +lima.entries.paste.transaction.error.lockedFinancialPeriod= lima.entries.remove.entry=Delete entry +lima.entries.remove.entry.confirm= +lima.entries.remove.entry.error.lockedEntryBook= +lima.entries.remove.entry.error.lockedFinancialPeriod= +lima.entries.remove.entry.title= lima.entries.remove.transaction=Delete transaction +lima.entries.remove.transaction.confirm= +lima.entries.remove.transaction.error.lockedEntryBook= +lima.entries.remove.transaction.error.lockedFinancialPeriod= +lima.entries.remove.transaction.title= lima.entries.search= -lima.entries.searchtransaction=Search transaction -lima.entries.searchunbalancedtransaction=Incorrect transactions lima.entries.unbalanced= -lima.entries.writetransaction=Write entries lima.entry=Entry -lima.entry.add.error.afterLastFiscalPeriod= -lima.entry.add.error.beforeFirstFiscalPeriod= -lima.entry.add.error.lockedEntryBook= -lima.entry.add.error.lockedFinancialPeriod= -lima.entry.add.error.noFinancialPeriod=Any fiscal period are difined. -lima.entry.paste.error.afterLastFiscalPeriod= -lima.entry.paste.error.beforeFirstFiscalPeriod= -lima.entry.paste.error.lockedEntryBook= -lima.entry.paste.error.lockedFinancialPeriod= +lima.entry.account= +lima.entry.credit= +lima.entry.debit= +lima.entry.description= +lima.entry.letter= +lima.entry.remove.confirm= lima.entry.update.closed.entryBook.error= lima.entryBook=EntryBook lima.entryBook.add= -lima.entryBook.alreadyExistEntryBookException=An entry book with code %s already exists. +lima.entryBook.alreadyExistEntryBook= lima.entryBook.code= lima.entryBook.default= lima.entryBook.delete.used.error=Can't delete entry book %2$s (%1$s) because exist financcial transactions in this entry book. -lima.entryBook.deletemessage= -lima.entryBook.deletetitle= -lima.entryBook.entrybooktile= +lima.entryBook.error.lockedEntryBook= lima.entryBook.form= lima.entryBook.import= lima.entryBook.import.form= -lima.entryBook.importtitle= lima.entryBook.label= lima.entryBook.remove= -lima.entryBook.remove.shortcut= +lima.entryBook.remove.confirm= +lima.entryBook.remove.title= lima.entryBook.update= lima.entryBooks=EntryBooks -lima.entryBooksreports.documentcreationerror=Enable to create document -lima.entryBooksreports.documentcreationfiscalerror=Can't create document on an open fiscal year -lima.entryBooksreports.documentcreationfiscaltitle= -lima.entryBooksreports.listerror=Can't get entries list -lima.enum.comboboxaccount.account=Account -lima.enum.comboboxaccount.accountlist=Account list -lima.enum.comboboxaccount.allaccount=All accounts -lima.enum.comboboxentrybook.all=All entrybooks -lima.enum.comboboxentrybook.select_one=EntryBook -lima.enum.comboboxletter.all=All letters -lima.enum.comboboxletter.selectone=Letter -lima.enum.comboboxoperator.equal=Equal -lima.enum.comboboxoperator.inferior=Inferior -lima.enum.comboboxoperator.inferiororequal=Inferior or equal -lima.enum.comboboxoperator.interval=Inteval -lima.enum.comboboxoperator.notequal=Not equal -lima.enum.comboboxoperator.superior=Superior -lima.enum.comboboxoperator.superiororequal=Superior or equal -lima.enum.comboboxperiod.date= -lima.enum.comboboxperiod.financialperiod=Financial period -lima.enum.comboboxperiod.fiscalperiod=Fiscal period -lima.enum.comboboxperiod.period=Period -lima.enum.list.entryBook= lima.error=Error -lima.error.errorpane.htmlmessage=<html><body><b>An application error happened</b>\:<br/>%s</body></html> +lima.error.message= +lima.error.noFiscalPeriodFound= +lima.error.notAllowedLabel= +lima.export.exceptions= +lima.export.failed= +lima.export.terminated= lima.file= lima.filer.condition.sensitive.case= -lima.filer.condition.string= lima.filter=Filter lima.filter.account= -lima.filter.amount= lima.filter.condition.all= -lima.filter.condition.delete= lima.filter.condition.one= lima.filter.credit= -lima.filter.date= -lima.filter.date.financialPeriod= -lima.filter.date.fiscalPeriod= lima.filter.date.interval= lima.filter.date.one= -lima.filter.date.window= lima.filter.debit= lima.filter.description= lima.filter.entryBook= @@ -290,8 +214,7 @@ lima.filter.voucher= lima.financialPeriod= lima.financialPeriod.begin= lima.financialPeriod.block= -lima.financialPeriod.block.error.NoLockedPreviousEntryBook.main= -lima.financialPeriod.block.error.entry= +lima.financialPeriod.block.confirm= lima.financialPeriod.block.error.noLockedPreviousEntryBook.main= lima.financialPeriod.block.error.noLockedPreviousEntryBook.previousEntryBook= lima.financialPeriod.block.error.unbalanced.main= @@ -301,26 +224,24 @@ lima.financialPeriod.block.error.unfilled.main= lima.financialPeriod.block.error.unfilled.noAccount= lima.financialPeriod.block.error.unfilled.noDescription= lima.financialPeriod.block.error.unfilled.noVoucher= -lima.financialPeriod.block.error.unfilled.noVouchier= lima.financialPeriod.block.error.withoutEntryBook.main= lima.financialPeriod.block.error.withoutEntryBook.transaction= -lima.financialPeriod.blockmessage= -lima.financialPeriod.blocktitle= -lima.financialPeriod.closure= +lima.financialPeriod.block.title= +lima.financialPeriod.closed= lima.financialPeriod.end= -lima.financialPeriod.entrybook= -lima.financialPeriod.period= +lima.financialPeriod.entryBook= +lima.financialPeriod.open= lima.financialPeriod.status= lima.financialPeriods= +lima.financialStatement=Financialstatement chart lima.financialStatement.accounts=Account list on debit and on credit -lima.financialStatement.addfinancialStatementHeadererror=Can't add financialStatementHeader -lima.financialStatement.alreadyExistFinancialStatement=FAILED \: The financial statement %s already exists \! +lima.financialStatement.base=Base financialstatement chart lima.financialStatement.check=Check accounts passing to movement lima.financialStatement.creditAccounts= -lima.financialStatement.creditaccounts=Account credit list lima.financialStatement.debitAccounts= -lima.financialStatement.debitaccounts=Account debit list lima.financialStatement.delete=Delete actual financialstatement chart before import new +lima.financialStatement.developed=Developped financialstatement chart +lima.financialStatement.error.alreadyExistFinancialStatement= lima.financialStatement.header.add=Add category lima.financialStatement.header.form= lima.financialStatement.headerAmount=Calculate amount on header @@ -328,55 +249,19 @@ lima.financialStatement.import.form= lima.financialStatement.label=Label lima.financialStatement.movement.add=Add movement lima.financialStatement.movement.form= -lima.financialStatement.notAllowedLabel=Not allowed label\: %s +lima.financialStatement.nothing=NO financialstatement chart lima.financialStatement.provisionDeprecationAccounts= -lima.financialStatement.provisiondeprecationaccounts=Provisions and deprecations accounts list +lima.financialStatement.remove.confirm= +lima.financialStatement.shortened=Shortened financialstatement chart lima.financialStatement.subAmount=Calculate a subamount -lima.financialStatementreport.listerror=Can't get entries list lima.financialStatements= lima.financialStatements.check= lima.financialStatements.check.nothing= lima.financialStatements.check.warn= -lima.financialTransaction.account= -lima.financialTransaction.add.error.afterLastFiscalPeriod= -lima.financialTransaction.add.error.beforeFirstFiscalPeriod= -lima.financialTransaction.add.error.lockedEntryBook= -lima.financialTransaction.add.error.lockedFinancialPeriod= -lima.financialTransaction.balance= -lima.financialTransaction.buttonback= -lima.financialTransaction.buttonnext= -lima.financialTransaction.credit= lima.financialTransaction.date= -lima.financialTransaction.date.in= -lima.financialTransaction.date.to= -lima.financialTransaction.dateInterval= -lima.financialTransaction.dateInterval.in= -lima.financialTransaction.dateInterval.to= -lima.financialTransaction.debit= -lima.financialTransaction.delete.error.lockedEntryBook= -lima.financialTransaction.delete.error.lockedFinancialPeriod= -lima.financialTransaction.description= -lima.financialTransaction.entryBook= -lima.financialTransaction.entrybook= -lima.financialTransaction.financialPeriod= -lima.financialTransaction.financialperiod= -lima.financialTransaction.fiscalYear= -lima.financialTransaction.fiscalyear= -lima.financialTransaction.letter= -lima.financialTransaction.lockedEntryBookException=Entry can not be added as entry book is locked for period from %1$tm/%1$te/%1$tY to %1$tm/%1$te/%1$tY.\n -lima.financialTransaction.lockedFinancialPeriodException=locked financial transaction -lima.financialTransaction.messageremoveentry= -lima.financialTransaction.messageremovetransaction= lima.financialTransaction.nextFinancialPeriod= -lima.financialTransaction.nextfinancialperiod=Next period -lima.financialTransaction.paste.error.afterLastFiscalPeriod= -lima.financialTransaction.paste.error.beforeFirstFiscalPeriod= -lima.financialTransaction.paste.error.lockedEntryBook= -lima.financialTransaction.paste.error.lockedFinancialPeriod= lima.financialTransaction.previousFinancialPeriod= -lima.financialTransaction.previousfinancialperiod=previous period -lima.financialTransaction.titleremoveentry= -lima.financialTransaction.titleremovetransaction= +lima.financialTransaction.remove.confirm= lima.financialTransaction.update.error.afterLastFiscalPeriod= lima.financialTransaction.update.error.beforeFirstFiscalPeriod= lima.financialTransaction.update.error.lockedEntryBook= @@ -384,61 +269,40 @@ lima.financialTransaction.update.error.lockedFinancialPeriod= lima.financialTransaction.voucher= lima.fiscalPeriod= lima.fiscalPeriod.add= -lima.fiscalPeriod.add.beginAfterEndFiscalPeriod= +lima.fiscalPeriod.add.confirm.moreThan12= lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod= lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod= lima.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod= -lima.fiscalPeriod.add.moreOneUnlockFiscalPeriod= -lima.fiscalPeriod.add.notBeginNextDayOfLastFiscalPeriod= -lima.fiscalPeriod.addfiscalperiod.addfiscalperiodtitle= -lima.fiscalPeriod.addfiscalperiod.endAfterBegin= -lima.fiscalPeriod.addfiscalperiod.morethan12= -lima.fiscalPeriod.addfiscalperiodtitle= +lima.fiscalPeriod.add.form= lima.fiscalPeriod.begin= lima.fiscalPeriod.block= -lima.fiscalPeriod.block.addretainedearnings= +lima.fiscalPeriod.block.addRetainedEarnings= lima.fiscalPeriod.block.cantBalanceIfNextPeriodNotExist= lima.fiscalPeriod.block.cantBalanceNotBook= lima.fiscalPeriod.block.cantBlockNotBalance= lima.fiscalPeriod.block.confirmation= lima.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod= lima.fiscalPeriod.block.error.lastUnlockedFiscalPeriod= -lima.fiscalPeriod.block.error.lockedFinancialPeriod=Fiscal period from %3$te %3$tB %3$tY to %4$te %4$tB %4$tY is closed. -lima.fiscalPeriod.block.error.lockedFiscalPeriod=Fiscal period closed %s -lima.fiscalPeriod.block.newyear= +lima.fiscalPeriod.block.newYear= lima.fiscalPeriod.block.retainedEarnings= lima.fiscalPeriod.block.title= -lima.fiscalPeriod.buttonback=← -lima.fiscalPeriod.buttonnext=→ lima.fiscalPeriod.closed= -lima.fiscalPeriod.closure= -lima.fiscalPeriod.defaultAccountingRules.beginAfterEndFiscalPeriodException=Fiscal period ending date must be after the begining one, begin\: %1$tm/%1$te/%1$tY end\: %1$tm/%1$te/%1$tY.\n lima.fiscalPeriod.delete= lima.fiscalPeriod.delete.confirmation= lima.fiscalPeriod.delete.error.noEmptyFiscalPeriod= lima.fiscalPeriod.delete.title= lima.fiscalPeriod.end= lima.fiscalPeriod.entryBooks.create= -lima.fiscalPeriod.fiscalperiod= -lima.fiscalPeriod.fiscalperiod.begin= -lima.fiscalPeriod.fiscalperiod.end= -lima.fiscalPeriod.fiscalperiod.status= +lima.fiscalPeriod.error.beginAfterEndFiscalPeriod= +lima.fiscalPeriod.error.lockedFinancialPeriod= +lima.fiscalPeriod.error.moreOneUnlockFiscalPeriod= +lima.fiscalPeriod.error.notBeginNextDayOfLastFiscalPeriod= lima.fiscalPeriod.form= -lima.fiscalPeriod.franceAccountingRules.invalidAccountNumberException=Master account is not a digit between 1 to 8 \: %s"\n -lima.fiscalPeriod.franceAccountingRules.lastUnlockedFiscalPeriodException=Current fiscal period must not be closed. -lima.fiscalPeriod.franceAccountingRules.moreOneUnlockFiscalPeriodException=The ante fiscal period is not locked\: concerned fiscal period from %1$tm/%1$te/%1$tY to %1$tm/%1$te/%1$tY.\n -lima.fiscalPeriod.franceAccountingRules.noEmptyFiscalPeriodException=The fiscal period is not empty \! -lima.fiscalPeriod.franceAccountingRules.notBeginNextDayOfLastFiscalPeriodException=The new fiscal period must adjoining the last\: concerned fiscal period from %1$tm/%1$te/%1$tY to %1$tm/%1$te/%1$tY.\n -lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException=Account Number that doesn't start with 4 have to be numeric\: %s"\n -lima.fiscalPeriod.modifyfiscalperiodtitle= lima.fiscalPeriod.open= -lima.fiscalPeriod.remove= lima.fiscalPeriod.status= -lima.fiscalPeriod.unbalancedtransactions=Fiscal Period has unbalanced transactions lima.fiscalPeriod.update= +lima.fiscalPeriod.update.form= lima.fiscalYears= -lima.fullscreen= -lima.generateHtml= lima.help= lima.help.about= lima.help.about.title=About Lima... @@ -450,18 +314,11 @@ lima.help.i18n.fr= lima.help.i18n.uk= lima.help.site= lima.home=Home -lima.home.account=Chart of accounts lima.home.accounts= lima.home.accounts.create= lima.home.accounts.info= lima.home.accounts.modify= lima.home.accounts.nothing= -lima.home.chartaccounts.create=Create the chart of accounts -lima.home.chartaccounts.modify=Edit the chart of accounts -lima.home.chartaccounts.nothing=No account set\! -lima.home.chartaccounts.state1_2=The chart of accounts has -lima.home.chartaccounts.state2_2=accounts -lima.home.daily=Daily tasks lima.home.entries= lima.home.entries.balanced= lima.home.entries.create= @@ -475,31 +332,12 @@ lima.home.entryBooks.info= lima.home.entryBooks.info.one= lima.home.entryBooks.modify= lima.home.entryBooks.nothing= -lima.home.entrybooks=Books -lima.home.entrybooks.create=Create entry book -lima.home.entrybooks.modify=Edit books -lima.home.entrybooks.nothing=No book -lima.home.entrybooks.state.single=The book is\: -lima.home.entrybooks.state1_2.plural=The -lima.home.entrybooks.state2_2.plural=books are\: lima.home.fiscalYears= lima.home.fiscalYears.closed= lima.home.fiscalYears.create= lima.home.fiscalYears.modify= lima.home.fiscalYears.noOpen= lima.home.fiscalYears.opened= -lima.home.fiscalperiod.closed= -lima.home.fiscalperiod.create= -lima.home.fiscalperiod.modify= -lima.home.fiscalperiod.noopen= -lima.home.fiscalperiod.opened= -lima.home.fiscalyear=Fiscal year -lima.home.transaction.balanced=moves, all balanced -lima.home.transaction.create=Add moves -lima.home.transaction.inexact=moves are not valid\! -lima.home.transaction.modifiy.balanced=Edit moves -lima.home.transaction.modifiy.inexact=Edit incorrect moves -lima.home.transaction.nothing=No move lima.identity=Identity lima.identity.address=Address lima.identity.address2=Address (next) @@ -512,122 +350,73 @@ lima.identity.name=Name lima.identity.phoneNumber=Phone number lima.identity.vatNumber=VAT number lima.identity.zipCode=Zip code -lima.import.entries.noFiscalPeriodFoundException=No fiscal period found.\n -lima.import.noDataToImportException=No data to import. -lima.import.unknownError=Unknown error. +lima.import.error= +lima.import.error.extractFile= +lima.import.error.noDataToImport= +lima.import.error.unknown= +lima.import.line= +lima.import.report= +lima.import.terminated= +lima.import.title= lima.importExport.account=Accounts import completed. -lima.importExport.accountcharts=Accounts chart lima.importExport.all=All -lima.importExport.choiceencoding= lima.importExport.csv=Import/Export CSV -lima.importExport.defaultentrybooks=Defaults entrybooks lima.importExport.ebp=Import/Export EBP -lima.importExport.entries=Entries +lima.importExport.encoding.choice= lima.importExport.entry=Entries import completed. lima.importExport.entryBook= -lima.importExport.entrybook=Entry books import completed. -lima.importExport.entrybooks=Entry books +lima.importExport.entryBooks.default= lima.importExport.export=Export -lima.importExport.export.exceptions=Export failed.\n -lima.importExport.export.failed=Export failed \! -lima.importExport.export.import.exceptions=Export has failed. -lima.importExport.export.terminated=Export terminated lima.importExport.financialStatement=Financial transactions import completed. lima.importExport.financialTransaction= -lima.importExport.financialstatements=FinancialStatements chart -lima.importExport.financialtransactions=Moves lima.importExport.fiscalPeriod=Fiscal periods import completed. lima.importExport.identity=Identity import completed. lima.importExport.import= -lima.importExport.import.alreadyExistFinancialStatement=Category with name %s exists for parent %s.\n -lima.importExport.import.alreadyExistVatStatement=VAT statement with name %s exists for parents %s.\n -lima.importExport.import.backupException=could not import backup. -lima.importExport.import.extractFileError=Could not extract file. -lima.importExport.import.line=Line %d\: -lima.importExport.import.nbCreated=%d created\n -lima.importExport.import.nbIgnored=%d ignored\n -lima.importExport.import.nbUpdated=%d updated\n -lima.importExport.import.notAllowedLabel=Not allowed char in label\: %s.\n -lima.importExport.import.terminated=Import terminated\n -lima.importExport.import.vatpdfimport=The PDF has been imported. It can be found inside the Lima resources directory -lima.importExport.importcsv= -lima.importExport.importebp= -lima.importExport.importerror=An error has occured during import -lima.importExport.importtitle= -lima.importExport.no.result=No result found. -lima.importExport.usevatpdf= lima.importExport.vatStatement=VTA transactions import completed. -lima.importExport.vatstatements=VAT chart lima.importExport.wait=Job in progress… lima.info=Information lima.init.closed=Lima closed at %1$s -lima.init.errorclosing=Error during Lima close +lima.init.errorclosing= lima.label=Label -lima.ledger.documentcreationerror=Enable to create document +lima.launch.accounting= +lima.launch.finished= +lima.launch.services= lima.lettering.account=Accounts +lima.lettering.account.aAll= lima.lettering.account.back= lima.lettering.account.next= -lima.lettering.accountRegularization=Lettering regularization -lima.lettering.actions=Actions -lima.lettering.beginFinancialPeriod=From -lima.lettering.buttonAuto=Auto -lima.lettering.buttonEqualize=Equalize -lima.lettering.buttonLettered=To Letter -lima.lettering.buttonNoLettered=To Unletter -lima.lettering.buttonRefresh=Refresh lima.lettering.checkAll=All -lima.lettering.checkLettredEntry=Lettered -lima.lettering.checkLettredEntrye= -lima.lettering.checkNoLettredEntry=Unlettered -lima.lettering.checkNoLettredEntrye= -lima.lettering.endFinancialPeriod=To +lima.lettering.checkLettredEntry= +lima.lettering.checkNoLettredEntry= lima.lettering.entry=Entries lima.lettering.equalize= lima.lettering.lettered= -lima.lettering.listerror=Can't get entries list lima.lettering.period=Periods lima.lettering.period.begin= lima.lettering.period.end= lima.lettering.refresh= lima.lettering.roundAndCreateEntry.error.lockedEntryBook= lima.lettering.roundAndCreateEntry.error.lockedFinancialPeriod= -lima.lettering.selectCredit= -lima.lettering.selectDebit= -lima.lettering.selectEntry=Actual selection -lima.lettering.selectSolde=Balance lima.lettering.selection.credit= lima.lettering.selection.debit= lima.lettering.selection.sold= lima.lettering.unLettered= -lima.list.seeAll=ALL -lima.locale= -lima.mainview.title=Lutin Invoice Monitoring and Accounting -lima.menu.file=File -lima.menu.help=Help -lima.menu.help.about=About -lima.menu.help.i18n=Language -lima.menu.help.i18n.fr=French -lima.menu.help.i18n.uk=English -lima.menu.help.site=WebSite -lima.menu.window=Window -lima.message.help.usage=Options (set with --option <key> <value>\: -lima.misc.supportemail.description=Support email -lima.misc.supportemail.label= -lima.movmentedfilter=Accounts filtered +lima.lookAndFeel.nimbus.warning= +lima.message.help.usage= lima.new=New -lima.nonaffect= +lima.noAffect= lima.ok=Ok lima.open=Open -lima.openejb.remotemode.description= -lima.openejb.remotemode.label= +lima.openEjb.remote.mode.description= +lima.openEjb.remote.mode.label= lima.opening= lima.opening.accounts=<html><center>Select a default, <br/>import your personnal<br/> or cancel to create your own account chart.</center></html> lima.opening.close=Close lima.opening.end=Finish -lima.opening.entrybook=<html>Tick box to import default accounts chart\:<br/> Achats, Ventes, Trésorerie, Opération diverses</html> +lima.opening.entryBook= +lima.opening.fiscalPeriod= lima.opening.import=Import a CSV backup lima.opening.next=Next -lima.opening.title= lima.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR import instantanly your already existing save in CSV format<br/><br/><br/><br/></center></html> lima.paste=Paste lima.preferences=Preferences @@ -636,75 +425,42 @@ lima.refresh=Refresh lima.refresh.shortcut= lima.remove=Remove lima.remove.shortcut= -lima.reports=Reports -lima.reports.account.noaccount= -lima.reports.account.noaccounttitle= -lima.reports.accounts=Edit account -lima.reports.balance=Balance -lima.reports.entrybooks=Edit entrybook -lima.reports.financialstatement=Financialstatements -lima.reports.ledger=Ledger -lima.reports.vat=Edit VAT lima.retainedEarnings.wait= lima.search=Search -lima.solde=Solde -lima.soldecredit=Credit solde -lima.soldedebit=Debit solde -lima.splash.1=Loading services... -lima.splash.2="Loading accounting... -lima.splash.3=Ready \! lima.structure=Structure lima.table.account=Account lima.table.balance=Balance -lima.table.cell.colorSelectionFocus= -lima.table.cell.comportmentEditingCell= -lima.table.cell.selectAllEditingCell= lima.table.credit=Credit lima.table.date= lima.table.debit=Debit -lima.table.debitcredit=Debit and credit +lima.table.debitCredit= lima.table.description=Description -lima.table.entrybook=EntryBook -lima.table.grossamount=Gross amount +lima.table.entryBook= lima.table.label=Label lima.table.letter=Letter -lima.table.move.credit=Movmented Credit -lima.table.move.debit=Movemented Debit -lima.table.netamount=Net amount lima.table.number=Account Number -lima.table.provisiondeprecationamount=Provision & Deprecation -lima.table.solde=Solder -lima.table.solde.credit=Credit solde -lima.table.solde.debit=Debit solde -lima.table.sum=Sums +lima.table.provisionDeprecation= lima.table.voucher=Voucher -lima.thousandSeparator= -lima.tooltip.Filter= -lima.tooltip.filter=<html>Regular expression \:<br/>- accounts interval i..j <br/>- accounts list i,j,k <br/>- Exclude an account -i</html> -lima.tooltip.lettering=<html>Add a letter on many entries <br/>Select many rows with combination ctrl + click</html> +lima.title= lima.transaction=Transaction lima.update=Modify lima.update.shortcut= lima.vatStatement=VAT statement chart lima.vatStatement.accounts=List of accounts -lima.vatStatement.alreadyExistVatStatement=FAILED \: The vatStatement %s already exists \! lima.vatStatement.base=Base VAT statement chart lima.vatStatement.boxName=PDF BoxName lima.vatStatement.delete=Delete actual VAT statement chart before import new -lima.vatStatement.deleteparent=Delete subcategories before this line +lima.vatStatement.delete.parent= lima.vatStatement.developed=Developped VAT statement chart +lima.vatStatement.error.alreadyExistVatStatement= lima.vatStatement.import= lima.vatStatement.label=Label lima.vatStatement.master= lima.vatStatement.movement= lima.vatStatement.movement.add=Add movement lima.vatStatement.nothing=No vat statement chart -lima.vatStatement.question.remove=Do you really want to delete this line ? +lima.vatStatement.remove.confirm= +lima.vatStatement.remove.title= lima.vatStatement.shortened=Shortened vat statement chart lima.vatStatements= -lima.vatreport.listerror=Can't get entries list lima.wait= -lima.warning.nimbus.landf=Could not find Numbus Look&Feel -limaFinancialStatement.movement.form= -limma.config.thousandseparator.description= -limma.config.thousandseparator.label= diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index c803284..91d9677 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -1,65 +1,29 @@ -lima-business.document.entrybooks= -lima-business.document.generalentrybook= lima.account=Compte lima.account.add=Nouveau compte (Ctrl+A) lima.account.add.error.InvalidAccountNumber=Le numéro du compt %1$s n'est pas valide lima.account.add.error.alreadyExist=Le compt %1$s existe déjà lima.account.add.form=Ajout d'un compte -lima.account.base=Plan comptable de base -lima.account.buttonback=← -lima.account.buttonnext=→ -lima.account.developed=Plan comptable développé +lima.account.error.invalidAccountNumber=Le numéro du compte général n'est pas compris entre 1 et 8 \: %s +lima.account.error.notNumberAccountNumber=Un numéro de compte ne commençant pas par 4 doit être numérique \: %s lima.account.import=Importer lima.account.import.description=Sélectionnez un plan par défaut ou un plan personnalisé. lima.account.label=Libellé lima.account.number=Numéro de compte +lima.account.remove.confirm=Voulez-vous supprimer le compte %s ? +lima.account.remove.confirm.title=Suppression d'un compte lima.account.remove.error.usedAccount=Il exist des transactions sur ce compte -lima.account.removeaccountconfirm=Voulez-vous supprimer le compte %s ? -lima.account.removeaccounttitle=Suppression d'un compte -lima.account.shortened=Plan comptable abrégé lima.account.update.error.invalidAccountNumber=Le numéro du compte %1$s n'est pas valide lima.account.update.form=Modification d'un compte lima.accounts=Comptes -lima.accounts.plan=Plan comptable -lima.accountsreports.listerror=Erreur lors de la récupération des données de la liste lima.action.commandline.help=Afficher l'aide en console -lima.all.NotAllowedLabel= -lima.all.notAllowedLabel=Le caractère "\\" n'est pas authorisé, trouvé sur le compte %s. -lima.amount=Montant -lima.amountcredit=Total Crédit -lima.amountdebit=Total Débit -lima.autocomplete=Autocomplétion lima.balance=Équilibrer -lima.balance.documentcreationerror=Erreur lors de la création du document -lima.balance.documentcreationfiscalerror=Impossible de créer le document quand la période fiscale est ouverte -lima.balance.listerror=Erreur lors de la récupération des données de la liste -lima.beginDate=Début -lima.buttonback=← -lima.buttonnext=→ lima.cancel=Annuler -lima.charts.account=Plan comptable -lima.charts.account.base=Plan comptable de base -lima.charts.account.developed=Plan comptable développé -lima.charts.account.importcsv=Plan comptable personnalisé au format CSV -lima.charts.account.importebp=Plan comptable personnalisé au format EBP -lima.charts.account.number=Numéro de compte -lima.charts.account.question.remove=Voulez-vous supprimer ce compte? -lima.charts.account.shortened=Plan comptable abrégé -lima.charts.financialStatement=Plan BCR -lima.charts.financialStatement.base=Plan BCR de base -lima.charts.financialStatement.developed=Plan BCR développé -lima.charts.financialStatement.nothing=<html><center>Aucun plan BCR chargé<br/>Veuillez sélectionner un plan par défaut, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> -lima.charts.financialStatement.shortened=Plan BCR abrégé -lima.charts.financialperiod=Périodes comptables -lima.charts.financialtransaction.question.removeentry=Voulez-vous supprimer cette ligne de transaction? -lima.charts.financialtransaction.question.removetransaction=Voulez-vous supprimer cette transaction? -lima.charts.fiscalperiod.create= -lima.charts.fiscalyear=Exercices -lima.charts.vatpdf=Import du pdf -lima.closed=Fermé -lima.closedPeriodicEntryBook.franceAccountingRules.unbalancedFinancialTransactionsException=Impossible de bloquer la période financière / le journal, il contient des transactions non équilibrées. -lima.closedPeriodicEntryBook.franceAccountingRules.withoutEntryBookFinancialTransactionsException=Impossible de bloquer la période financière / il manque un journal dans une transaction (%1$te/%1$tm/%1$tY) -lima.code=Code +lima.chart.accounts=Plan comptable +lima.chart.accounts.base=Plan comptable de base +lima.chart.accounts.developed=Plan comptable développé +lima.chart.accounts.import.csv=Plan comptable personnalisé au format CSV +lima.chart.accounts.import.ebp=Plan comptable personnalisé au format EBP +lima.chart.accounts.shortened=Plan comptable abrégé lima.config.category.directories=Répertoires lima.config.category.directories.description=Répertoires utilisés par Lima lima.config.category.other=Autre @@ -114,125 +78,126 @@ lima.config.cell.selected.mandatory.background.description=Couleur de fond d'une lima.config.cell.selected.mandatory.background.label=Couleur de fond sélectionnée obligatoire lima.config.cell.selected.mandatory.foreground.description=Couleur du texte d'une cellule vide dont la valeur est obligatoire pour une ligne sélectionnée lima.config.cell.selected.mandatory.foreground.label=Couleur du texte sélectionnée obligatoire -lima.config.colorselectionfocus= -lima.config.colorselectionfocus.description=Couleur des bordures de la séléction -lima.config.colorselectionfocus.label=Couleur de l'encadrement de sélection d'une cellule +lima.config.color.selection.focus=bordure de sélection +lima.config.color.selection.focus.description=Couleur des bordures de la séléction +lima.config.color.selection.focus.label=Couleur de l'encadrement de sélection d'une cellule lima.config.configFileName.description=Le nom du fichier de configuration de l'application lima.config.configFileName.label=fichier de configuration lima.config.currency.description=Afficher le symbole monétaire lima.config.currency.label=Unité monétaire lima.config.data.dir.description=Répertoire d'enregistrement des données de l'application lima.config.data.dir.label=Répertoire des données -lima.config.decimalseparator.description=Caractères de séparation entre la partie entière et la parti décimale d'un nombre -lima.config.decimalseparator.label=Séparateur de décimales -lima.config.host.adress.description=Adresse du serveur distant -lima.config.host.adress.label=Serveur -lima.config.i18n.dir.description= -lima.config.i18n.dir.label= +lima.config.decimalSeparator.description=Caractères de séparation entre la partie entière et la parti décimale d'un nombre +lima.config.decimalSeparator.label=Séparateur de décimales +lima.config.host.address.description=Adresse du serveur distant +lima.config.host.address.label=Serveur +lima.config.i18n.dir.description=Dossier contenant les traduction de lima +lima.config.i18n.dir.label=dossier de traduction lima.config.locale.description=Paramétres local utilisés par l'application lima.config.locale.label=Zone lima.config.numberSeparator.comma=Virgule lima.config.numberSeparator.dot=Point lima.config.numberSeparator.semicolon=Point-virgule lima.config.numberSeparator.space=Espace -lima.config.resources.dir.description= -lima.config.resources.dir.label= +lima.config.resources.dir.description=Dossier contenant les fichiers ressouces de lima +lima.config.resources.dir.label=Dossier ressources lima.config.scale.description=Nombre de caratères décimales pour les montants lima.config.scale.label=Nombre de décimales lima.config.selectAllEditingCell.description=Sélectionner tous le contenu à édition d'une cellule lima.config.selectAllEditingCell.label=Tous Sélectioner à l'édition -lima.config.state.file=Fichier d'état de l'application -lima.config.state.file.description= -lima.config.state.file.label= -lima.config.ui.flaunchui.description= -lima.config.ui.flaunchui.label= -lima.config.ui.fullscreen.description=demarrer l'application en mode plein écran -lima.config.ui.fullscreen.label=Plein écran +lima.config.state.file.description=Fichier d'état de l'application +lima.config.state.file.label=Fichier d'état de l'application +lima.config.thousandSeparator.description=Caractère de séparation entre les blocs de milliers +lima.config.thousandSeparator.label=Séparateur de milliers +lima.config.ui.launchUi.description=Démarrer Lima en mode client (sinon en mode serveur) +lima.config.ui.launchUi.label=mode client de Lima lima.confirmation=Confirmation lima.copy=Copier lima.date=Date +lima.date.begin=Début +lima.date.end=Fin lima.dates.interval=Interval de dates lima.dates.interval.in=Du lima.dates.interval.to=au lima.documents=Documents… -lima.endDate=Fin -lima.enterEntries=Écritures +lima.email.support.description=Adresse email de support +lima.email.support.label=support lima.entries=Écritures +lima.entries.add.entry.error.afterLastFiscalPeriod=Impossible d'ajouter une écriture car la date de la transaction est après le %1$te %1$tB %1$tY fin du dernier exercice. +lima.entries.add.entry.error.beforeFirstFiscalPeriod=Impossible d'ajouter une écriture car la date de la transaction est avant le %1$te %1$tB %1$tY début du premier exercice. +lima.entries.add.entry.error.lockedEntryBook=Impossible d'ajouter une écriture car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entries.add.entry.error.lockedFinancialPeriod=Impossible d'ajouter une écriture car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.entries.add.transaction.error.afterLastFiscalPeriod=Impossible d'ajouter une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. +lima.entries.add.transaction.error.beforeFirstFiscalPeriod=Impossible d'ajouter une transaction avant le %1$te %1$tB %1$tY début du premier exercice. +lima.entries.add.transaction.error.lockedEntryBook=Impossible d'ajouter une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entries.add.transaction.error.lockedFinancialPeriod=Impossible d'ajouter une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. lima.entries.addEntry=Créer une entrée dans la transaction (Ctrl+N) lima.entries.addTransaction=Créer une transaction (Ctrl+Maj+N) -lima.entries.assign.closed.entryBook.error=Impossible d'affecter cette valeur a l'ensemble des entrés de la transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.entries.assign.entries=Assigner cette valeur à toutes les entrées de la transaction (Ctrl+Alt+A) -lima.entries.balance=Équilibrer la transaction avec cette entrée (Ctrl+B) -lima.entries.copy.entry=Copier l'entrée (Ctrl+Alt+C) +lima.entries.assign.entries=Assigner cette valeur à toutes les écritures de la transaction (Ctrl+Alt+A) +lima.entries.assign.error.lockedEntryBook=Impossible d'affecter cette valeur a l'ensemble des écritures de la transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entries.balance=Équilibrer la transaction avec cette écriture (Ctrl+B) +lima.entries.copy.entry=Copier l'écritures (Ctrl+Alt+C) lima.entries.copy.transaction=Copier la transaction (Ctrl+Maj+C) lima.entries.enter=Saisie des écritures -lima.entries.letter.closed.entryBook.error=Impossible de modifier le lettrage des ces entrés car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entries.entryBook=Journal +lima.entries.financialPeriod=Périodes comptables +lima.entries.fiscalYear=Exercices +lima.entries.letter.closed.entryBook.error=Impossible de modifier le lettrage des ces écritures car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.entries.letter.unbalanced.error=Impossible de lettrer ces écritures car leur solde n'est pas nul. lima.entries.lettering=Lettrage -lima.entries.lettering.add=Ajouter une lettre -lima.entries.lettering.noletterselected=Erreur \: Aucune lettre sélectionnée. -lima.entries.lettering.radiobutton.list=Lettres existantes -lima.entries.lettering.radiobutton.new=Nouvelle lettre -lima.entries.lettering.remove=Supprimer une lettre lima.entries.paste.entry=Coller l'entrée (Ctrl+Alt+V) +lima.entries.paste.entry.error.afterLastFiscalPeriod=Impossible de copier une écriture car la date de la transaction est après le %1$te %1$tB %1$tY fin du dernier exercice. +lima.entries.paste.entry.error.beforeFirstFiscalPeriod=Impossible de copier une écriture car la date de la transaction est avant le %1$te %1$tB %1$tY début du premier exercice. +lima.entries.paste.entry.error.lockedEntryBook=Impossible de copier une écriture car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entries.paste.entry.error.lockedFinancialPeriod=Impossible de copier une écriture car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. lima.entries.paste.transaction=Coller la transaction (Ctrl+Maj+V) +lima.entries.paste.transaction.error.afterLastFiscalPeriod=Impossible de copier une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. +lima.entries.paste.transaction.error.beforeFirstFiscalPeriod=Impossible de copier une transaction avant le %1$te %1$tB %1$tY début du premier exercice. +lima.entries.paste.transaction.error.lockedEntryBook=Impossible de copier une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entries.paste.transaction.error.lockedFinancialPeriod=Impossible de copier une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. lima.entries.remove.entry=Supprimer l'entrée (Suppr) +lima.entries.remove.entry.confirm=Voulez-vous supprimer cette écriture ? +lima.entries.remove.entry.error.lockedEntryBook=Impossible de supprimer une écriture car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entries.remove.entry.error.lockedFinancialPeriod=Impossible de supprimer une écriture car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.entries.remove.entry.title=Suppression lima.entries.remove.transaction=Supprimer la transaction (Ctrl+Suppr) +lima.entries.remove.transaction.confirm=Voulez-vous supprimer cette transaction? +lima.entries.remove.transaction.error.lockedEntryBook=Impossible de supprimer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entries.remove.transaction.error.lockedFinancialPeriod=Impossible de supprimer une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. +lima.entries.remove.transaction.title=Suppression lima.entries.search=Rechercher des écritures -lima.entries.searchtransaction= -lima.entries.searchunbalancedtransaction= lima.entries.unbalanced=Entrées incorrectes -lima.entries.writetransaction= lima.entry=Entrée -lima.entry.add.error.afterLastFiscalPeriod=Impossible d'ajouter une entré car la date de la transaction est après le %1$te %1$tB %1$tY fin du dernier exercice. -lima.entry.add.error.beforeFirstFiscalPeriod=Impossible d'ajouter une entré car la date de la transaction est avant le %1$te %1$tB %1$tY début du premier exercice. -lima.entry.add.error.lockedEntryBook=Impossible d'ajouter une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.entry.add.error.lockedFinancialPeriod=Impossible d'ajouter une entré car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.entry.add.error.noFinancialPeriod=Aucune période fiscale n'est définie. -lima.entry.paste.error.afterLastFiscalPeriod=Impossible de copier une entré car la date de la transaction est après le %1$te %1$tB %1$tY fin du dernier exercice. -lima.entry.paste.error.beforeFirstFiscalPeriod=Impossible de copier une entré car la date de la transaction est avant le %1$te %1$tB %1$tY début du premier exercice. -lima.entry.paste.error.lockedEntryBook=Impossible de copier une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.entry.paste.error.lockedFinancialPeriod=Impossible de copier une entré car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.entry.update.closed.entryBook.error=Impossible de modifier cette entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. +lima.entry.account=Compte +lima.entry.credit=Crédit +lima.entry.debit=Débit +lima.entry.description=Description +lima.entry.letter=Lettre +lima.entry.remove.confirm=Voulez-vous supprimer cette ligne de transaction? +lima.entry.update.closed.entryBook.error=Impossible de modifier cette écriture car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.entryBook=Journal lima.entryBook.add=Ajout de journal (Ctrl+A) -lima.entryBook.alreadyExistEntryBookException=Un journal avec comme code % existe déjà. +lima.entryBook.alreadyExistEntryBook=Un journal avec comme code % existe déjà. lima.entryBook.code=Code lima.entryBook.default=Journaux par défault lima.entryBook.delete.used.error=Imposible de supprimer le journal %2$s (%1$s) car Il existe des transactioins sur ce journal. -lima.entryBook.deletemessage=Êtes vous sûr de vouloir supprimer le journal %s ? -lima.entryBook.deletetitle=Suppression de journal +lima.entryBook.error.lockedEntryBook=Impossible d'ajouter une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.entryBook.form=Journal lima.entryBook.import=Importer lima.entryBook.import.form=Import lima.entryBook.label=Libellé lima.entryBook.remove=Supprimer (Suppr) +lima.entryBook.remove.confirm=Êtes vous sûr de vouloir supprimer le journal %s ? +lima.entryBook.remove.title=Suppression de journal lima.entryBook.update=Modifier (Ctrl+M) lima.entryBooks=Journaux -lima.entryBooksreports.documentcreationerror=Erreur lors de la création du document -lima.entryBooksreports.documentcreationfiscalerror=Impossible de créer un document quand la période fiscale est ouverte -lima.entryBooksreports.documentcreationfiscaltitle= -lima.entryBooksreports.listerror=Erreur lors de la récupération des données de la liste -lima.enum.comboboxaccount.account=Compte -lima.enum.comboboxaccount.accountlist=Liste de comptes -lima.enum.comboboxaccount.allaccount=Tous les comptes -lima.enum.comboboxentrybook.all=Tous les journaux -lima.enum.comboboxentrybook.select_one=Journal -lima.enum.comboboxletter.all=Toutes les lettres -lima.enum.comboboxletter.selectone=Lettre -lima.enum.comboboxoperator.equal=Égal -lima.enum.comboboxoperator.inferior=Inférieur -lima.enum.comboboxoperator.inferiororequal=Inférieur ou égal -lima.enum.comboboxoperator.interval=Intervalle -lima.enum.comboboxoperator.notequal=Différent -lima.enum.comboboxoperator.superior=Supérieur -lima.enum.comboboxoperator.superiororequal=Supérieur ou égal -lima.enum.comboboxperiod.date=Date -lima.enum.comboboxperiod.financialperiod=Période Financière -lima.enum.comboboxperiod.fiscalperiod=Exercice -lima.enum.comboboxperiod.period=Période lima.error=Erreur -lima.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> +lima.error.message=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> +lima.error.noFiscalPeriodFound=Aucune periode fiscale trouvée. +lima.error.notAllowedLabel=Le caractère "\\" n'est pas authorisé, trouvé sur le compte %s. +lima.export.exceptions=Echec de l'export. +lima.export.failed=Echec de l'export \! +lima.export.terminated=Export terminé lima.file=Fichier lima.filer.condition.sensitive.case=sensible à la case lima.filter=Filtrer @@ -244,7 +209,6 @@ lima.filter.credit=Ajouter un filtre sur les crédits lima.filter.date=Ajouter un filtre sur les dates lima.filter.date.interval=Ajouter un filtre sur un interval de dates lima.filter.date.one=Ajouter un filtre sur une date -lima.filter.date.window= lima.filter.debit=Ajouter un filtre sur les débits lima.filter.description=Ajouter un filtre sur les descriptions lima.filter.entryBook=Ajouter un filtre sur les journaux @@ -255,6 +219,7 @@ lima.filter.voucher=Ajouter un filtre sur les pièces comptables lima.financialPeriod=Périodes Financières lima.financialPeriod.begin=Début lima.financialPeriod.block=Cloturer une période (Ctrl+C) +lima.financialPeriod.block.confirm=Êtes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! lima.financialPeriod.block.error.noLockedPreviousEntryBook.main=Impossible de clôturer cette période car les périodes précedentes ne sont pas clôturer \: lima.financialPeriod.block.error.noLockedPreviousEntryBook.previousEntryBook=période du %1$te %1$tB %1$tY au %2$te %2$tB %2$tY lima.financialPeriod.block.error.unbalanced.main=Impossible de clôturer cette période car elle contient des transactions non équilibrées \: @@ -266,21 +231,23 @@ lima.financialPeriod.block.error.unfilled.noDescription=n'a pas de description lima.financialPeriod.block.error.unfilled.noVoucher=n'a pas de pièce comptable lima.financialPeriod.block.error.withoutEntryBook.main=Impossible de clôturer cette période car elle contient des transactions sans journal lima.financialPeriod.block.error.withoutEntryBook.transaction=transaction du %1$te/%1$tm/%1$tY d'un montant de %2$s, -lima.financialPeriod.blockmessage=Êtes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! -lima.financialPeriod.blocktitle=Clôture -lima.financialPeriod.closure=Clôture +lima.financialPeriod.block.title=Clôture +lima.financialPeriod.closed=Fermé lima.financialPeriod.end=Fin -lima.financialPeriod.entrybook=Journal +lima.financialPeriod.entryBook=Journal +lima.financialPeriod.open=Ouvert lima.financialPeriod.period=Période lima.financialPeriod.status=Statut lima.financialPeriods=Périodes comptables +lima.financialStatement=Plan BCR lima.financialStatement.accounts=Liste de comptes au crédit et au débit -lima.financialStatement.addfinancialStatementHeadererror=Erreur lors de l'ajout de l'entête sur la déclaration financière -lima.financialStatement.alreadyExistFinancialStatement=u00C9chec \: Le mouvement %s exist déjà \! +lima.financialStatement.base=Plan BCR de base lima.financialStatement.check=Vérification des comptes (Ctrl+F) lima.financialStatement.creditAccounts=Liste de comptes au crédit lima.financialStatement.debitAccounts=Liste de comptes au débit lima.financialStatement.delete=Supprimer le plan BCR actuel avant d'importer +lima.financialStatement.developed=Plan BCR développé +lima.financialStatement.error.alreadyExistFinancialStatement=u00C9chec \: Le mouvement %s exist déjà \! lima.financialStatement.header.add=Ajouter une catégorie (Ctrl+Maj+N) lima.financialStatement.header.form=Catégorie lima.financialStatement.headerAmount=Calculer le total en en-tete @@ -288,44 +255,19 @@ lima.financialStatement.import.form=Importer lima.financialStatement.label=Libellé lima.financialStatement.movement.add=Ajouter un regrouprement (Ctrl+N) lima.financialStatement.movement.form=Regroupement -lima.financialStatement.notAllowedLabel=Label non authorisé\: %s +lima.financialStatement.nothing=<html><center>Aucun plan BCR chargé<br/>Veuillez sélectionner un plan par défaut, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> lima.financialStatement.provisionDeprecationAccounts=Liste de comptes d'amortissement et provisions +lima.financialStatement.remove.confirm=Voulez-vous supprimer ce bilan ? +lima.financialStatement.shortened=Plan BCR abrégé lima.financialStatement.subAmount=Calculer un sous-total -lima.financialStatementreport.listerror=Erreur lors de la récupération des données de la liste lima.financialStatements=Plan BCR lima.financialStatements.check=Vérification des comptes aux postes -lima.financialStatements.check.nothing=Introuvable \: %s - %s \n -lima.financialStatements.check.warn=Attention cette fonctionnalité n'est qu'une aide utilisateur.\n Certains comptes ne doivent pas être présent au bilan et compte de résultat.\n Il est donc normal que des comptes sont marqués comme introuvable.\n\n -lima.financialTransaction.account=Compte -lima.financialTransaction.add.error.afterLastFiscalPeriod=Impossible d'ajouter une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. -lima.financialTransaction.add.error.beforeFirstFiscalPeriod=Impossible d'ajouter une transaction avant le %1$te %1$tB %1$tY début du premier exercice. -lima.financialTransaction.add.error.lockedEntryBook=Impossible d'ajouter une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.financialTransaction.add.error.lockedFinancialPeriod=Impossible d'ajouter une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.financialTransaction.balance=Balance -lima.financialTransaction.buttonback=← -lima.financialTransaction.buttonnext=→ -lima.financialTransaction.credit=Crédit +lima.financialStatements.check.nothing=Introuvable \: %s - %s +lima.financialStatements.check.warn=Attention cette fonctionnalité n'est qu'une aide utilisateur.\n Certains comptes ne doivent pas être présent au bilan et compte de résultat.\n Il est donc normal que des comptes sont marqués comme introuvable. lima.financialTransaction.date=Date -lima.financialTransaction.debit=Débit -lima.financialTransaction.delete.error.lockedEntryBook=Impossible de supprimer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.financialTransaction.delete.error.lockedFinancialPeriod=Impossible de supprimer une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.financialTransaction.description=Description -lima.financialTransaction.entryBook=Journal -lima.financialTransaction.financialPeriod=Périodes comptables -lima.financialTransaction.fiscalYear=Exercices -lima.financialTransaction.letter=Lettre -lima.financialTransaction.lockedEntryBookException=Impossible d'ajouter une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY.\n -lima.financialTransaction.lockedFinancialPeriodException=La période financière est bloquée\n -lima.financialTransaction.messageremoveentry=Voulez-vous supprimer cette ligne de transaction? -lima.financialTransaction.messageremovetransaction=Voulez-vous supprimer cette transaction? lima.financialTransaction.nextFinancialPeriod=Période suivante -lima.financialTransaction.paste.error.afterLastFiscalPeriod=Impossible de copier une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. -lima.financialTransaction.paste.error.beforeFirstFiscalPeriod=Impossible de copier une transaction avant le %1$te %1$tB %1$tY début du premier exercice. -lima.financialTransaction.paste.error.lockedEntryBook=Impossible de copier une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. -lima.financialTransaction.paste.error.lockedFinancialPeriod=Impossible de copier une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. lima.financialTransaction.previousFinancialPeriod=Période précédente -lima.financialTransaction.titleremoveentry=Suppression -lima.financialTransaction.titleremovetransaction=Suppression +lima.financialTransaction.remove.confirm=Voulez-vous supprimer cette transaction? lima.financialTransaction.update.error.afterLastFiscalPeriod=Impossible de déplacer une transaction après le %1$te %1$tB %1$tY fin du dernier exercice. lima.financialTransaction.update.error.beforeFirstFiscalPeriod=Impossible de déplacer une transaction avant le %1$te %1$tB %1$tY début du premier exercice. lima.financialTransaction.update.error.lockedEntryBook=Impossible de déplacer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. @@ -333,53 +275,41 @@ lima.financialTransaction.update.error.lockedFinancialPeriod=Impossible de depla lima.financialTransaction.voucher=Pièce comptable lima.fiscalPeriod=Exercices lima.fiscalPeriod.add=Nouvel exercice (Ctrl+A) +lima.fiscalPeriod.add.confirm.moreThan12=La période sélectionnée n'est pas de 12 mois, voulez-vous continuer ? lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod=Le date de fin de l'exercice (%2$te/%2$tm/%2$tY) doit être postérieur à la date de début (%1$te/%1$tm/%1$tY) lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod=Il existe déjà %1s exercices non clôturés. lima.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod=La date de début de l'exercice doit suivre la date de fin de l'exercice précédent le %1$te/%1$tm/%1$tY -lima.fiscalPeriod.addfiscalperiod.morethan12=La période sélectionnée n'est pas de 12 mois, voulez-vous continuer ? -lima.fiscalPeriod.addfiscalperiodtitle=Nouvel exercice +lima.fiscalPeriod.add.form=Nouvel exercice lima.fiscalPeriod.begin=Début lima.fiscalPeriod.block=Cloturer un exercice (Ctrl+C) -lima.fiscalPeriod.block.addretainedearnings=Reporter à nouveau? +lima.fiscalPeriod.block.addRetainedEarnings=Reporter à nouveau? lima.fiscalPeriod.block.cantBalanceIfNextPeriodNotExist=Impossible de créer le report à nouveaux. L'exercice fiscal suivant n'existe pas lima.fiscalPeriod.block.cantBalanceNotBook=Impossible de créer le report à nouveaux. aucun journal n'est selectioné. lima.fiscalPeriod.block.cantBlockNotBalance=Impossible de clôturer un exercice non equilibré lima.fiscalPeriod.block.confirmation=Ètes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! lima.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod=L'exercice est déjà clôturés lima.fiscalPeriod.block.error.lastUnlockedFiscalPeriod=L'exercice prédent doit être clôturé -lima.fiscalPeriod.block.error.lockedFinancialPeriod=La période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.fiscalPeriod.block.error.lockedFiscalPeriod=L'exercice ést clôturé %s -lima.fiscalPeriod.block.newyear=Voulez vous créer un nouvel exercice? +lima.fiscalPeriod.block.newYear=Voulez vous créer un nouvel exercice? lima.fiscalPeriod.block.retainedEarnings=Report à nouveau lima.fiscalPeriod.block.title=Cloture de l'exercice -lima.fiscalPeriod.buttonback=← -lima.fiscalPeriod.buttonnext=→ lima.fiscalPeriod.closed=Cloturé -lima.fiscalPeriod.closure=Cloture lima.fiscalPeriod.create=Choisissez la date de début et de fin du nouvel exercice -lima.fiscalPeriod.defaultAccountingRules.beginAfterEndFiscalPeriodException=La date de début doit être avant la date de fin, debut\: %1$te/%1$tm/%1$tY fin\: %1$te/%1$tm/%1$tY.\n lima.fiscalPeriod.delete=Supprimer un exercice (Suppr) lima.fiscalPeriod.delete.confirmation=Ètes vous sûre de vouloir supprimer cette période ? Cette action est irréversible \! lima.fiscalPeriod.delete.error.noEmptyFiscalPeriod=Impossible de supprimer un exercice avec des transactions (%1$s). lima.fiscalPeriod.delete.title=Suppression de l'exercice lima.fiscalPeriod.end=Fin lima.fiscalPeriod.entryBooks.create=Création d'un nouveau journal -lima.fiscalPeriod.fiscalperiod=Exercice +lima.fiscalPeriod.error.beginAfterEndFiscalPeriod=La date de début doit être avant la date de fin, debut\: %1$te/%1$tm/%1$tY fin\: %1$te/%1$tm/%1$tY. +lima.fiscalPeriod.error.lockedFinancialPeriod=La période financière est bloquée. +lima.fiscalPeriod.error.moreOneUnlockFiscalPeriod=Le nombre maximal d'exercices ouverts est déjà ateint\: periode fiscale concernée du %1$te/%1$tm/%1$tY au %1$te/%1$tm/%1$tY. +lima.fiscalPeriod.error.notBeginNextDayOfLastFiscalPeriod=La nouvelle période fiscale doit suivre la précédente\: periode fiscale concernée du %1$te/%1$tm/%1$tY au %1$te/%1$tm/%1$tY. lima.fiscalPeriod.form=Exercice -lima.fiscalPeriod.franceAccountingRules.invalidAccountNumberException=Le numéro du compte général n'est pas compris entre 1 et 8 \: %s\n -lima.fiscalPeriod.franceAccountingRules.lastUnlockedFiscalPeriodException=Impossible de clore la dernière période fiscale ouverte. -lima.fiscalPeriod.franceAccountingRules.moreOneUnlockFiscalPeriodException=Le nombre maximal d'exercices ouverts est déjà ateint\: periode fiscale concernée du %1$te/%1$tm/%1$tY au %1$te/%1$tm/%1$tY.\n -lima.fiscalPeriod.franceAccountingRules.noEmptyFiscalPeriodException=La période fiscale à supprimer n'est pas vide \! -lima.fiscalPeriod.franceAccountingRules.notBeginNextDayOfLastFiscalPeriodException=La nouvelle période fiscale doit suivre la précédente\: periode fiscale concernée du %1$te/%1$tm/%1$tY au %1$te/%1$tm/%1$tY.\n -lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException=Un numéro de compte ne commençant pas par 4 doit être numérique \: %s\n -lima.fiscalPeriod.modifyfiscalperiodtitle=Modification de l'exercice lima.fiscalPeriod.open=Ouvert -lima.fiscalPeriod.remove= lima.fiscalPeriod.status=Statut -lima.fiscalPeriod.unbalancedtransactions=La période fiscale contient des transactions non équilibrées lima.fiscalPeriod.update=Modifier la date de fin de l'exercice (Ctrl+M) +lima.fiscalPeriod.update.form=Modification de l'exercice lima.fiscalYears=Exercices -lima.generateHtml=HTML lima.help=Aide lima.help.about=À Propos lima.help.about.title=À propos de Lima... @@ -409,7 +339,6 @@ lima.home.entryBooks.info=Les %s journaux \: lima.home.entryBooks.info.one=Le journal \: lima.home.entryBooks.modify=Modifier les journaux lima.home.entryBooks.nothing=Aucun journal ouvert \! -lima.home.entrybooks=Journaux lima.home.fiscalYears=Exercices lima.home.fiscalYears.closed=%s exercices cloturés lima.home.fiscalYears.create=Créer un exercice @@ -428,96 +357,71 @@ lima.identity.name=Nom lima.identity.phoneNumber=n° Tel lima.identity.vatNumber=n° TVA lima.identity.zipCode=Code Postal -lima.import.entries.noFiscalPeriodFoundException=Aucune periode fiscale trouvée.\n -lima.import.noDataToImportException=Aucune donnée à importer. -lima.import.unknownError=Erreur inconnue. +lima.import.error=Une erreur est survenue lors de l'import +lima.import.error.extractFile=Le fichier n'est correct +lima.import.error.noDataToImport=Aucune donnée à importer. +lima.import.error.unknown=Erreur inconnue. +lima.import.line=Ligne %d\: +lima.import.report=%d créés\n %d ignorés\n %d mis à jours +lima.import.terminated=Import terminé +lima.import.title=Erreur d'import lima.importExport.account=des comptes terminé. lima.importExport.all=Tout -lima.importExport.choiceencoding=Choix de l'encodage lima.importExport.csv=Import/Export CSV -lima.importExport.defaultentrybooks=Journaux par défaut lima.importExport.ebp=Import/Export EBP +lima.importExport.encoding.choice=Choix de l'encodage lima.importExport.entry=des entrées terminé. -lima.importExport.entrybook=des journaux terminé. -lima.importExport.entrybooks=Journaux +lima.importExport.entryBook=des journaux terminé. +lima.importExport.entryBooks.default=Journaux par défaut lima.importExport.export=Exporter -lima.importExport.export.action=Export -lima.importExport.export.exceptions=Echec de l'export.\n -lima.importExport.export.failed=Echec de l'export \! -lima.importExport.export.terminated=Export terminé lima.importExport.financialStatement=des déclaration financière terminé. lima.importExport.financialTransaction=des transaction financière terminé. lima.importExport.fiscalPeriod=des periodes fiscales terminé. lima.importExport.identity=de l'identité terminé. lima.importExport.import=Importer lima.importExport.import.action=Import -lima.importExport.import.alreadyExistFinancialStatement=La transaction financière %s existe déjà sur le parent %s.\n -lima.importExport.import.alreadyExistVatStatement=La transaction de TVA %s existe déjà sur le parent %s.\n -lima.importExport.import.backupException=Echec de l'import du backup. -lima.importExport.import.extractFileError=Le fichier n'est correct -lima.importExport.import.line=Ligne %d\: -lima.importExport.import.nbCreated=%d créés\n -lima.importExport.import.nbIgnored=%d ignorés\n -lima.importExport.import.nbUpdated=%d mis à jours\n -lima.importExport.import.notAllowedLabel=Label non contenant un caractère interdit %s.\n -lima.importExport.import.terminated=Import terminé\n -lima.importExport.import.vatpdfimport=Le PDF a bien été importé dans le répertoire des ressources de Lima -lima.importExport.importcsv=Import/Export CSV -lima.importExport.importebp=Import/Export EBP -lima.importExport.importerror=Une erreur est survenue lors de l'import -lima.importExport.importtitle=Erreur d'import -lima.importExport.no.result=Aucun résultat trouvé. -lima.importExport.usevatpdf=Êtes-vous sûr de vouloir utiliser ce pdf pour la déclaration de TVA ? lima.importExport.vatStatement=des transactions de tva terminé. lima.importExport.wait=Traitement en cours… lima.info=Information lima.init.closed=Lima fermé à %1$s lima.init.errorclosing=Erreur lors de la fermeture lima.label=Libellé -lima.ledger.documentcreationerror=Erreur lors de la création du document +lima.launch.accounting=Chargement de la comptabilité +lima.launch.finished=Application prête \! +lima.launch.services=Chargement des services lima.lettering.account=Comptes +lima.lettering.account.aAll=TOUS lima.lettering.account.back=← lima.lettering.account.next=→ -lima.lettering.accountRegularization=Régularisation lettrage -lima.lettering.actions=Actions -lima.lettering.buttonAuto=Auto lima.lettering.checkAll=Toutes lima.lettering.checkLettredEntry=Lettrées -lima.lettering.checkLettredEntrye= lima.lettering.checkNoLettredEntry=Non-lettrées -lima.lettering.checkNoLettredEntrye= lima.lettering.entry=Écritures lima.lettering.equalize=Equilibrer (Ctrl+B) lima.lettering.lettered=Lettrer (Ctrl+L) -lima.lettering.listerror=Erreur lors de la récupération des données de la liste lima.lettering.period=Périodes lima.lettering.period.begin=De lima.lettering.period.end=A lima.lettering.refresh=Rafraîchir (F5) lima.lettering.roundAndCreateEntry.error.lockedEntryBook=Impossible de modifier le lettrage d'une entré car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.lettering.roundAndCreateEntry.error.lockedFinancialPeriod=Impossible de modifier le lettrage d'une entré car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. -lima.lettering.selectEntry=Sélection courante lima.lettering.selection.credit=Crédit lima.lettering.selection.debit=Débit lima.lettering.selection.sold=Solde lima.lettering.unLettered=Délettrer (Suppr) -lima.list.seeAll=TOUS -lima.mainview.title=Lutin Invoice Monitoring and Accounting +lima.lookAndFeel.nimbus.warning=Le look and feel nymbus n'a pas été trouvé lima.message.help.usage=Options (set with --option <key> <value>\: -lima.misc.supportemail.description=Adresse email de support -lima.misc.supportemail.label=support -lima.movmentedfilter=Comptes mouvementés lima.new=Nouveau -lima.nonaffect=N.R +lima.noAffect=N.R lima.ok=OK -lima.open=Ouvert -lima.openejb.remotemode.description= -lima.openejb.remotemode.label= +lima.openEjb.remote.mode.description=Activation du mode server +lima.openEjb.remote.mode.label=Activation du mode server lima.opening=Initialisation lima.opening.accounts=<html><center>Veuillez sélectionner un plan par défault, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> lima.opening.close=Fermer lima.opening.end=Terminer -lima.opening.entrybook=<html>Cochez la case pour importer les journaux par défaut \:<br/> Achats, Ventes, Trésorerie, Opération diverses</html> +lima.opening.entryBook=<html>Cochez la case pour importer les journaux par défaut \:<br/> Achats, Ventes, Trésorerie, Opération diverses</html> +lima.opening.fiscalPeriod=Création de l'exercice lima.opening.import=Importer une sauvegarde CSV lima.opening.next=Suivant lima.opening.welcome=<html><center>Bienvenue dans Lima<br/>Laissez vous guider par cet assistant pour démarrer votre comptabilité en quelques instants…<br/>Ou bien importer directement une ancienne sauvegarde de LIMA au format CSV<br/><br/><br/><br/></center></html> @@ -527,71 +431,43 @@ lima.quit=Quitter lima.refresh=Actualiser lima.refresh.shortcut=Actualiser (F5) lima.remove=Supprimer -lima.remove.shortcut="Supprimer (Suppr) -lima.reports=Rapports -lima.reports.account.noaccount= -lima.reports.account.noaccounttitle= -lima.reports.accounts=Edition compte -lima.reports.balance=Balance -lima.reports.entrybooks=Edition journal -lima.reports.financialstatement=Bilan et Compte de résultat -lima.reports.ledger=Grand Livre -lima.reports.vat=Edition TVA +lima.remove.shortcut=Supprimer (Suppr) lima.retainedEarnings.wait=Report à nouveaux... lima.search=Rechercher -lima.solde=Solde -lima.soldecredit=Solde Créditeur -lima.soldedebit=Solde Débiteur -lima.splash.1=Chargement des services -lima.splash.2=Chargement de la comptabilité -lima.splash.3=Application prête \! lima.structure=Structure lima.table.account=Compte lima.table.balance=Solde lima.table.credit=Crédit lima.table.date=Date lima.table.debit=Débit -lima.table.debitcredit=Débit et Crédit +lima.table.debitCredit=Débit et Crédit lima.table.description=Description -lima.table.entrybook=Journal -lima.table.grossamount=Brut +lima.table.entryBook=Journal lima.table.label=Libellé lima.table.letter=Lettre -lima.table.move.credit=Mouvement au crédit -lima.table.move.debit=Mouvement au débit -lima.table.netamount=Net lima.table.number=Numéro de compte -lima.table.provisiondeprecationamount=Amortissements et provisions -lima.table.solde=Solde -lima.table.solde.credit=Solde crédit -lima.table.solde.debit=Solde débit -lima.table.sum=Totaux +lima.table.provisionDeprecation=Amortissements et provisions lima.table.voucher=Pièce comptable -lima.tooltip.Filter= -lima.tooltip.filter=<html>Expression régulière \:<br/>- intervalle de compte i..j <br/>- liste de compte i,j,k <br/>- Exclure un compte -i</html> -lima.tooltip.lettering=<html>Pour ajouter une lettre à plusieurs écritures <br/>Sélectionner plusieurs lignes avec la combinaison ctrl + click</html> +lima.title=Lutin Invoice Monitoring and Accounting lima.transaction=Transaction lima.update=Modifier lima.update.shortcut=Modifier (Ctrl+M) lima.vatStatement=Plan TVA lima.vatStatement.accounts=Liste des comptes -lima.vatStatement.alreadyExistVatStatement=u00C9chec \: Le plan %s exist déjà \! lima.vatStatement.base=Plan TVA de base lima.vatStatement.boxName=PDF BoxName lima.vatStatement.delete=Supprimer le plan TVA actuel avant d'importer -lima.vatStatement.deleteparent=Veuillez supprimer les sous-catégories de cette ligne +lima.vatStatement.delete.parent=Veuillez supprimer les sous-catégories de cette ligne lima.vatStatement.developed=Plan TVA développé -lima.vatStatement.import= +lima.vatStatement.error.alreadyExistVatStatement=u00C9chec \: Le plan %s exist déjà \! +lima.vatStatement.import=Import CSV lima.vatStatement.label=Libellé -lima.vatStatement.master= -lima.vatStatement.movement= +lima.vatStatement.master=Plan parent +lima.vatStatement.movement=Regroupement lima.vatStatement.movement.add=Ajouter un regrouprement (Ctrl+N) lima.vatStatement.nothing=<html><center>Aucun plan TVA chargé<br/>Veuillez sélectionner un plan par défaut, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> -lima.vatStatement.question.remove=Etes vous sur de vouloir supprimer cette ligne ? +lima.vatStatement.remove.confirm=Etes vous sur de vouloir supprimer cette ligne ? +lima.vatStatement.remove.title=supprimer de ligne ? lima.vatStatement.shortened=Plan TVA abrégé lima.vatStatements=Plan TVA -lima.vatreport.listerror=Erreur lors de la récupération des données de la liste lima.wait=Traitement en cours -lima.warning.nimbus.landf=Le look and feel nymbus n'a pas été trouvé -limma.config.thousandseparator.description=Caractère de séparation entre les blocs de milliers -limma.config.thousandseparator.label=Séparateur de milliers -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.