[Lima-commits] r3897 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/resources/i18n lima-business-api/src/main/java/org/chorem/lima/business lima-swing/src/main/java/org/chorem/lima/ui/importexport lima-swing/src/main/resources/i18n

5 Aug 2014

Author: dcosse
Date: 2014-08-05 17:56:52 +0200 (Tue, 05 Aug 2014)
New Revision: 3897

Url: http://forge.chorem.org/projects/lima/repository/revisions/3897

Log:
refs #1032 ajout de descriptions d'erreur

Modified:
   trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java
   trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistVatStatement.java
   trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java
   trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java
   trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java
   trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java
   trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java
   trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotAllowedLabel.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java
   trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java
   trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
   trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java
===================================================================

--- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java	2014-08-05 15:56:52 UTC (rev 3897)
@@ -78,11 +78,16 @@
         if (!StringUtils.isNumeric(accountNumber) && !accountNumber.startsWith("4")) {
             log.warn(t("lima-business.franceaccountingrules.accountnumbernotnumeric",
                     account.getAccountNumber()));
+            throw new InvalidAccountNumberException(t("lima-business.franceaccountingrules.accountnumbernotnumeric",
+                    account.getAccountNumber()), account.getAccountNumber());
         }
 
         // Check root account starts with 1 to 8
         if (accountNumber.length() >= 1 && !accountNumber.substring(0, 1).matches("[1-8]")) {
-            throw new InvalidAccountNumberException(account.getAccountNumber());
+            log.warn(t("lima-business.franceaccountingrules.accountstartnumbererror",
+                    account.getAccountNumber()));
+            throw new InvalidAccountNumberException(t("lima-business.franceaccountingrules.accountstartnumbererror",
+                    account.getAccountNumber()), account.getAccountNumber());
         }
 
     }

Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties
===================================================================
--- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties	2014-08-05 15:56:52 UTC (rev 3897)
@@ -143,5 +143,6 @@
 lima.table.voucher=
 lima.ui.financialtransaction.account=
 lima.ui.fiscalperiod.fiscalperiod=
+lima.ui.importexport.import.exceptions.reason=Reason\:%
 lima.ui.lettering.accountRegularization=
 llima.importexport.import.alreadyExistFinancialStatement=

Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java
===================================================================
--- trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java	2014-08-05 15:56:52 UTC (rev 3897)
@@ -38,6 +38,16 @@
         this.accountNumber = accountNumber;
     }
 
+    public AccountException(String accountNumber, String message) {
+        super(message);
+        this.accountNumber = accountNumber;
+    }
+
+    public AccountException(String accountNumber, String message, Throwable cause) {
+        super(message, cause);
+        this.accountNumber = accountNumber;
+    }
+
     public String getAccountNumber() {
         return accountNumber;
     }

Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistVatStatement.java
===================================================================
--- trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistVatStatement.java	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistVatStatement.java	2014-08-05 15:56:52 UTC (rev 3897)
@@ -22,6 +22,8 @@
  * #L%
  */
 
+import static org.nuiton.i18n.I18n.t;
+
 /**
  * Created by davidcosse on 28/07/14.
  */
@@ -32,6 +34,7 @@
     protected String masterLabel;
 
     public AlreadyExistVatStatement(String label, String masterLabel) {
+        super(t("lima.importexport.import.alreadyExistFinancialStatement",label, masterLabel));
         this.vatStatementLabel = label;
         this.masterLabel = masterLabel;
     }

Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java
===================================================================
--- trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java	2014-08-05 15:56:52 UTC (rev 3897)
@@ -35,11 +35,21 @@
         this.closedPeriodicEntryBook = closedPeriodicEntryBook;
     }
 
+    public ClosedPeriodicEntryBookException(ClosedPeriodicEntryBook closedPeriodicEntryBook, String message) {
+        super(message);
+        this.closedPeriodicEntryBook = closedPeriodicEntryBook;
+    }
+
     public ClosedPeriodicEntryBookException(ClosedPeriodicEntryBook closedPeriodicEntryBook, Throwable cause) {
         super(cause);
         this.closedPeriodicEntryBook = closedPeriodicEntryBook;
     }
 
