May 2014 - Lima-commits - mailman.cloud.codelutin.com

r3787 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by maven-release＠users.chorem.org May 7, 2014

May 7, 2014

Author: maven-release Date: 2014-05-07 15:23:38 +0200 (Wed, 07 May 2014) New Revision: 3787 Url: http://forge.chorem.org/projects/lima/repository/revisions/3787 Log: [maven-release-plugin] prepare release lima-0.7.2 Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2014-05-07 13:03:15 UTC (rev 3786) +++ trunk/lima-business/pom.xml 2014-05-07 13:23:38 UTC (rev 3787) @@ -4,7 +4,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7.2</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2014-05-07 13:03:15 UTC (rev 3786) +++ trunk/lima-business-api/pom.xml 2014-05-07 13:23:38 UTC (rev 3787) @@ -4,7 +4,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7.2</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2014-05-07 13:03:15 UTC (rev 3786) +++ trunk/lima-callao/pom.xml 2014-05-07 13:23:38 UTC (rev 3787) @@ -4,7 +4,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7.2</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2014-05-07 13:03:15 UTC (rev 3786) +++ trunk/lima-swing/pom.xml 2014-05-07 13:23:38 UTC (rev 3787) @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7.2</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-07 13:03:15 UTC (rev 3786) +++ trunk/pom.xml 2014-05-07 13:23:38 UTC (rev 3787) @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7.2</version> <packaging>pom</packaging> <name>Lima</name> @@ -144,11 +144,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.chorem.org/lima/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/lima/tags/lima-0.7.2</connection> <developerConnection> - scm:svn:https://svn.chorem.org/lima/trunk + scm:svn:https://svn.chorem.org/lima/tags/lima-0.7.2 </developerConnection> - <url>https://forge.chorem.org/repositories/browse/lima/trunk</url> + <url>https://forge.chorem.org/repositories/browse/lima/tags/lima-0.7.2</url> </scm> <distributionManagement> <site>

1 0

r3786 - trunk
by dcosse＠users.chorem.org May 7, 2014

May 7, 2014

Author: dcosse Date: 2014-05-07 15:03:15 +0200 (Wed, 07 May 2014) New Revision: 3786 Url: http://forge.chorem.org/projects/lima/repository/revisions/3786 Log: move libs version number to properties Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-07 12:34:08 UTC (rev 3785) +++ trunk/pom.xml 2014-05-07 13:03:15 UTC (rev 3786) @@ -169,8 +169,19 @@ <nuitonProfilingVersion>2.7.1</nuitonProfilingVersion> <eugenePluginVersion>2.7.4</eugenePluginVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> + <topiaVersion>2.9-rc-1</topiaVersion> - <topiaVersion>2.9-rc-1</topiaVersion> + <swinglabsVersion>3.0.4</swinglabsVersion> + <h2Version>1.3.176</h2Version> + <hibernateVersion>4.3.5.Final</hibernateVersion> + <openejbJavaeeApiVersion>6.0-5</openejbJavaeeApiVersion> + <dom4jVersion>1.6.1</dom4jVersion> + <jdomVersion>2.0.2</jdomVersion> + <openCsvVersion>2.3</openCsvVersion> + <itextVersion>4.2.1</itextVersion> + <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> + <launch4jPluginVersion>1.5.0.0</launch4jPluginVersion> +  <jaxxVersion>2.8.4</jaxxVersion> @@ -295,7 +306,7 @@ <dependency> <groupId>org.swinglabs</groupId> <artifactId>jxlayer</artifactId> - <version>3.0.4</version> + <version>${swinglabsVersion}</version> </dependency>  @@ -315,14 +326,14 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.176</version> + <version>${h2Version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>4.3.5.Final</version> + <version>${hibernateVersion}</version> </dependency>  @@ -342,7 +353,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>javaee-api</artifactId> - <version>6.0-5</version> + <version>${openejbJavaeeApiVersion}</version> <scope>runtime</scope> </dependency> @@ -391,21 +402,21 @@ <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <version>1.6.1</version> + <version>${dom4jVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> - <version>2.0.2</version> + <version>${jdomVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>2.3</version> + <version>${openCsvVersion}</version> <scope>compile</scope> </dependency> @@ -414,7 +425,7 @@ <dependency> <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> - <version>4.2.1</version> + <version>${itextVersion}</version> <exclusions> <exclusion> <groupId>bouncycastle</groupId> @@ -459,7 +470,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-widgets</artifactId> - <version>1.1.1</version> + <version>${nuitonWidgetsVersion}</version> </dependency> </dependencies> @@ -502,7 +513,7 @@ <plugin> <groupId>org.bluestemsoftware.open.maven.plugin</groupId> <artifactId>launch4j-plugin</artifactId> - <version>1.5.0.0</version> + <version>${launch4jPluginVersion}</version> </plugin> </plugins>

1 0

r3785 - trunk
by dcosse＠users.chorem.org May 7, 2014

May 7, 2014

Author: dcosse Date: 2014-05-07 14:34:08 +0200 (Wed, 07 May 2014) New Revision: 3785 Url: http://forge.chorem.org/projects/lima/repository/revisions/3785 Log: pre release, fix release version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-07 12:22:52 UTC (rev 3784) +++ trunk/pom.xml 2014-05-07 12:34:08 UTC (rev 3785) @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7.2-SNAPSHOT</version> + <version>0.8-SNAPSHOT</version> <packaging>pom</packaging> <name>Lima</name>

