Author: sbavencoff Date: 2013-11-22 17:48:35 +0100 (Fri, 22 Nov 2013) New Revision: 3716 Url: http://chorem.org/projects/lima/repository/revisions/3716 Log: [Entry Book] : fix check if entry already exist fix error message Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2013-11-22 16:39:28 UTC (rev 3715) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2013-11-22 16:48:35 UTC (rev 3716) @@ -68,11 +68,11 @@ // check if entrybook with is name already exist EntryBookDAO entryBookDAO = getDaoHelper().getEntryBookDAO(); EntryBook existingEntryBook = - entryBookDAO.findByLabel(entryBook.getCode()); + entryBookDAO.findByCode(entryBook.getCode()); if (existingEntryBook != null) { throw new LimaBusinessException( _("lima-business.entrybook.entrybookalreadyexist", - entryBook.getLabel())); + entryBook.getCode())); } // creation du EntryBook Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2013-11-22 16:39:28 UTC (rev 3715) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2013-11-22 16:48:35 UTC (rev 3716) @@ -64,7 +64,7 @@ lima-business.document.vatnumber=VAT N° lima-business.document.voucher=Voucher lima-business.document.zipcode= -lima-business.entrybook.entrybookalreadyexist=An EntryBook already exists with this label \: %s +lima-business.entrybook.entrybookalreadyexist=An EntryBook already exists with this code \: %s lima-business.financialstatement.check.nothing=Not found \: %s - %s \n lima-business.financialstatement.check.warn=Warning this function is just an help.\n Many accounts must no calculate on Financial statement.\n Some account marked not found is normally.\n\n lima-business.financialtransaction.retainedearnings.description=Retained earnings 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 2013-11-22 16:39:28 UTC (rev 3715) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2013-11-22 16:48:35 UTC (rev 3716) @@ -66,7 +66,7 @@ lima-business.document.vatnumber=N° TVA lima-business.document.voucher=Pièce comptable lima-business.document.zipcode=Code postal -lima-business.entrybook.entrybookalreadyexist=Un journal existe déjà avec ce libellé \: %s +lima-business.entrybook.entrybookalreadyexist=Un journal existe déjà avec ce code \: %s lima-business.financialstatement.check.nothing=Introuvable \: %s - %s \n lima-business.financialstatement.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-business.financialtransaction.retainedearnings.description=Report à nouveau