Author: dcosse Date: 2014-02-14 15:59:24 +0100 (Fri, 14 Feb 2014) New Revision: 3745 Url: http://chorem.org/projects/lima/repository/revisions/3745 Log: les compte comportant des lettres autre que les compte commen?\195?\167ant par 4 sont authoris?\195?\169s Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 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-01-31 16:41:50 UTC (rev 3744) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2014-02-14 14:59:24 UTC (rev 3745) @@ -69,8 +69,8 @@ // ledger account must be located in 411 account if (!StringUtils.isNumeric(accountNumber) && !accountNumber.startsWith("4")) { - throw new LimaBusinessException(_("lima-business.franceaccountingrules.accountnumbernotnumeric", - account.getAccountNumber())); + log.warn(_("lima-business.franceaccountingrules.accountnumbernotnumeric", + account.getAccountNumber())); } // Check root account starts with 1 to 8 Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-01-31 16:41:50 UTC (rev 3744) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-02-14 14:59:24 UTC (rev 3745) @@ -988,10 +988,10 @@ } protected String constructHeaderTitle(String title, Date beginDate, Date endDate) { - String headerTitle = ""; + String headerTitle; Identity identity = identityService.getIdentity(); - headerTitle += "<table>" + + headerTitle = "<table>" + "<thead> " + "<tr><th>" + title + "</th></tr>" + 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-01-31 16:41:50 UTC (rev 3744) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-02-14 14:59:24 UTC (rev 3745) @@ -50,6 +50,7 @@ import javax.swing.JPanel; import javax.swing.SwingWorker; +import com.google.common.base.Strings; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -112,11 +113,11 @@ public void importExport(ImportExportEnum importExportMethode, String file, boolean verbose) { final ImportExportEnum importExportMethodeF = importExportMethode; encodingEnum = EncodingEnum.UTF8; - if (file.equals("")) { + if (Strings.isNullOrEmpty(file)) { file = chooseFile(importExportMethode.getImportMode(), importExportMethode); } //if export cancel - if (!file.equals("")) { + if (!Strings.isNullOrEmpty(file)) { final EncodingEnum charset = encodingEnum; final String filePath = file; final Boolean verboseMode = verbose;