1 0

r3784 - trunk
by dcosse＠users.chorem.org May 7, 2014

May 7, 2014

Author: dcosse Date: 2014-05-07 14:22:52 +0200 (Wed, 07 May 2014) New Revision: 3784 Url: http://forge.chorem.org/projects/lima/repository/revisions/3784 Log: pre release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-06 16:47:18 UTC (rev 3783) +++ trunk/pom.xml 2014-05-07 12:22:52 UTC (rev 3784) @@ -5,12 +5,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.6-SNAPSHOT</version> + <version>5.0.6</version> </parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Lima</name> @@ -49,7 +49,30 @@ <role>Développeur</role> </roles> </developer> + <developer> + <id>dcosse</id> + <name>David Cossé</name> + <email>cosse(a)codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>bavencoff</id> + <name>Sylvain Bavencoff</name> + <email>bavencoff(a)codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> </developers> + <contributors> <contributor> <name>Cédric Houbart</name> @@ -111,16 +134,6 @@ <role>Développeur</role> </roles> </contributor> - <contributor> - <name>bavencoff</name> - <email>bavencoff(a)codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </contributor> </contributors> <modules> @@ -149,21 +162,21 @@ <projectId>lima</projectId>  + <jettyVersion>${jettyPluginVersion}</jettyVersion> <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonProfilingVersion>2.7.1</nuitonProfilingVersion> <eugenePluginVersion>2.7.4</eugenePluginVersion> + <nuitonI18nVersion>3.1</nuitonI18nVersion> - <topiaVersion>2.9-SNAPSHOT</topiaVersion> + <topiaVersion>2.9-rc-1</topiaVersion>  <jaxxVersion>2.8.4</jaxxVersion> - <nuitonI18nVersion>3.0</nuitonI18nVersion> <openEjbVersion>4.6.0</openEjbVersion> <slf4jVersion>1.7.7</slf4jVersion> <swingxVersion>1.6.5-1</swingxVersion> - <jettyVersion>${jettyPluginVersion}</jettyVersion> <pdfboxVersion>1.8.4</pdfboxVersion>

1 0

r3783 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/lettering lima-swing/src/main/resources/i18n
by dcosse＠users.chorem.org May 6, 2014

May 6, 2014