+    public ClosedPeriodicEntryBookException(ClosedPeriodicEntryBook closedPeriodicEntryBook, String message, Throwable cause) {
+        super(message, cause);
+        this.closedPeriodicEntryBook = closedPeriodicEntryBook;
+    }
+
     public ClosedPeriodicEntryBook getClosedPeriodicEntryBook() {
         return closedPeriodicEntryBook;
     }

Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java
===================================================================
--- trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java	2014-08-05 15:56:52 UTC (rev 3897)
@@ -35,6 +35,11 @@
         this.financialPeriod = financialPeriod;
     }
 
+    public FinancialPeriodException(FinancialPeriod financialPeriod, String message) {
+        super(message);
+        this.financialPeriod = financialPeriod;
+    }
+
     public FinancialPeriodException(FinancialPeriod financialPeriod, Throwable cause) {
         super(cause);
         this.financialPeriod = financialPeriod;

Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java
===================================================================
--- trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java	2014-08-05 15:56:52 UTC (rev 3897)
@@ -31,6 +31,10 @@
         super(accountNumber);
     }
 
+    public InvalidAccountNumberException(String accountNumber, String message) {
+        super(accountNumber, message);
+    }
+
     public InvalidAccountNumberException(String accountNumber, Throwable cause) {
         super(accountNumber, cause);
     }

Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java
===================================================================
--- trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java	2014-08-05 15:56:52 UTC (rev 3897)
@@ -24,15 +24,25 @@
 
 import org.chorem.lima.entity.ClosedPeriodicEntryBook;
 
