From dcosse@users.chorem.org Fri Feb 14 15:59:25 2014
From: dcosse@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r3745 - in trunk:
	lima-business/src/main/java/org/chorem/lima/business/accountingrules
	lima-business/src/main/java/org/chorem/lima/business/ejb
	lima-swing/src/main/java/org/chorem/lima/ui/importexport
Date: Fri, 14 Feb 2014 15:59:25 +0100
Message-ID: <20140214145925.22E8E183851@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7743009800817746371=="

--===============7743009800817746371==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 pa=
r 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/DocumentSer=
viceImpl.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExpor=
t.java

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accounti=
ngrules/FranceAccountingRules.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrule=
s/FranceAccountingRules.java	2014-01-31 16:41:50 UTC (rev 3744)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrule=
s/FranceAccountingRules.java	2014-02-14 14:59:24 UTC (rev 3745)
@@ -69,8 +69,8 @@
=20
         // ledger account must be located in 411 account
         if (!StringUtils.isNumeric(accountNumber) && !accountNumber.startsWi=
th("4")) {
-            throw new LimaBusinessException(_("lima-business.franceaccountin=
grules.accountnumbernotnumeric",
-                                              account.getAccountNumber()));
+            log.warn(_("lima-business.franceaccountingrules.accountnumbernot=
numeric",
+                    account.getAccountNumber()));
         }
=20
         // Check root account starts with 1 to 8

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/Docu=
mentServiceImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentSe=
rviceImpl.java	2014-01-31 16:41:50 UTC (rev 3744)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentSe=
rviceImpl.java	2014-02-14 14:59:24 UTC (rev 3745)
@@ -988,10 +988,10 @@
     }
=20
     protected String constructHeaderTitle(String title, Date beginDate, Date=
 endDate) {
-        String headerTitle =3D "";
+        String headerTitle;
         Identity identity =3D identityService.getIdentity();
=20
-        headerTitle +=3D "<table>" +
+        headerTitle =3D "<table>" +
                 "<thead> " +
                 "<tr><th>" + title +
                 "</th></tr>" +

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/Impo=
rtExport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExpo=
rt.java	2014-01-31 16:41:50 UTC (rev 3744)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExpo=
rt.java	2014-02-14 14:59:24 UTC (rev 3745)
@@ -50,6 +50,7 @@
 import javax.swing.JPanel;
 import javax.swing.SwingWorker;
=20
+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 fi=
le, boolean verbose) {
         final ImportExportEnum importExportMethodeF =3D importExportMethode;
         encodingEnum =3D EncodingEnum.UTF8;
-        if (file.equals("")) {
+        if (Strings.isNullOrEmpty(file)) {
             file =3D chooseFile(importExportMethode.getImportMode(), importE=
xportMethode);
         }
         //if export cancel
-        if (!file.equals("")) {
+        if (!Strings.isNullOrEmpty(file)) {
             final EncodingEnum charset =3D encodingEnum;
             final String filePath =3D file;
             final Boolean verboseMode =3D verbose;


--===============7743009800817746371==--