Author: dcosse Date: 2014-05-06 18:47:18 +0200 (Tue, 06 May 2014) New Revision: 3783 Url: http://forge.chorem.org/projects/lima/repository/revisions/3783 Log: fixes #1022 possibilit?\195?\169 de s?\195?\169l?\195?\169ctionner tous les comptes Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.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/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-05-06 15:41:32 UTC (rev 3782) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-05-06 16:47:18 UTC (rev 3783) @@ -441,7 +441,7 @@ try { EntryDAO entryDAO = getDaoHelper().getEntryDAO(); - entries = entryDAO.findAllEntryByAccountAndLettering(filter); + entries = entryDAO.findAllEntryByFilter(filter); } catch (Exception ex) { throw new LimaException("Can't get entries", ex); } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2014-05-06 15:41:32 UTC (rev 3782) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2014-05-06 16:47:18 UTC (rev 3783) @@ -190,11 +190,25 @@ * @param filter filtre sur les entrees, selon le compte, les dates de debut et de fin, et le lettrage * @throws TopiaException * */ - public List<Entry> findAllEntryByAccountAndLettering(LetteringFilter filter) throws TopiaException { + public List<Entry> findAllEntryByFilter(LetteringFilter filter) throws TopiaException { + List<Entry> entries; + Account account = filter.getAccount(); + if (account != null && account.getTopiaId() == null) { + // case user want to see all accounts + entries = getAllEntryByLetteringAndDateForEntryBook(filter); + } else { + entries = getAllEntryByAccountLetteringAndDateForEntryBook(filter); + } + return entries; + } + + public List<Entry> getAllEntryByAccountLetteringAndDateForEntryBook(LetteringFilter filter) throws TopiaException { + List<Entry> entries; + String query = "Select E from " + Entry.class.getName() + " E " + - " where E.account.accountNumber like :account "; + " where E.account.accountNumber like :account "; if (!filter.getDisplayLettered() && filter.getDisplayUnlettred()){ @@ -204,13 +218,35 @@ } query += " and E.financialTransaction.transactionDate between :beginDate and :endDate " + - " order by E.financialTransaction.transactionDate, E.financialTransaction." + FinancialTransaction.TOPIA_CREATE_DATE; + " order by E.financialTransaction.transactionDate, E.financialTransaction." + FinancialTransaction.TOPIA_CREATE_DATE; - log.info("Query:" + query); + entries = context.findAll(query, "account", filter.getAccount().getAccountNumber() + "%", "beginDate", filter.getDateStart(), "endDate", filter.getDateEnd()); + return entries; } + public List<Entry> getAllEntryByLetteringAndDateForEntryBook(LetteringFilter filter) throws TopiaException { + List<Entry> entries; + + String query = "Select E from " + Entry.class.getName() + " E "; + + query += " WHERE E.financialTransaction.transactionDate BETWEEN :beginDate and :endDate "; + + if (!filter.getDisplayLettered() && filter.getDisplayUnlettred()){ + query += " and (E.lettering is null or E.lettering = '') "; + } else if (filter.getDisplayLettered() && !filter.getDisplayUnlettred()){ + query += " and (E.lettering is not null or E.lettering !='') "; + } + + query += " order by E.financialTransaction.transactionDate, E.financialTransaction." + FinancialTransaction.TOPIA_CREATE_DATE; + + entries = context.findAll(query, "beginDate", filter.getDateStart(), "endDate", filter.getDateEnd()); + + return entries; + } + + /** * Retourne la dernière entrée d'une transaction * @param financialTransaction transaction sur laquelle la derniere entree est selectionnee Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2014-05-06 15:41:32 UTC (rev 3782) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2014-05-06 16:47:18 UTC (rev 3783) @@ -35,6 +35,7 @@ import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.api.FiscalPeriodService; import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.AccountImpl; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; @@ -48,7 +49,9 @@ import java.util.Date; import java.util.List; +import static org.nuiton.i18n.I18n.t; + /** * Handler associated with financial transaction view. * @@ -302,6 +305,11 @@ public void loadComboAndRows(){ List<Account> allAccounts = accountService.getAllAccounts(); + Account seeAllAccounts = new AccountImpl(); + seeAllAccounts.setAccountNumber("-"); + seeAllAccounts.setLabel(t("lima.ui.list.seeAll")); + allAccounts.add(seeAllAccounts); + view.getAccountComboBoxModel().setObjects(allAccounts); if (!allAccounts.isEmpty()) { @@ -320,7 +328,7 @@ if (fiscalPeriod != null){ defaultDateBegFiscalPeriod = fiscalPeriodService.getLastFiscalPeriod().getBeginDate(); - }else{ + } else{ defaultDateBegFiscalPeriod = DateUtils.setDays(new Date(), premierJourMoisCourant); } 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-05-06 15:41:32 UTC (rev 3782) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-05-06 16:47:18 UTC (rev 3783) @@ -499,6 +499,7 @@ lima.ui.lettering.selectDebit= lima.ui.lettering.selectEntry=Actual selection lima.ui.lettering.selectSolde=Balance +lima.ui.list.seeAll=ALL lima.ui.locale= lima.ui.mainview.title=Lutin Invoice Monitoring and Accounting lima.ui.nonaffect= 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-05-06 15:41:32 UTC (rev 3782) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-05-06 16:47:18 UTC (rev 3783) @@ -476,6 +476,7 @@ lima.ui.lettering.selectDebit=Débit lima.ui.lettering.selectEntry=Sélection courante lima.ui.lettering.selectSolde=Solde +lima.ui.list.seeAll=TOUS lima.ui.mainview.title=Lutin Invoice Monitoring and Accounting lima.ui.nonaffect=N.R lima.ui.opening.accounts=<html><center>Veuillez sélectionner un plan par défault, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html>

1 0

r3782 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-callao/src/main/java/org/chorem/lima/entity lima-callao/src/main/xmi lima-swing/src/main/java/org/chorem/lima/enums lima-swing/src/main/java/org/chorem/lima/ui/lettering
by dcosse＠users.chorem.org May 6, 2014

May 6, 2014