+import static org.nuiton.i18n.I18n.t;
+
 /**
  * @author Sylvain Bavencoff <bavencoff@codelutin.com>
  */
 public class LockedEntryBookException extends ClosedPeriodicEntryBookException {
 
     public LockedEntryBookException(ClosedPeriodicEntryBook closedPeriodicEntryBook) {
-        super(closedPeriodicEntryBook);
+        super(closedPeriodicEntryBook, t("lima.ui.lettering.roundAndCreateEntry.error.lockedEntryBook",
+                closedPeriodicEntryBook.getEntryBook().getCode(),
+                closedPeriodicEntryBook.getEntryBook().getLabel(),
+                closedPeriodicEntryBook.getFinancialPeriod().getBeginDate(),
+                closedPeriodicEntryBook.getFinancialPeriod().getEndDate()));
     }
 
+    public LockedEntryBookException(ClosedPeriodicEntryBook closedPeriodicEntryBook, String message) {
+        super(closedPeriodicEntryBook, message);
+    }
+
     public LockedEntryBookException(ClosedPeriodicEntryBook closedPeriodicEntryBook, Throwable cause) {
         super(closedPeriodicEntryBook, cause);
     }

Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java
===================================================================
--- trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java	2014-08-05 15:56:52 UTC (rev 3897)
@@ -24,15 +24,21 @@
 
 import org.chorem.lima.entity.FinancialPeriod;
 
+import static org.nuiton.i18n.I18n.t;
+
 /**
  * @author Sylvain Bavencoff <bavencoff@codelutin.com>
  */
 public class LockedFinancialPeriodException extends FinancialPeriodException{
 
     public LockedFinancialPeriodException(FinancialPeriod financialPeriod) {
-        super(financialPeriod);
+        super(financialPeriod, t("lima.ui.fiscalPeriod.block.error.lockedFinancialPeriod",financialPeriod.getBeginDate(), financialPeriod.getEndDate()));
     }
 
+    public LockedFinancialPeriodException(FinancialPeriod financialPeriod, String message) {
+        super(financialPeriod, message);
+    }
+
     public LockedFinancialPeriodException(FinancialPeriod financialPeriod, Throwable cause) {
         super(financialPeriod, cause);
     }

Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotAllowedLabel.java
===================================================================
--- trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotAllowedLabel.java	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotAllowedLabel.java	2014-08-05 15:56:52 UTC (rev 3897)
@@ -22,6 +22,8 @@
  * #L%
  */
 
+import static org.nuiton.i18n.I18n.t;
+
 /**
  * Created by davidcosse on 31/07/14.
  */
@@ -30,6 +32,7 @@
     protected String label;
 
     public NotAllowedLabel(String label) {
+        super(t("lima.importexport.import.notAllowedLabel",label));
         this.label = label;
     }
 

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java	2014-08-05 15:56:52 UTC (rev 3897)
@@ -145,93 +145,89 @@
                 @Override
                 protected ImportExportResults doInBackground() {
                     ImportExportResults results = new ImportExportResults();
-                    try {
-                        switch (importExportMethodeF) {
-                            //####################################### CSV ##############################################
+                    switch (importExportMethodeF) {
+                        //####################################### CSV ##############################################
 
-                            case CSV_ACCOUNTCHARTS_EXPORT:
-                                results.pushExportResults(exportService.exportAccountsAsCSV(defaultCharset.name()));
-                                createFile(filePath, defaultCharset.name(), results.getExportResults().get(0).getExportData());
-                                break;
+                        case CSV_ACCOUNTCHARTS_EXPORT:
+                            results.pushExportResults(exportService.exportAccountsAsCSV(defaultCharset.name()));
+                            createFile(filePath, defaultCharset.name(), results.getExportResults().get(0).getExportData());
+                            break;
 
-                            case CSV_ACCOUNTCHARTS_IMPORT:
-                                String content = loadFile(filePath, defaultCharset.name());
-                                results.pushImportResults(importService.importAccountAsCSV(content));
-                                break;
-                            case CSV_ENTRYBOOKS_EXPORT:
-                                results.pushExportResults(exportService.exportEntryBooksAsCSV(defaultCharset.name()));
-                                createFile(filePath, defaultCharset.name(), results.getExportResults().get(0).getExportData());
-                                break;
-                            case CSV_ENTRYBOOKS_IMPORT:
-                                content = loadFile(filePath, defaultCharset.name());
-                                results.pushImportResults(importService.importEntryBooksAsCSV(content));
-                                break;
-                            case CSV_ENTRIES_EXPORT:
-                                results.pushExportResults(exportService.exportEntriesAsCSV(defaultCharset.name(), true));
-                                createFile(filePath, defaultCharset.name(), results.getExportResults().get(0).getExportData());
-                                break;
-                            case CSV_ENTRIES_IMPORT:
-                                content = loadFile(filePath, defaultCharset.name());
-                                results.pushImportResults(importService.importEntriesAsCSV(content));
-                                break;
+                        case CSV_ACCOUNTCHARTS_IMPORT:
+                            String content = loadFile(filePath, defaultCharset.name());
+                            results.pushImportResults(importService.importAccountAsCSV(content));
+                            break;
+                        case CSV_ENTRYBOOKS_EXPORT:
+                            results.pushExportResults(exportService.exportEntryBooksAsCSV(defaultCharset.name()));
+                            createFile(filePath, defaultCharset.name(), results.getExportResults().get(0).getExportData());
+                            break;
+                        case CSV_ENTRYBOOKS_IMPORT:
+                            content = loadFile(filePath, defaultCharset.name());
+                            results.pushImportResults(importService.importEntryBooksAsCSV(content));
+                            break;
+                        case CSV_ENTRIES_EXPORT:
+                            results.pushExportResults(exportService.exportEntriesAsCSV(defaultCharset.name(), true));
+                            createFile(filePath, defaultCharset.name(), results.getExportResults().get(0).getExportData());
+                            break;
+                        case CSV_ENTRIES_IMPORT:
+                            content = loadFile(filePath, defaultCharset.name());
+                            results.pushImportResults(importService.importEntriesAsCSV(content));
+                            break;
 
-                            case CSV_ALL_EXPORT:
-                                exportBackup(filePath, defaultCharset.name());
-                                break;
-                            case CSV_ALL_IMPORT:
-                                results = importAllFromZipFile(filePath);
-                                break;
+                        case CSV_ALL_EXPORT:
+                            results = exportBackup(filePath, defaultCharset.name());
+                            break;
+                        case CSV_ALL_IMPORT:
+                            results = importAllFromZipFile(filePath);
+                            break;
 
-                            case CSV_VAT_EXPORT:
-                                results.pushExportResults(exportService.exportVatStatements(defaultCharset.name()));
-                                createFile(filePath, defaultCharset.name(), results.getExportResults().get(0).getExportData());
-                                break;
-                            case CSV_VAT_IMPORT:
-                                content = loadFile(filePath, defaultCharset.name());
-                                results.pushImportResults(importService.importVATStatementsAsCSV(content));
-                                break;
+                        case CSV_VAT_EXPORT:
+                            results.pushExportResults(exportService.exportVatStatements(defaultCharset.name()));
+                            createFile(filePath, defaultCharset.name(), results.getExportResults().get(0).getExportData());
+                            break;
+                        case CSV_VAT_IMPORT:
+                            content = loadFile(filePath, defaultCharset.name());
+                            results.pushImportResults(importService.importVATStatementsAsCSV(content));
+                            break;
 
-                            case CSV_FINANCIALSTATEMENTS_EXPORT:
-                                results.pushExportResults(exportService.exportFinancialStatements(defaultCharset.name()));
-                                createFile(filePath, defaultCharset.name(), results.getExportResults().get(0).getExportData());
-                                break;
-                            case CSV_FINANCIALSTATEMENTS_IMPORT:
-                                content = loadFile(filePath, defaultCharset.name());
-                                results.pushImportResults(importService.importFinancialStatementsAsCSV(content));
-                                break;
+                        case CSV_FINANCIALSTATEMENTS_EXPORT:
+                            results.pushExportResults(exportService.exportFinancialStatements(defaultCharset.name()));
+                            createFile(filePath, defaultCharset.name(), results.getExportResults().get(0).getExportData());
+                            break;
+                        case CSV_FINANCIALSTATEMENTS_IMPORT:
+                            content = loadFile(filePath, defaultCharset.name());
+                            results.pushImportResults(importService.importFinancialStatementsAsCSV(content));
+                            break;
 
-                            //####################################### EBP ##############################################
-                            //For windows ebp so using encoding ISOLATIN1
+                        //####################################### EBP ##############################################
+                        //For windows ebp so using encoding ISOLATIN1
 
-                            case EBP_ACCOUNTCHARTS_EXPORT:
-                                results.pushExportResults(exportService.exportAccountAsEbp(defaultCharset.name()));
-                                createFile(filePath, EncodingEnum.ISOLATIN1.getEncoding(), results.getExportResults().get(0).getExportData());
-                                break;
-                            case EBP_ACCOUNTCHARTS_IMPORT:
-                                content = loadFile(filePath, EncodingEnum.ISOLATIN1.getEncoding());
-                                results.pushImportResults(importService.importAccountFromEbp(content));
-                                break;
+                        case EBP_ACCOUNTCHARTS_EXPORT:
+                            results.pushExportResults(exportService.exportAccountAsEbp(defaultCharset.name()));
+                            createFile(filePath, EncodingEnum.ISOLATIN1.getEncoding(), results.getExportResults().get(0).getExportData());
+                            break;
+                        case EBP_ACCOUNTCHARTS_IMPORT:
+                            content = loadFile(filePath, EncodingEnum.ISOLATIN1.getEncoding());
+                            results.pushImportResults(importService.importAccountFromEbp(content));
+                            break;
 
-                            case EBP_ENTRYBOOKS_EXPORT:
-                                results.pushExportResults(exportService.exportEntryBookAsEbp(defaultCharset.name()));
-                                createFile(filePath, EncodingEnum.ISOLATIN1.getEncoding(), results.getExportResults().get(0).getExportData());
-                                break;
-                            case EBP_ENTRYBOOKS_IMPORT:
-                                content = loadFile(filePath, EncodingEnum.ISOLATIN1.getEncoding());
-                                results.pushImportResults(importService.importEntryBookFromEbp(content));
-                                break;
+                        case EBP_ENTRYBOOKS_EXPORT:
+                            results.pushExportResults(exportService.exportEntryBookAsEbp(defaultCharset.name()));
+                            createFile(filePath, EncodingEnum.ISOLATIN1.getEncoding(), results.getExportResults().get(0).getExportData());
+                            break;
+                        case EBP_ENTRYBOOKS_IMPORT:
+                            content = loadFile(filePath, EncodingEnum.ISOLATIN1.getEncoding());
+                            results.pushImportResults(importService.importEntryBookFromEbp(content));
+                            break;
 
-                            case EBP_ENTRIES_EXPORT:
-                                results.pushExportResults(exportService.exportEntriesAsEbp(defaultCharset.name()));
-                                createFile(filePath, EncodingEnum.ISOLATIN1.getEncoding(), results.getExportResults().get(0).getExportData());
-                                break;
-                            case EBP_ENTRIES_IMPORT:
-                                content = loadFile(filePath, EncodingEnum.ISOLATIN1.getEncoding());
-                                results.pushImportResults(importService.importEntriesFromEbp(content));
-                                break;
-                        }
-                    } catch (ExportException e) {
-                        e.printStackTrace();
+                        case EBP_ENTRIES_EXPORT:
+                            results.pushExportResults(exportService.exportEntriesAsEbp(defaultCharset.name()));
+                            createFile(filePath, EncodingEnum.ISOLATIN1.getEncoding(), results.getExportResults().get(0).getExportData());
+                            break;
+                        case EBP_ENTRIES_IMPORT:
+                            content = loadFile(filePath, EncodingEnum.ISOLATIN1.getEncoding());
+                            results.pushImportResults(importService.importEntriesFromEbp(content));
+                            break;
                     }
                     return results;
                 }
@@ -275,7 +271,7 @@
                                         String message = "";
                                         for (ImportResult result : resultList) {
                                             Class fromSource = result.getFromSource();
-                                            message += "Import " + getFromSourceMessage(fromSource)+"\n";
+                                            message += "Import " + getFromSourceMessage(fromSource);
                                             message += t("lima.ui.importexport.import.nbCreated", result.getNbCreated())+"\n";
                                             message += t("lima.ui.importexport.import.nbUpdated", result.getNbUpdated())+"\n";
                                             message += t("lima.ui.importexport.import.nbIgnored", result.getNbIgnored())+"\n";
@@ -283,13 +279,16 @@
                                             if (exceptionsByLine != null) {
                                                 Set<Integer> lines = exceptionsByLine.keySet();
                                                 for (Integer line : lines) {
-                                                    message += t("lima.ui.importexport.import.exceptions", line)+"\n";
+                                                    LimaException importException = exceptionsByLine.get(line);
+                                                    message += t("lima.ui.importexport.import.exceptions", (line +1))+"\n";
+                                                    // TODO DCossé 05/08/14 display reason
+                                                    //message += t("lima.ui.importexport.import.exceptions.reason", importException.getMessage()) +"\n";
                                                     if (log.isErrorEnabled()) {
-                                                        LimaException importException = exceptionsByLine.get(line);
                                                         log.error(importException.getMessage());
                                                     }
                                                 }
                                             }
+                                            message +="\n";
                                         }
 
                                         JOptionPane.showMessageDialog(
@@ -473,7 +472,7 @@
         return result;
     }
 
-    protected void exportBackup(String path, String charset) throws ExportException {
+    protected ImportExportResults exportBackup(String path, String charset){
         ImportExportResults results = exportService.exportBackup(charset);
 
         ZipOutputStream export = null;
@@ -502,6 +501,7 @@
         } finally {
             IOUtils.closeQuietly(export);
         }
+        return results;
     }
 
     protected ImportExportResults importAllFromZipFile(String filePath) {

Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties	2014-08-05 15:56:52 UTC (rev 3897)
@@ -351,6 +351,8 @@
 lima.importexport.export.terminated=
 lima.importexport.import=
 lima.importexport.import.alreadyExistFinancialStatement=Category with name %s exists for parent %s.
+lima.importexport.import.alreadyExistVatStatement=VAT statement with name %s exists for parents %s.
+lima.importexport.import.notAllowedLabel=Not allowed char in label\: %s.
 lima.importexport.usevatpdf=
 lima.init.closed=Lima closed at %1$s
 lima.init.errorclosing=Error during Lima close
@@ -536,6 +538,8 @@
 lima.ui.fiscalPeriod.add.notBeginNextDayOfLastFiscalPeriod=
 lima.ui.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod=
 lima.ui.fiscalPeriod.block.error.lastUnlockedFiscalPeriod=
+lima.ui.fiscalPeriod.block.error.lockedFinancialPeriod=Fiscal period from %3$te %3$tB %3$tY to %4$te %4$tB %4$tY is closed.
+lima.ui.fiscalPeriod.block.error.lockedFiscalPeriod=Fiscal period closed %s
 lima.ui.fiscalPeriod.buttonback=
 lima.ui.fiscalPeriod.buttonnext=
 lima.ui.fiscalPeriod.delete.error.noEmptyFiscalPeriod=
@@ -596,6 +600,7 @@
 lima.ui.importexport.import=
 lima.ui.importexport.import.exception=
 lima.ui.importexport.import.exceptions=The line %d could not be imported.
+lima.ui.importexport.import.exceptions.reason=Reason\:%
 lima.ui.importexport.import.nbCreated=%d created
 lima.ui.importexport.import.nbIgnored=%d ignored
 lima.ui.importexport.import.nbUpdated=%d updated
@@ -661,6 +666,3 @@
 lima.warning.nimbus.landf=Could not find Numbus Look&Feel
 limma.config.thousandseparator.description=
 limma.config.thousandseparator.label=
-org.chorem.lima.LimaConfig.NumberSeparator.COMMA=
-org.chorem.lima.LimaConfig.NumberSeparator.DOT=
-org.chorem.lima.LimaConfig.NumberSeparator.SPACE=

Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties	2014-08-05 14:49:54 UTC (rev 3896)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties	2014-08-05 15:56:52 UTC (rev 3897)
@@ -309,7 +309,8 @@
 lima.importexport.export.terminated=Export terminé
 lima.importexport.import=Importer
 lima.importexport.import.alreadyExistFinancialStatement=La transaction financière %s existe déjà sur le parent %s.
-lima.importexport.import.alreadyExistVatStatement=
+lima.importexport.import.alreadyExistVatStatement=La transaction de TVA %s existe déjà sur le parent %s.
+lima.importexport.import.notAllowedLabel=Label non contenant un caractère interdit %s.
 lima.importexport.usevatpdf=Êtes-vous sûr de vouloir utiliser ce pdf pour la déclaration de TVA ?
 lima.init.closed=Lima fermé à %1$s
 lima.init.errorclosing=Erreur lors de la fermeture
@@ -472,6 +473,8 @@
 lima.ui.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.ui.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod=L'exercice est déjà clôturés
 lima.ui.fiscalPeriod.block.error.lastUnlockedFiscalPeriod=L'exercice prédent doit être clôturé
+lima.ui.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.ui.fiscalPeriod.block.error.lockedFiscalPeriod=L'exercice ést clôturé %s
 lima.ui.fiscalPeriod.buttonback=←
 lima.ui.fiscalPeriod.buttonnext=→
 lima.ui.fiscalPeriod.delete.error.noEmptyFiscalPeriod=Impossible de supprimer un exercice avec des transactions (%1$s).
@@ -515,6 +518,7 @@
 lima.ui.importexport.import=Importer
 lima.ui.importexport.import.action=Import
 lima.ui.importexport.import.exceptions=La ligne %d n'a pu être impotée.
+lima.ui.importexport.import.exceptions.reason=Raison\:
 lima.ui.importexport.import.nbCreated=%d créés
 lima.ui.importexport.import.nbIgnored=%d ignorés
 lima.ui.importexport.import.nbUpdated=%d mis à jours

    

[Lima-commits] r3897 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/resources/i18n lima-business-api/src/main/java/org/chorem/lima/business lima-swing/src/main/java/org/chorem/lima/ui/importexport lima-swing/src/main/resources/i18n

dcosse＠users.chorem.org