Author: dcosse Date: 2014-07-31 10:38:23 +0200 (Thu, 31 Jul 2014) New Revision: 3879 Url: http://forge.chorem.org/projects/lima/repository/revisions/3879 Log: refs #1032 ajout d'un contr?\195?\180le sur les caract?\195?\168res authoris?\195?\169 d'un label de financial statement Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.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-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java 2014-07-31 08:26:29 UTC (rev 3878) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java 2014-07-31 08:38:23 UTC (rev 3879) @@ -30,6 +30,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; import org.chorem.lima.business.AlreadyExistFinancialTransaction; +import org.chorem.lima.business.NotAllowedLabel; import org.chorem.lima.business.api.FinancialStatementService; import org.chorem.lima.entity.FinancialStatement; import org.chorem.lima.entity.FinancialStatementImpl; @@ -215,6 +216,9 @@ } catch (AlreadyExistFinancialTransaction alreadyExistFinancialTransaction) { errorHelper.showErrorMessage(t("lima.importexport.import.alreadyExistFinancialStatement", alreadyExistFinancialTransaction.getFinancialTransactionLabel(), alreadyExistFinancialTransaction.getMasterLabel())); + } catch (NotAllowedLabel notAllowedLabel) { + errorHelper.showErrorMessage(t("lima.importexport.import.alreadyExistFinancialStatement", + notAllowedLabel.getLabel())); } modelSupport.fireTreeStructureChanged(path); } 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-07-31 08:26:29 UTC (rev 3878) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-07-31 08:38:23 UTC (rev 3879) @@ -265,6 +265,7 @@ lima.financialstatement.headeramount=Calculate amount on header lima.financialstatement.label=Label lima.financialstatement.movement.add=Add movement +lima.financialstatement.notAllowedLabel=Not allowed label\: %s lima.financialstatement.provisiondeprecationaccounts=Provisions and deprecations accounts list lima.financialstatement.subamount=Calculate a subamount lima.financialstatementreport.listerror=Can't get entries list @@ -355,7 +356,7 @@ lima.importexport.usevatpdf= lima.init.closed=Lima closed at %1$s lima.init.errorclosing=Error during Lima close -lima.ledger.documentcreationerror=Enable to create document +lima.ledger.documentcreationerror=Enable to create document lima.lettering.listerror=Can't get entries list lima.menu.file=File lima.menu.help=Help 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-07-31 08:26:29 UTC (rev 3878) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-07-31 08:38:23 UTC (rev 3879) @@ -248,6 +248,7 @@ lima.financialstatement.headeramount=Calculer le total en en-tete lima.financialstatement.label=Libellé lima.financialstatement.movement.add=Ajouter un regrouprement +lima.financialstatement.notAllowedLabel=Label non authorisé\: %s lima.financialstatement.provisiondeprecationaccounts=Liste de comptes d'amortissement et provisions lima.financialstatement.subamount=Calculer un sous-total lima.financialstatementreport.listerror=Erreur lors de la récupération des données de la liste