Author: dcosse Date: 2014-05-06 17:41:32 +0200 (Tue, 06 May 2014) New Revision: 3782 Url: http://forge.chorem.org/projects/lima/repository/revisions/3782 Log: fixes #1020 corrige le fonctionnement du filtre Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-callao/src/main/xmi/accounting.properties trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-05-06 09:22:03 UTC (rev 3781) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-05-06 15:41:32 UTC (rev 3782) @@ -50,6 +50,7 @@ import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.pdfbox.exceptions.COSVisitorException; @@ -266,9 +267,9 @@ entry.setAmount(debit); } entry.setAccount(account); - entry.setDescription(entryEBP.getLibelle()); - entry.setVoucher(entryEBP.getPiece()); - entry.setLettering(entryEBP.getLettre()); + entry.setDescription(StringUtils.trimToNull(entryEBP.getLibelle())); + entry.setVoucher(StringUtils.trimToNull(entryEBP.getPiece())); + entry.setLettering(StringUtils.trimToNull(entryEBP.getLettre())); // Association of the entry with the financialTransaction // Each financialTransaction is associated with an entryBook @@ -419,8 +420,8 @@ String[] line = csvReader.readNext(); while (line != null) { EntryBook entryBook = new EntryBookImpl(); - entryBook.setCode(line[0]); - entryBook.setLabel(line[2]); + entryBook.setCode(StringUtils.trimToNull(line[0])); + entryBook.setLabel(StringUtils.trimToNull(line[2])); entryBookService.createEntryBook(entryBook); result.append(t("lima-business.import.accountadded", entryBook.getCode(), entryBook.getLabel())); count++; @@ -800,8 +801,8 @@ StringBuilder result = new StringBuilder(); EntryBook entryBook = new EntryBookImpl(); - entryBook.setCode(nextLine[1]); - entryBook.setLabel(nextLine[2]); + entryBook.setCode(StringUtils.trimToNull(nextLine[1])); + entryBook.setLabel(StringUtils.trimToNull(nextLine[2])); // if exist, skip if (entryBookService.getEntryBookByCode(entryBook.getCode()) != null) { @@ -858,12 +859,12 @@ Map<String, List<FinancialStatementImport>> financialStatements) throws LimaException, TopiaException { StringBuilder result = new StringBuilder(); - String label = nextLine[1]; + String label = StringUtils.trimToNull(nextLine[1]); String header = nextLine[2]; - String accounts = nextLine[3]; - String debitAccounts = nextLine[4]; - String creditAccounts = nextLine[5]; - String provisionDeprecationAccounts = nextLine[6]; + String accounts = StringUtils.trimToNull(nextLine[3]); + String debitAccounts = StringUtils.trimToNull(nextLine[4]); + String creditAccounts = StringUtils.trimToNull(nextLine[5]); + String provisionDeprecationAccounts = StringUtils.trimToNull(nextLine[6]); String subAmount = nextLine[7]; String headerAmount = nextLine[8]; String masterFinancialStatement = nextLine[9]; @@ -918,9 +919,9 @@ StringBuilder result = new StringBuilder(); String boxName = nextLine[1]; - String label = nextLine[2]; + String label = StringUtils.trimToNull(nextLine[2]); String header = nextLine[3]; - String accounts = nextLine[4]; + String accounts = StringUtils.trimToNull(nextLine[4]); String masterVatStatement = nextLine[5]; // if exist, skip @@ -982,13 +983,13 @@ int num = new Integer(nextLine[1]); EntryImport entryImport = new EntryImportImpl(); - entryImport.setDescription(nextLine[2]); + entryImport.setDescription(StringUtils.trimToNull(nextLine[2])); entryImport.setAmount(nextLine[3]); entryImport.setDebit(nextLine[4]); - entryImport.setLettering(nextLine[5]); - entryImport.setDetail(nextLine[6]); - entryImport.setVoucher(nextLine[7]); - entryImport.setPosition(nextLine[8]); + entryImport.setLettering(StringUtils.trimToNull(nextLine[5])); + entryImport.setDetail(StringUtils.trimToNull(nextLine[6])); + entryImport.setVoucher(StringUtils.trimToNull(nextLine[7])); + entryImport.setPosition(StringUtils.trimToNull(nextLine[8])); entryImport.setAccount(nextLine[9]); if (entries.containsKey(num)) { @@ -1231,15 +1232,13 @@ Entry entry = new EntryImpl(); Account account = accountService.getAccountByNumber(entryImport.getAccount()); entry.setAccount(account); - entry.setDescription(entryImport.getDescription()); + entry.setDescription(StringUtils.trimToNull(entryImport.getDescription())); entry.setAmount(new BigDecimal(entryImport.getAmount())); entry.setDebit(Boolean.parseBoolean(entryImport.getDebit())); - - entry.setLettering(entryImport.getLettering()); - - entry.setDetail(entryImport.getDetail()); - entry.setVoucher(entryImport.getVoucher()); - entry.setPosition(entryImport.getPosition()); + entry.setLettering(StringUtils.trimToNull(entryImport.getLettering())); + entry.setDetail(StringUtils.trimToNull(entryImport.getDetail())); + entry.setVoucher(StringUtils.trimToNull(entryImport.getVoucher())); + entry.setPosition(StringUtils.trimToNull(entryImport.getPosition())); entryService.createEntry(entry); financialTransaction.addEntry(entry); } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2014-05-06 09:22:03 UTC (rev 3781) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2014-05-06 15:41:32 UTC (rev 3782) @@ -193,20 +193,20 @@ public List<Entry> findAllEntryByAccountAndLettering(LetteringFilter filter) throws TopiaException { List<Entry> entries; - String query = "Select E from " + Entry.class.getName() + " E, " + FinancialTransaction.class.getName() + " F" + - " where E.financialTransaction = F" + - " and E.account.accountNumber like :account "; + String query = "Select E from " + Entry.class.getName() + " E " + + " where E.account.accountNumber like :account "; if (!filter.getDisplayLettered() && filter.getDisplayUnlettred()){ - query += " and E.lettering is null"; + query += " and (E.lettering is null or E.lettering = '') "; } else if (filter.getDisplayLettered() && !filter.getDisplayUnlettred()){ - query += " and E.lettering is not null"; + query += " and (E.lettering is not null or E.lettering !='') "; } query += " and E.financialTransaction.transactionDate between :beginDate and :endDate " + - " order by F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; + " order by E.financialTransaction.transactionDate, E.financialTransaction." + FinancialTransaction.TOPIA_CREATE_DATE; + log.info("Query:" + query); entries = context.findAll(query, "account", filter.getAccount().getAccountNumber() + "%", "beginDate", filter.getDateStart(), "endDate", filter.getDateEnd()); return entries; } Modified: trunk/lima-callao/src/main/xmi/accounting.properties =================================================================== --- trunk/lima-callao/src/main/xmi/accounting.properties 2014-05-06 09:22:03 UTC (rev 3781) +++ trunk/lima-callao/src/main/xmi/accounting.properties 2014-05-06 15:41:32 UTC (rev 3782) @@ -49,11 +49,14 @@ # lazy org.chorem.lima.entity.ClosedPeriodicEntryBook.attribute.entryBook.tagvalue.lazy=false org.chorem.lima.entity.ClosedPeriodicEntryBook.attribute.financialPeriod.tagvalue.lazy=false + org.chorem.lima.entity.Entry.attribute.account.tagvalue.lazy=false org.chorem.lima.entity.Entry.attribute.financialTransaction.tagvalue.lazy=false + org.chorem.lima.entity.FinancialTransaction.attribute.entry.tagvalue.lazy=false org.chorem.lima.entity.FinancialTransaction.attribute.entryBook.tagvalue.lazy=false org.chorem.lima.entity.FinancialStatement.attribute.subFinancialStatements.tagvalue.lazy=false org.chorem.lima.entity.FinancialStatement.attribute.masterFinancialStatement.tagvalue.lazy=false + org.chorem.lima.entity.VatStatement.attribute.subVatStatements.tagvalue.lazy=false org.chorem.lima.entity.VatStatement.attribute.masterVatStatement.tagvalue.lazy=false Modified: trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java 2014-05-06 09:22:03 UTC (rev 3781) +++ trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java 2014-05-06 15:41:32 UTC (rev 3782) @@ -26,7 +26,9 @@ package org.chorem.lima.enums; -/** Boolean importMode define if it's a import (true) or an export (false) */ +/** first Boolean importMode define if it's a import (true) or an export (false) + * second one to allow or not choce for encoding + * */ public enum ImportExportEnum { CSV_ALL_EXPORT(false, true), CSV_ALL_IMPORT(true, true), CSV_ACCOUNTCHARTS_EXPORT(false, true), CSV_ACCOUNTCHARTS_IMPORT(true, true), Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2014-05-06 09:22:03 UTC (rev 3781) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2014-05-06 15:41:32 UTC (rev 3782) @@ -329,10 +329,13 @@ view.getPickerDebut().setDate(defaultDateBegFiscalPeriod); view.getPickerFin().setDate(defaultDateEndCurrent); + filter.setDateStart(defaultDateBegFiscalPeriod); filter.setDateEnd(defaultDateEndCurrent); - filter.setDisplayUnlettred(true); + TypeEntry type = view.getLettredEntryComboBox().getSelectedItem(); + setTypeEntry(type); + updateAllEntries(); }

1 0

r3781 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/enums lima-swing/src/main/java/org/chorem/lima/ui/importexport
by dcosse＠users.chorem.org May 6, 2014

May 6, 2014

Author: dcosse Date: 2014-05-06 11:22:03 +0200 (Tue, 06 May 2014) New Revision: 3781 Url: http://forge.chorem.org/projects/lima/repository/revisions/3781 Log: fixes #1016 ajout des imports/export des journaux. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.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/ejb/ExportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2014-05-05 16:28:39 UTC (rev 3780) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2014-05-06 09:22:03 UTC (rev 3781) @@ -135,11 +135,7 @@ entryBook = financialTransaction.getEntryBook(); - if (entryBook != null) { - entrybookCode = entryBook.getCode(); - } else { - entrybookCode = ""; - } + entrybookCode = entryBook == null ? "" : entryBook.getCode(); for (Entry entry : financialTransaction.getEntry()) { account = entry.getAccount(); @@ -163,7 +159,7 @@ nextLine[0] = date; nextLine[1] = entrybookCode; nextLine[2] = accountNumber; - nextLine[3] = entry.getDescription(); + nextLine[3] = StringUtils.remove(entry.getDescription(), ","); nextLine[4] = entry.getVoucher(); nextLine[5] = debit; nextLine[6] = credit; @@ -205,6 +201,8 @@ CSVWriter.DEFAULT_SEPARATOR, CSVWriter.NO_QUOTE_CHARACTER); //export accounts + //Numero,Intitule,Type,bLetManuel,bLetAuto,bLetAppro,bCentPhysique,bCentJournal,bCentGLivre,bGeleDebit,bGeleCredit,bNoEchAna,TypeRel,Categorie,CodeTVA,TypeTVA,Lettrage,Encours,Seuil,Remise,Escompte,Devise,RIB0NomBanque,RIB0AdrBanque,RIB0Agence,RIB0Guichet,RIB0Compte,RIB0CleRIB,RIB1NomBanque,RIB1AdrBanque,RIB1Agence,RIB1Guichet,RIB1Compte,RIB1CleRIB,RIB2NomBanque,RIB2AdrBanque,RIB2Agence,RIB2Guichet,RIB2Compte,RIB2CleRIB,AdresseCivilite,AdresseRaiSoc,AdresseAdresse,AdresseCodePostal,AdresseVille,AdressePays,NII,Contact0Interloc,Contact0Fonction,Contact0TelNumTel,Contact0TelNumFax,Contact0Infos,Contact1Interloc,Contact1Fonction,Contact1TelNumTel,Contact1TelNumFax,Contact1Infos,Contact2Interloc,Contact2Fonction,Contact2TelNumTel,Contact2TelNumFax,Contact2Infos,Contact3Interloc,Contact3Fonction,Contact3TelNumTel,Contact3TelNumFax,Contact3Infos,Contact4Interloc,Contact4Fonction,Contact4TelNumTel,Contact4TelNumFax,Contact4Infos,CodeRegle,NbJours,TypeJours,Limite,Grille1,Grille2,Grille3,SectGeo,SectAct,ObjCA,TailleCA,NbEmpl,Commercial,JoursMois,CptTva,CptCharge,bDecouvertAutorise,MntDecouvertAutorise,EMailTiers,WebSiteTiers,NatAchat,NatVente,NatDepense,NatRecette,NumCptBqCH,NumClearing,NumIBAN,LetPart,TypeAchatTVA,IBAN0Pays,IBAN0Controle,IBAN0Contenu,IBAN1Pays,IBAN1Controle,IBAN1Contenu,IBAN2Pays,IBAN2Controle,IBAN2Contenu,BIC0Banque,BIC0Pays,BIC0Localisation,BIC0Branche,BIC1Banque,BIC1Pays,BIC1Localisation,BIC1Branche,BIC2Banque,BIC2Pays,BIC2Localisation,BIC2Branche,LibBIC0,LibBIC1,LibBIC2 + String[] nextLine = new String[2]; // Add the header line nextLine[0] = "Numero"; @@ -263,7 +261,7 @@ if (entryBooks != null && !entryBooks.isEmpty()) { for (EntryBook entryBook:entryBooks) { nextLine[0] = entryBook.getCode(); - nextLine[1] = entryBook.getLabel(); + nextLine[1] = StringUtils.remove(entryBook.getLabel(), ","); // Ajoute la ligne au fichier csvWriter.writeNext(nextLine); } @@ -387,11 +385,7 @@ financialStatement.getHeaderAmount()); FinancialStatement masterFinancialStatement = financialStatement.getMasterFinancialStatement(); - String masterFinancialStatementString = ""; - if (masterFinancialStatement != null) { - masterFinancialStatementString = - masterFinancialStatement.getLabel(); - } + String masterFinancialStatementString = masterFinancialStatement == null ? "" : StringUtils.remove(masterFinancialStatement.getLabel(), ";"); nextLine[9] = masterFinancialStatementString; FinancialStatementWayEnum financialStatementWayEnum = financialStatement.getWay(); String financialStatementWay = ""; @@ -522,7 +516,7 @@ for (EntryBook entryBook : listEntryBook) { nextLine[0] = ImportExportEntityEnum.ENTRYBOOK.getLabel(); nextLine[1] = entryBook.getCode(); - nextLine[2] = entryBook.getLabel(); + nextLine[2] = StringUtils.remove(entryBook.getLabel(), ";"); // Ajoute la ligne au fichier csvWriter.writeNext(nextLine); } @@ -577,7 +571,7 @@ for (Account account : listAccount) { nextLine[0] = ImportExportEntityEnum.ACCOUNT.getLabel(); nextLine[1] = account.getAccountNumber(); - nextLine[2] = account.getLabel(); + nextLine[2] = StringUtils.remove(account.getLabel(), ";"); nextLine[3] = account.getThirdParty(); // Ajoute la ligne au fichier Modified: trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java 2014-05-05 16:28:39 UTC (rev 3780) +++ trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java 2014-05-06 09:22:03 UTC (rev 3781) @@ -35,9 +35,9 @@ CSV_VAT_EXPORT(false, true), CSV_VAT_IMPORT(true, true), CSV_ENTRIES_IMPORT(true, true), PDF_VAT_EXPORT(false, true), PDF_VAT_IMPORT(true, true), - EBP_ACCOUNTCHARTS_EXPORT(false, true), EBP_ENTRIES_EXPORT(false, true), + EBP_ACCOUNTCHARTS_EXPORT(false, false), EBP_ENTRIES_EXPORT(false, false), EBP_ACCOUNTCHARTS_IMPORT(true, true), EBP_ENTRIES_IMPORT(true, true), - EBP_ENTRYBOOKS_IMPORT(true, true),EBP_ENTRYBOOKS_EXPORT(false, true); + EBP_ENTRYBOOKS_IMPORT(true, true),EBP_ENTRYBOOKS_EXPORT(false, false); private final Boolean importMode; 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-05-05 16:28:39 UTC (rev 3780) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-05-06 09:22:03 UTC (rev 3781) @@ -312,7 +312,7 @@ chooser.setApproveButtonText(approveButtonText); } else { approveButtonText = t("lima.ui.importexport.export"); - chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); + chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); chooser.setDialogTitle(approveButtonText); chooser.setApproveButtonText(approveButtonText); }

1 0

r3780 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-swing/src/main/java/org/chorem/lima/enums lima-swing/src/main/java/org/chorem/lima/ui lima-swing/src/main/java/org/chorem/lima/ui/account lima-swing/src/main/java/org/chorem/lima/ui/entrybook lima-swing/src/main/java/org/chorem/lima/ui/importexport
by dcosse＠users.chorem.org May 5, 2014

May 5, 2014

Author: dcosse Date: 2014-05-05 18:28:39 +0200 (Mon, 05 May 2014) New Revision: 3780 Url: http://forge.chorem.org/projects/lima/repository/revisions/3780 Log: refs #1016 ajout des imports/export des journaux. Il faut tester sous EBPCompta pour valider les exports Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ExportService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.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/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-04-16 14:06:13 UTC (rev 3779) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-05-05 16:28:39 UTC (rev 3780) @@ -62,39 +62,39 @@ public EntryBook createEntryBook(EntryBook entryBook) throws LimaException { - EntryBook result; + EntryBook result = null; try { // check if entrybook with is name already exist EntryBookDAO entryBookDAO = getDaoHelper().getEntryBookDAO(); - EntryBook existingEntryBook = + result = entryBookDAO.findByCode(entryBook.getCode()); - if (existingEntryBook != null) { - throw new LimaBusinessException( + if (result != null) { + log.error( t("lima-business.entrybook.entrybookalreadyexist", entryBook.getCode())); - } + } else { + // creation du EntryBook + result = entryBookDAO.create(entryBook); - // creation du EntryBook - result = entryBookDAO.create(entryBook); + //create ClosedPeriodicEntryBook for all unblocked financial period + ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = + getDaoHelper().getClosedPeriodicEntryBookDAO(); + FinancialPeriodDAO financialPeriodDAO = + getDaoHelper().getFinancialPeriodDAO(); + // for all unblocked financialperiod + for (FinancialPeriod financialPeriod : financialPeriodDAO.findAllByLocked(false)) { - //create ClosedPeriodicEntryBook for all unblocked financial period - ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = - getDaoHelper().getClosedPeriodicEntryBookDAO(); - FinancialPeriodDAO financialPeriodDAO = - getDaoHelper().getFinancialPeriodDAO(); - // for all unblocked financialperiod - for (FinancialPeriod financialPeriod : financialPeriodDAO.findAllByLocked(false)) { - - //new closed periodic entrybook - ClosedPeriodicEntryBook closedPeriodicEntryBook = - new ClosedPeriodicEntryBookImpl(); - // set entrybook - closedPeriodicEntryBook.setEntryBook(entryBook); - // set financial period - closedPeriodicEntryBook.setFinancialPeriod(financialPeriod); - // create it - closedPeriodicEntryBookDAO.create(closedPeriodicEntryBook); + //new closed periodic entrybook + ClosedPeriodicEntryBook closedPeriodicEntryBook = + new ClosedPeriodicEntryBookImpl(); + // set entrybook + closedPeriodicEntryBook.setEntryBook(entryBook); + // set financial period + closedPeriodicEntryBook.setFinancialPeriod(financialPeriod); + // create it + closedPeriodicEntryBookDAO.create(closedPeriodicEntryBook); + } } } catch (TopiaException ex) { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2014-04-16 14:06:13 UTC (rev 3779) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2014-05-05 16:28:39 UTC (rev 3780) @@ -29,6 +29,7 @@ import org.apache.commons.lang3.StringUtils; import org.chorem.lima.FinancialStatementWayEnum; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.ExportService; import org.chorem.lima.business.api.ExportServiceLocal; import org.chorem.lima.business.utils.ImportExportEntityEnum; @@ -51,6 +52,7 @@ import org.chorem.lima.entity.VatStatementDAO; import org.nuiton.topia.TopiaException; +import javax.ejb.EJB; import javax.ejb.Local; import javax.ejb.Remote; import javax.ejb.Stateless; @@ -80,6 +82,9 @@ protected final String DATE_PATTERN = "dd/MM/yyyy"; + @EJB + private EntryBookService entryBookService; + //############## EXPORT EBP /** @@ -200,7 +205,12 @@ CSVWriter.DEFAULT_SEPARATOR, CSVWriter.NO_QUOTE_CHARACTER); //export accounts - String[] nextLine = new String[10]; + String[] nextLine = new String[2]; + // Add the header line + nextLine[0] = "Numero"; + nextLine[1] = "Intitule"; + csvWriter.writeNext(nextLine); + // Récupère tous les comptes AccountDAO accountDAO = getDaoHelper().getAccountDAO(); List<Account> listAccount = accountDAO.findAll(); @@ -229,7 +239,55 @@ return out.getBuffer().toString(); } + @Override + public String exportEntryBooksAsEBP() throws LimaException { + StringWriter out = new StringWriter(); + CSVWriter csvWriter = null; + try { + csvWriter = new CSVWriter(out, + CSVWriter.DEFAULT_SEPARATOR, + CSVWriter.NO_QUOTE_CHARACTER); + + //entryBooks to export + List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); + + //Code,Type,Libelle,TypePiece,NextPiece,CpteType,CpteCompte,Contact,RIBNomBanque,RIBAdrBanque,RIBAgence,RIBGuichet,RIBCompte,RIBCleRIB,Lcr,Preleve,MemoDateCreat,MemoDateModif,Devise,CompteTP,NumCptBqCH,NumClearing,bSaisieKM + String[] nextLine = new String[2]; + // Add the header line + nextLine[0] = "Code"; + nextLine[1] = "Libelle"; + // Ajoute la ligne au fichier + csvWriter.writeNext(nextLine); + + if (entryBooks != null && !entryBooks.isEmpty()) { + for (EntryBook entryBook:entryBooks) { + nextLine[0] = entryBook.getCode(); + nextLine[1] = entryBook.getLabel(); + // Ajoute la ligne au fichier + csvWriter.writeNext(nextLine); + } + } + + // Write cache in string + csvWriter.flush(); + + } catch (Exception ex) { + throw new LimaException("Can't export", ex); + } finally { + if (csvWriter != null) { + try { + csvWriter.close(); + out.close(); + } catch (IOException e) { + // nothing to do + } + } + } + return out.getBuffer().toString(); + } + + //############## EXPORT CSV /** Export integrality of database in CSV */ Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ExportService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ExportService.java 2014-04-16 14:06:13 UTC (rev 3779) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ExportService.java 2014-05-05 16:28:39 UTC (rev 3780) @@ -79,5 +79,10 @@ */ String exportAccountsAsEBP() throws LimaException; - + /** + * export entryBooks as EBP + * @return + * @throws LimaException + */ + String exportEntryBooksAsEBP() throws LimaException; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java 2014-04-16 14:06:13 UTC (rev 3779) +++ trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java 2014-05-05 16:28:39 UTC (rev 3780) @@ -35,8 +35,9 @@ CSV_VAT_EXPORT(false, true), CSV_VAT_IMPORT(true, true), CSV_ENTRIES_IMPORT(true, true), PDF_VAT_EXPORT(false, true), PDF_VAT_IMPORT(true, true), - EBP_ACCOUNTCHARTS_EXPORT(false, false), EBP_ENTRIES_EXPORT(false, false), - EBP_ACCOUNTCHARTS_IMPORT(true, false), EBP_ENTRIES_IMPORT(true, false); + EBP_ACCOUNTCHARTS_EXPORT(false, true), EBP_ENTRIES_EXPORT(false, true), + EBP_ACCOUNTCHARTS_IMPORT(true, true), EBP_ENTRIES_IMPORT(true, true), + EBP_ENTRYBOOKS_IMPORT(true, true),EBP_ENTRYBOOKS_EXPORT(false, true); private final Boolean importMode; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-04-16 14:06:13 UTC (rev 3779) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-05-05 16:28:39 UTC (rev 3780) @@ -96,12 +96,16 @@ onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ACCOUNTCHARTS_IMPORT)'/> <JMenuItem text="lima.ui.importexport.entries" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ENTRIES_IMPORT)'/> + <JMenuItem text="lima.ui.importexport.entrybooks" + onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ENTRYBOOKS_IMPORT)'/> </JMenu> <JMenu text="lima.ui.importexport.export" actionIcon='export-element'> <JMenuItem text="lima.ui.importexport.accountcharts" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ACCOUNTCHARTS_EXPORT)'/> <JMenuItem text="lima.ui.importexport.entries" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ENTRIES_EXPORT)'/> + <JMenuItem text="lima.ui.importexport.entrybooks" + onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ENTRYBOOKS_EXPORT)'/> </JMenu> </JMenu> <JSeparator/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2014-04-16 14:06:13 UTC (rev 3779) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2014-05-05 16:28:39 UTC (rev 3780) @@ -424,11 +424,10 @@ form.setLocationRelativeTo(view); form.setVisible(true); - ImportExport importExport = new ImportExport(view); - Object value = form.getButtonGroup().getSelectedValue(); // if action confirmed if (value != null) { + ImportExport importExport = new ImportExport(view); AccountsChartEnum defaultAccountsChartEnum = (AccountsChartEnum) value; //Import accounts chart Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2014-04-16 14:06:13 UTC (rev 3779) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2014-05-05 16:28:39 UTC (rev 3780) @@ -262,6 +262,7 @@ Object value = form.getButtonGroup().getSelectedValue(); // if action confirmed if (value != null) { + EntryBooksChartEnum defaultEntryBooksEnum = (EntryBooksChartEnum) value; ImportExport importExport = new ImportExport(view); importExport.importExport(ImportExportEnum.CSV_ENTRYBOOKS_IMPORT, 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-04-16 14:06:13 UTC (rev 3779) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-05-05 16:28:39 UTC (rev 3780) @@ -186,7 +186,7 @@ int response = JOptionPane.showConfirmDialog(waitView, t("lima.importexport.usevatpdf"), t("lima.common.confirmation"), JOptionPane.YES_NO_OPTION); - datas = extractFile(filePath, charset.getEncoding()); + extractFile(filePath, charset.getEncoding()); result = importService.importAsPDF(filePath, ImportExportEntityEnum.VATPDF, response == JOptionPane.YES_OPTION); break; case EBP_ACCOUNTCHARTS_IMPORT: @@ -199,6 +199,14 @@ datas = extractFile(filePath, EncodingEnum.ISOLATIN1.getEncoding()); result = importService.importEntriesFromEbp(datas); break; + case EBP_ENTRYBOOKS_IMPORT: + datas = extractFile(filePath, EncodingEnum.ISOLATIN1.getEncoding()); + result = importService.importEntryBookFromEbp(datas); + break; + case EBP_ENTRYBOOKS_EXPORT: + datas = exportService.exportEntryBooksAsEBP(); + createFile(filePath, EncodingEnum.ISOLATIN1.getEncoding(), datas); + break; } return result; }

1 0