Lima-commits
Threads by month
- ----- 2026 -----
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- 1853 discussions
Aug. 27, 2010
Author: jpepin
Date: 2010-08-27 18:44:52 +0200 (Fri, 27 Aug 2010)
New Revision: 3028
Url: http://chorem.org/repositories/revision/lima/3028
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
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 2010-08-27 16:44:50 UTC (rev 3027)
+++ trunk/lima-business/pom.xml 2010-08-27 16:44:52 UTC (rev 3028)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.chorem</groupId>
<artifactId>lima</artifactId>
- <version>0.4.0</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<groupId>org.chorem.lima</groupId>
Modified: trunk/lima-callao/pom.xml
===================================================================
--- trunk/lima-callao/pom.xml 2010-08-27 16:44:50 UTC (rev 3027)
+++ trunk/lima-callao/pom.xml 2010-08-27 16:44:52 UTC (rev 3028)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.chorem</groupId>
<artifactId>lima</artifactId>
- <version>0.4.0</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<groupId>org.chorem.lima</groupId>
Modified: trunk/lima-swing/pom.xml
===================================================================
--- trunk/lima-swing/pom.xml 2010-08-27 16:44:50 UTC (rev 3027)
+++ trunk/lima-swing/pom.xml 2010-08-27 16:44:52 UTC (rev 3028)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.chorem</groupId>
<artifactId>lima</artifactId>
- <version>0.4.0</version>
+ <version>0.4.1-SNAPSHOT</version>
</parent>
<groupId>org.chorem.lima</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-08-27 16:44:50 UTC (rev 3027)
+++ trunk/pom.xml 2010-08-27 16:44:52 UTC (rev 3028)
@@ -15,7 +15,7 @@
<groupId>org.chorem</groupId>
<artifactId>lima</artifactId>
- <version>0.4.0</version>
+ <version>0.4.1-SNAPSHOT</version>
<modules>
<module>lima-callao</module>
@@ -335,9 +335,9 @@
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
<scm>
- <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.4.0</connection>
- <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.4.0</developerConnection>
- <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.4.0</url>
+ <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection>
+ <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/trunk</developerConnection>
+ <url>http://www.chorem.org/repositories/browse/lima/trunk</url>
</scm>
<repositories>
1
0
Author: jpepin
Date: 2010-08-27 18:44:50 +0200 (Fri, 27 Aug 2010)
New Revision: 3027
Url: http://chorem.org/repositories/revision/lima/3027
Log:
[maven-release-plugin] copy for tag lima-0.4.0
Added:
tags/lima-0.4.0/
Property changes on: tags/lima-0.4.0
___________________________________________________________________
Added: svn:ignore
+ *.log
target
bin
.classpath
.project
*.ipr
*.iws
*.iml
Added: svn:mergeinfo
+
1
0
Aug. 27, 2010
Author: jpepin
Date: 2010-08-27 18:44:48 +0200 (Fri, 27 Aug 2010)
New Revision: 3026
Url: http://chorem.org/repositories/revision/lima/3026
Log:
[maven-release-plugin] prepare release lima-0.4.0
Modified:
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 2010-08-27 16:42:59 UTC (rev 3025)
+++ trunk/lima-business/pom.xml 2010-08-27 16:44:48 UTC (rev 3026)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.chorem</groupId>
<artifactId>lima</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.0</version>
</parent>
<groupId>org.chorem.lima</groupId>
Modified: trunk/lima-callao/pom.xml
===================================================================
--- trunk/lima-callao/pom.xml 2010-08-27 16:42:59 UTC (rev 3025)
+++ trunk/lima-callao/pom.xml 2010-08-27 16:44:48 UTC (rev 3026)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.chorem</groupId>
<artifactId>lima</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.0</version>
</parent>
<groupId>org.chorem.lima</groupId>
Modified: trunk/lima-swing/pom.xml
===================================================================
--- trunk/lima-swing/pom.xml 2010-08-27 16:42:59 UTC (rev 3025)
+++ trunk/lima-swing/pom.xml 2010-08-27 16:44:48 UTC (rev 3026)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.chorem</groupId>
<artifactId>lima</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.0</version>
</parent>
<groupId>org.chorem.lima</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-08-27 16:42:59 UTC (rev 3025)
+++ trunk/pom.xml 2010-08-27 16:44:48 UTC (rev 3026)
@@ -15,7 +15,7 @@
<groupId>org.chorem</groupId>
<artifactId>lima</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.0</version>
<modules>
<module>lima-callao</module>
@@ -335,9 +335,9 @@
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
<scm>
- <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection>
- <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/trunk</developerConnection>
- <url>http://www.chorem.org/repositories/browse/lima/trunk</url>
+ <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.4.0</connection>
+ <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.4.0</developerConnection>
+ <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.4.0</url>
</scm>
<repositories>
1
0
r3025 - in trunk: . lima-business/src/license lima-swing/src/license
by jpepin＠users.chorem.org Aug. 27, 2010
by jpepin＠users.chorem.org Aug. 27, 2010
Aug. 27, 2010
Author: jpepin
Date: 2010-08-27 18:42:59 +0200 (Fri, 27 Aug 2010)
New Revision: 3025
Url: http://chorem.org/repositories/revision/lima/3025
Log:
licence jdom
Added:
trunk/release.properties
Modified:
trunk/lima-business/src/license/THIRD-PARTY.properties
trunk/lima-swing/src/license/THIRD-PARTY.properties
Modified: trunk/lima-business/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/lima-business/src/license/THIRD-PARTY.properties 2010-08-27 15:14:51 UTC (rev 3024)
+++ trunk/lima-business/src/license/THIRD-PARTY.properties 2010-08-27 16:42:59 UTC (rev 3025)
@@ -1,37 +1,42 @@
# Generated by org.nuiton.license.plugin.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - ANTLR 2 License
# - Apache 2
# - Apache License Version 2.0
# - Apache Software License - Version 2.0
# - Apache Software License 2.0
+# - Apache Software License, Version 2.0
# - BSD License
# - Bouncy Castle Licence
# - Bouncy Castle License
# - CPL
+# - Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license
# - Common Public License Version 1.0
# - Eclipse Public License - Version 1.0
# - GNU Lesser General Public License
# - General Public License (GPL)
# - HSQLDB License
+# - JDom license
# - Lesser General Public License (LGPL) v 3.0
+# - License Agreement for Java Transaction API Classes
# - MIT License
# - Mozilla Public License
# - Public Domain
# - The Apache Software License, Version 2.0
# - The H2 License, Version 1.0
-# - dom4j
# - http://asm.ow2.org/license.html
# - http://www.apache.org/licenses/LICENSE-2.0.txt
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Fri Aug 27 16:30:34 CEST 2010
+#Fri Aug 27 17:23:00 CEST 2010
antlr--antlr--2.7.6=ANTLR 2 License
com.sun.xml.bind--jaxb-impl--2.1.9=Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license
commons-net--commons-net--2.0=Apache Software License, Version 2.0
commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0
+dom4j--dom4j--1.6.1=jdomlicence
javassist--javassist--3.8.0.GA=GNU Lesser General Public License
javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes
org.codehaus.swizzle--swizzle-stream--1.0.1=Apache Software License, Version 2.0
Modified: trunk/lima-swing/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/lima-swing/src/license/THIRD-PARTY.properties 2010-08-27 15:14:51 UTC (rev 3024)
+++ trunk/lima-swing/src/license/THIRD-PARTY.properties 2010-08-27 16:42:59 UTC (rev 3025)
@@ -1,42 +1,48 @@
# Generated by org.nuiton.license.plugin.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - ANTLR 2 License
# - Apache 2
# - Apache License Version 2.0
-# - Apache License, Version 2.0
# - Apache Software License - Version 2.0
# - Apache Software License 2.0
-# - BSD
+# - Apache Software License, Version 2.0
+# - BSD License
# - Bouncy Castle Licence
# - Bouncy Castle License
# - CPL
# - Common Development and Distribution License (CDDL) v1.0
+# - Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license
# - Common Public License Version 1.0
# - Eclipse Public License - Version 1.0
# - GNU Lesser General Public License
# - General Public License (GPL)
# - HSQLDB License
+# - JDom license
# - Lesser General Public License (LGPL)
# - Lesser General Public License (LGPL) v 3.0
+# - License Agreement for Java Transaction API Classes
+# - License Agreement for JavaMail(TM) API
# - MIT License
# - Mozilla Public License
+# - OpenSymphony Software License, Version 1.1
# - Public Domain
# - The Apache Software License, Version 2.0
# - The H2 License, Version 1.0
# - The OpenSymphony Software License 1.1
-# - dom4j
# - http://asm.ow2.org/license.html
# - http://www.apache.org/licenses/LICENSE-2.0.txt
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Fri Aug 27 15:06:50 CEST 2010
+#Fri Aug 27 18:08:51 CEST 2010
antlr--antlr--2.7.6=ANTLR 2 License
com.sun.xml.bind--jaxb-impl--2.1.9=Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license
commons-jxpath--commons-jxpath--1.3=Apache Software License, Version 2.0
commons-net--commons-net--2.0=Apache Software License, Version 2.0
commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0
+dom4j--dom4j--1.6.1=jdomlicence
javassist--javassist--3.8.0.GA=GNU Lesser General Public License
javax.mail--mail--1.4.1=License Agreement for JavaMail(TM) API
javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes
Added: trunk/release.properties
===================================================================
--- trunk/release.properties (rev 0)
+++ trunk/release.properties 2010-08-27 16:42:59 UTC (rev 3025)
@@ -0,0 +1,8 @@
+#release configuration
+#Fri Aug 27 18:39:55 CEST 2010
+preparationGoals=clean verify
+scm.commentPrefix=[maven-release-plugin]
+remoteTagging=true
+exec.additionalArguments=-P nexus-profile
+completedPhase=check-poms
+scm.url=scm\:svn\:http\://svn.chorem.org/svn/lima/trunk
1
0
Author: jpepin
Date: 2010-08-27 17:14:51 +0200 (Fri, 27 Aug 2010)
New Revision: 3024
Url: http://chorem.org/repositories/revision/lima/3024
Log:
licence jdom
Modified:
trunk/lima-callao/src/license/THIRD-PARTY.properties
Modified: trunk/lima-callao/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/lima-callao/src/license/THIRD-PARTY.properties 2010-08-27 14:51:45 UTC (rev 3023)
+++ trunk/lima-callao/src/license/THIRD-PARTY.properties 2010-08-27 15:14:51 UTC (rev 3024)
@@ -1,19 +1,22 @@
# Generated by org.nuiton.license.plugin.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - ANTLR 2 License
+# - Apache Software License, Version 2.0
# - BSD License
# - GNU Lesser General Public License
# - Lesser General Public License (LGPL) v 3.0
+# - License Agreement for Java Transaction API Classes
# - MIT License
# - The Apache Software License, Version 2.0
# - The H2 License, Version 1.0
-# - dom4j
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Fri Aug 27 16:18:28 CEST 2010
+#Fri Aug 27 17:06:55 CEST 2010
antlr--antlr--2.7.6=ANTLR 2 License
commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0
+dom4j--dom4j--1.6.1=jdomlicence
javassist--javassist--3.8.0.GA=GNU Lesser General Public License
javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes
1
0
Author: jpepin
Date: 2010-08-27 16:51:45 +0200 (Fri, 27 Aug 2010)
New Revision: 3023
Url: http://chorem.org/repositories/revision/lima/3023
Log:
D?\195?\169bogue UI, manque une colonne dans les rapports.
D?\195?\169bogue g?\195?\169n?\195?\169ration BCR, et nouveau fichier de plan BCR.
Added:
trunk/src/site/resources/extras/
trunk/src/site/resources/extras/exemple_ecritures.csv
trunk/src/site/resources/extras/puzzle.svg
trunk/src/site/resources/extras/puzzle_icon.png
trunk/src/site/resources/screens/export_ebp_1.png
trunk/src/site/resources/screens/export_ebp_2.png
trunk/src/site/resources/screens/export_ebp_3.png
trunk/src/site/resources/screens/export_ebp_4.png
trunk/src/site/resources/screens/export_ebp_5.png
trunk/src/site/resources/screens/export_ebp_6.png
trunk/src/site/resources/screens/export_ebp_7.png
trunk/src/site/resources/screens/lima_import_charset.png
trunk/src/site/resources/screens/lima_import_limaall.png
trunk/src/site/resources/screens/lima_lettering.png
trunk/src/site/resources/screens/lima_open_account.png
trunk/src/site/resources/screens/lima_open_entrybook.png
trunk/src/site/resources/screens/lima_open_fiscalperiod.png
trunk/src/site/resources/screens/lima_open_identity.png
trunk/src/site/resources/screens/lima_open_welcome.png
trunk/src/site/resources/screens/lima_splashscreen.png
trunk/src/site/rst/assistant.rst
trunk/src/site/rst/importexport.rst
trunk/src/site/rst/rapports.rst
trunk/src/site/rst/saisie.rst
Removed:
trunk/src/site/resources/images/
trunk/src/site/resources/schemas/
trunk/src/site/resources/screenshots/
trunk/src/site/rst/howto.rst
trunk/src/site/rst/journal.rst
trunk/src/site/rst/planComptable.rst
trunk/src/site/rst/roadmap.rst
trunk/src/site/rst/todo.rst
Modified:
trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java
trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java
trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java
trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryEBPComparator.java
trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java
trunk/lima-callao/src/main/xmi/accounting.zargo
trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java
trunk/lima-swing/src/main/resources/import/bcr_base.csv
trunk/lima-swing/src/main/resources/import/bcr_developed.csv
trunk/lima-swing/src/main/resources/import/bcr_shortened.csv
trunk/src/site/rst/contact.rst
trunk/src/site/rst/features.rst
trunk/src/site/rst/index.rst
trunk/src/site/rst/install.rst
trunk/src/site/rst/lexique.rst
trunk/src/site/rst/presentation.rst
trunk/src/site/site_fr.xml
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -31,6 +31,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.chorem.lima.FinancialStatementWayEnum;
+import org.chorem.lima.beans.Amounts;
+import org.chorem.lima.beans.AmountsImpl;
import org.chorem.lima.beans.FinancialStatementAmounts;
import org.chorem.lima.beans.FinancialStatementAmountsImpl;
import org.chorem.lima.beans.FinancialStatementDatas;
@@ -290,7 +292,8 @@
List<FinancialStatement> financialStatements =
getChildrenFinancialStatement(financialStatement);
try {
- BigDecimal grossAmount = new BigDecimal(0), provisionDeprecationAmount = new BigDecimal(0);
+ BigDecimal grossAmount = new BigDecimal(0),
+ provisionDeprecationAmount = new BigDecimal(0);
List<FinancialStatementAmounts> subResult =
new ArrayList<FinancialStatementAmounts>();
for (FinancialStatement subFinancialStatement : financialStatements) {
@@ -299,7 +302,8 @@
selectedBeginDate, selectedEndDate, topiaContext);
if (!subFinancialStatement.getHeader()){
//on calcul
- grossAmount = grossAmount.add(financialStatementAmounts.getGrossAmount());
+ grossAmount =
+ grossAmount.add(financialStatementAmounts.getGrossAmount());
provisionDeprecationAmount = provisionDeprecationAmount.add(
financialStatementAmounts.getProvisionDeprecationAmount());
subResult.add(financialStatementAmounts);
@@ -354,8 +358,10 @@
subResult.add(headerfinancialStatementAmounts);
}
else {
- headerfinancialStatementAmounts.setGrossAmount(new BigDecimal(0));
- headerfinancialStatementAmounts.setProvisionDeprecationAmount(new BigDecimal(0));
+ headerfinancialStatementAmounts.
+ setGrossAmount(new BigDecimal(0));
+ headerfinancialStatementAmounts.
+ setProvisionDeprecationAmount(new BigDecimal(0));
subResult.add(headerfinancialStatementAmounts);
}
//ajoute liste
@@ -384,45 +390,76 @@
return result;
}
+
/**
* Permet de calculer le montant de tous les comptes contenu dans un mouvement
*/
public FinancialStatementAmounts financialStatementAmounts(FinancialStatement financialStatement, Date selectedBeginDate, Date selectedEndDate, TopiaContext topiaContext) throws LimaException{
FinancialStatementAmounts financialStatementAmounts =
new FinancialStatementAmountsImpl();
-
- FinancialStatement masterFinancialStatement = financialStatement.getMasterFinancialStatement();
- FinancialStatementWayEnum financialStatementWayEnum = FinancialStatementWayEnum.BOTH;
+ BigDecimal amount = new BigDecimal(0);
+ BigDecimal debitAmount = new BigDecimal(0);
+ BigDecimal creditAmount = new BigDecimal(0);
+ BigDecimal provisionDeprecationAmount = new BigDecimal(0);
+
+ FinancialStatement masterFinancialStatement =
+ financialStatement.getMasterFinancialStatement();
+ FinancialStatementWayEnum financialStatementWayEnum =
+ FinancialStatementWayEnum.BOTH;
if (masterFinancialStatement != null){
financialStatementWayEnum = masterFinancialStatement.getWay();
}
// DEBIT & CREDIT ACCOUNTS LIST
+ Amounts amounts = new AmountsImpl();
String accountsString = financialStatement.getAccounts();
- BigDecimal amount = accountsNumberListToAmount(accountsString,
- financialStatementWayEnum, FinancialStatementWayEnum.BOTH,
- selectedBeginDate,selectedEndDate, topiaContext);
+ if (accountsString != null && !accountsString.equals("")){
+ amounts = amountFromAccountList(accountsString,
+ selectedBeginDate, selectedEndDate, topiaContext);
+ debitAmount = debitAmount.add(amounts.getDebit());
+ creditAmount = creditAmount.add(amounts.getCredit());
+ }
// DEBIT ACCOUNTS LIST
String debitAccountsString = financialStatement.getDebitAccounts();
- BigDecimal debitAmount = accountsNumberListToAmount(debitAccountsString,
- financialStatementWayEnum, FinancialStatementWayEnum.DEBIT,
- selectedBeginDate, selectedEndDate, topiaContext);
+ if (debitAccountsString != null && !debitAccountsString.equals("")){
+ amounts = amountFromAccountList(debitAccountsString,
+ selectedBeginDate, selectedEndDate, topiaContext);
+ debitAmount = debitAmount.add(amounts.getDebit());
+ }
//CREDIT ACCOUNTS LIST
String creditAccountsString = financialStatement.getCreditAccounts();
- BigDecimal creditAmount = accountsNumberListToAmount(creditAccountsString,
- financialStatementWayEnum, FinancialStatementWayEnum.CREDIT,
- selectedBeginDate, selectedEndDate, topiaContext);
+ if (creditAccountsString != null && !creditAccountsString.equals("")){
+ amounts = amountFromAccountList(creditAccountsString,
+ selectedBeginDate, selectedEndDate, topiaContext);
+ creditAmount = creditAmount.add(amounts.getCredit());
+ }
// PROVISION & DEPRECATION
String provisionDeprecationAccountsString =
financialStatement.getProvisionDeprecationAccounts();
- BigDecimal provisionDeprecationAmount = accountsNumberListToAmount(
- provisionDeprecationAccountsString, financialStatementWayEnum,
- FinancialStatementWayEnum.BOTH, selectedBeginDate,
- selectedEndDate, topiaContext);
+ if (provisionDeprecationAccountsString != null && !provisionDeprecationAccountsString.equals("")){
+ amounts = amountFromAccountList(
+ provisionDeprecationAccountsString, selectedBeginDate,
+ selectedEndDate, topiaContext);
+ provisionDeprecationAmount =
+ provisionDeprecationAmount.add(amounts.getCredit());
+ provisionDeprecationAmount =
+ provisionDeprecationAmount.subtract(amounts.getDebit());
+ }
+ switch (financialStatementWayEnum) {
+ case BOTH:
+ amount = amount.add(debitAmount);
+ amount = amount.subtract(creditAmount);
+ amount = amount.abs();
+ break;
+ case CREDIT:
+ amount = amount.add(creditAmount);
+ amount = amount.subtract(debitAmount);
+ break;
+ case DEBIT:
+ amount = amount.add(debitAmount);
+ amount = amount.subtract(creditAmount);
+ }
- // set result
- amount = amount.add(creditAmount);
- amount = amount.add(debitAmount);
financialStatementAmounts.setGrossAmount(amount);
financialStatementAmounts.setLabel(financialStatement.getLabel());
financialStatementAmounts.setProvisionDeprecationAmount(
@@ -433,85 +470,57 @@
return financialStatementAmounts;
}
- /**
- * Calulate the amount of string contains a list of account
- * account number seperate by ',' use methode stringToList from account service
- * the list support '-' minus operation
- * @return
- */
- public BigDecimal accountsNumberListToAmount (String accountsNumberList, FinancialStatementWayEnum financialStatementWayEnum, FinancialStatementWayEnum debitCredit, Date selectedBeginDate, Date selectedEndDate, TopiaContext topiaContext) throws LimaException{
- BigDecimal amount = new BigDecimal(0);
+
+ public Amounts amountFromAccountList(String accountsNumberList, Date selectedBeginDate, Date selectedEndDate, TopiaContext topiaContext) throws LimaException{
+ Amounts amounts = new AmountsImpl();
+ BigDecimal debit = new BigDecimal(0);
+ BigDecimal credit = new BigDecimal(0);
+ Boolean substract = false;
try {
- if (accountsNumberList != null){
- //Remove Spaces
- AccountDAO accountDAO = LimaCallaoDAOHelper.getAccountDAO(topiaContext);
- String result = StringUtils.deleteWhitespace(accountsNumberList);
- StringTokenizer stQuote = new StringTokenizer(result, "-");
- while (stQuote.hasMoreTokens()) {
- String s = stQuote.nextToken();
- List<Account> accountsList = accountDAO.stringToListAccounts(s, false);
- BigDecimal resAmount = new BigDecimal(0);
-
- for (Account account : accountsList) {
- ReportsDatas reportsDatas = reportServiceLocal.
- generateAccountReportsWithTransaction(account, true,
- selectedBeginDate, selectedEndDate, topiaContext);
- BigDecimal tempAmount = new BigDecimal(0);
- //check the way of financialstatement amount
- //exemple compte de résultat : charge -> débit, produit -> crédit
- switch (financialStatementWayEnum) {
- case BOTH:
- tempAmount = tempAmount.add(reportsDatas.getAmountSolde());
- break;
- case DEBIT:
- tempAmount = tempAmount.add(reportsDatas.getAmountDebit());
- tempAmount = tempAmount.subtract(reportsDatas.getAmountCredit());
- break;
- case CREDIT:
- tempAmount = tempAmount.add(reportsDatas.getAmountCredit());
- tempAmount = tempAmount.subtract(reportsDatas.getAmountDebit());
- break;
- }
-
- //add the calcul in function of list type: allaccounts, debit or credit
- switch (debitCredit) {
- case BOTH:
- resAmount = resAmount.add(tempAmount);
- break;
- case DEBIT:
- if (reportsDatas.getSoldeDebit()){
- resAmount = resAmount.add(tempAmount);
- }
- break;
- case CREDIT:
- if (!reportsDatas.getSoldeDebit()){
- resAmount = resAmount.add(tempAmount);
- }
- break;
- }
-
- }
- if (amount.doubleValue() == 0){
- amount = resAmount;
- }
- //compte(s) précédé du signe -
- else {
- amount = amount.subtract(resAmount);
- }
+ AccountDAO accountDAO = LimaCallaoDAOHelper.getAccountDAO(topiaContext);
+ //Remove Spaces
+ String result = StringUtils.deleteWhitespace(accountsNumberList);
+ StringTokenizer stQuote = new StringTokenizer(result, "-");
+ while (stQuote.hasMoreTokens()) {
+ String s = stQuote.nextToken();
+ List<Account> accountsList = accountDAO.stringToListAccounts(s, false);
+ BigDecimal debitTemp = new BigDecimal(0);
+ BigDecimal creditTemp = new BigDecimal(0);
+ for (Account account : accountsList) {
+ ReportsDatas reportsDatas = reportServiceLocal.
+ generateAccountReportsWithTransaction(account, true,
+ selectedBeginDate, selectedEndDate, topiaContext);
+ if (reportsDatas.getSoldeDebit()){
+ debitTemp = debitTemp.add(reportsDatas.getAmountSolde());
+ }
+ else {
+ creditTemp = creditTemp.add(reportsDatas.getAmountSolde());
+ }
}
- }
- }catch (LimaException ex) {
- doCatch(topiaContext, ex, log);
- } catch (TopiaException e) {
- doCatch(topiaContext, e, log);
+ if (!substract){
+ debit = debitTemp;
+ credit = creditTemp;
+ }
+ //compte(s) précédé du signe -
+ else {
+ debit = debit.subtract(debitTemp);
+ credit = credit.subtract(creditTemp);
+ }
+ substract = true;
+ }
+ amounts.setCredit(credit);
+ amounts.setDebit(debit);
+ } catch (TopiaException e) {
+ doCatch(topiaContext, e, log);
}
- return amount;
+ return amounts;
}
@Override
public String checkFinancialStatementChart() throws LimaException {
- StringBuffer result = new StringBuffer(_("lima-business.financialstatement.check.warn"));
+ StringBuffer result =
+ new StringBuffer(_("lima-business.financialstatement.check.warn"));
TopiaContext transaction = null;
try {
transaction = beginTransaction();
@@ -567,10 +576,14 @@
LimaCallaoDAOHelper.getFinancialStatementDAO(topiaContext);
TopiaQuery query = financialStatementDAO.createQuery();
- String accountProperty = TopiaQuery.getProperty(FinancialStatement.ACCOUNTS);
- String creditAccountProperty = TopiaQuery.getProperty(FinancialStatement.CREDIT_ACCOUNTS);
- String debitAccountProperty = TopiaQuery.getProperty(FinancialStatement.DEBIT_ACCOUNTS);
- String provisionDeprecationProperty = TopiaQuery.getProperty(FinancialStatement.PROVISION_DEPRECATION_ACCOUNTS);
+ String accountProperty =
+ TopiaQuery.getProperty(FinancialStatement.ACCOUNTS);
+ String creditAccountProperty =
+ TopiaQuery.getProperty(FinancialStatement.CREDIT_ACCOUNTS);
+ String debitAccountProperty =
+ TopiaQuery.getProperty(FinancialStatement.DEBIT_ACCOUNTS);
+ String provisionDeprecationProperty =
+ TopiaQuery.getProperty(FinancialStatement.PROVISION_DEPRECATION_ACCOUNTS);
String likeCondition = " " + Op.LIKE + " '%"+accountNumber + "%'";
query.addWhere(accountProperty + likeCondition
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 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -197,20 +197,20 @@
LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaContext);
String financialPeriodProperty = TopiaQuery.getProperty(FinancialTransaction.FINANCIAL_PERIOD);
- String entryBookLabelProperty = TopiaQuery.getProperty(FinancialTransaction.ENTRY_BOOK);
- String accountProperty = TopiaQuery.getProperty(Entry.ACCOUNT);
-
+ String entryBookLabelProperty = TopiaQuery.getProperty(FinancialTransaction.ENTRY_BOOK);
TopiaQuery query = financialTransactionDAO.createQuery("T");
- query.addFrom(FiscalPeriod.class, "F")
- .addDistinct()
+ query.addDistinct()
+ .addOrder("T."+FinancialTransaction.TOPIA_CREATE_DATE)
+ .addFrom(FiscalPeriod.class, "F")
.addLeftJoin("T."+FinancialTransaction.ENTRY, "E", true)
.addWhere("T.amountCredit != T.amountDebit OR E.account = null OR T.entryBook = null")
.addInElements("T.financialPeriod", "F.financialPeriod")
.addEquals("F", fiscalPeriod)
// load lazy
- .addLeftJoin("E."+accountProperty,"A", true)
+ .addFetch("E."+Entry.ACCOUNT)
+ .addFetch("E."+Entry.LETTER)
.addLoad(financialPeriodProperty)
.addLoad(entryBookLabelProperty);
@@ -603,7 +603,7 @@
try {
topiaContext = beginTransaction();
LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext);
- int n = letterDAO.count()+1;
+ int n = letterDAO.count();
String res = numberToString(n, null);
//if already exist
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 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -200,7 +200,6 @@
// DAOs
AccountDAO accountDAO = LimaCallaoDAOHelper
.getAccountDAO(topiaContext);
- LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext);
EntryBookDAO entryBookDAO = LimaCallaoDAOHelper
.getEntryBookDAO(topiaContext);
List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods();
@@ -225,17 +224,18 @@
Date beginDate = fiscalPeriods.get(0).getBeginDate();
Date endDate = fiscalPeriods.get(nbFiscalPeriods-1).getEndDate();
- // if account not exist not export
- if (account == null) {
- throw new LimaBusinessException(
- _("lima-business.import.ebpmissingaccount",
- entryEBP.getCompte()));
- }
+ //if entry date have fiscalperiod open
+ if (date.compareTo(beginDate) < 0 || date.compareTo(endDate) > 0){
- else if (date.compareTo(beginDate) < 0 || date.compareTo(endDate) > 0){
-
result.append(_("lima-business.import.entriesoutofdatesrange",date));
}
+ // if account not exist not export
+ else if (account == null) {
+ throw new LimaBusinessException(
+ _("lima-business.import.ebpmissingaccount",
+ entryEBP.getCompte()));
+ }
+ //create entry
else {
entry.setAccount(account);
BigDecimal debit = new BigDecimal(entryEBP.getDebit());
@@ -265,7 +265,7 @@
entryBookService.createEntryBook(entryBook);
result.append(_("lima-business.import.entrybooknotexist",entryBook));
}
-
+ //create transaction
if (financialTransaction == null
|| !(date.equals(financialTransaction.getTransactionDate())
&& entryBook.getCode().equals(financialTransaction.getEntryBook().getCode()))) {
@@ -273,6 +273,7 @@
// update previous financial transaction before create
// new
if (financialTransaction != null) {
+ //call methode to calculte amounts
financialTransaction.setAmounts();
financialTransactionService
.updateFinancialTransactionWithTransaction(
@@ -373,8 +374,8 @@
masterAccount, account, topiaContext);
result.append(_("lima-business.import.accountadded", accountNumber, label));
}
- // else is account
- else {
+ // else if account and exclude account start with 0 (fix from error on EBP)
+ else if (!accountNumber.startsWith("0")){
// if account is class account : 1, 2, 3, 4, 5, 6, 7,…
int nbCharAccountNumber = accountNumber.length();
if (nbCharAccountNumber == 1) {
@@ -976,6 +977,7 @@
if (letter == null) {
letter = new LetterImpl();
letter.setCode(letterCode);
+ financialTransactionService.createLetter(letter);
}
} catch (TopiaException eeeTE) {
doCatch(topiaContext, eeeTE, log);
@@ -1093,7 +1095,6 @@
throws LimaException {
StringBuffer result = new StringBuffer();
try {
- LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext);
EntryBookDAO entryBookDAO = LimaCallaoDAOHelper
.getEntryBookDAO(topiaContext);
EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext);
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryEBPComparator.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryEBPComparator.java 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryEBPComparator.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -20,20 +20,38 @@
package org.chorem.lima.business.utils;
import java.io.Serializable;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Comparator;
+import java.util.Date;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.chorem.lima.beans.EntryEBP;
public class EntryEBPComparator implements Serializable, Comparator<EntryEBP>{
+ private static final Log log =
+ LogFactory.getLog(EntryEBPComparator.class);
+
private static final long serialVersionUID = 1L;
@Override
public int compare(EntryEBP o1, EntryEBP o2) {
-
- int result = o1.getDatEcr().compareTo(o2.getDatEcr());
+ int result = 0;
+ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+ try {
+ Date date1 = sdf.parse(o1.getDatEcr());
+ Date date2 = sdf.parse(o2.getDatEcr());
+ result = date1.compareTo(date2);
+ if(result==0){
+ result = o1.getJournal().compareTo(o2.getJournal());
+ }
+ } catch (ParseException eee) {
+ log.error("Can't parse date", eee);
+ }
+
- if(result==0)
- result = o1.getJournal().compareTo(o2.getJournal());
+
return result;
}
Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java
===================================================================
--- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -5,6 +5,8 @@
public class FinancialTransactionImpl extends FinancialTransactionAbstract {
+ private static final long serialVersionUID = 1L;
+
@Override
public void setAmounts() {
Modified: trunk/lima-callao/src/main/xmi/accounting.zargo
===================================================================
(Binary files differ)
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -59,7 +59,7 @@
@Override
public int getColumnCount() {
- return 7;
+ return 8;
}
@Override
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -57,7 +57,7 @@
@Override
public int getColumnCount() {
- return 6;
+ return 7;
}
@Override
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -317,7 +317,9 @@
@Override
public void notifyMethod(String serviceName, String methodName) {
- if (methodName.contains("importFinancialStatements") || methodName.contains("importAll") || methodName.contains("importAs")){
+ if (methodName.contains("FinancialStatements")
+ || methodName.contains("importAll")
+ || methodName.contains("importAs")){
refresh();
}
}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -222,7 +222,6 @@
}
//if entry
else {
- log.debug("not end");
//FIXME set value is doing after key pressed
// so update not terminated before get balanced
//Swing Worker stop the UI 500ms
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -56,7 +56,7 @@
public class FinancialTransactionSearchTableModel extends AbstractTableModel implements ServiceListener{
/** serialVersionUID. */
- private static final long serialVersionUID = 3914954536809622358L;
+ private static final long serialVersionUID = 1L;
/** log. */
private static final Log log = LogFactory
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -114,7 +114,7 @@
@Override
public void notifyMethod(String serviceName, String methodeName) {
- if (methodeName.contains("Account") || methodeName.contains("importAll") || methodeName.contains("importAsCSV")){
+ if (methodeName.contains("Account") || methodeName.contains("importAll") || methodeName.contains("importAs")){
refresh();
}
}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -131,7 +131,8 @@
@Override
public void notifyMethod(String serviceName, String methodeName) {
- if (methodeName.contains("EntryBook") || methodeName.contains("importAll") || methodeName.contains("importAs")){
+ if (methodeName.contains("EntryBook") || methodeName.contains("importAll")
+ || methodeName.contains("importAs") || methodeName.contains("importEntries")){
refresh();
}
}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -146,7 +146,9 @@
@Override
public void notifyMethod(String serviceName, String methodeName) {
- if (methodeName.contains("FiscalPeriod") || methodeName.contains("FinancialTransaction") || methodeName.contains("Entry") || methodeName.contains("importEntries") || methodeName.contains("importAll")){
+ if (methodeName.contains("FiscalPeriod") || methodeName.contains("FinancialTransaction")
+ || methodeName.contains("Entry") || methodeName.contains("importEntries")
+ || methodeName.contains("importAll") || methodeName.contains("importAs")){
refresh();
}
}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -123,7 +123,8 @@
@Override
public void notifyMethod(String serviceName, String methodeName) {
- if (methodeName.contains("FiscalPeriod") || methodeName.contains("importAll")){
+ if (methodeName.contains("FiscalPeriod") || methodeName.contains("importAll")
+ || methodeName.contains("importAs")){
refresh();
}
}
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 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2010-08-27 14:51:45 UTC (rev 3023)
@@ -176,12 +176,13 @@
DialogHelper.showMessageDialog(_("lima.importexport.import.terminated"));
}
}
- } catch (InterruptedException eeeIE) {
+ } catch (InterruptedException eee) {
if (log.isDebugEnabled()){
- log.debug("Can't get result message", eeeIE);
+ log.error("Can't get result message", eee);
}
- } catch (ExecutionException eeeEE) {
- DialogHelper.showMessageDialog(eeeEE.getMessage());
+ } catch (ExecutionException eee) {
+ DialogHelper.showMessageDialog(eee.getCause().getMessage());
+ log.error("Error on import", eee);
}
}
}.execute();
@@ -222,8 +223,6 @@
if (importExportMethode.getEncodingOption()){
encodingEnum = EncodingEnum.valueOfDescription((String) comboBox.getSelectedItem());
}
- log.debug(encodingEnum.getEncoding());
- log.debug(filePath);
}
return filePath;
@@ -244,7 +243,7 @@
}
catch (IOException eee) {
if (log.isDebugEnabled()){
- log.debug("Can't write file " + filePath, eee);
+ log.error("Can't write file " + filePath, eee);
}
}
}
@@ -263,7 +262,7 @@
}
catch (IOException eee) {
if (log.isDebugEnabled()){
- log.debug("Can't read file "+filePath, eee);
+ log.error("Can't read file "+filePath, eee);
}
}
return new String(datas);
Modified: trunk/lima-swing/src/main/resources/import/bcr_base.csv
===================================================================
--- trunk/lima-swing/src/main/resources/import/bcr_base.csv 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/resources/import/bcr_base.csv 2010-08-27 14:51:45 UTC (rev 3023)
@@ -1,7 +1,7 @@
"FNST";"BILAN ACTIF";"true";"";"";"";"";"true";"false";"";"BOTH"
"FNST";"Capital Souscrit non appelé";"false";"109";" ";" ";" ";"false";"false";"BILAN ACTIF";""
"FNST";"BILAN PASSIF";"true";"";"";"";"";"true";"false";"";"BOTH"
-"FNST";"CAPITAUX PROPRES";"true";"";"";"";"";"true";"false";"BILAN PASSIF";"BOTH"
+"FNST";"CAPITAUX PROPRES";"true";"";"";"";"";"true";"false";"BILAN PASSIF";"CREDIT"
"FNST";"COMPTE DE RESULTAT";"true";"";"";"";"";"false";"false";"";"BOTH"
"FNST";"Capital (dont versé?)";"false";"101, 108";"";"";"";"false";"false";"CAPITAUX PROPRES";""
"FNST";"CHARGES";"true";" ";" ";" ";" ";"true";"false";"COMPTE DE RESULTAT";"DEBIT"
@@ -13,7 +13,7 @@
"FNST";"Stocks et en-cours";"true";"";"";"";"";"false";"true";"ACTIF CIRCULANT";"BOTH"
"FNST";"Marchandises";"false";"37";"";"";"397";"false";"false";"Stocks et en-cours";""
"FNST";"Variations de stocks de march.";"false";"6037";"";"";"";"false";"false";"Coût d'achat des marchandises";""
-"FNST";"Achat de marchandises";"false";"607, 6097";"";"";"";"false";"false";"Coût d'achat des marchandises";""
+"FNST";"Achat de marchandises";"false";"607, 6087, 6097";"";"";"";"false";"false";"Coût d'achat des marchandises";""
"FNST";"Immobilisations incorporelles";"true";"";"";"";"";"false";"false";"ACTIF IMMOBILISÉ";"BOTH"
"FNST";"Frais d'établissement";"false";"201";"";"";"2801";"false";"false";"Immobilisations incorporelles";""
"FNST";"Frais de recherche et développement";"false";"203";"";"";"2803";"false";"false";"Immobilisations incorporelles";""
@@ -41,7 +41,7 @@
"FNST";"Valeurs mobilières de placement";"true";"";"";"";"";"false";"false";"ACTIF CIRCULANT";"BOTH"
"FNST";"Actions propres";"false";"502";"";"";"59";"false";"false";"Valeurs mobilières de placement";""
"FNST";"Autres titres";"false";"50 -502 -509";"";"";"59";"false";"false";"Valeurs mobilières de placement";""
-"FNST";"Disponibilités";"false";"53, 54";"51 -5181 -519";"";"";"false";"false";"ACTIF CIRCULANT";""
+"FNST";"Disponibilités";"false";"53, 54 -5181 -519";"51";"";"";"false";"false";"ACTIF CIRCULANT";""
"FNST";"Charges constatées d'avance";"false";"486";"";"";"";"false";"false";"ACTIF CIRCULANT";""
"FNST";"Instrument de trésorerie";"false";"";"52";"";"";"false";"false";"Valeurs mobilières de placement";""
"FNST";"Charges à répartir sur plusieurs exercices";"false";"481";"";"";"";"false";"false";"BILAN ACTIF";""
@@ -54,8 +54,8 @@
"FNST";"Réserve légale";"false";"1061";"";"";"";"false";"false";"Réserves";""
"FNST";"Réserves statutaires ou contractuelles";"false";"1063";"";"";"";"false";"false";"Réserves";""
"FNST";"Réserves réglementées";"false";"1062, 1064";"";"";"";"false";"false";"Réserves";""
-"FNST";"Report à nouveau";"false";"110-119";"";"";"";"false";"false";"CAPITAUX PROPRES";""
-"FNST";"RÉSULTAT DE L'EXERCICE (BÉNÉFICE OU PERTE)";"false";"7-6";"";"";"";"false";"false";"CAPITAUX PROPRES";""
+"FNST";"Report à nouveau";"false";"110,119";"";"";"";"false";"false";"CAPITAUX PROPRES";""
+"FNST";"RÉSULTAT DE L'EXERCICE (BÉNÉFICE OU PERTE)";"false";"7,6";"";"";"";"false";"false";"CAPITAUX PROPRES";""
"FNST";"Subventions d'investissement";"false";"13";"";"";"";"false";"false";"CAPITAUX PROPRES";""
"FNST";"Provisions réglementées";"false";"14";"";"";"";"false";"false";"CAPITAUX PROPRES";""
"FNST";"AUTRES FONDS PROPRES";"true";"";"";"";"";"true";"false";"BILAN PASSIF";"BOTH"
@@ -71,13 +71,11 @@
"FNST";"Emprunts et dettes financières diverses";"false";"165, 166, 1675, 168, 16883, 17, 426 -16881 -457";"";"45";"";"false";"false";"DETTES";""
"FNST";"Avances et acomptes reçues sur commandes en cours";"false";"4191";"";"";"";"false";"false";"DETTES";""
"FNST";"Ecarts de conversion passif";"false";"477";"";"";"";"false";"false";"BILAN PASSIF";""
-"FNST";"Coût d'achats de matières premières et autres approvisionnements";"true";"";"";"";"";"false";"true";"CHARGES D'EXPLOITATION";"DEBIT"
-"FNST";"Achats de matières premières et autres approvisionnements";"false";"601, 602, 608, 6091, 6092";"";"";"";"false";"false";"Coût d'achats de matières premières et autres approvisionnements";""
-"FNST";"Variation des stock d'approv.";"false";"6031, 6032";"";"";"";"false";"false";"Coût d'achats de matières premières et autres approvisionnements";""
-"FNST";"Autres achats et charges externes";"false";"604, 605, 606, 6094, 6095, 6096, 61, 62";"";"";"";"false";"false";"CHARGES D'EXPLOITATION";""
-"FNST";"Impôts, taxes et versements assimilés";"false";"63";"";"";"";"false";"false";"CHARGES D'EXPLOITATION";""
+"FNST";"Coût d'achats de matières premières et autres approvisionnements";"true";"";"";"";"";"false";"false";"CHARGES D'EXPLOITATION";"DEBIT"
+"FNST";"Achats de matières premières et autres approvisionnements";"false";"601, 6081, 6091";"";"";"";"false";"false";"Coût d'achats de matières premières et autres approvisionnements";""
+"FNST";"Variation des stock";"false";"6031, 6032";"";"";"";"false";"false";"Coût d'achats de matières premières et autres approvisionnements";""
"FNST";"Salaires et traitements";"false";"641, 644, 648";"";"";"";"false";"false";"CHARGES D'EXPLOITATION";""
-"FNST";"Charges sociales";"false";"645, 646, 647, 648";"";"";"";"false";"false";"CHARGES D'EXPLOITATION";""
+"FNST";"Charges sociales";"false";"645, 646, 647";"";"";"";"false";"false";"CHARGES D'EXPLOITATION";""
"FNST";"Dotations aux amortis. & provisions";"true";" ";" ";" ";" ";"false";"true";"CHARGES D'EXPLOITATION";"DEBIT"
"FNST";"Autres charges";"false";"65 -655";"";"";"";"false";"false";"CHARGES D'EXPLOITATION";""
"FNST";"Quotes-parts de résultat sur opérations faites en commun";"false";"655";"";"";"";"false";"false";"CHARGES";""
@@ -88,20 +86,13 @@
"FNST";"Charges nettes sur cessions de valeurs mobilières de placement";"false";"667";"";"";"";"false";"false";"Charges financières";""
"FNST";"Charges exceptionnelles";"true";"";"";"";"";"false";"true";"CHARGES";"DEBIT"
"FNST";"Sur opérations de gestion";"false";"671";"";"";"";"false";"false";"Charges exceptionnelles";""
-"FNST";"Sur opérations en capital";"false";"675, 678";"";"";"";"false";"false";"Charges exceptionnelles";""
-"FNST";"Dotations aux amortissements et aux provisions";"false";"687";"";"";"";"false";"false";"Charges exceptionnelles";""
"FNST";"Participation des salariés aux résultats";"false";"691";"";"";"";"false";"false";"CHARGES";""
"FNST";"Impôts sur les bénéfices";"false";"695, 697, 689, 698, 699, 789";"";"";"";"false";"false";"CHARGES";""
"FNST";"Produits d'exploitation";"true";"";"";"";"";"true";"false";"PRODUITS";"CREDIT"
-"FNST";"Montant net Chiffre d'affaires";"true";"";"";"";"";"false";"true";"Produits d'exploitation";"CREDIT"
-"FNST";"Production vendue (B&S)";"false";"70 -707 -708 -7097";"";"";"";"false";"false";"Montant net Chiffre d'affaires";""
-"FNST";"Ventes de marchandises";"false";"707, 708 -7097";"";"";"";"false";"false";"Montant net Chiffre d'affaires";""
+"FNST";"Production vendue";"true";"";"";"";"";"false";"true";"Produits d'exploitation";"CREDIT"
+"FNST";"Ventes";"false";"701, 702, 703, 707, 708, 7091, 7092, 7097, 7098";"";"";"";"false";"false";"Production vendue";""
+"FNST";"Travaux";"false";"704, 708, 7094, 7098";"";"";"";"false";"false";"Production vendue";""
"FNST";"Autres produits d'exploitation";"true";"";"";"";"";"false";"true";"Produits d'exploitation";"CREDIT"
-"FNST";"Production stockée";"false";"713";"";"";"";"false";"false";"Autres produits d'exploitation";""
-"FNST";"Production immobilisée";"false";"72, 73";"";"";"";"false";"false";"Autres produits d'exploitation";""
-"FNST";"Subventions d'exploitation";"false";"74";"";"";"";"false";"false";"Autres produits d'exploitation";""
-"FNST";"Reprises sur provisions (et amortissements), transferts de charges";"false";"781, 791";"";"";"";"false";"false";"Autres produits d'exploitation";""
-"FNST";"Autres produits";"false";"75 -755";"";"";"";"false";"false";"Autres produits d'exploitation";""
"FNST";"Quote-parts de résultat sur opérations faites en commun";"false";"755";"";"";"";"false";"false";"PRODUITS";""
"FNST";"Produits financiers";"true";"";"";"";"";"false";"true";"PRODUITS";"CREDIT"
"FNST";"De participations";"false";"761";"";"";"";"false";"false";"Produits financiers";""
@@ -116,19 +107,56 @@
"FNST";"Sur immobilisations : dotations aux provisions";"false";"6816";"";"";"";"false";"false";"Dotations aux amortis. & provisions";""
"FNST";"Sur actif circulant : dotations aux provisions";"false";"6817";"";"";"";"false";"false";"Dotations aux amortis. & provisions";""
"FNST";"Pour risques et charges : dotations aux provisions";"false";"6815";"";"";"";"false";"false";"Dotations aux amortis. & provisions";""
-"FNST";"Créances Clients et Comptes rattachés";"false";"410, 411, 413, 416, 418";"";"";"491";"false";"false";"Créances";""
+"FNST";"Créance d'exploitation";"true";"";"";"";"";"false";"false";"Créances";"BOTH"
+"FNST";"Créances clients et Comptes rattachés";"false";"410, 411, 413, 416, 418";"";"";"491";"false";"false";"Créance d'exploitation";""
+"FNST";"Créances diverses";"false";"4411, 4418, 462, 465, 4687";"443, 444, 451, 456, 458, 467 -4562";"";"";"false";"false";"Créances";""
"FNST";"Capital souscrit et appelé, non versé";"false";"4562";"";"";"";"false";"false";"Créances";""
-"FNST";"Dettes Fournisseurs et Comptes rattachés";"false";"400, 401, 403, 4081, 4088";"";"";"";"false";"false";"DETTES";""
-"FNST";"Dettes fiscales et sociales";"false";"421, 422, 424, 427, 4282, 4286, 43, 442, 4455, 4457, 44584, 44587, 446, 447, 4482, 4486, 457 -4387";"";"443, 444";"";"false";"false";"DETTES";""
-"FNST";"Dettes sur immobilisations et Comptes rattachés";"false";"269, 279, 404, 405, 4084, 4088";"";"";"";"false";"false";"DETTES";""
-"FNST";"Autres dettes";"false";"4196, 4197, 4198, 464, 4686, 509";"";"467, 478";"";"false";"false";"DETTES";""
-"FNST";"Instruments de trésorerie";"false";"";"";"52";"";"false";"false";"DETTES";""
+"FNST";"Dettes d'exploitation";"true";"";"";"";"";"false";"false";"DETTES";"BOTH"
+"FNST";"Dettes fournisseurs et comptes rattachés";"false";"400, 401, 403, 4081, 4088";"";"";"";"false";"false";"Dettes d'exploitation";""
+"FNST";"Dettes fiscales et sociales";"false";"421, 422, 424, 427, 4282, 4286, 431, 437, 4386, 4455, 4457, 446, 447, 4486";"";"4458";"";"false";"false";"Dettes d'exploitation";""
+"FNST";"Dettes diverses";"true";"";"";"";"";"false";"false";"DETTES";"BOTH"
+"FNST";"Dettes sur immobilisations et Comptes rattachés";"false";"269, 279, 404, 405, 4084";"";"";"";"false";"false";"Dettes diverses";""
+"FNST";"Dettes fiscales (impôts sur les bénéfices)";"false";"";"";"444";"";"false";"false";"Dettes diverses";""
+"FNST";"Sur opérations en capital";"false";"775, 777, 778";"";"";"";"false";"false";"Produits exceptionnels";""
+"FNST";"Prestation de services";"false";"705, 706, 708, 7095, 7096, 7098";"";"";"";"false";"false";"Production vendue";""
+"FNST";"Production stockée";"true";"";"";"";"";"false";"true";"Autres produits d'exploitation";"CREDIT"
+"FNST";"En-cours de production de biens";"false";"7133";"";"";"";"false";"false";"Production stockée";""
+"FNST";"En-cours de production de services";"false";"7134";"";"";"";"false";"false";"Production stockée";""
+"FNST";"Produits";"false";"7135";"";"";"";"false";"false";"Production stockée";""
+"FNST";"Reprises sur provisions (et amortissements), transferts de charges";"true";"";"";"";"";"false";"true";"Autres produits d'exploitation";"CREDIT"
+"FNST";"Reprises sur provisions (et amortissements)";"false";"781";"";"";"";"false";"false";"Reprises sur provisions (et amortissements), transferts de charges";""
+"FNST";"Transferts de charges";"false";"791";"";"";"";"false";"false";"Reprises sur provisions (et amortissements), transferts de charges";""
+"FNST";"Production exceptionnels sur opérations en capital";"true";"";"";"";"";"false";"true";"Autres produits d'exploitation";"CREDIT"
+"FNST";"Produits des cessions d'éléments d'actif";"false";"775";"";"";"";"false";"false";"Production exceptionnels sur opérations en capital";""
+"FNST";"Subvention d'investissement virées au résultat de l'exercice";"false";"778";"";"";"";"false";"false";"Production exceptionnels sur opérations en capital";""
+"FNST";"Autres approvisionnements";"false";"602, 6082, 6092";"";"";"";"false";"false";"Coût d'achats de matières premières et autres approvisionnements";""
+"FNST";"Autres charges et charges externes";"true";"";"";"";"";"false";"true";"CHARGES D'EXPLOITATION";"DEBIT"
+"FNST";"Achats de sous-traitance";"false";"604, 6084, 6094, 6095";"";"";"";"false";"false";"Autres charges et charges externes";""
+"FNST";"Achats non stockés de matières et fournitures";"false";"605, 606, 6085, 6086, 6096";"";"";"";"false";"false";"Autres charges et charges externes";""
+"FNST";"Services extérieurs";"true";"";"";"";"";"false";"true";"Autres charges et charges externes";"DEBIT"
+"FNST";"Personnel extérieur";"false";"621";"";"";"";"false";"false";"Services extérieurs";""
+"FNST";"Loyers en crédit-bail mobilier";"false";"6122";"";"";"";"false";"false";"Services extérieurs";""
+"FNST";"Loyers en crédit-bail immobilier";"false";"";"";"";"";"false";"false";"Services extérieurs";""
+"FNST";"Impôts, taxes et versements assimilés";"true";"";"";"";"";"false";"true";"CHARGES D'EXPLOITATION";"DEBIT"
+"FNST";"sur rémunérations";"false";"631, 633";"";"";"";"false";"false";"Impôts, taxes et versements assimilés";""
+"FNST";"autres";"false";"635, 637";"";"";"";"false";"false";"Impôts, taxes et versements assimilés";""
+"FNST";"sur opération en capital";"true";"";"";"";"";"false";"true";"Charges exceptionnelles";"DEBIT"
+"FNST";"valeurs comptables des éléments immobiliers et financiers cédés";"false";"675";"";"";"";"false";"false";"sur opération en capital";""
+"FNST";"Dotations aux amortissements et aux provisions";"true";"";"";"";"";"false";"true";"Charges exceptionnelles";"DEBIT"
+"FNST";"Dotations aux provisions réglementées";"false";"6872, 6873, 6874";"";"";"";"false";"false";"Dotations aux amortissements et aux provisions";""
+"FNST";"dotations aux amortissements et aux provisions";"false";"6871, 6875, 6876";"";"";"";"false";"false";"Dotations aux amortissements et aux provisions";""
"FNST";"Produits constatés d'avance";"false";"487";"";"";"";"false";"false";"DETTES";""
-"FNST";"Autres";"false";"4096, 4097, 4098, 425, 4287, 4387, 441, 4452, 4456, 44581, 44582, 44583, 44586, 4487, 462, 465, 467, 4687";"443, 444, 451, 455, 456, 458 -4562";"";"495, 496";"false";"false";"Créances";""
+"FNST";"Production immobilisée";"false";"72, 73";"";"";"";"false";"false";"Autres produits d'exploitation";""
+"FNST";"Subventions d'exploitation";"false";"74";"";"";"";"false";"false";"Autres produits d'exploitation";""
"FNST";"Autres";"false";"275, 2761, 27685, 27688";"";"";"2975, 2976";"false";"false";"Immobilisations financières";""
"FNST";"Autres";"false";"218";"";"";"2818";"false";"false";"Immobilisations corporelles";""
"FNST";"Autres";"false";"1068";"";"";"";"false";"false";"Réserves";""
"FNST";"Autres";"false";"";"";"";"";"false";"false";"AUTRES FONDS PROPRES";""
+"FNST";"Autres";"false";"4096, 4097, 4098, 425, 4287, 4387, 4417, 4452, 4456, 4487";"4458";"";"495, 496";"false";"false";"Créance d'exploitation";""
+"FNST";"Autres";"false";"4196, 4197, 4198, 4419";"";"";"";"false";"false";"Dettes d'exploitation";""
+"FNST";"Autres";"false";"424, 426, 4284, 4419, 442, 4486, 457, 464, 467, 4686, 509";"";"443, 451, 455, 456, 458";"";"false";"false";"Dettes diverses";""
+"FNST";"Autres";"false";"61, 62 -6122 -6125 -621";"";"";"";"false";"false";"Services extérieurs";""
+"FNST";"Autres";"false";"75 - 755";"";"";"";"false";"false";"Autres produits d'exploitation";""
"FNST";"Avances et acomptes";"false";"238";"";"";"";"false";"false";"Immobilisations corporelles";""
"FNST";"Sur opérations de gestion";"false";"771";"";"";"";"false";"false";"Produits exceptionnels";""
-"FNST";"Sur opérations en capital";"false";"775, 777, 778";"";"";"";"false";"false";"Produits exceptionnels";""
+"FNST";"autres";"false";"678";"";"";"";"false";"false";"sur opération en capital";""
Modified: trunk/lima-swing/src/main/resources/import/bcr_developed.csv
===================================================================
--- trunk/lima-swing/src/main/resources/import/bcr_developed.csv 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/resources/import/bcr_developed.csv 2010-08-27 14:51:45 UTC (rev 3023)
@@ -1,9 +1,9 @@
"FNST";"BILAN ACTIF";"true";"";"";"";"";"true";"false";"";"BOTH"
"FNST";"Capital Souscrit non appelé";"false";"109";" ";" ";" ";"false";"false";"BILAN ACTIF";""
"FNST";"BILAN PASSIF";"true";"";"";"";"";"true";"false";"";"BOTH"
-"FNST";"CAPITAUX PROPRES";"true";"";"";"";"";"true";"false";"BILAN PASSIF";"BOTH"
+"FNST";"CAPITAUX PROPRES";"true";"";"";"";"";"true";"false";"BILAN PASSIF";"CREDIT"
"FNST";"COMPTE DE RESULTAT";"true";"";"";"";"";"false";"false";"";"BOTH"
-"FNST";"Capital (dont versé?)";"false";"101, 108, 1013";"";"";"";"false";"false";"CAPITAUX PROPRES";""
+"FNST";"Capital (dont versé?)";"false";"101, 108";"";"";"";"false";"false";"CAPITAUX PROPRES";""
"FNST";"CHARGES";"true";" ";" ";" ";" ";"true";"false";"COMPTE DE RESULTAT";"DEBIT"
"FNST";"PRODUITS";"true";"";"";"";"";"true";"false";"COMPTE DE RESULTAT";"CREDIT"
"FNST";"ACTIF IMMOBILISÉ";"true";" ";" ";" ";" ";"true";"false";"BILAN ACTIF";"BOTH"
@@ -54,8 +54,8 @@
"FNST";"Réserve légale";"false";"1061";"";"";"";"false";"false";"Réserves";""
"FNST";"Réserves statutaires ou contractuelles";"false";"1063";"";"";"";"false";"false";"Réserves";""
"FNST";"Réserves réglementées";"false";"1062, 1064";"";"";"";"false";"false";"Réserves";""
-"FNST";"Report à nouveau";"false";"110-119";"";"";"";"false";"false";"CAPITAUX PROPRES";""
-"FNST";"RÉSULTAT DE L'EXERCICE (BÉNÉFICE OU PERTE)";"false";"7-6";"";"";"";"false";"false";"CAPITAUX PROPRES";""
+"FNST";"Report à nouveau";"false";"110,119";"";"";"";"false";"false";"CAPITAUX PROPRES";""
+"FNST";"RÉSULTAT DE L'EXERCICE (BÉNÉFICE OU PERTE)";"false";"7,6";"";"";"";"false";"false";"CAPITAUX PROPRES";""
"FNST";"Subventions d'investissement";"false";"13";"";"";"";"false";"false";"CAPITAUX PROPRES";""
"FNST";"Provisions réglementées";"false";"14";"";"";"";"false";"false";"CAPITAUX PROPRES";""
"FNST";"AUTRES FONDS PROPRES";"true";"";"";"";"";"true";"false";"BILAN PASSIF";"BOTH"
@@ -75,7 +75,7 @@
"FNST";"Achats de matières premières et autres approvisionnements";"false";"601, 6081, 6091";"";"";"";"false";"false";"Coût d'achats de matières premières et autres approvisionnements";""
"FNST";"Variation des stock";"false";"6031, 6032";"";"";"";"false";"false";"Coût d'achats de matières premières et autres approvisionnements";""
"FNST";"Salaires et traitements";"false";"641, 644, 648";"";"";"";"false";"false";"CHARGES D'EXPLOITATION";""
-"FNST";"Charges sociales";"false";"645, 646, 647, 648";"";"";"";"false";"false";"CHARGES D'EXPLOITATION";""
+"FNST";"Charges sociales";"false";"645, 646, 647";"";"";"";"false";"false";"CHARGES D'EXPLOITATION";""
"FNST";"Dotations aux amortis. & provisions";"true";" ";" ";" ";" ";"false";"true";"CHARGES D'EXPLOITATION";"DEBIT"
"FNST";"Autres charges";"false";"65 -655";"";"";"";"false";"false";"CHARGES D'EXPLOITATION";""
"FNST";"Quotes-parts de résultat sur opérations faites en commun";"false";"655";"";"";"";"false";"false";"CHARGES";""
@@ -157,3 +157,6 @@
"FNST";"Avances et acomptes";"false";"238";"";"";"";"false";"false";"Immobilisations corporelles";""
"FNST";"Sur opérations de gestion";"false";"771";"";"";"";"false";"false";"Produits exceptionnels";""
"FNST";"autres";"false";"678";"";"";"";"false";"false";"sur opération en capital";""
+"FNST";"Production immobilisée";"false";"72, 73";"";"";"";"false";"false";"Autres produits d'exploitation";""
+"FNST";"Subventions d'exploitation";"false";"74";;;;"false";"false";"Autres produits d'exploitation";""
+"FNST";"Autres";"false";"75 - 755";;;;"false";"false";"Autres produits d'exploitation";""
Modified: trunk/lima-swing/src/main/resources/import/bcr_shortened.csv
===================================================================
--- trunk/lima-swing/src/main/resources/import/bcr_shortened.csv 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/lima-swing/src/main/resources/import/bcr_shortened.csv 2010-08-27 14:51:45 UTC (rev 3023)
@@ -1,6 +1,6 @@
"FNST";"BILAN ACTIF";"true";"";"";"";"";"true";"false";"";"BOTH"
"FNST";"BILAN PASSIF";"true";"";"";"";"";"true";"false";"";"BOTH"
-"FNST";"CAPITAUX PROPRES";"true";"";"";"";"";"true";"false";"BILAN PASSIF";"BOTH"
+"FNST";"CAPITAUX PROPRES";"true";"";"";"";"";"true";"false";"BILAN PASSIF";"CREDIT"
"FNST";"COMPTE DE RESULTAT";"true";"";"";"";"";"false";"false";"";"BOTH"
"FNST";"Capital";"false";"101, 108";"";"";"";"false";"false";"CAPITAUX PROPRES";""
"FNST";"CHARGES";"true";" ";" ";" ";" ";"true";"false";"COMPTE DE RESULTAT";"DEBIT"
@@ -21,8 +21,8 @@
"FNST";"Réserves";"true";"";"";"";"";"false";"false";"CAPITAUX PROPRES";"BOTH"
"FNST";"Réserve légale";"false";"1061";"";"";"";"false";"false";"Réserves";""
"FNST";"Réserves réglementées";"false";"1064";"";"";"";"false";"false";"Réserves";""
-"FNST";"Report à nouveau";"false";"110-119";"";"";"";"false";"false";"CAPITAUX PROPRES";""
-"FNST";"RÉSULTAT DE L'EXERCICE (BÉNÉFICE OU PERTE)";"false";"7-6";"";"";"";"false";"false";"CAPITAUX PROPRES";""
+"FNST";"Report à nouveau";"false";"110,119";"";"";"";"false";"false";"CAPITAUX PROPRES";""
+"FNST";"RÉSULTAT DE L'EXERCICE (BÉNÉFICE OU PERTE)";"false";"7,6";"";"";"";"false";"false";"CAPITAUX PROPRES";""
"FNST";"Provisions réglementées";"false";"145, 146, 147, 148";"";"";"";"false";"false";"CAPITAUX PROPRES";""
"FNST";"Provisions pour risques et charges";"false";"15";"";"";"";"false";"false";"BILAN PASSIF";""
"FNST";"DETTES";"true";"";"";"";"";"true";"false";"BILAN PASSIF";"BOTH"
Added: trunk/src/site/resources/extras/exemple_ecritures.csv
===================================================================
--- trunk/src/site/resources/extras/exemple_ecritures.csv (rev 0)
+++ trunk/src/site/resources/extras/exemple_ecritures.csv 2010-08-27 14:51:45 UTC (rev 3023)
@@ -0,0 +1,96 @@
+"FTRC";"0";"23,03,2010 00:00:00";"60.0";"60.0";"01,03,2010 00:00:00";"31,03,2010 23:59:59";"VTE"
+"NTRY";"0";"vente de poisson";"60.0";"false";"";;"fact 2";;"707"
+"NTRY";"0";"vente de poisson";"60.0";"true";"";;"fact 2";;"410"
+"FTRC";"1";"23,03,2010 00:00:00";"60.0";"60.0";"01,03,2010 00:00:00";"31,03,2010 23:59:59";"BQE"
+"NTRY";"1";"encaissement vente";"60.0";"false";"";;"fact 2";;"410"
+"NTRY";"1";"encaissement vente";"60.0";"true";"";;"fact 2";;"530"
+"FTRC";"2";"23,03,2010 00:00:00";"40.0";"40.0";"01,03,2010 00:00:00";"31,03,2010 23:59:59";"VTE"
+"NTRY";"2";"vente de poisson";"40.0";"false";"";;"fact 1";;"707"
+"NTRY";"2";"vente de poisson";"40.0";"true";"";;"fact 1";;"410"
+"FTRC";"3";"23,03,2010 00:00:00";"10.0";"10.0";"01,03,2010 00:00:00";"31,03,2010 23:59:59";"ODT"
+"NTRY";"3";"impot et taxe";"10.0";"true";"";;"fact 700";;"633"
+"NTRY";"3";"impot et taxe";"10.0";"false";"";;"fact 700";;"400"
+"FTRC";"4";"23,04,2010 00:00:00";"10.0";"10.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"ACH"
+"NTRY";"4";"achat de poisson";"10.0";"true";"";;"fact 715";;"607"
+"NTRY";"4";"achat de poisson";"10.0";"false";"";;"fact 715";;"400"
+"FTRC";"5";"23,04,2010 00:00:00";"10.0";"10.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"BQE"
+"NTRY";"5";"achat de poisson";"10.0";"true";"";;"fact 715";;"400"
+"NTRY";"5";"achat de poisson";"10.0";"false";"";;"fact 715";;"530"
+"FTRC";"6";"23,04,2010 00:00:00";"30.0";"30.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"ACH"
+"NTRY";"6";"achat de poisson";"30.0";"true";"";;"fact 738";;"607"
+"NTRY";"6";"achat de poisson";"30.0";"false";"";;"fact 738";;"400"
+"FTRC";"7";"23,04,2010 00:00:00";"30.0";"30.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"BQE"
+"NTRY";"7";"achat de poisson";"30.0";"true";"";;"fact 738";;"400"
+"NTRY";"7";"achat de poisson";"30.0";"false";"";;"fact 738";;"530"
+"FTRC";"8";"23,03,2010 00:00:00";"10.0";"10.0";"01,03,2010 00:00:00";"31,03,2010 23:59:59";"BQE"
+"NTRY";"8";"impot et taxe";"10.0";"true";"";;"fact 700";;"400"
+"NTRY";"8";"impot et taxe";"10.0";"false";"";;"fact 700";;"530"
+"FTRC";"9";"23,05,2010 00:00:00";"50.0";"50.0";"01,05,2010 00:00:00";"31,05,2010 23:59:59";"BQE"
+"NTRY";"9";"réglements facts 326 532 603";"50.0";"true";"";;"piece de caisse";;"400"
+"NTRY";"9";"réglements facts 326 532 603";"50.0";"false";"";;"piece de caisse";;"530"
+"FTRC";"10";"23,05,2010 00:00:00";"20.0";"20.0";"01,05,2010 00:00:00";"31,05,2010 23:59:59";"ACH"
+"NTRY";"10";"achat de glace";"20.0";"true";"";;"fact 801";;"606"
+"NTRY";"10";"achat de glace";"20.0";"false";"";;"fact 801";;"400"
+"FTRC";"11";"23,05,2010 00:00:00";"20.0";"20.0";"01,05,2010 00:00:00";"31,05,2010 23:59:59";"BQE"
+"NTRY";"11";"achat de fourniture";"20.0";"true";"";;"fact 801";;"400"
+"NTRY";"11";"achat de fourniture";"20.0";"false";"";;"fact 801";;"530"
+"FTRC";"12";"23,05,2010 00:00:00";"30.0";"30.0";"01,05,2010 00:00:00";"31,05,2010 23:59:59";"ACH"
+"NTRY";"12";"achat frigo";"30.0";"true";"";;"fact 5328";;"215"
+"NTRY";"12";"achat frigo";"30.0";"false";"";;"fact 5328";;"400"
+"FTRC";"13";"23,05,2010 00:00:00";"20.0";"20.0";"01,05,2010 00:00:00";"31,05,2010 23:59:59";"BQE"
+"NTRY";"13";"reglement";"20.0";"true";"";;"piece de caisse";;"400"
+"NTRY";"13";"reglement";"20.0";"false";"";;"piece de caisse";;"530"
+"FTRC";"14";"23,06,2010 00:00:00";"80.0";"80.0";"01,06,2010 00:00:00";"30,06,2010 23:59:59";"VTE"
+"NTRY";"14";"ventede poisson";"80.0";"false";"";;"fact 5";;"707"
+"NTRY";"14";"ventede poisson";"80.0";"true";"";;"fact 5";;"410"
+"FTRC";"15";"23,06,2010 00:00:00";"40.0";"40.0";"01,06,2010 00:00:00";"30,06,2010 23:59:59";"BQE"
+"NTRY";"15";"reglement";"40.0";"false";"";;"fact 1";;"410"
+"NTRY";"15";"reglement";"40.0";"true";"";;"fact 1";;"530"
+"FTRC";"16";"07,01,2010 00:00:00";"200.0";"200.0";"01,01,2010 00:00:00";"31,01,2010 23:59:59";"ODT"
+"NTRY";"16";"Machine";"40.0";"true";"";;"statuts";;"215"
+"NTRY";"16";"Magasin";"100.0";"true";"";;"statuts";;"213"
+"NTRY";"16";"Capital";"200.0";"false";"";;"statuts";;"101"
+"NTRY";"16";"Camionnette";"50.0";"true";"";;"statuts";;"218"
+"NTRY";"16";"Caisse";"10.0";"true";"";;"statuts";;"530"
+"FTRC";"17";"23,04,2010 00:00:00";"50.0";"50.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"BQE"
+"NTRY";"17";"vente de poisson";"50.0";"false";"";;"fact 4";;"410"
+"NTRY";"17";"vente de poisson";"50.0";"true";"";;"fact 4";;"530"
+"FTRC";"18";"23,06,2010 00:00:00";"20.0";"20.0";"01,06,2010 00:00:00";"30,06,2010 23:59:59";"VTE"
+"NTRY";"18";"vente de poisson";"20.0";"false";"";;"fact 6";;"707"
+"NTRY";"18";"vente de poisson";"20.0";"true";"";;"fact 6";;"410"
+"FTRC";"19";"23,04,2010 00:00:00";"20.0";"20.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"BQE"
+"NTRY";"19";"vente de poisson";"20.0";"false";"";;"fact 3";;"410"
+"NTRY";"19";"vente de poisson";"20.0";"true";"";;"fact 3";;"530"
+"FTRC";"20";"23,06,2010 00:00:00";"50.0";"50.0";"01,06,2010 00:00:00";"30,06,2010 23:59:59";"ACH"
+"NTRY";"20";"achat de poisson";"50.0";"true";"";;"fact 910";;"607"
+"NTRY";"20";"achat de poisson";"50.0";"false";"";;"fact 910";;"400"
+"FTRC";"21";"23,04,2010 00:00:00";"20.0";"20.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"VTE"
+"NTRY";"21";"vente de poisson";"20.0";"false";"";;"fact 3";;"707"
+"NTRY";"21";"vente de poisson";"20.0";"true";"";;"fact 3";;"410"
+"FTRC";"22";"17,02,2010 00:00:00";"10.0";"10.0";"01,02,2010 00:00:00";"28,02,2010 23:59:59";"ACH"
+"NTRY";"22";"Achat poisson port de Lorient";"10.0";"true";"";;"FACT 603";;"607"
+"NTRY";"22";"Achat poisson port de Lorient";"10.0";"false";"";;"FACT 603";;"400"
+"FTRC";"23";"23,07,2010 00:00:00";"10.0";"10.0";"01,07,2010 00:00:00";"31,07,2010 23:59:59";"ODT"
+"NTRY";"23";"dotation aux amortissements";"10.0";"true";"";;"inventaire";;"68112"
+"NTRY";"23";"amortissement du matériel de transport";"10.0";"false";"";;"inventaire";;"281"
+"FTRC";"24";"28,02,2010 00:00:00";"30.0";"30.0";"01,02,2010 00:00:00";"28,02,2010 23:59:59";"ACH"
+"NTRY";"24";"Achat poisson port de Lorient";"30.0";"true";;;"FACT 532";;"607"
+"NTRY";"24";"Achat poisson port de Lorient";"30.0";"false";;;"FACT 532";;"400"
+"FTRC";"25";"28,02,2010 00:00:00";"10.0";"10.0";"01,02,2010 00:00:00";"28,02,2010 23:59:59";"ACH"
+"NTRY";"25";"Achat poisson port de Lorient";"10.0";"true";;;"FACT 326";;"607"
+"NTRY";"25";"Achat poisson port de Lorient";"10.0";"false";;;"FACT 326";;"400"
+"FTRC";"26";"23,04,2010 00:00:00";"50.0";"50.0";"01,04,2010 00:00:00";"30,04,2010 23:59:59";"VTE"
+"NTRY";"26";"vente de poisson";"50.0";"false";;;"fact 4";;"707"
+"NTRY";"26";"vente de poisson";"50.0";"true";;;"fact 4";;"410"
+"FTRC";"27";"23,06,2010 00:00:00";"20.0";"20.0";"01,06,2010 00:00:00";"30,06,2010 23:59:59";"ACH"
+"NTRY";"27";"achat de sachet";"20.0";"true";;;"fact 011475";;"601"
+"NTRY";"27";"achat de sachet";"20.0";"false";;;"fact 011475";;"400"
+"FTRC";"28";"23,06,2010 00:00:00";"20.0";"20.0";"01,06,2010 00:00:00";"30,06,2010 23:59:59";"BQE"
+"NTRY";"28";"achat de sachet - réglement";"20.0";"true";"";;"fact 011475";;"400"
+"NTRY";"28";"achat de sachet - réglement";"20.0";"false";"";;"fact 011475";;"530"
+"FTRC";"29";"30,07,2010 00:00:00";"10.0";"10.0";"01,07,2010 00:00:00";"31,07,2010 23:59:59";"ODT"
+"NTRY";"29";"stock sachet";"10.0";"true";;;"inventaire";;"326"
+"NTRY";"29";"variation de stocks sachet";"10.0";"false";;;"inventaire";;"6031"
+"FTRC";"30";"30,07,2010 00:00:00";"10.0";"10.0";"01,07,2010 00:00:00";"31,07,2010 23:59:59";"ODT"
+"NTRY";"30";"charges de personnel";"10.0";"true";;;"inventaire";;"6411"
+"NTRY";"30";"paiement personel - caisse";"10.0";"false";;;"inventaire";;"530"
Added: trunk/src/site/resources/extras/puzzle.svg
===================================================================
--- trunk/src/site/resources/extras/puzzle.svg (rev 0)
+++ trunk/src/site/resources/extras/puzzle.svg 2010-08-27 14:51:45 UTC (rev 3023)
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="600px" height="320px" viewBox="0 0 600 320" enable-background="new 0 0 600 320" xml:space="preserve">
+<g>
+ <g>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.7925" stroke-linecap="round" d="
+ M112.569,20.437c6.155-2.797,29.762-10.26,32.449-2.869c0.845,2.326-5.011,9.366-2.778,13.232
+ c6.918,11.984,32.843,9.294,33.967-1.857c0.456-4.525-7.024-9.375-3.784-13.443c1.181-1.482,15.286-0.389,16.419-0.247
+ c6.44,0.806,11.306,2.789,17.122,5.185"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.7821" stroke-linecap="round" d="
+ M205.964,20.437c0.624,1,35.747,7.914,35.126,2.387c-0.647-5.765-8.141-11.704-1.897-17.257
+ c12.795-11.378,35.977-1.403,29.539,12.976c-5.904,13.188,23.637,2.929,31.571,1.895"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.7702" stroke-linecap="round" d="
+ M300.304,20.437c1.77-1.348,26.947-10.338,31.033-4.608c2.691,3.775-6.24,9.711,0.326,17.556
+ c3.111,3.716,26.02,11.374,31.087-1.951c1.731-4.55-6.125-11.999-3.263-15.918c2.418-3.312,31.892,2.371,33.739,4.686"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.7476" stroke-linecap="round" d="
+ M393.227,20.2c2.115-0.32,10.13,3.37,17.884,4.376c6.304,0.818,19.26,2.505,16.15-5.99c-3.647-9.96-4.657-13.421,6.492-16.441
+ c12.948-3.508,26.895,3.809,22.713,15.454c-5.135,14.305,19.572,4.743,31.099,2.602"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.8067" stroke-linecap="round" d="
+ M487.564,20.2c9.936-3.858,21.351-6.935,31.896-3.975c-10.879,15.521,10.356,30.142,26.081,19.855
+ c11.851-7.753-2.489-15.099,1.673-20.565c3.323-4.364,31.891,3.197,32.163,3.542c2.761,3.483-11.096,40.242,2.049,34.901
+ c10.608-4.31,14.398-3.363,17.267,5.518c3.206,9.93-1.069,24.835-11.462,24.633c-3.396-0.066-6.644-4.825-9.843-2.78
+ c-5.286,3.38,1.114,20.411,3.101,32.502"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.7476" stroke-linecap="round" d="
+ M18.938,207.698c-0.32-2.115,3.37-10.13,4.376-17.884c0.818-6.304,2.504-19.261-5.991-16.15
+ c-9.959,3.647-13.42,4.657-16.441-6.492c-3.508-12.947,3.809-26.895,15.454-22.713c14.305,5.135,4.744-19.573,2.602-31.1"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.8126" stroke-linecap="round" d="
+ M18.938,113.359c-3.857-9.935-6.934-21.35-3.975-31.895c15.521,10.879,30.143-10.357,19.855-26.082
+ c-7.753-11.85-15.099,2.49-20.565-1.673c-4.364-3.322,3.198-31.89,3.542-32.162c3.483-2.762,40.242,11.096,34.902-2.049
+ C48.387,8.891,49.333,5.101,58.215,2.232c9.93-3.207,24.834,1.068,24.632,11.463c-0.066,3.395-4.825,6.643-2.78,9.841
+ c3.38,5.287,20.412-1.113,32.502-3.1"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9763" stroke-linecap="round" d="
+ M18.938,113.359c3.433,0.549,26.396-10.062,31.188-3.775c3.299,4.327-7.687,17.995,7.39,21.453
+ c6.439,1.477,35.435,0.313,21.537-16.107c-10.004-11.818,29.885-4.154,32.573-2.041"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.961" stroke-linecap="round" d="
+ M111.626,112.889c2.62-9.377,7.243-14.898,5.998-31.139c-0.51-6.649-12.35,2.566-16.185,1.371
+ c-12.182-3.801-10.102-33.043,6.082-33.215c9.089-0.098,11.295,4.568,9.243-15.128c-0.277-2.665-2.868-8.076-4.195-14.342"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9567" stroke-linecap="round" d="
+ M205.964,20.437c1.816,1.922-10.956,25.455-5.19,31.94c6.147,6.912,18.266-11.694,23.339,8.287
+ c1.632,6.428,0.018,20.425-7.443,23.196c-7.114,2.642-10.618-5.024-14.711-1.687c-3.84,3.132,0.096,14.949,0.457,17.169
+ c0.701,4.308,1.923,9.358,3.549,13.546"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9486" stroke-linecap="round" d="
+ M205.964,112.889c8.781-2.143,29.122-7.715,32.284-3.089c2.89,4.228-7.179,12.34,2.291,19.33
+ c6.077,4.485,19.318,2.448,22.797,1.168c11.203-4.123,2.916-5.28,1.665-19.261c-0.514-5.753,31.528-0.443,34.358,2.794"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="2.8942" stroke-linecap="round" d="
+ M299.36,113.831c0.236-0.079,0.472-0.157,0.707-0.235"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9427" stroke-linecap="round" d="
+ M393.227,20.2c-1.374,5.997-3.719,12.398-4.471,18.766c0.027-0.225-1.826,13.276-0.031,14.686
+ c2.585,2.028,14.651-3.731,17.15-2.575c5.601,2.591,10.837,28.531-2.168,32.84c-5.998,1.987-13.4-6.856-14.95,0.334
+ c-1.59,7.383,2.913,21.171,4.941,28.639"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9652" stroke-linecap="round" d="
+ M393.698,112.889c6.645-1.379,12.054-3.559,14.757-3.999c4.448-0.726,13.604-2.911,16.24-0.249
+ c6.98,7.051-11.271,17.084,10.175,22.396c7.523,1.863,22.672,0.547,22.5-10.464c-0.102-6.565-7.465-7.682-2.883-12.622
+ c2.781-2.998,30.519,3.668,32.842,5.173"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="2.8942" stroke-linecap="round" d="
+ M487.329,113.124c0.235-0.079,0.473-0.157,0.708-0.235"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9154" stroke-linecap="round" d="
+ M300.304,20.437c1.91,8.407,7.834,28.434,3.104,31.373c-2.141,1.33-3.746-1.894-8.431-2.353
+ c-19.992-1.955-13.671,31.447-6.322,33.461c7.159,1.963,10.695-6.845,15.436-3.391c2.343,1.708,0.281,17.947,0.407,16.188
+ c-0.231,3.229-2.572,8.779-4.431,17.881"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9384" stroke-linecap="round" d="
+ M300.067,113.596c1.214,2.08,37.851,8.974,33.971,1.507c-11.193-21.544,18.189-26.554,27.773-14.821
+ c5.306,6.494-3.987,12.434,0.229,17.557c4.094,4.971,28.536-4.005,31.658-4.949"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9831" stroke-linecap="round" d="
+ M487.564,20.2c-0.548,3.433,10.063,26.396,3.776,31.188c-4.327,3.299-17.994-7.688-21.453,7.39
+ c-1.483,6.472-0.301,35.425,16.106,21.537c11.82-10.004,4.155,29.885,2.043,32.573"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="2.8942" stroke-linecap="round" d="
+ M111.626,112.889c0.079,0.235,0.157,0.471,0.236,0.707"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9576" stroke-linecap="round" d="
+ M111.862,113.596c3.774-0.121,37.778,11.95,34.148-0.52c-2.962-10.18-6.495-13.614,4.903-17.393
+ c6.951-2.305,22.412-0.671,25.085,7.438c1.275,3.867-5.393,13.74-0.555,14.705c7.981,1.594,19.421-1.215,30.364-4.467"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="2.8942" stroke-linecap="round" d="
+ M205.808,113.359c0.052-0.156,0.104-0.314,0.157-0.471"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.8808" stroke-linecap="round" d="
+ M111.626,207.227c6.562-2.337,28.98-8.865,32.284-4.031c3.967,5.804-8.897,15.057,6.06,21.236
+ c5.71,2.358,20.13,2.504,24.135-3.465c3.139-4.678-6.508-13.627-2.376-18.7c3.362-4.129,29.896,3.773,34.079,4.489"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9758" stroke-linecap="round" d="
+ M205.808,206.756c-1.114-1.516,10.428-28.44,4.395-33.312c-4.999-4.037-8.467,5.103-15.411,3.13
+ c-15.224-4.323-4.753-31.869,0.469-33.717c4.071-1.439,11.221,4.559,14.671,1.504c3.109-2.754-2.161-25.728-4.124-31.002"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9766" stroke-linecap="round" d="
+ M300.067,207.462c1.753,1.635,23.625-11.175,30.29-4.483c3.711,3.726-1.06,4.387-1.032,9.574
+ c0.093,17.719,29.807,16.169,33.46,6.323c3.191-8.607-7.56-11.223-2.634-16.586c2.021-2.2,22.575,2.268,22.833,2.331
+ c1.661,0.406,7.287,0.889,10.715,2.605"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="2.8942" stroke-linecap="round" d="
+ M393.698,207.227c0.157-0.053,0.314-0.104,0.472-0.157"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.8808" stroke-linecap="round" d="
+ M394.17,207.069c1.109-6.185,3.672-12.227,4.47-18.372c0.392-3.015,1.699-17.07-2.08-16.771c-9.47,0.75-17.292,11.149-21.01-5.871
+ c-1.667-7.625,0.404-18.833,6.497-22.239c6.652-3.72,15.21,5.499,16.593-1.347c1.522-7.539-1.923-21.927-4.941-29.581"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.8021" stroke-linecap="round" d="
+ M580.488,207.227c0.824-0.659,10.743-30.466,4.297-34.181c-1.935-1.116-10.971,4.601-12.771,4.424
+ c-10.148-1-9.716-19.771-8.974-22.932c1.489-6.341,4.407-11.217,9.885-11.893c-0.334,0.041,11.628,4.939,12.477,1.967
+ c2.328-8.152-1.088-22.314-4.914-30.781"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9832" stroke-linecap="round" d="
+ M580.488,113.831c-8.747,1.837-10.785,4.589-22.641,4.62c-18.859,0.049,1.916-11.966-11.942-20.874
+ c-7.508-4.827-24.858-3.586-27.896,4.604c-1.872,5.046,8.351,15.448,1.166,16.664c-14.821,2.508-20.789-3.611-31.138-5.957"/>
+
+ <line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="2.8942" stroke-linecap="round" x1="393.698" y1="112.889" x2="393.698" y2="112.889"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9774" stroke-linecap="round" d="
+ M394.17,207.069c1.515-1.113,28.44,10.429,33.311,4.395c4.037-4.999-5.102-8.467-3.13-15.41
+ c4.323-15.225,31.871-4.754,33.717,0.469c1.439,4.07-4.559,11.221-1.503,14.67c2.753,3.109,25.727-2.161,31-4.123"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9542" stroke-linecap="round" d="
+ M487.564,207.069c0.961-4.867-11.193-26.125-3.755-31.802c3.618-2.763,10.649,2.982,13.47,2.191
+ c9.686-2.711,9.701-19.536,7.514-25.562c-2.82-7.768-2.613-9.106-16.429-4.828c-12.179,3.771-2.435-26.246-1.035-33.945"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9419" stroke-linecap="round" d="
+ M18.938,207.698c5.998,1.374,12.398,3.718,18.766,4.471c-0.224-0.027,13.277,1.826,14.686,0.031
+ c2.028-2.585-3.731-14.651-2.575-17.15c2.591-5.601,28.53-10.837,32.839,2.168c1.988,5.998-6.856,13.401,0.334,14.95
+ c7.382,1.591,21.171-2.913,28.638-4.941"/>
+
+ <line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="2.8942" stroke-linecap="round" x1="111.626" y1="207.227" x2="111.626" y2="207.227"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9523" stroke-linecap="round" d="
+ M111.626,207.227c-1.377-6.645-3.558-12.054-3.998-14.757c-0.726-4.448-2.911-13.604-0.25-16.24
+ c7.05-6.979,17.083,11.271,22.396-10.175c1.863-7.523,0.546-22.672-10.463-22.5c-6.565,0.103-7.682,7.466-12.622,2.883
+ c-2.999-2.78,3.667-30.518,5.172-32.842"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="2.8942" stroke-linecap="round" d="
+ M205.808,206.756c0.052,0.156,0.104,0.313,0.157,0.471"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9648" stroke-linecap="round" d="
+ M205.964,207.227c2.829,0.69,36.763,12.077,34.385,0.188c-2.095-10.474-5.819-10.568,0.19-15.486
+ c5.754-4.709,26.764-4.347,29.848,5.289c1.08,3.372-4.471,10.761-2.468,13.799c3.519,5.334,28.782-2.259,31.44-3.79"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9339" stroke-linecap="round" d="
+ M299.36,207.227c-2.466-11.109-10.088-35.88,1.559-30.908c21.438,9.151,22.406-32.744,6.318-32.072
+ c-6.701,0.278-7.689,6.343-11.865,3.127c-4.947-3.812,3.404-28.087,3.987-33.542"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.7683" stroke-linecap="round" d="
+ M393.227,300.857c2.324,0.646,29.727-10.943,32.988-1.283c0.524,1.554-2.713,6.293-2.695,6.196
+ c-1.557,8.183,4.838,11.703,10.233,13.143c4.297,1.146,22.595,2.328,23.549-8.824c0.445-5.218-7.319-9.101-3.75-13.461
+ c4.372-5.34,32.56,4.99,34.013,4.229"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9423" stroke-linecap="round" d="
+ M487.564,300.857c1.297-5.793,3.707-11.939,4.471-17.822c0.448-3.454,1.664-17.066-2.081-16.77
+ c-14.194,1.125-13.671,9.194-18.404-0.467c-1.706-3.482-6.237-24.751,5.534-28.657c3.623-1.202,11.039,4.389,13.99,2.415
+ c5.538-3.706-1.959-25.908-3.037-32.33"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="2.8942" stroke-linecap="round" d="
+ M488.037,207.227c-0.158-0.053-0.315-0.104-0.473-0.157"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.8025" stroke-linecap="round" d="
+ M18.938,207.698c-0.915,1.813-12.947,38.019,1.172,33.059c20.396-7.165,18.947,16.769,14.676,24.946
+ c-9.442,18.081-25.282-11.36-20.796,19.684c2.647,18.317,4.734,13.495,20.71,11.095c8.521-1.28,17.503-1.638,15.167,6.02
+ c-6.256,20.509,19.905,19.297,26.811,14.709c11.354-7.544-3.514-14.304,1.407-20.584c3.879-4.952,32.02,4.592,34.484,3.996"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.8427" stroke-linecap="round" d="
+ M205.964,300.622c4.623-0.185,35.752-11.611,31.637,1.879c-6.445,21.128,21.418,18.292,26.811,14.709
+ c11.917-7.918-3.409-14.438,1.407-20.584c2.659-3.394,27.964,2.534,34.485,3.996"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.888" stroke-linecap="round" d="
+ M300.304,300.622c2.67-11.128,6.319-22.765,3.344-34.184c-7.716-0.787-8.166,6.646-14.475,4.416
+ c-12.481-4.413-9.976-35.345,6.083-33.215c3.682,0.488,6.765,2.708,8.072,1.919c6.158-3.721-3.209-28.396-3.26-32.097"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="2.8942" stroke-linecap="round" d="
+ M300.067,207.462c-0.235-0.078-0.471-0.157-0.707-0.235"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9214" stroke-linecap="round" d="
+ M111.626,207.227c1.399,5.645,4.053,10.175,4.941,14.758c1.013,5.229,2.757,13.731,0.249,16.239
+ c-5.849,5.85-18.911-9.225-21.744,9.387c-1.823,11.979-0.282,29.147,18.288,19.49c9.196-4.783,0.853,28.509-0.791,33.521"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.7586" stroke-linecap="round" d="
+ M112.569,300.622c0.291,0.654,30.637,10.824,34.182,4.29c1.158-2.135-4.717-12.959-3.6-15.568c5.319-12.416,32.65-7.217,34,3.716
+ c-0.176-1.429-4.593,11.726-1.966,12.477c8.196,2.341,23.509-1.56,30.78-4.914"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9682" stroke-linecap="round" d="
+ M205.964,300.622c-1.897-7.095-4.989-14.15-4.713-24.528c0.293-11.054,3.661-4.46,10.04-4.493
+ c16.363-0.086,17.76-29.217,6.323-33.459c-8.383-3.109-11.226,7.556-16.585,2.633c-2.059-1.891,2.206-22.323,2.331-22.833
+ c0.566-2.316,0.542-5.763,2.605-10.715"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.8061" stroke-linecap="round" d="
+ M300.304,300.622c2.797,2.289,9.91,3.469,14.955,4.249c3.539,0.546,19.878,2.876,19.072-1.058
+ c-1.872-9.145-8.687-16.655,6.025-20.539c6.364-1.681,20.446-0.51,23.427,7.339c1.362,3.588-4.643,14.373-0.839,14.999
+ c8.886,1.465,23.641-1.513,30.282-4.755"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9609" stroke-linecap="round" d="
+ M393.227,300.857c1.564-4.043-11.484-25.358-3.75-31.227c4.175-3.166,17.993,7.625,21.427-7.352
+ c2.968-12.94-2.204-32.87-16.178-21.583c-10.637,8.591-4.913-27.192-1.027-33.47"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.79" stroke-linecap="round" d="
+ M487.564,300.857c2.549,0.859,9.52,3.886,16.941,4.849c1.393,0.181,15.623,1.431,16.753-0.11
+ c3.517-4.798-7.626-11.46-0.921-18.862c5.668-6.258,27.788-6.493,31.115,3.848c0.858,2.67-4.201,14.465-0.774,15.031
+ c8.464,1.401,17.597,0.172,30.21-5.049c-0.255-1.156-10.425-29.557-2.316-32.397c6.688-2.342,8.761,7.748,16.498,0.817
+ c7.121-6.378,6.782-27.575-2.684-30.864c-2.119-0.737-13.812,5.162-15.964,3.503c-3.443-2.653,2.695-28.266,4.065-34.396"/>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.9564" stroke-linecap="round" d="
+ M580.488,207.227c-1.922,1.815-25.456-10.957-31.94-5.19c-6.912,6.146,11.694,18.267-8.287,23.34
+ c-6.428,1.631-20.425,0.018-23.195-7.443c-2.643-7.114,5.023-10.618,1.686-14.711c-3.132-3.842-14.949,0.096-17.169,0.457
+ c-4.309,0.699-9.357,1.922-13.545,3.548"/>
+ </g>
+</g>
+</svg>
Added: trunk/src/site/resources/extras/puzzle_icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/extras/puzzle_icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/export_ebp_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/export_ebp_1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/export_ebp_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/export_ebp_2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/export_ebp_3.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/export_ebp_3.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/export_ebp_4.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/export_ebp_4.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/export_ebp_5.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/export_ebp_5.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/export_ebp_6.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/export_ebp_6.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/export_ebp_7.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/export_ebp_7.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_import_charset.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_import_charset.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_import_limaall.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_import_limaall.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_lettering.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_lettering.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_open_account.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_open_account.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_open_entrybook.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_open_entrybook.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_open_fiscalperiod.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_open_fiscalperiod.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_open_identity.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_open_identity.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_open_welcome.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_open_welcome.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_splashscreen.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_splashscreen.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/rst/assistant.rst
===================================================================
--- trunk/src/site/rst/assistant.rst (rev 0)
+++ trunk/src/site/rst/assistant.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -0,0 +1,76 @@
+============
+Assistant
+============
+
+Au premier démarrage de LIMA un assistant vous guide pour créer votre comptabilité.
+Il est également possible de charger une précédente sauvegarde de LIMA au format CSV.
+Dans le cas par exemple d'une réinstallation du logiciel.
+Ou de fermer l'assistant pour créer sa comptabilité sans l'assistant.
+
+
+--------------------------------------
+Les différentes étapes de l'assistant
+--------------------------------------
+
+~~~~~~~~~~~~~~~~~
+Fiche d'identité
+~~~~~~~~~~~~~~~~~
+
+Vous pouvez renseigner les coordonnées de votre entreprise dans les champs
+correspondants. Ces informations permettent de personnalisé vos documents lors
+de l'impression des rapports PDF ou HTML : journaux, grand-livre, balance, …
+Ces coordonnées sont modifiables par la suite dans le menu Fichier -> Identité
+
+.. image:: screens/lima_open_identity.png
+
+
+~~~~~~~~~~~~~~~~~
+Plan comptable
+~~~~~~~~~~~~~~~~~
+
+Par défaut LIMA propose les trois plans comptables de la norme française :
+- abrégé ;
+- de base ;
+- développé.
+
+Choisissez celui qui correspond à votre activité.
+Ce plan comptable est modifiable à volonté : ajout, modification, suppression de compte.
+Menu Structure -> Plan comptable
+
+Il est également possible d'importer un plan comptable au format LIMA CSV, ou provenant
+du logiciel EBP. Pour plus d'information sur le format d'import/export EBP.
+Cf. (..IMPORT-EXPORT_)
+
+.. _IMPORT-EXPORT: ../importexport.rst
+
+Lors de l'import d'un plan comptable abregé, de base, ou développé. Le générateur
+de bilan / compte de résultat, charge le plan de passage des compte au poste
+correspondant (appelé BCR dans lima). Pour un import externe, le plan BCR chargé
+par défaut est celui de base.
+
+.. image:: screens/lima_open_account.png
+
+
+~~~~~~~~~~~~~~~~~
+Journaux
+~~~~~~~~~~~~~~~~~
+
+Par défaut les quatres journaux les plus courants sont proposés au chargement :
+- achat ;
+- vente ;
+- opérations diverses ;
+- trésorerie.
+
+Il est possible d'ajouter, modifier et supprimer des journaux en fonction de votre activité.
+Menu Structure -> Journaux
+
+.. image:: screens/lima_open_entrybook.png
+
+~~~~~~~~~~~~~~~~~
+Exercice
+~~~~~~~~~~~~~~~~~
+
+Séléctionner la date et fin du nouvel exercice, une fois crée un exercice ne
+peut-être supprimé ou sa date modifiée.
+
+.. image:: screens/lima_open_fiscalperiod.png
\ No newline at end of file
Modified: trunk/src/site/rst/contact.rst
===================================================================
--- trunk/src/site/rst/contact.rst 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/src/site/rst/contact.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -13,9 +13,7 @@
Support
=======
-.. image:: logo/codelutin.png
-
Code Lutin est une société de services en logiciels libres spécialisée dans les
technologies Java/J2EE, XML, UML. Son offre s'étend à l'audit, au conseil, à la
tierce maintenance applicative et à la formation.
Modified: trunk/src/site/rst/features.rst
===================================================================
--- trunk/src/site/rst/features.rst 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/src/site/rst/features.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -1,78 +1,84 @@
-========
+-----------------
Fonctionnalités
-========
+-----------------
-
+~~~~~~~~~~~~~
Structure
------------
+~~~~~~~~~~~~~
Cette section permet de définir le cadre de la comptabilité :
-- plan comptable
-.. image:: screens/lima_charts_accountschart.png
+- Plan comptable
-- journaux
+.. image:: screens/lima_charts_accounts.png
+- Journaux
+
.. image:: screens/lima_charts_entrybooks.png
-- exercices
+- Exercices
.. image:: screens/lima_charts_fiscalperiod.png
-- période comptable
+- Période comptable
.. image:: screens/lima_charts_financialperiod.png
-- plan bilan / compte de résultat
+- Plan bilan / compte de résultat
.. image:: screens/lima_charts_financialstatement.png
-
+~~~~~~~~~~~~~
Traitement
------------
+~~~~~~~~~~~~~
La partie traitement regroupe les fonctions utiles au quotidien :
-- saisie
+- Saisie
-.. image:: screenshots/lima_entries.png
+.. image:: screens/lima_entries.png
-- recherche
+- Recherche
-.. image:: screenshots/lima_searchtransaction.png
+.. image:: screens/lima_searchtransaction.png
+- Lettrage
+.. image:: screens/lima_lettering.png
+
+~~~~~~~~~~~~~
Rapports
------------
+~~~~~~~~~~~~~
Permet de visualiser les documents usuelles de la comptabilité :
-- journal
+- Journal
-.. image:: screenshots/lima_reports_entrybooks.png
+.. image:: screens/lima_reports_entrybooks.png
-- comptes
+- Comptes
-.. image:: screenshots/lima_reports_accounts.png
+.. image:: screens/lima_reports_accounts.png
-- balance
+- Balance
-.. image:: screenshots/lima_reports_balance.png
+.. image:: screens/lima_reports_balance.png
-- grand-livre
+- Grand-livre
-.. image:: screenshots/lima_reports_ledger.png
+.. image:: screens/lima_reports_ledger.png
- Bilan et compte de résultat
-.. image:: screenshots/lima_reports_financialstatement.png
+.. image:: screens/lima_reports_financialstatement.png
Les documents sont atteignables par les menu de LIMA et via un site internet embarqué.
+~~~~~~~~~~~~~~~~~
Import / Export
------------
+~~~~~~~~~~~~~~~~~
Toutes les données de LIMA sont exportables et importables à volontés au format CSV.
L'utilisation de ce format permet d'être exploité par un tableur.
Deleted: trunk/src/site/rst/howto.rst
===================================================================
--- trunk/src/site/rst/howto.rst 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/src/site/rst/howto.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -1,6 +0,0 @@
-
-==========================
-Télécharger et lancer LIMA
-==========================
-
-A venir
\ No newline at end of file
Added: trunk/src/site/rst/importexport.rst
===================================================================
--- trunk/src/site/rst/importexport.rst (rev 0)
+++ trunk/src/site/rst/importexport.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -0,0 +1,104 @@
+==================
+Import / Export
+==================
+
+LIMA supporte actuellement deux formats d'import export.
+Le CSV avec un modèle de donnée spécifique à LIMA ; et le format EBP.
+
+
+-------------------------
+Format CSV
+-------------------------
+
+La comptabilité de LIMA peut-être sauvegarder en intégralité via la fonction
+Import -> Tout. Ou seulement le plan des comptes, le plan BCR ou les journaux.
+
+.. image:: screens/lima_import_limaall.png
+
++-----------------------------------------------------------------------------------------------+
+| Structure des champs correspondant à chaque entité au format CSV LIMA |
++================+==============================================================================+
+| Compte | "ACCN";"AccountNumber";"Label";"ThirdParty";"MasterAccount";"GeneralLedger" |
++----------------+------------------------------------------------------------------------------+
+| Journal | "ENBK";"Code";"Label";"Type" |
++----------------+------------------------------------------------------------------------------+
+| Transaction | "FTRC";"TransactionNumber";"TransactionDate";"AmountDebit";"AmountCredit"; |
+| . | "FinancialPeriod BeginDate";"FinancialPeriod EndDate";"EntryBook Code" |
++----------------+------------------------------------------------------------------------------+
+| Entry | "NTRY";"TransactionNumber";"Description";"Amount";"Debit Boolean";"Letter"; |
+| . | "Details";"Voucher";"Position";"AccountNumber" |
++----------------+------------------------------------------------------------------------------+
+| Identity | "IDNT";"Name";"Description","Address";"Address2";"City";"PhoneNumber"; |
+| . | "Email";"ZipCode";"VatNumber";"ClassificationCode";"BusinessNumber" |
++----------------+------------------------------------------------------------------------------+
+| Financial | "FNST";"Label";"Header";"Accounts";"DebitAccounts";"CreditAccounts"; |
+| Statement | "ProvisionDeprecationAccnts";"SubAmount";"HeaderAmount";"MasterFincialStmnt" |
++----------------+------------------------------------------------------------------------------+
+| Fiscal Period | "FSCP";"BeginDate";"EndDate";"Locked" |
++----------------+------------------------------------------------------------------------------+
+| ClosedPeriodic | "CPEB";"Locked";"FinancialPeriod beginDate"; |
+| EntryBook | "FinancialPeriod endDate";"EntryBook Code" |
++----------------+------------------------------------------------------------------------------+
+
+
+Le format CSV est utilisable à partir d'un tableur, pour une compatibilité étendue
+avec les différents systèmes d'exploitation, différent charset au moment de l'import
+et de l'export sont supportés : UTF8, ISO Latin 1, MacRoman.
+
+.. image:: screens/lima_import_charset.png
+
+À partir de la fonction Import -> Tout, votre fichier peut contenir que les entités
+qui vous intéresse. Ainsi vous pouvez tapez au kilomètre vos écritures dans un tableur et les importer
+en respectant bien le système Transaction / Entrées.
+
+
+Une sauvegarde de démonstration au format CSV est (..disponible_) au téléchargement.
+
+.. _disponible: http://chorem.org/projects/list_files/lima
+
+
+
+-------------------------
+Format EBP
+-------------------------
+
+La procédure est identique pour l'export des comptes ou des écritures.
+
+
+.. image:: screens/export_ebp_1.png
+
+Choissisez l'option Export Paramétrable dans EBP
+
+
+.. image:: screens/export_ebp_2.png
+
+Choisissez l'export qui vous intéresse : comptes ou écritures.
+
+
+.. image:: screens/export_ebp_3.png
+
+Entrer un emplacement et un nom au fichier d'export
+
+
+.. image:: screens/export_ebp_4.png
+
+Cliquer sur le bouton "Tout exporter", tous les champs passe du cadre de droite
+à gauche
+
+
+.. image:: screens/export_ebp_5.png
+
+Choisir la première ligne devra contenir "les noms des champs". Vérifier que le
+séparateur est virgule et que les champs de texte sont entourés par rien.
+
+
+.. image:: screens/export_ebp_6.png
+
+Cliquer sur le bouton "Exporter" pour confirmer.
+
+
+.. image:: screens/export_ebp_7.png
+
+L'export est effectué !
+
+
\ No newline at end of file
Property changes on: trunk/src/site/rst/importexport.rst
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/src/site/rst/index.rst
===================================================================
--- trunk/src/site/rst/index.rst 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/src/site/rst/index.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -2,6 +2,7 @@
Introduction
==================
+.. image:: extras/puzzle_icon.png
Acronyme de Lutin Invoice Monitoring and Accounting, l’application de comptabilité
LIMA est un logiciel libre pensé pour être la plus ergonomique possible et facile
Modified: trunk/src/site/rst/install.rst
===================================================================
--- trunk/src/site/rst/install.rst 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/src/site/rst/install.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -1,12 +1,16 @@
Installer et lancer Lima
-------------------------
+-------------------------
-Le lancement de Lima est assez simple, il suffit de télécharger le zip de la
-dernière version à partir du lien download et de le décompresser à l'endroit où
-vous souhaitez le voir installé.
+Installer LIMA en quelques instants. Télécharger l'archive au format zip sur la
+page de (..download_). Décompresser le fichier sur votre disque dur.
-Pour le lancer, il suffit de double-cliquer sur lima.exe si vous êtes sur
-Windows ou sur go.sh si vous êtes sur un système Linux. Vous accédez alors
-à l'interface de Lima après un temps de chargement.
+Pour lancer l'application :
-.. image:: screenshots/FirstLaunch.png
+- Linux : lancer le script go.sh ;
+- Mac OS X : double clique sur le jar lima.jar ;
+- Windows : double clique sur l'executable lima.exe.
+
+.. image:: screens/lima_splashscreen.png
+
+
+.. _download: http://chorem.org/projects/list_files/lima
\ No newline at end of file
Deleted: trunk/src/site/rst/journal.rst
===================================================================
--- trunk/src/site/rst/journal.rst 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/src/site/rst/journal.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -1,22 +0,0 @@
-Créer et modifier les journaux
-------------------------------
-
-Pour obtenir la liste des journaux, il suffit de cliquer sur Editer > Journal.
-Vous ouvrez ainsi un onglet qui indique la liste des journaux créés. Si c'est la
-première fois que vous utilisez Lima, cette liste est vide.
-
-.. image:: screenshots/journaux.png
-
-Pour créer un journal, il suffit de cliquer sur 'Ajout'. Il est demandé de
-renseigner les différentes information du journal : Nom, Description et Préfixe.
-
-.. image:: screenshots/AjoutJournal.png
-
-Pour modifier un journal, il suffit de le sélectionner dans la liste et de
-cliquer sur 'Mettre à jour'. Il est ainsi possible de modifier le préfixe et la
-description d'un journal.
-
-.. image:: screenshots/EditJournal.png
-
-Pour supprimer un journal, on le sélectionne dans la liste et on clique sur
-'Supprimer' une validation plus tard, le journal est supprimé.
\ No newline at end of file
Modified: trunk/src/site/rst/lexique.rst
===================================================================
--- trunk/src/site/rst/lexique.rst 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/src/site/rst/lexique.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -5,22 +5,36 @@
Nous définirons ici les quelques notions de comptabilité d'entreprise nécessaires
à l'appréhension du fonctionnement de LIMA.
-``Actif :``
------------
-L'actif d'une entreprise est l'ensemble de son patrimoine. Il comporte notamment
-la trésorerie, les immobilisations et les créances (sommes dues par des tiers).
-``Bilan :``
------------
-Le bilan est un état comptable, obligatoirement publié à l'issue de l'exercice
-et déduit du Grand Livre. Il présente l'état des actifs (patrimoines, ou emplois
-des ressources) et passifs (ressources, sous diverses formes de dettes) de
-l'entreprise à une date donnée : la date de clôture de l'exercice.
+~~~~~~~~~~~~~~~~~
+Transaction
+~~~~~~~~~~~~~~~~~
+Ce que nous appelons ici transaction désigne une opération comptable,
+c'est-à-dire l'inscription au journal, à une date donnée, d'un certain nombre
+d'écritures au débit et au crédit. Pour que l'opération soit équilibrée, il faut
+que la somme des écritures au crédit soit égale à celle des écritures au débit.
+L'ensemble compose une transaction entre plusieurs comptes.
-On peut également établir un bilan provisoire avant la fin de l'exercice.
+Une transaction peut, par exemple, représenter une opération d'achat à un
+fournisseur (Crédit du compte de "Achat", débit du compte "Fournisseur"), une
+opération de vente à un client...
-``Compte :``
-------------
+Historiquement, une transaction est inscrite au Journal (ou, pour la comptabilité
+multi-journaux au journal concerné : journal des ventes, journal des achats...)
+et ses écritures sont reportées au Grand Livre.
+
+
+~~~~~~~~~~~~~~~~~
+Ecriture
+~~~~~~~~~~~~~~~~~
+Une écriture comptable représente tout simplement le débit ou le crédit d'un
+compte. Elles sont passées par compte dans le Grand Livre, et rassemblées par
+opérations dans le Journal.
+
+
+~~~~~~~~~~~~~~~~~
+Compte
+~~~~~~~~~~~~~~~~~
Un compte est la plus petite unité retenue pour le classement des flux de valeur.
Il sera débité ou crédité pour symboliser certaines opérations. Il existe par
exemple des comptes de charges (Impôts sur les sociétés, Achats, Variations de
@@ -41,36 +55,10 @@
passées respectivement au débit et au crédit du compte. Cela leur donne une forme
de T, ce qui a donné naissance à l'appellation de compte en T.
-``Compte de résultat :``
-------------------------
-Le compte de résultat est un état comptable, obligatoirement publié à l'issue de
-l'exercice et déduit du Grand Livre. Il oppose la liste des différentes charges
-(pertes d'argent ou de valeur, que ce soit par consommation, par paiement de
-taxes ou de salaires, par donations, par dépréciation d'actif...) à celle des
-différents produits (gains d'argent, généralement par vente de produits finis ou
-de marchandises).
-Il met également en avant la différence entre les deux, qui représente le
-résultat de l'entreprise pour l'exercice. Celui-ci peut être positif ou négatif,
-suivant que la somme des produits dépasse celle des charges ou non. S'il est
-positif, on parle alors de bénéfice qui pourra être redistribué aux actionnaires
-(propriétaires) ou conservé pour financer l'activité.
-
-``Ecriture :``
---------------
-Une écriture comptable représente tout simplement le débit ou le crédit d'un
-compte. Elles sont passées par compte dans le Grand Livre, et rassemblées par
-opérations dans le Journal.
-
-``Etats comptables :``
-----------------------
-Les états comptables sont des documents de synthèse déduits du Journal et du
-Grand Livre et dont la publication est également obligatoire à la fin de
-l'exercice. Ils fournissent des indications sur la santé de l'entreprise. Les
-états sont, en France, le bilan, le compte de résultat et l'annexe.
-
-``Exercice :``
---------------
+~~~~~~~~~~~~~~~~~
+Exercice
+~~~~~~~~~~~~~~~~~
Un exercice est une période, généralement de un an, pour laquelle l'entreprise
établit sa comptabilité. A l'issu de l'exercice, l'entreprise doit publier sa
comptabilité concernant cette période. Une fois cette publication effectuée,
@@ -78,14 +66,10 @@
exercice, une fois fini, doit être clôturé, ce qui interdit alors toutes
modifications sur les informations comptables concernant cet exercice.
-``Grand Livre :``
------------------
-Historiquement, le Grand Livre est le cahier où sont consignés tous les comptes
-en T de l'entreprises (tableaux de deux colonnes, débit et crédit, consignant
-les diverses écritures passées sur le compte), à raison d'un par page.
-``Journal :``
--------------
+~~~~~~~~~~~~~~~~~
+Journal
+~~~~~~~~~~~~~~~~~
Historiquement, le journal est le cahier où l'entreprise consigne par ordre
chronologique la trace de ses opérations comptables (transactions). Parfois,
celle-ci utilise plusieurs journaux (journal des achats, journal des stocks,
@@ -94,41 +78,53 @@
transactions entre différentes personnes, chacune responsable d'un domaine
précis (achat, vente, stock...). On parle alors de comptabilité multi-journaux.
-``Passif :``
-------------
+
+~~~~~~~~~~~~~~~~~
+Grand Livre
+~~~~~~~~~~~~~~~~~
+Historiquement, le Grand Livre est le cahier où sont consignés tous les comptes
+en T de l'entreprises (tableaux de deux colonnes, débit et crédit, consignant
+les diverses écritures passées sur le compte), à raison d'un par page.
+
+
+~~~~~~~~~~~~~~~~~
+Actif
+~~~~~~~~~~~~~~~~~
+L'actif d'une entreprise est l'ensemble de son patrimoine. Il comporte notamment
+la trésorerie, les immobilisations et les créances (sommes dues par des tiers).
+
+
+~~~~~~~~~~~~~~~~~
+Passif
+~~~~~~~~~~~~~~~~~
Le passif d'une entreprise est l'ensemble des ressources de l'entreprise, sous
la forme de capitaux et de dettes.
-``Report à nouveau :``
-----------------------
-Historiquement, lors de la clôture d'un exercice comptable, on changeait de
-cahiers (Journal et Grand Live) pour attaquer la consignation des opérations du
-nouvel exercice. On soldait alors tous les comptes du Grand Livre en débitant
-les comptes créditeurs et en créditant les comptes débiteurs de la valeur du
-solde (différence entre débit et crédit) du compte. On effectuait alors
-l'opération inverse en première opération du nouvel exercice. On appelle cette
-opération un report à nouveau.
-Dans notre cas, comme dans tous les logiciels de comptabilité, le report à
-nouveau ne sera que partiellement effectué. Si CALLAO reportera bien le solde
-des différents comptes sur l'exercice suivant, nous ne solderons pas l'exercice
-précédent.
+~~~~~~~~~~~~~~~~~
+Bilan
+~~~~~~~~~~~~~~~~~
+Le bilan est un état comptable, obligatoirement publié à l'issue de l'exercice
+et déduit du Grand Livre. Il présente l'état des actifs (patrimoines, ou emplois
+des ressources) et passifs (ressources, sous diverses formes de dettes) de
+l'entreprise à une date donnée : la date de clôture de l'exercice.
-``Transaction :``
------------------
-Ce que nous appelons ici transaction désigne une opération comptable,
-c'est-à-dire l'inscription au journal, à une date donnée, d'un certain nombre
-d'écritures de débit et de crédit. Pour que l'opération soit équilibrée, il faut
-que la somme des écritures de crédit (sur certains comptes) la composant soit
-égale à celle des écritures de débit (sur d'autres comptes). C'est pourquoi on
-peut voir l'ensemble comme une transaction entre plusieurs comptes.
+On peut également établir un bilan provisoire avant la fin de l'exercice.
-Une transaction peut, par exemple, représenter une opération d'achat à un
-fournisseur (Crédit du compte de "Achat", débit du compte "Fournisseur"), une
-opération de vente à un client... Dans ce genre de cas, la réalité de l'opération
-peut être prouvée à l'aide d'un justificatif, dont la référence sera inscrite
-dans la comptabilité.
-Historiquement, une transaction est inscrite au Journal (ou, pour la comptabilité
-multi-journaux au journal concerné : journal des ventes, journal des achats...)
-et ses écritures sont reportées au Grand Livre.
\ No newline at end of file
+~~~~~~~~~~~~~~~~~~~~
+Compte de résultat
+~~~~~~~~~~~~~~~~~~~~
+Le compte de résultat est un état comptable, obligatoirement publié à l'issue de
+l'exercice et déduit du Grand Livre. Il oppose la liste des différentes charges
+(pertes d'argent ou de valeur, que ce soit par consommation, par paiement de
+taxes ou de salaires, par donations, par dépréciation d'actif...) à celle des
+différents produits (gains d'argent, généralement par vente de produits finis ou
+de marchandises).
+
+Il met également en avant la différence entre les deux, qui représente le
+résultat de l'entreprise pour l'exercice. Celui-ci peut être positif ou négatif,
+suivant que la somme des produits dépasse celle des charges ou non. S'il est
+positif, on parle alors de bénéfice qui pourra être redistribué aux actionnaires
+(propriétaires) ou conservé pour financer l'activité.
+
Deleted: trunk/src/site/rst/planComptable.rst
===================================================================
--- trunk/src/site/rst/planComptable.rst 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/src/site/rst/planComptable.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -1,24 +0,0 @@
-Créer-modifier son plan comptable
----------------------------------
-
-Lima possède un plan-comptable simple, cependant vous pouvez modifier ce dernier
-ou bien créer le votre. Pour accéder au plan comptable, il suffit de cliquer sur
-'Editer>Compte'. Cela ouvre un nouvel onglet contenant le plan comptable
-utilisé.
-
-.. image:: screenshots/PlanComptable.png
-
-Pour ajouter un compte, il suffit de sélectionner son compte père et de cliquer
-sur 'Ajout'. Il faut ensuite compléter le nom et le numéro du compte ainsi que
-son type (Actif, Passif, Produit ou Charge).
-
-.. image:: screenshots/AjouterCompte.png
-
-Pour une modification, il suffit de sélectionner le compte et de cliquer sur
-'Mettre à jour', seuls la description et le type de compte sont modifiables.
-
-Pour une suppression, il suffit de sélectionner le compte à supprimer et de
-cliquer sur 'Supprimer', une validation plus tard, le compte est supprimé.
-
-Attention, si vous supprimer un compte, tous ses compte-fils seront aussi
-supprimés.
Modified: trunk/src/site/rst/presentation.rst
===================================================================
--- trunk/src/site/rst/presentation.rst 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/src/site/rst/presentation.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -2,8 +2,9 @@
Présentation de LIMA
========================
+------------------
Introduction
-------------
+------------------
Acronyme de Lutin Invoice Monitoring and Accounting, l’application de comptabilité
LIMA est un logiciel libre pensé pour être la plus ergonomique possible et facile
@@ -22,8 +23,9 @@
désiré.
+------------------
Historique
-------------
+------------------
Ce projet est né d'un besoin d'adapter l'ergonomie d'OFBiz Neogia qui
proposait un système de comptabilité générale.
@@ -43,16 +45,14 @@
programmation de Code Lutin. LIMA s'appuie notamment sur les projets internes Topia,
EuGene et JAXX.
-
+------------------
Architecture
-------------
+------------------
LIMA est un projet MAVEN multi-module, il est en réalité composé de trois projets Java :
lima-business, lima-callao, lima-swing.
-.. image:: resources/schemas/lima-callao-architecture.png
-
-
+~~~~~~~~~~~~~
Lima-callao
~~~~~~~~~~~~~
@@ -68,7 +68,7 @@
de définir les méthodes associées à la base de données pour le stockage de ces
entités : ajout, modification, suppression.
-
+~~~~~~~~~~~~~
lima-business
~~~~~~~~~~~~~
@@ -83,7 +83,7 @@
service des périodes financières, service des entrées, services des rapports, etc...
On peut ajouter, modifier et supprimer des services selon les besoins de l'activité.
-
+~~~~~~~~~~~~~
lima-swing
~~~~~~~~~~~~~
@@ -98,9 +98,9 @@
les bons messages, d’appeler les services correspondants, et de retourner les
données, par exemple : le remplissage d’un tableau.
-
+------------------
Licence
--------
+------------------
Lima est développé sous licence GPL :
GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007
\ No newline at end of file
Added: trunk/src/site/rst/rapports.rst
===================================================================
--- trunk/src/site/rst/rapports.rst (rev 0)
+++ trunk/src/site/rst/rapports.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -0,0 +1,5 @@
+============
+Rapports
+============
+
+TODO
\ No newline at end of file
Property changes on: trunk/src/site/rst/rapports.rst
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/src/site/rst/roadmap.rst
===================================================================
--- trunk/src/site/rst/roadmap.rst 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/src/site/rst/roadmap.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -1,10 +0,0 @@
-=======
-RoadMap
-=======
-
-+-----------------------------------------------------------------------------------------+
-| **A venir** |
-+-------------------+---------------------------------------------------------------------+
-| *Release* | Release d'une version packagée exécutable comprenant Lima et Callao |
-+-------------------+---------------------------------------------------------------------+
-
Added: trunk/src/site/rst/saisie.rst
===================================================================
--- trunk/src/site/rst/saisie.rst (rev 0)
+++ trunk/src/site/rst/saisie.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -0,0 +1,5 @@
+============
+Saisie
+============
+
+TODO
\ No newline at end of file
Property changes on: trunk/src/site/rst/saisie.rst
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/src/site/rst/todo.rst
===================================================================
--- trunk/src/site/rst/todo.rst 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/src/site/rst/todo.rst 2010-08-27 14:51:45 UTC (rev 3023)
@@ -1,29 +0,0 @@
-TODO
-====
-
-- probleme sur les copyright (non present dans les jaxx, en double dans certain
- fichier java
-
-- idem pour service Lima, sans doute n'en avoir qu'un
-- prefixer les DTO lima par 'Lima' et sans mettre DTO a la fin
- AccountDTO -> LimaAccount (ca evite de se perdre dans les noms de classes qui
- se nome pareil dans les differents projets :(
-- Les dto de lima, n'ont pas a etre generee (pas de plus value, car pas de
- persistance)
-- Les dta lima ne devrait etre que des interfaces de la meme facon que les
- service et etre dans le meme module que les services
-- Les methodes specifiques sur les DTO seront donc dans des Helper ou dans les
- service
-
-- Balance.Category devrait etre un helper plus general
-- les comparator devrait etre dans les dto (Comparable)
-- a quoi servent tous les enumerations ? elles sont de toute facon mal placee
-- dans les filters, il ne devrait pas y avoir de '_' dans les if. Ces filters
- ne devrait-il pas plutot etre des Criteria utilise pour des appels au Service
-- a quoi sert Item et PeriodItem (essayer de les enlever)
-
-- verifier que ApplicationConfig est utilise de facon convenable (chose bizarre
- dans la declaration de l'enum 'Option'
-
-- le jaxx est a revoir trop de composant instancier a la main au lieu d'utiliser
- le xml, pas d'utilisation de beanModel, ...
Modified: trunk/src/site/site_fr.xml
===================================================================
--- trunk/src/site/site_fr.xml 2010-08-27 14:39:46 UTC (rev 3022)
+++ trunk/src/site/site_fr.xml 2010-08-27 14:51:45 UTC (rev 3023)
@@ -23,7 +23,7 @@
</menu>
<menu name="Mode d'emploi" inherit="top" >
<item name="Installer et lancer" href="install.html" />
- <item name="Création de sa comptabilité" href="assistant.html" />
+ <item name="Créer sa comptabilité" href="assistant.html" />
<item name="Saisie d'écritures" href="saisie.html" />
<item name="Rapports" href="rapports.html" />
<item name="Import / Export" href="importexport.html" />
1
0
r3022 - in trunk: lima-business/src lima-business/src/license lima-callao/src lima-callao/src/license
by echatellier＠users.chorem.org Aug. 27, 2010
by echatellier＠users.chorem.org Aug. 27, 2010
Aug. 27, 2010
Author: echatellier
Date: 2010-08-27 16:39:46 +0200 (Fri, 27 Aug 2010)
New Revision: 3022
Url: http://chorem.org/repositories/revision/lima/3022
Log:
Add third party file
Added:
trunk/lima-business/src/license/
trunk/lima-business/src/license/THIRD-PARTY.properties
trunk/lima-callao/src/license/
trunk/lima-callao/src/license/THIRD-PARTY.properties
Added: trunk/lima-business/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/lima-business/src/license/THIRD-PARTY.properties (rev 0)
+++ trunk/lima-business/src/license/THIRD-PARTY.properties 2010-08-27 14:39:46 UTC (rev 3022)
@@ -0,0 +1,40 @@
+# Generated by org.nuiton.license.plugin.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache 2
+# - Apache License Version 2.0
+# - Apache Software License - Version 2.0
+# - Apache Software License 2.0
+# - BSD License
+# - Bouncy Castle Licence
+# - Bouncy Castle License
+# - CPL
+# - Common Public License Version 1.0
+# - Eclipse Public License - Version 1.0
+# - GNU Lesser General Public License
+# - General Public License (GPL)
+# - HSQLDB License
+# - Lesser General Public License (LGPL) v 3.0
+# - MIT License
+# - Mozilla Public License
+# - Public Domain
+# - The Apache Software License, Version 2.0
+# - The H2 License, Version 1.0
+# - dom4j
+# - http://asm.ow2.org/license.html
+# - http://www.apache.org/licenses/LICENSE-2.0.txt
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Fri Aug 27 16:30:34 CEST 2010
+antlr--antlr--2.7.6=ANTLR 2 License
+com.sun.xml.bind--jaxb-impl--2.1.9=Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license
+commons-net--commons-net--2.0=Apache Software License, Version 2.0
+commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0
+javassist--javassist--3.8.0.GA=GNU Lesser General Public License
+javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes
+org.codehaus.swizzle--swizzle-stream--1.0.1=Apache Software License, Version 2.0
+org.jdom--jdom--1.1=JDom license
+org.osgi--org.osgi.core--4.1.0=Apache Software License, Version 2.0
+quartz--quartz--1.5.2=Apache Software License, Version 2.0
Added: trunk/lima-callao/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/lima-callao/src/license/THIRD-PARTY.properties (rev 0)
+++ trunk/lima-callao/src/license/THIRD-PARTY.properties 2010-08-27 14:39:46 UTC (rev 3022)
@@ -0,0 +1,19 @@
+# Generated by org.nuiton.license.plugin.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - BSD License
+# - GNU Lesser General Public License
+# - Lesser General Public License (LGPL) v 3.0
+# - MIT License
+# - The Apache Software License, Version 2.0
+# - The H2 License, Version 1.0
+# - dom4j
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Fri Aug 27 16:18:28 CEST 2010
+antlr--antlr--2.7.6=ANTLR 2 License
+commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0
+javassist--javassist--3.8.0.GA=GNU Lesser General Public License
+javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes
1
0
Aug. 27, 2010
Author: echatellier
Date: 2010-08-27 16:05:13 +0200 (Fri, 27 Aug 2010)
New Revision: 3021
Url: http://chorem.org/repositories/revision/lima/3021
Log:
Add third party file
Added:
trunk/lima-swing/src/license/
trunk/lima-swing/src/license/THIRD-PARTY.properties
Added: trunk/lima-swing/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/lima-swing/src/license/THIRD-PARTY.properties (rev 0)
+++ trunk/lima-swing/src/license/THIRD-PARTY.properties 2010-08-27 14:05:13 UTC (rev 3021)
@@ -0,0 +1,48 @@
+# Generated by org.nuiton.license.plugin.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache 2
+# - Apache License Version 2.0
+# - Apache License, Version 2.0
+# - Apache Software License - Version 2.0
+# - Apache Software License 2.0
+# - BSD
+# - Bouncy Castle Licence
+# - Bouncy Castle License
+# - CPL
+# - Common Development and Distribution License (CDDL) v1.0
+# - Common Public License Version 1.0
+# - Eclipse Public License - Version 1.0
+# - GNU Lesser General Public License
+# - General Public License (GPL)
+# - HSQLDB License
+# - Lesser General Public License (LGPL)
+# - Lesser General Public License (LGPL) v 3.0
+# - MIT License
+# - Mozilla Public License
+# - Public Domain
+# - The Apache Software License, Version 2.0
+# - The H2 License, Version 1.0
+# - The OpenSymphony Software License 1.1
+# - dom4j
+# - http://asm.ow2.org/license.html
+# - http://www.apache.org/licenses/LICENSE-2.0.txt
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Fri Aug 27 15:06:50 CEST 2010
+antlr--antlr--2.7.6=ANTLR 2 License
+com.sun.xml.bind--jaxb-impl--2.1.9=Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license
+commons-jxpath--commons-jxpath--1.3=Apache Software License, Version 2.0
+commons-net--commons-net--2.0=Apache Software License, Version 2.0
+commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0
+javassist--javassist--3.8.0.GA=GNU Lesser General Public License
+javax.mail--mail--1.4.1=License Agreement for JavaMail(TM) API
+javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes
+opensymphony--ognl--2.6.11=OpenSymphony Software License, Version 1.1
+org.apache.commons--commons-email--1.2=Apache Software License, Version 2.0
+org.codehaus.swizzle--swizzle-stream--1.0.1=Apache Software License, Version 2.0
+org.jdom--jdom--1.1=JDom license
+org.osgi--org.osgi.core--4.1.0=Apache Software License, Version 2.0
+quartz--quartz--1.5.2=Apache Software License, Version 2.0
1
0
Author: jpepin
Date: 2010-08-26 00:04:25 +0200 (Thu, 26 Aug 2010)
New Revision: 3020
Url: http://chorem.org/repositories/revision/lima/3020
Log:
Ajout fonction de lettrage.
Added:
trunk/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxLetterEnum.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/LetterTableCellEditor.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterRenderer.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchComboBox.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchPanel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/
trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.jaxx
trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetterComboBox.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx
trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java
trunk/lima-swing/src/main/java/org/chorem/lima/util/LetterToString.java
Removed:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountRenderer.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/FinancialTransactionServiceImpl.java
trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java
trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java
trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.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
trunk/lima-callao/src/main/xmi/accounting.zargo
trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx
trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountComboBox.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx
trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchComboBox.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchPanel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx
trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java
trunk/lima-swing/src/main/java/org/chorem/lima/util/AccountToString.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/ExportServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -513,7 +513,7 @@
nextLine[2] = entry.getDescription();
nextLine[3] = entry.getAmount().toString();
nextLine[4] = Boolean.toString(entry.getDebit());
- nextLine[5] = entry.getLettering();
+ nextLine[5] = entry.getLetter().getCode();
nextLine[6] = entry.getDetail();
nextLine[7] = entry.getVoucher();
nextLine[8] = entry.getPosition();
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 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -41,6 +41,9 @@
import org.chorem.lima.entity.FinancialPeriod;
import org.chorem.lima.entity.FinancialPeriodDAO;
import org.chorem.lima.entity.FiscalPeriod;
+import org.chorem.lima.entity.Letter;
+import org.chorem.lima.entity.LetterDAO;
+import org.chorem.lima.entity.LetterImpl;
import org.chorem.lima.entity.LimaCallaoDAOHelper;
import org.chorem.lima.entity.FinancialTransaction;
import org.chorem.lima.entity.FinancialTransactionDAO;
@@ -86,7 +89,6 @@
public void createFinancialTransactionWithTransaction(
FinancialTransaction financialtransaction, TopiaContext topiaContext)
throws LimaException {
- log.debug(financialtransaction);
try {
//check if the financial period is blocked
accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction(
@@ -149,7 +151,6 @@
String financialPeriodProperty = TopiaQuery.getProperty(FinancialTransaction.FINANCIAL_PERIOD);
String entryBookLabelProperty = TopiaQuery.getProperty(FinancialTransaction.ENTRY_BOOK);
- String accountProperty = TopiaQuery.getProperty(FinancialTransaction.ENTRY, Entry.ACCOUNT);
// filter with topia query
TopiaQuery query = transactionDAO.createQuery("T");
@@ -166,7 +167,9 @@
//load for lazy
.addLoad(financialPeriodProperty)
.addLoad(entryBookLabelProperty)
- .addFetch("T."+accountProperty);
+ .addLeftJoin("T."+FinancialTransaction.ENTRY, "E", true)
+ .addFetch("E."+Entry.ACCOUNT)
+ .addFetch("E."+Entry.LETTER);
financialTransactions = transactionDAO.findAllByQuery(query);
}
catch (TopiaException ex) {
@@ -501,7 +504,7 @@
entryOld.setVoucher(entry.getVoucher());
entryOld.setFinancialTransaction(entry.getFinancialTransaction());
entryOld.setPosition(entry.getPosition());
- entryOld.setLettering(entry.getLettering());
+ entryOld.setLetter(entry.getLetter());
//calculate financial transaction amounts
FinancialTransaction financialTransaction =
@@ -589,9 +592,158 @@
}
+ /**
+ * Get letter from count of existing letter
+ * 1 -> A, 2 -> B, 26 -> Z, 27 -> AA, 28 -> AB, ...
+ */
+ @Override
+ public Letter getNewLetter() throws LimaException {
+ Letter letter = new LetterImpl();
+ TopiaContext topiaContext = null;
+ try {
+ topiaContext = beginTransaction();
+ LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext);
+ int n = letterDAO.count()+1;
+ String res = numberToString(n, null);
+
+ //if already exist
+ while (letterDAO.findByCode(res) != null){
+ res = numberToString(n++, null);
+ }
+ letter.setCode(res);
+ }
+ catch (TopiaException ex) {
+ doCatch(topiaContext, ex, log);
+ }
+ finally {
+ doFinally(topiaContext, log);
+ }
+ return letter;
+ }
+ public static String numberToString(int n, StringBuffer result){
+ if (result == null){
+ result = new StringBuffer();
+ }
+ int mod = (n-1) % 26;
+ int div = (n-1) / 26;
+ if (div > 0){
+ result.append(numberToString(div, result));
+ }
+ return (result.append((char) (mod+65))).toString();
+ }
+
+ @Override
+ public void createLetter(Letter letter) throws LimaException {
+ TopiaContext topiaContext = null;
+ try {
+ topiaContext = beginTransaction();
+ createLetterWithTransaction(letter, topiaContext);
+ }
+ catch (TopiaException ex) {
+ doCatch(topiaContext, ex, log);
+ }
+ finally {
+ doFinally(topiaContext, log);
+ }
+ }
+
+ public void createLetterWithTransaction(Letter letter, TopiaContext topiaContext) throws LimaException {
+ try {
+ LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext);
+ letterDAO.create(letter);
+ commitTransaction(topiaContext);
+ } catch (TopiaException ex) {
+ doCatch(topiaContext, ex, log);
+ }
+ }
- @Override
+ @Override
+ public void removeLetter(Letter letter) throws LimaException {
+ TopiaContext topiaContext = null;
+ try {
+ topiaContext = beginTransaction();
+ LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext);
+ letterDAO.delete(letter);
+ commitTransaction(topiaContext);
+ }
+ catch (TopiaException ex) {
+ doCatch(topiaContext, ex, log);
+ }
+ finally {
+ doFinally(topiaContext, log);
+ }
+ }
+
+
+ @Override
+ public List<Letter> getAllLetters() throws LimaException {
+ List<Letter> letters = null;
+ TopiaContext topiaContext = null;
+ try {
+ topiaContext = beginTransaction();
+ LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext);
+ letters = letterDAO.findAll();
+ }
+ catch (TopiaException ex) {
+ doCatch(topiaContext, ex, log);
+ }
+ finally {
+ doFinally(topiaContext, log);
+ }
+ return letters;
+ }
+
+
+
+ @Override
+ public void setEntryLetter(Entry entry, Letter letter) throws LimaException {
+
+ TopiaContext topiaContext = null;
+ try {
+ topiaContext = beginTransaction();
+ LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext);
+ Letter letterOld = letterDAO.findByCode(letter.getCode());
+ if (letterOld == null){
+ createLetterWithTransaction(letter, topiaContext);
+ letterOld = letter;
+ }
+ EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext);
+ Entry entryOld = entryDAO.findByTopiaId(entry.getTopiaId());
+ entryOld.setLetter(letterOld);
+ commitTransaction(topiaContext);
+ }
+ catch (TopiaException ex) {
+ doCatch(topiaContext, ex, log);
+ }
+ finally {
+ doFinally(topiaContext, log);
+ }
+ }
+
+
+
+ @Override
+ public void removeEntryLetter(Entry entry) throws LimaException {
+
+ TopiaContext topiaContext = null;
+ try {
+ topiaContext = beginTransaction();
+
+ EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext);
+ Entry entryOld = entryDAO.findByTopiaId(entry.getTopiaId());
+ entryOld.setLetter(null);
+ commitTransaction(topiaContext);
+ }
+ catch (TopiaException ex) {
+ doCatch(topiaContext, ex, log);
+ }
+ finally {
+ doFinally(topiaContext, log);
+ }
+ }
+
+ @Override
public List<Object> searchFinancialTransaction(FinancialTransactionSearch financialTransactionSearch) throws LimaException {
List<Object> result = new ArrayList<Object>();
List<FinancialTransaction> financialTransactions = null;
@@ -627,9 +779,9 @@
if (description != null){
query.addWhere("E.description", Op.LIKE, "%"+description+"%");
}
- String letter = financialTransactionSearch.getLetter();
+ Letter letter = financialTransactionSearch.getLetter();
if (letter != null){
- query.addWhere("E.lettering", Op.LIKE, "%"+letter+"%");
+ query.addEquals("E.letter", letter);
}
Account account = financialTransactionSearch.getAccount();
String accountsList = financialTransactionSearch.getAccountList();
@@ -688,7 +840,7 @@
TopiaQuery query2 = entryDAO.createQuery();
query2.addEquals(Entry.FINANCIAL_TRANSACTION, financialTransaction);
//Load for lazy
- query2.addLoad(Entry.ACCOUNT);
+ query2.addLoad(Entry.ACCOUNT, Entry.LETTER);
List<Entry> entries = entryDAO.findAllByQuery(query2);
result.addAll(entries);
}
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 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -95,6 +95,9 @@
import org.chorem.lima.entity.FiscalPeriodImpl;
import org.chorem.lima.entity.Identity;
import org.chorem.lima.entity.IdentityImpl;
+import org.chorem.lima.entity.Letter;
+import org.chorem.lima.entity.LetterDAO;
+import org.chorem.lima.entity.LetterImpl;
import org.chorem.lima.entity.LimaCallaoDAOHelper;
import org.nuiton.topia.TopiaContext;
import org.nuiton.topia.TopiaContextFactory;
@@ -175,17 +178,17 @@
strat.setColumnMapping(csvReader.readNext());
// check if file have a good header
- List<String> headAccount = new ArrayList<String>();
- headAccount.add("Journal");
- headAccount.add("Compte");
- headAccount.add("DatEcr");
- headAccount.add("Piece");
- headAccount.add("Libelle");
- headAccount.add("Debit");
- headAccount.add("Credit");
- headAccount.add("Lettre");
+ List<String> headEntry = new ArrayList<String>();
+ headEntry.add("Journal");
+ headEntry.add("Compte");
+ headEntry.add("DatEcr");
+ headEntry.add("Piece");
+ headEntry.add("Libelle");
+ headEntry.add("Debit");
+ headEntry.add("Credit");
+ headEntry.add("Lettre");
if (!Arrays.asList(strat.getColumnMapping()).containsAll(
- headAccount)) {
+ headEntry)) {
throw new LimaBusinessException(
_("lima-business.import.ebpnoentry"));
}
@@ -197,6 +200,7 @@
// DAOs
AccountDAO accountDAO = LimaCallaoDAOHelper
.getAccountDAO(topiaContext);
+ LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext);
EntryBookDAO entryBookDAO = LimaCallaoDAOHelper
.getEntryBookDAO(topiaContext);
List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods();
@@ -244,12 +248,15 @@
entry.setAmount(debit);
}
entry.setDescription(entryEBP.getLibelle());
- entry.setLettering(entryEBP.getLettre());
entry.setVoucher(entryEBP.getPiece());
+
+ Letter letter = createLetter(
+ entryEBP.getLettre(), topiaContext);
+ entry.setLetter(letter);
+
String entryBookCode = entryEBP.getJournal();
EntryBook entryBook = entryBookDAO
.findByCode(entryBookCode);
-
// if entrybook not exist create it !
if (entryBook == null) {
entryBook = new EntryBookImpl();
@@ -685,7 +692,36 @@
}
return result.toString();
}
+
+
+ /**
+ * Import and create Letter : TYPE | Code
+ */
+ public String importLetterCSV(String[] nextLine,
+ TopiaContext topiaContext) throws LimaException {
+ StringBuffer result = new StringBuffer();
+ try {
+ LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext);
+
+ Letter letter = new LetterImpl();
+ String code = nextLine[1];
+ letter.setCode(code);
+
+ // if exist, skip
+ if (letterDAO.findByCode(code) != null) {
+ result.append(_("lima-business.import.letteralreadyexist", code));
+ } else {
+ // create it
+ financialTransactionService.createLetter(letter);
+ result.append(_("lima-business.import.letteradded",code));
+ }
+ } catch (TopiaException eeeTE) {
+ doCatch(topiaContext, eeeTE, log);
+ }
+ return result.toString();
+ }
+
/**
* Import and create closedperiodicentrybook import Structure : TYPE |
* BeginDate | EndDate | Locked
@@ -927,6 +963,26 @@
return result.toString();
}
+
+ /**
+ * Dynamic letter creation used by CSV and EBP Import
+ */
+ public Letter createLetter(String letterCode, TopiaContext topiaContext) throws LimaException{
+ Letter letter = null;
+ try {
+ LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext);
+ letter = letterDAO.findByCode(letterCode);
+ // if letter not exist create it !
+ if (letter == null) {
+ letter = new LetterImpl();
+ letter.setCode(letterCode);
+ }
+ } catch (TopiaException eeeTE) {
+ doCatch(topiaContext, eeeTE, log);
+ }
+ return letter;
+ }
+
public String createAccounts(Map<String, AccountImport> accounts,
TopiaContext topiaContext) throws LimaException {
StringBuffer result = new StringBuffer();
@@ -1037,6 +1093,7 @@
throws LimaException {
StringBuffer result = new StringBuffer();
try {
+ LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext);
EntryBookDAO entryBookDAO = LimaCallaoDAOHelper
.getEntryBookDAO(topiaContext);
EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext);
@@ -1080,7 +1137,11 @@
entry.setDescription(entryImport.getDescription());
entry.setAmount(new BigDecimal(entryImport.getAmount()));
entry.setDebit(Boolean.parseBoolean(entryImport.getDebit()));
- entry.setLettering(entryImport.getLettering());
+
+ Letter letter = createLetter(
+ entryImport.getLettering(), topiaContext);
+ entry.setLetter(letter);
+
entry.setDetail(entryImport.getDetail());
entry.setVoucher(entryImport.getVoucher());
entry.setPosition(entryImport.getPosition());
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -198,12 +198,11 @@
TopiaQuery entriesQuery =
createEntryQuery(account, beginDate, endDate, entryDAO, queryAlias);
//IMPORTANT : LOADING ENTRIES AND IS COLUMN FOR NO LAZY EXCEPTION
- entriesQuery.addLoad(Entry.FINANCIAL_TRANSACTION);
- entriesQuery.addLoad(Entry.ACCOUNT);
String loadEntryBookProperty =
TopiaQuery.getProperty(Entry.FINANCIAL_TRANSACTION,
FinancialTransaction.ENTRY_BOOK);
- entriesQuery.addLoad(loadEntryBookProperty);
+ entriesQuery.addLoad(Entry.ACCOUNT, Entry.FINANCIAL_TRANSACTION, Entry.LETTER)
+ .addLoad(loadEntryBookProperty);
reportsDatas.setListEntry(entryDAO.findAllByQuery(entriesQuery));
TopiaQuery amountsQuery =
@@ -348,7 +347,7 @@
TopiaQuery entriesQuery = createEntryBookReportsQuery(
entryBook, beginDate, endDate, entryDAO, "E");
//IMPORTANT : LOADING ENTRIES AND IS COLUMN FOR NO LAZY EXCEPTION
- entriesQuery.addLoad(Entry.ACCOUNT, Entry.FINANCIAL_TRANSACTION);
+ entriesQuery.addLoad(Entry.ACCOUNT, Entry.FINANCIAL_TRANSACTION, Entry.LETTER);
String orderDateProperty =
TopiaQuery.getProperty("E", Entry.FINANCIAL_TRANSACTION, FinancialTransaction.TRANSACTION_DATE);
String orderIdProperty =
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -28,6 +28,7 @@
import org.chorem.lima.entity.FinancialPeriod;
import org.chorem.lima.entity.FinancialTransaction;
import org.chorem.lima.entity.FiscalPeriod;
+import org.chorem.lima.entity.Letter;
/**
* Transaction service.
@@ -51,6 +52,13 @@
* @return all transaction for entry book and period
* @throws LimaException
*/
+
+ void createFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException;
+
+ void updateFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException;
+
+ void removeFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException;
+
List<FinancialTransaction> getAllFinancialTransactionsForFinancialPeriod(
FinancialPeriod period) throws LimaException;
@@ -60,13 +68,9 @@
List<FinancialTransaction> getAllInexactFinancialTransactions(FiscalPeriod fiscalPeriod) throws LimaException;
List<FinancialTransaction> getAllFinancialTransactionsBalanced(FiscalPeriod fiscalPeriod) throws LimaException;
+ List<Object> searchFinancialTransaction(FinancialTransactionSearch financialTransactionSearch) throws LimaException;
- void createFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException;
-
- void updateFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException;
- void removeFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException;
-
/**
* Methodes for create, update and remove the entry
* @param entry
@@ -79,5 +83,23 @@
void removeEntry(Entry entry) throws LimaException;
- List<Object> searchFinancialTransaction(FinancialTransactionSearch financialTransactionSearch) throws LimaException;
+
+ /**
+ * Methodes for create, update and remove the letter
+ * @param entry
+ * @throws LimaException
+ */
+
+ Letter getNewLetter() throws LimaException;
+
+ void createLetter(Letter letter) throws LimaException;
+
+ void removeLetter(Letter letter) throws LimaException;
+
+ List<Letter> getAllLetters() throws LimaException;
+
+ void setEntryLetter(Entry entry, Letter letter) throws LimaException;
+
+ void removeEntryLetter(Entry entry) throws LimaException;
+
}
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 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-business/src/main/resources/i18n/lima-business-en_GB.properties 2010-08-25 22:04:25 UTC (rev 3020)
@@ -52,6 +52,8 @@
lima-business.import.fiscalperiodadded=SUCCESS \: The fiscalPeriod %s - %s is created \! \n
lima-business.import.fiscalperiodalreadyexist=FAILED \: The fiscalperiod %s - %s already exists \!\n
lima-business.import.identityadded=SUCCESS \: The identity %s is created \! \n
+lima-business.import.letteradded=SUCCESS \: The letter %s - %s is created \! \n
+lima-business.import.letteralreadyexist=FAILED \: The letter %s already exists \!\n
lima-business.import.noaccount=ERROR \: This file contains no account
lima-business.import.nofiscalperiodopen=FAILED \: No Fiscal period open \! \n
lima-business.import.transactionadded=SUCCES \: FinancialTransaction, %s - %s, added\n
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 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-business/src/main/resources/i18n/lima-business-fr_FR.properties 2010-08-25 22:04:25 UTC (rev 3020)
@@ -52,6 +52,8 @@
lima-business.import.fiscalperiodadded=Succ\u00E8s \: Exercice %s - %s ajout\u00E9e \! \n
lima-business.import.fiscalperiodalreadyexist=u00C9chec \: L'exerice %s - %s existe d\u00E9j\u00E0 \!\n
lima-business.import.identityadded=Succ\u00E8s \: Identit\u00E9 %s ajout\u00E9e \! \n
+lima-business.import.letteradded=Succ\u00E8s \: ajout\u00E9e \! \n
+lima-business.import.letteralreadyexist=u00C9chec \: La lettre %s existe d\u00E9j\u00E0 \!\n
lima-business.import.noaccount=Erreur \: Ce fichier ne contient aucun compte.
lima-business.import.nofiscalperiodopen=u00C9chec \: Aucun exercice ouvert \! \n
lima-business.import.transactionadded=Succ\u00E8s \: Transaction, %s, %s, ajout\u00E9e\n
Modified: trunk/lima-callao/src/main/xmi/accounting.zargo
===================================================================
(Binary files differ)
Added: trunk/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxLetterEnum.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxLetterEnum.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/enums/ComboBoxLetterEnum.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,60 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.enums;
+
+import static org.nuiton.i18n.I18n._;
+
+
+public enum ComboBoxLetterEnum {
+
+ ALL(_("lima.enum.comboboxletter.all")),
+ SELECT_ONE(_("lima.enum.comboboxletter.selectone"));
+
+ private final String description;
+
+ private ComboBoxLetterEnum(String description) {
+ this.description = description;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public static String[] descriptions(){
+ int nbElts = ComboBoxLetterEnum.values().length;
+ String[] descriptions = new String[nbElts];
+ ComboBoxLetterEnum[] enums = ComboBoxLetterEnum.values();
+ for (int i = 0; i < nbElts; i++) {
+ descriptions[i] = enums[i].getDescription();
+ }
+ return descriptions;
+ }
+
+ public static ComboBoxLetterEnum valueOfDescription(String description){
+ ComboBoxLetterEnum value = null;
+
+ for (ComboBoxLetterEnum enums : ComboBoxLetterEnum.values()) {
+ if (description.equals(enums.description)){
+ value = enums;
+ break;
+ }
+ }
+ return value;
+ }
+}
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 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2010-08-25 22:04:25 UTC (rev 3020)
@@ -160,10 +160,8 @@
actionIcon='entries-unbalanced'/>
<JMenuItem text="lima.entries.searchtransaction" onActionPerformed='getHandler().showTransactionSearchView(this)'
actionIcon='entries-search'/>
- <!-- Menu prévu pour le lettrage automatique
<JMenuItem text="lima.entries.lettering" onActionPerformed='getHandler().showLetteringView(this)'
actionIcon='lettering'/>
- -->
</JMenu>
<JMenu text="lima.reports" mnemonic="{'R'}">
<JMenuItem text="lima.reports.accounts" onActionPerformed='getHandler().showAccountReports(this)'
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -46,6 +46,7 @@
import org.chorem.lima.ui.identity.IdentityForm;
import org.chorem.lima.ui.importexport.ImportExport;
import org.chorem.lima.ui.ledger.LedgerView;
+import org.chorem.lima.ui.lettering.LetteringView;
import org.chorem.lima.util.ErrorHelper;
/**
@@ -377,6 +378,12 @@
mainView.showTab(_("lima.entries.searchtransaction"), searchView);
}
+ public void showLetteringView(JAXXContext rootContext){
+ MainView mainView = getUI(rootContext);
+ LetteringView letteringView = new LetteringView(mainView);
+ mainView.showTab(_("lima.entries.lettering"), letteringView);
+ }
+
public void showBalanceView(JAXXContext rootContext) {
MainView mainView = getUI(rootContext);
BalanceView balanceView = new BalanceView(mainView);
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountComboBox.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountComboBox.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountComboBox.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -27,6 +27,7 @@
import org.apache.commons.logging.LogFactory;
import org.chorem.lima.entity.Account;
import org.chorem.lima.ui.combobox.AccountComboBoxModel;
+import org.chorem.lima.ui.combobox.AccountRenderer;
import org.chorem.lima.util.AccountToString;
import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountRenderer.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountRenderer.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountRenderer.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -1,49 +0,0 @@
-/* *##% Lima Swing
- * Copyright (C) 2008 - 2010 CodeLutin
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * ##%*/
-
-package org.chorem.lima.ui.accountsreports;
-
-import java.awt.Component;
-
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JLabel;
-import javax.swing.JList;
-
-import org.chorem.lima.entity.Account;
-
-public class AccountRenderer extends DefaultListCellRenderer {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-
- JLabel label = new JLabel();
- Account account = (Account) value;
- if (account != null){
- String accountLabel = account.getLabel();
- int nbChars = 30;
- if (accountLabel.length()>nbChars){
- accountLabel = accountLabel.substring(0, nbChars)+"…";
- }
- label.setText(account.getAccountNumber() +" - " + accountLabel);
- }
- return label;
- }
-
-}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -82,9 +82,12 @@
res = _("lima.table.description"); //Description
break;
case 5:
+ res = _("lima.table.letter"); //Letter
+ break;
+ case 6:
res = _("lima.table.debit"); //Debit
break;
- case 6:
+ case 7:
res = _("lima.table.credit"); //Credit
break;
}
@@ -122,9 +125,17 @@
result = currentRow.getDescription();
break;
case 5:
+ if (currentRow.getLetter() != null){
+ result = currentRow.getLetter().getCode();
+ }
+ else {
+ result = null;
+ }
+ break;
+ case 6:
result = currentRow.getDebit() ? currentRow.getAmount() : 0;
break;
- case 6:
+ case 7:
result = currentRow.getDebit() ? 0 : currentRow.getAmount();
break;
}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2010-08-25 22:04:25 UTC (rev 3020)
@@ -42,7 +42,7 @@
<JLabel text="lima.common.filter"/>
</cell>
<cell anchor="west">
- <JTextField id='balanceFilter' minimumSize='{balanceFilter.getPreferredSize()}'/>
+ <JTextField id='balanceFilter' toolTipText="lima.tooltip.filter" minimumSize='{balanceFilter.getPreferredSize()}'/>
<javax.swing.text.Document javaBean="balanceFilter.getDocument()"
onInsertUpdate='handler.setAccountFilter(balanceFilter.getText())'
onRemoveUpdate='handler.setAccountFilter(balanceFilter.getText())' />
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AccountTableCellEditor.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -34,7 +34,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.chorem.lima.entity.Account;
-import org.chorem.lima.ui.accountsreports.AccountRenderer;
+import org.chorem.lima.ui.combobox.AccountRenderer;
import org.chorem.lima.ui.combobox.SubAccountComboBoxModel;
import org.chorem.lima.util.AccountToString;
import org.chorem.lima.widgets.JWideComboBox;
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/LetterTableCellEditor.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/LetterTableCellEditor.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/LetterTableCellEditor.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,146 @@
+/*
+ * *##% Lima Main
+ * Copyright (C) 2008 CodeLutin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*
+ */
+
+package org.chorem.lima.ui.celleditor;
+
+import java.awt.Component;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
+import java.util.EventObject;
+import javax.swing.AbstractCellEditor;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.table.TableCellEditor;
+import javax.swing.text.JTextComponent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.lima.entity.Account;
+import org.chorem.lima.ui.combobox.LetterComboBoxModel;
+import org.chorem.lima.ui.combobox.LetterRenderer;
+import org.chorem.lima.util.LetterToString;
+import org.chorem.lima.widgets.JWideComboBox;
+import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
+
+public class LetterTableCellEditor extends AbstractCellEditor implements TableCellEditor, KeyListener {
+
+ protected static final Log log = LogFactory.getLog(EntryBookTableCellEditor.class);
+ private final JWideComboBox comboBox;
+ private static final long serialVersionUID = 1L;
+ private static LetterTableCellEditor editor;
+ private static LetterComboBoxModel comboBoxModel;
+ private static boolean keyPressed = false;
+
+ /**
+ * constructor
+ */
+ public LetterTableCellEditor() {
+ super();
+ comboBox = new JWideComboBox();
+ comboBoxModel = new LetterComboBoxModel();
+ comboBox.setModel(comboBoxModel);
+ LetterRenderer renderer = new LetterRenderer();
+ comboBox.setRenderer(renderer);
+ AutoCompleteDecorator.decorate(comboBox, LetterToString.getInstance());
+ comboBox.getEditor().getEditorComponent().addKeyListener(this);
+ }
+
+ @Override
+ public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+ if (value instanceof Account){
+ comboBox.setSelectedItem((Account) value);
+ }
+ return comboBox;
+ }
+
+ @Override
+ public Object getCellEditorValue() {
+ return comboBox.getSelectedItem();
+ }
+
+ /**
+ * Vérifie si la cellule peut être éditable :
+ * seulement si il y a une frappe au clavier ou un double clic.
+ * @param evt
+ * @return
+ */
+ @Override
+ public boolean isCellEditable(EventObject evt) {
+ // Si il y a une frappe au clavier
+ if (evt instanceof KeyEvent) {
+ final KeyEvent keyEvent = (KeyEvent) evt;
+ // Empèche la touche echap
+ if ( keyEvent.getKeyChar() != KeyEvent.VK_ESCAPE){
+ // Permet de placer le focus sur l'editor de la comboBox
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ comboBox.getEditor().getEditorComponent().requestFocus();
+ JTextComponent edit = (JTextComponent) comboBox.getEditor().getEditorComponent();
+ if (!Character.isIdentifierIgnorable(keyEvent.getKeyChar()))
+ {
+ edit.setText(Character.toString(keyEvent.getKeyChar()));
+ }
+ }
+ });
+ }
+ }
+ keyPressed = false;
+ return ( !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 2 );
+ }
+
+
+ @Override
+ public void keyPressed(KeyEvent e) {
+
+ }
+
+ @Override
+ public void keyReleased(KeyEvent e) {
+
+ // Vérifie si c'est la première frappe au clavier
+ if ( keyPressed == false )
+ {
+ // Récupère l'editor de la comboBox
+ JTextComponent edit = (JTextComponent) comboBox.getEditor().getEditorComponent();
+ // Met en place le curseur et la selection après la première lettre
+ edit.select(1, edit.getText().length());
+ keyPressed = true;
+ }
+
+ // delegate popup list menu
+ if ( e.getKeyChar() == KeyEvent.VK_ENTER )
+ {
+ fireEditingStopped();
+ }
+ }
+
+ @Override
+ public void keyTyped(KeyEvent e) {
+
+ }
+
+ public static LetterTableCellEditor getInstance() {
+ if (editor == null) {
+ editor = new LetterTableCellEditor();
+ }
+ return editor;
+ }
+
+}
Copied: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java (from rev 2999, trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountRenderer.java)
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,49 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.ui.combobox;
+
+import java.awt.Component;
+
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JLabel;
+import javax.swing.JList;
+
+import org.chorem.lima.entity.Account;
+
+public class AccountRenderer extends DefaultListCellRenderer {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+
+ JLabel label = new JLabel();
+ Account account = (Account) value;
+ if (account != null){
+ String accountLabel = account.getLabel();
+ int nbChars = 30;
+ if (accountLabel.length()>nbChars){
+ accountLabel = accountLabel.substring(0, nbChars)+"…";
+ }
+ label.setText(account.getAccountNumber() +" - " + accountLabel);
+ }
+ return label;
+ }
+
+}
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,110 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.ui.combobox;
+
+import java.util.List;
+import javax.swing.AbstractListModel;
+import javax.swing.ComboBoxModel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.lima.business.FinancialTransactionServiceMonitorable;
+import org.chorem.lima.business.ImportServiceMonitorable;
+import org.chorem.lima.business.LimaException;
+import org.chorem.lima.business.ServiceListener;
+import org.chorem.lima.entity.Letter;
+import org.chorem.lima.service.LimaServiceFactory;
+import org.chorem.lima.ui.financialperiod.FinancialPeriodTableModel;
+
+/**
+ * Account combo box model.
+ */
+
+public class LetterComboBoxModel extends AbstractListModel implements ComboBoxModel, ServiceListener {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final Log log =
+ LogFactory.getLog(FinancialPeriodTableModel.class);
+
+ protected Object selectedAccount;
+
+ protected List<Letter> datasCache;
+
+ protected FinancialTransactionServiceMonitorable service;
+
+ public LetterComboBoxModel () {
+ service =
+ LimaServiceFactory.getInstance().getService(
+ FinancialTransactionServiceMonitorable.class);
+ service.addListener(this);
+ LimaServiceFactory.getInstance().getService(
+ ImportServiceMonitorable.class).addListener(this);
+ datasCache = getDataList();
+ }
+
+ @Override
+ public Object getSelectedItem() {
+ return selectedAccount;
+ }
+
+ @Override
+ public void setSelectedItem(Object anItem) {
+ selectedAccount = anItem;
+ fireContentsChanged(this, -1, -1);
+ }
+
+
+ @Override
+ public Object getElementAt(int index) {
+ return datasCache.get(index);
+ }
+
+ @Override
+ public int getSize() {
+ return datasCache.size();
+ }
+
+ public List<Letter> getDataList(){
+ List<Letter> result = null;
+ try {
+ result = service.getAllLetters();
+ }
+ catch (LimaException eee) {
+ if (log.isDebugEnabled()){
+ log.debug("Can't get list letters", eee);
+ }
+ }
+ return result;
+
+ }
+
+ public void refresh(){
+ datasCache = getDataList();
+ fireContentsChanged(this, 0, datasCache.size());
+ }
+
+ @Override
+ public void notifyMethod(String serviceName, String methodeName) {
+ if (methodeName.contains("Letter") || methodeName.contains("importAll")){
+ refresh();
+ }
+ }
+
+
+}
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterRenderer.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterRenderer.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterRenderer.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,42 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.ui.combobox;
+
+import java.awt.Component;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import org.chorem.lima.entity.Letter;
+
+public class LetterRenderer extends DefaultListCellRenderer {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+
+ JLabel label = new JLabel();
+ Letter letter = (Letter) value;
+ if (letter != null){
+ label.setText(letter.getCode());
+ }
+ return label;
+ }
+
+}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -65,23 +65,26 @@
String res = "n/a";
switch (column) {
case 0:
- res = _("lima.table.date"); //Date
+ res = _("lima.table.date");
break;
case 1:
- res = _("lima.table.account"); //Account
+ res = _("lima.table.account");
break;
case 2:
- res = _("lima.table.voucher"); // Voucher
+ res = _("lima.table.voucher");
break;
case 3:
- res = _("lima.table.description"); //Description
+ res = _("lima.table.description");
break;
case 4:
- res = _("lima.table.debit"); //Debit
- break;
+ res = _("lima.table.letter");
+ break;
case 5:
- res = _("lima.table.credit"); //Credit
+ res = _("lima.table.debit");
break;
+ case 6:
+ res = _("lima.table.credit");
+ break;
}
return res;
}
@@ -114,9 +117,17 @@
result = currentRow.getDescription();
break;
case 4:
+ if (currentRow.getLetter() != null){
+ result = currentRow.getLetter().getCode();
+ }
+ else {
+ result = null;
+ }
+ break;
+ case 5:
result = currentRow.getDebit() ? currentRow.getAmount() : 0;
break;
- case 5:
+ case 6:
result = currentRow.getDebit() ? 0 : currentRow.getAmount();
break;
}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -20,22 +20,14 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
import javax.swing.JComboBox;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.chorem.lima.entity.EntryBook;
import org.chorem.lima.entity.FinancialPeriod;
-import org.chorem.lima.entity.FiscalPeriod;
-import org.chorem.lima.ui.combobox.EntryBookComboBoxModel;
-import org.chorem.lima.ui.combobox.EntryBookRenderer;
import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel;
import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer;
-import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel;
-import org.chorem.lima.util.EntryBookToString;
-import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
+
public class FinancialPeriodComboBox extends JComboBox implements ActionListener {
private static final long serialVersionUID = 1L;
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -43,6 +43,7 @@
import org.chorem.lima.entity.FinancialPeriod;
import org.chorem.lima.entity.FinancialTransactionImpl;
import org.chorem.lima.entity.FinancialTransaction;
+import org.chorem.lima.entity.Letter;
import org.chorem.lima.service.LimaServiceFactory;
import org.chorem.lima.util.DialogHelper;
import org.chorem.lima.util.ErrorHelper;
@@ -159,7 +160,7 @@
result = String.class;
break;
case 5:
- result = String.class;
+ result = Letter.class;
break;
case 6:
result = BigDecimal.class;
@@ -297,8 +298,13 @@
result = currentEntry.getDescription();
break;
case 5 :
- result = currentEntry.getLettering();
- break;
+ if (currentEntry.getLetter() != null){
+ result = currentEntry.getLetter().getCode();
+ }
+ else {
+ result = null;
+ }
+ break;
case 6:
result = currentEntry.getDebit() ? currentEntry.getAmount() : 0;
break;
@@ -495,7 +501,7 @@
currentEntry.setDescription((String)value);
break;
case 5 :
- currentEntry.setLettering((String)value);
+ currentEntry.setLetter((Letter)value);
break;
case 6:
currentEntry.setAmount((BigDecimal)value);
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchComboBox.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchComboBox.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchComboBox.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -26,8 +26,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.chorem.lima.entity.Account;
-import org.chorem.lima.ui.accountsreports.AccountRenderer;
import org.chorem.lima.ui.combobox.AccountComboBoxModel;
+import org.chorem.lima.ui.combobox.AccountRenderer;
import org.chorem.lima.util.AccountToString;
import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchPanel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchPanel.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchPanel.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -18,6 +18,7 @@
package org.chorem.lima.ui.financialtransactionsearch;
+import static org.nuiton.i18n.I18n._;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import javax.swing.JPanel;
@@ -55,6 +56,7 @@
case ACCOUNT_LIST:
final JTextField accountsList = new JTextField(16);
accountsList.setMinimumSize(accountsList.getPreferredSize());
+ accountsList.setToolTipText(_("lima.tooltip.filter"));
KeyListener accountsListKeyListener = new KeyListener() {
@Override
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -35,6 +35,7 @@
import org.chorem.lima.entity.EntryImpl;
import org.chorem.lima.entity.FinancialTransaction;
import org.chorem.lima.entity.FiscalPeriod;
+import org.chorem.lima.entity.Letter;
import org.chorem.lima.service.LimaServiceFactory;
import org.chorem.lima.util.DialogHelper;
import org.chorem.lima.util.ErrorHelper;
@@ -158,7 +159,7 @@
result = BigDecimal.class;
break;
case 8:
- result = String.class;
+ result = Letter.class;
break;
}
@@ -295,8 +296,13 @@
result = null;
break;
case 8:
- result = currentEntry.getLettering();
- break;
+ if (currentEntry.getLetter() != null){
+ result = currentEntry.getLetter().getCode();
+ }
+ else {
+ result = null;
+ }
+ break;
}
}
@@ -409,7 +415,7 @@
currentEntry.setDebit(false);
break;
case 8:
- currentEntry.setLettering((String)value);
+ currentEntry.setLetter((Letter)value);
break;
}
try {
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2010-08-25 22:04:25 UTC (rev 3020)
@@ -24,12 +24,14 @@
import org.chorem.lima.enums.ComboBoxPeriodEnum;
import org.chorem.lima.enums.ComboBoxAccountsEnum;
import org.chorem.lima.enums.ComboBoxEntryBooksEnum;
+ import org.chorem.lima.enums.ComboBoxLetterEnum;
import org.chorem.lima.FinancialStatementWayEnum;
import org.chorem.lima.enums.ComboBoxOperatorsEnum;
AccountSearchPanel accountSearchPanel = new AccountSearchPanel(handler);
AmountSearchPanel amountSearchPanel = new AmountSearchPanel(handler);
EntryBookSearchPanel entryBookSearchPanel = new EntryBookSearchPanel(handler);
+ LetterSearchPanel letterSearchPanel = new LetterSearchPanel(handler);
FinancialTransactionPeriodSearchPanel periodSearchPanel = new FinancialTransactionPeriodSearchPanel(handler);
void $afterCompleteSetup() {
@@ -64,12 +66,10 @@
onInsertUpdate='handler.setDescription(description.getText())'
onRemoveUpdate='handler.setDescription(description.getText())' />
</cell>
- <cell><JLabel text="lima.table.letter"/></cell>
- <cell><JTextField id='letter' minimumSize='{letter.getPreferredSize()}'/>
- <javax.swing.text.Document javaBean="letter.getDocument()"
- onInsertUpdate='handler.setLetter(letter.getText())'
- onRemoveUpdate='handler.setLetter(letter.getText())' />
- </cell>
+ <cell><JComboBox id="letterComboBox" javaBean="new JComboBox(ComboBoxLetterEnum.descriptions())"
+ onActionPerformed="letterSearchPanel.refresh(ComboBoxLetterEnum.valueOfDescription((String) letterComboBox.getSelectedItem()));
+ validate(); repaint()"/></cell>
+ <cell><LetterSearchPanel javaBean="letterSearchPanel"/></cell>
</row></Table></cell>
</row>
<row>
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -28,6 +28,7 @@
import org.chorem.lima.business.ejbinterface.FinancialTransactionService;
import org.chorem.lima.entity.Account;
import org.chorem.lima.entity.EntryBook;
+import org.chorem.lima.entity.Letter;
import org.chorem.lima.service.LimaServiceFactory;
import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel;
@@ -97,12 +98,8 @@
financialTransactionSearch.setDescription(result);
}
- public void setLetter(String letter){
- String result = null;
- if (!letter.equals("")){
- result = letter;
- }
- financialTransactionSearch.setLetter(result);
+ public void setLetter(Letter letter){
+ financialTransactionSearch.setLetter(letter);
}
public String getAccountsList(){
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchComboBox.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchComboBox.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchComboBox.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,87 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.ui.financialtransactionsearch;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import javax.swing.JComboBox;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.lima.entity.Letter;
+import org.chorem.lima.ui.combobox.LetterComboBoxModel;
+import org.chorem.lima.ui.combobox.LetterRenderer;
+import org.chorem.lima.util.LetterToString;
+import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
+
+public class LetterSearchComboBox extends JComboBox implements KeyListener, ActionListener {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final Log log =
+ LogFactory.getLog(LetterSearchComboBox.class);
+
+ protected FinancialTransactionSearchViewHandler handler;
+
+ public LetterSearchComboBox(FinancialTransactionSearchViewHandler handler) {
+ this.handler = handler;
+ LetterComboBoxModel letterComboBoxModel = new LetterComboBoxModel();
+ LetterRenderer letterRenderer = new LetterRenderer();
+ setModel(letterComboBoxModel);
+ setRenderer(letterRenderer);
+ setEditable(true);
+ AutoCompleteDecorator.decorate(this, LetterToString.getInstance());
+ this.getEditor().getEditorComponent().addKeyListener(this);
+ this.addActionListener(this);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Object object = this.getSelectedItem();
+ if (object instanceof Letter){
+ handler.setLetter((Letter) this.getSelectedItem());
+ }
+ }
+
+
+ @Override
+ public void keyPressed(KeyEvent e) {
+
+ }
+
+ @Override
+ public void keyReleased(KeyEvent e) {
+ Object object = this.getSelectedItem();
+ if (object instanceof Letter){
+ handler.setLetter((Letter) this.getSelectedItem());
+ }
+ // delegate popup list menu
+ if ( e.getKeyChar() == KeyEvent.VK_ENTER )
+ {
+ firePopupMenuCanceled();
+ }
+ }
+
+ @Override
+ public void keyTyped(KeyEvent e) {
+
+ }
+
+}
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchPanel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchPanel.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/LetterSearchPanel.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,53 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.ui.financialtransactionsearch;
+
+import javax.swing.JPanel;
+import org.chorem.lima.enums.ComboBoxLetterEnum;
+
+public class LetterSearchPanel extends JPanel {
+
+ protected FinancialTransactionSearchViewHandler handler;
+
+ public LetterSearchPanel(FinancialTransactionSearchViewHandler handler) {
+ this.handler = handler;
+ }
+
+ static final long serialVersionUID = 1L;
+
+ public void refresh(ComboBoxLetterEnum comboBoxEnum){
+
+ switch (comboBoxEnum) {
+ case ALL:
+ handler.setLetter(null);
+ handler.refresh();
+ this.removeAll();
+ break;
+
+ case SELECT_ONE:
+ LetterSearchComboBox comboBox = new LetterSearchComboBox(handler);
+ this.removeAll();
+ this.add(comboBox);
+ break;
+
+ }
+
+ }
+
+}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -37,6 +37,7 @@
import org.chorem.lima.entity.EntryImpl;
import org.chorem.lima.entity.FinancialTransaction;
import org.chorem.lima.entity.FiscalPeriod;
+import org.chorem.lima.entity.Letter;
import org.chorem.lima.service.LimaServiceFactory;
import org.chorem.lima.util.DialogHelper;
import org.chorem.lima.util.ErrorHelper;
@@ -160,7 +161,7 @@
result = BigDecimal.class;
break;
case 8:
- result = String.class;
+ result = Letter.class;
break;
}
@@ -297,8 +298,13 @@
result = null;
break;
case 8:
- result = currentEntry.getLettering();
- break;
+ if (currentEntry.getLetter() != null){
+ result = currentEntry.getLetter().getCode();
+ }
+ else {
+ result = null;
+ }
+ break;
}
}
@@ -411,7 +417,7 @@
currentEntry.setDebit(false);
break;
case 8:
- currentEntry.setLettering((String)value);
+ currentEntry.setLetter((Letter)value);
break;
}
try {
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx 2010-08-25 22:04:25 UTC (rev 3020)
@@ -41,7 +41,7 @@
<JLabel text="lima.common.filter"/>
</cell>
<cell anchor="west">
- <JTextField id='balanceFilter' minimumSize='{balanceFilter.getPreferredSize()}'/>
+ <JTextField id='balanceFilter' toolTipText="lima.tooltip.filter" minimumSize='{balanceFilter.getPreferredSize()}'/>
<javax.swing.text.Document javaBean="balanceFilter.getDocument()"
onInsertUpdate='handler.setAccountFilter(balanceFilter.getText())'
onRemoveUpdate='handler.setAccountFilter(balanceFilter.getText())' />
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.jaxx (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.jaxx 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,57 @@
+<!-- ##% Lima Swing
+ Copyright (C) 2008 - 2010 CodeLutin
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ ##% -->
+
+<JDialog modal="true">
+ <jaxx.runtime.swing.JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/>
+ <Boolean id="validOk" javaBean='true'/>
+
+ <script>
+ <![CDATA[
+
+ getRootPane().setDefaultButton(ok);
+ protected void performCancel() {
+ setValidOk(false);
+ dispose();
+ }
+ ]]>
+ </script>
+
+ <Table>
+ <row fill="horizontal">
+ <cell>
+ <JRadioButton id="newLetter" text='lima.entries.lettering.radiobutton.new' value='{true}' buttonGroup="{getRadioButtons()}"
+ selected='true'/>
+ </cell>
+ <cell><JTextField editable="false" visible="{newLetter.isSelected()}" id='newLetterTextField' /></cell>
+ </row>
+ <row>
+ <cell>
+ <JRadioButton id="listLetter" text='lima.entries.lettering.radiobutton.list' value='{false}' buttonGroup="{getRadioButtons()}"
+ selected='true'/>
+ </cell>
+ <cell><JComboBox id='LetterListComboBox' visible="{listLetter.isSelected()}" javaBean="new LetterComboBox()"/></cell>
+ </row>
+ <row>
+ <cell fill="none">
+ <JButton text="lima.common.cancel" onActionPerformed="performCancel()"/>
+ </cell>
+ <cell fill="none">
+ <JButton id="ok" text="lima.common.ok" onActionPerformed="dispose()"/>
+ </cell>
+ </row>
+ </Table>
+</JDialog>
\ No newline at end of file
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.jaxx
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetterComboBox.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetterComboBox.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetterComboBox.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,47 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.ui.lettering;
+
+import javax.swing.JComboBox;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.lima.ui.combobox.LetterComboBoxModel;
+import org.chorem.lima.ui.combobox.LetterRenderer;
+import org.chorem.lima.util.LetterToString;
+import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
+
+public class LetterComboBox extends JComboBox {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final Log log =
+ LogFactory.getLog(LetterComboBox.class);
+
+
+ public LetterComboBox() {
+
+ LetterComboBoxModel letterComboBoxModel = new LetterComboBoxModel();
+ LetterRenderer letterRenderer = new LetterRenderer();
+ setModel(letterComboBoxModel);
+ setRenderer(letterRenderer);
+ setEditable(true);
+ AutoCompleteDecorator.decorate(this, LetterToString.getInstance());
+ }
+
+}
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,82 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.ui.lettering;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.JComboBox;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.lima.entity.FinancialPeriod;
+import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel;
+import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer;
+
+
+public class LetteringFinancialPeriodComboBox extends JComboBox implements ActionListener {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final Log log =
+ LogFactory.getLog(LetteringFinancialPeriodComboBox.class);
+
+ protected LetteringViewHandler handler;
+
+ public LetteringFinancialPeriodComboBox(LetteringViewHandler handler) {
+ this.handler = handler;
+
+ FinancialPeriodComboBoxModel comboBoxModel = new FinancialPeriodComboBoxModel();
+ FinancialPeriodComboBoxRenderer comboBoxRenderer = new FinancialPeriodComboBoxRenderer();
+
+ setModel(comboBoxModel);
+ setRenderer(comboBoxRenderer);
+ addActionListener(this);
+
+ }
+
+ public void back(){
+ int row = this.getSelectedIndex();
+ log.debug(row);
+ if (row > 0){
+ this.setSelectedItem(this.getItemAt(row-1));
+ repaint();
+ handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem());
+ }
+ }
+
+ public void next(){
+ int size = this.getModel().getSize();
+ int row = this.getSelectedIndex();
+ log.debug(row);
+
+ if (row < size-1){
+ this.setSelectedItem(this.getItemAt(row+1));
+ repaint();
+ handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem());
+ }
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Object object = this.getSelectedItem();
+ if (object instanceof FinancialPeriod){
+ handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem());
+ }
+ }
+
+}
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,174 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.ui.lettering;
+
+import static org.nuiton.i18n.I18n._;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.lima.entity.Account;
+import org.chorem.lima.entity.EntryBook;
+import org.chorem.lima.entity.Letter;
+import org.chorem.lima.ui.celleditor.AccountTableCellEditor;
+import org.chorem.lima.ui.celleditor.DateTableCellEditor;
+import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor;
+import org.chorem.lima.ui.celleditor.LetterTableCellEditor;
+import org.jdesktop.swingx.JXTable;
+import org.jdesktop.swingx.decorator.ColorHighlighter;
+import org.jdesktop.swingx.decorator.ComponentAdapter;
+import org.jdesktop.swingx.decorator.HighlightPredicate;
+import org.jdesktop.swingx.decorator.Highlighter;
+
+
+/**
+ * Table des transaction qui ajoute des comportement (keys).
+ *
+ * @author jpepin
+ */
+public class LetteringTable extends JXTable implements KeyListener {
+
+ /** serialVersionUID. */
+ private static final long serialVersionUID = 3133690382049594727L;
+
+ /** log. */
+ private static final Log log = LogFactory
+ .getLog(LetteringTable.class);
+
+ protected LetteringViewHandler handler;
+
+ private Highlighter colorTransaction;
+
+ private ColorHighlighter colorBalance;
+
+ public LetteringTable(LetteringViewHandler handler) {
+
+ this.handler = handler;
+
+ addKeyListener(this);
+
+ //Get new date editor
+ setDefaultEditor(Date.class, new DateTableCellEditor());
+ //Get new entry book editor
+ setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor());
+ //Get new account editor
+ setDefaultEditor(Account.class, new AccountTableCellEditor());
+ //Get new letter editor
+ setDefaultEditor(Letter.class, new LetterTableCellEditor());
+
+ //highlight financial financial transactions
+ addColorTransaction();
+ // highlight unbalanced financial transactions
+ addColorNonBalancedTransaction();
+
+
+ }
+
+ /**
+ * Cette méthode permet de colorer toutes les transactions dans le tableau
+ * afin de bien distinguer les transactions et entrées comptables.
+ * On récupère la première cellule, on vérifie que c'est une date
+ */
+ protected void addColorTransaction() {
+ if (colorTransaction != null) {
+ removeHighlighter(colorTransaction);
+ }
+ HighlightPredicate predicate = new HighlightPredicate() {
+ @Override
+ public boolean isHighlighted(Component renderer,
+ ComponentAdapter adapter) {
+ return adapter.getValueAt(adapter.row, 0) instanceof Date;
+ }
+ };
+ colorTransaction =
+ new ColorHighlighter(predicate, new Color(222,222,222), null);
+ addHighlighter(colorTransaction);
+ }
+
+
+
+ /**
+ * Permet de surligner une transaction dans le tableau lorsque
+ * cette dernière n'est pas équilibrée.
+ * On récupère la dernière cellule de la ligne
+ * et on vérifie si la valeur est différente de 0
+ */
+ protected void addColorNonBalancedTransaction() {
+ if (colorBalance != null) {
+ removeHighlighter(colorBalance);
+ }
+ HighlightPredicate predicate = new HighlightPredicate() {
+ @Override
+ public boolean isHighlighted(Component renderer,
+ ComponentAdapter adapter) {
+ boolean isHighlighted = false;
+ Object value = adapter.getValueAt(adapter.row, 8);
+ if (value instanceof BigDecimal) {
+ BigDecimal currentBalance = (BigDecimal) value;
+ if (currentBalance.doubleValue() != 0) {
+ isHighlighted = true;
+ }
+ }
+ return isHighlighted;
+ }
+ };
+ colorTransaction =
+ new ColorHighlighter(predicate, new Color(255, 198, 209), null);
+ addHighlighter(colorTransaction);
+ }
+
+ /**
+ * for each action combination key are think
+ * for extend keyboard and laptop keyboard
+ */
+ @Override
+ public void keyPressed(KeyEvent e) {
+
+
+ // add letter with the key combination : ctrl + L
+ if (e.getKeyCode() == KeyEvent.VK_L
+ && e.getModifiers() == KeyEvent.CTRL_MASK) {
+ handler.addLetter();
+ }
+
+ }
+
+
+ @Override
+ public void keyTyped(KeyEvent e) {
+
+ }
+
+
+ @Override
+ public void keyReleased(KeyEvent e) {
+
+ }
+
+
+}
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,415 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.ui.lettering;
+
+import static org.nuiton.i18n.I18n._;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import javax.swing.table.AbstractTableModel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.lima.business.FinancialTransactionServiceMonitorable;
+import org.chorem.lima.business.ImportServiceMonitorable;
+import org.chorem.lima.business.LimaException;
+import org.chorem.lima.business.ServiceListener;
+import org.chorem.lima.business.utils.EntryComparator;
+import org.chorem.lima.entity.Account;
+import org.chorem.lima.entity.Entry;
+import org.chorem.lima.entity.EntryBook;
+import org.chorem.lima.entity.FinancialPeriod;
+import org.chorem.lima.entity.FinancialTransaction;
+import org.chorem.lima.entity.Letter;
+import org.chorem.lima.service.LimaServiceFactory;
+import org.chorem.lima.util.DialogHelper;
+import org.chorem.lima.util.ErrorHelper;
+
+
+/**
+ * Basic transaction table model.
+ *
+ * Le modele est filtré sur {@link #selectedEntryBook} et
+ * {@link #selectedFinancialPeriod} (montée en charge !).
+ *
+ * @author ore
+ * @author chatellier
+ * @version $Revision: 2897 $
+ *
+ * Last update : $Date: 2010-05-14 13:22:26 +0200 (ven. 14 mai 2010) $
+ * By : $Author: jpepin $
+ */
+public class LetteringTableModel extends AbstractTableModel implements ServiceListener{
+
+ /** serialVersionUID. */
+ private static final long serialVersionUID = 1L;
+
+ /** log. */
+ private static final Log log = LogFactory
+ .getLog(LetteringTableModel.class);
+
+ /** Transaction service. */
+ protected final FinancialTransactionServiceMonitorable financialTransactionService;
+
+ /** selected financial period */
+ protected FinancialPeriod selectedFinancialPeriod;
+
+ /** data cache */
+ protected List<Object> cacheDataList;
+
+ /** collection
+
+
+ /**
+ * Model constructor.
+ *
+ * Just init service proxies.
+ */
+ public LetteringTableModel() {
+ /* Services */
+ financialTransactionService =
+ LimaServiceFactory.getInstance().getService(
+ FinancialTransactionServiceMonitorable.class);
+ financialTransactionService.addListener(this);
+ LimaServiceFactory.getInstance().getService(
+ ImportServiceMonitorable.class).addListener(this);
+ }
+
+ /**
+ * Le model est une combinaison de Transaction/Entries.
+ *
+ *
+ * @return
+ */
+ protected List<Object> getDataList() {
+ List<Object> results = new ArrayList<Object>();
+ if (selectedFinancialPeriod != null){
+ try {
+ List<FinancialTransaction> financialtransactions =
+ financialTransactionService.getAllFinancialTransactionsForFinancialPeriod(
+ selectedFinancialPeriod);
+ for (FinancialTransaction financialtransaction : financialtransactions) {
+ results.add(financialtransaction);
+ List<Entry> entries = (List<Entry>) financialtransaction.getEntry();
+ Collections.sort(entries, new EntryComparator());
+ results.addAll(entries);
+ }
+ }
+ catch (LimaException eee) {
+ if (log.isErrorEnabled()) {
+ log.error("Can't update model", eee);
+ }
+ ErrorHelper.showErrorDialog("Can't get transaction list", eee);
+ }
+ }
+ return results;
+ }
+
+ public void setLetter(int row, Letter letter){
+ try {
+ Object currentRow = cacheDataList.get(row);
+ if (currentRow instanceof Entry){
+ Entry entry = (Entry) currentRow;
+ financialTransactionService.setEntryLetter(entry, letter);
+ }
+ } catch (LimaException eee) {
+ log.error("Can't set letter", eee);
+ }
+ }
+
+ public void removeLetter(int row){
+ try {
+ Object currentRow = cacheDataList.get(row);
+ if (currentRow instanceof Entry){
+ Entry entry = (Entry) currentRow;
+ financialTransactionService.removeEntryLetter(entry);
+ }
+ } catch (LimaException eee) {
+ log.error("Can't remove letter", eee);
+ }
+ }
+
+ public void refresh(){
+ cacheDataList = getDataList();
+ fireTableDataChanged();
+ }
+
+ @Override
+ public int getColumnCount() {
+ return 9;
+ }
+
+ @Override
+ public Class<?> getColumnClass(int column) {
+
+ Class<?> result = null;
+
+ switch (column) {
+ case 0:
+ result = Date.class;
+ break;
+ case 1:
+ result = EntryBook.class;
+ break;
+ case 2:
+ result = String.class;
+ break;
+ case 3:
+ result = Account.class;
+ break;
+ case 4:
+ result = String.class;
+ break;
+ case 5:
+ result = Letter.class;
+ break;
+ case 6:
+ result = BigDecimal.class;
+ break;
+ case 7:
+ result = BigDecimal.class;
+ break;
+ case 8:
+ result = BigDecimal.class;
+ break;
+ }
+
+ return result;
+ }
+
+
+
+ @Override
+ public String getColumnName(int column) {
+ String result = "n/a";
+
+ switch (column) {
+ case 0:
+ result = _("lima.table.date");
+ break;
+ case 1:
+ result = _("lima.table.entrybook");
+ break;
+ case 2:
+ result = _("lima.table.voucher");
+ break;
+ case 3:
+ result = _("lima.table.account");
+ break;
+ case 4:
+ result = _("lima.table.description");
+ break;
+ case 5:
+ result = _("lima.table.letter");
+ break;
+ case 6:
+ result = _("lima.table.debit");
+ break;
+ case 7:
+ result = _("lima.table.credit");
+ break;
+ case 8:
+ result = _("lima.table.balance");
+ break;
+ }
+
+ return result;
+ }
+
+ @Override
+ public int getRowCount() {
+ int result = 0;
+
+ if (cacheDataList != null) {
+ result = cacheDataList.size();
+ }
+
+ return result;
+ }
+
+ @Override
+ public Object getValueAt(int row, int column) {
+ Object result = null;
+
+ // just prevent too much result
+ if (cacheDataList != null) {
+ result = cacheDataList.get(row);
+
+ if (result instanceof FinancialTransaction) {
+ FinancialTransaction currentRow = (FinancialTransaction)result;
+ BigDecimal amountDebit = currentRow.getAmountDebit();
+ BigDecimal amountCredit = currentRow.getAmountCredit();
+
+ switch (column) {
+ case 0:
+ result = currentRow.getTransactionDate();
+ break;
+ case 1:
+ if (currentRow.getEntryBook() != null){
+ result = currentRow.getEntryBook().getCode();
+ }
+ else {
+ result = null;
+ }
+ break;
+ case 2:
+ result = null; //voucher
+ break;
+ case 3:
+ result = null; // account
+ break;
+ case 4:
+ result = null; // description
+ break;
+ case 5 :
+ result = null; // letter
+ break;
+ case 6:
+ result = amountDebit;
+ break;
+ case 7:
+ result = amountCredit;
+ break;
+ case 8:
+ result = amountDebit.subtract(amountCredit);
+ break;
+ }
+ }
+ else if (result instanceof Entry) {
+ Entry currentEntry = (Entry)result;
+ switch (column) {
+ case 0:
+ result = null; // date
+ break;
+ case 1 : // entry book
+ result = null;
+ break;
+ case 2:
+ result = currentEntry.getVoucher();
+ break;
+ case 3: // account
+ if (currentEntry.getAccount() != null){
+ result = currentEntry.getAccount().getAccountNumber();
+ }
+ else {
+ result = null;
+ }
+ break;
+ case 4:
+ result = currentEntry.getDescription();
+ break;
+ case 5 :
+ if (currentEntry.getLetter() != null){
+ result = currentEntry.getLetter().getCode();
+ }
+ else {
+ result = null;
+ }
+ break;
+ case 6:
+ result = currentEntry.getDebit() ? currentEntry.getAmount() : 0;
+ break;
+ case 7:
+ result = currentEntry.getDebit() ? 0 : currentEntry.getAmount();
+ break;
+ case 8:
+ result = null;
+ break;
+ }
+
+ }
+ }
+ return result;
+ }
+
+
+ public void setFinancialPeriod(FinancialPeriod financialPeriod){
+ selectedFinancialPeriod = financialPeriod;
+ refresh();
+ }
+
+ /**
+ * To set cells editable or not
+ * different condition for entry or financial transaction
+ */
+ @Override
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
+ boolean editableCell=false;
+ Object currentRow = cacheDataList.get(rowIndex);
+ // cells editable for the entry row, all cells exclude the date
+ if ((currentRow instanceof Entry) && ((columnIndex==5))) {
+ editableCell=true;
+ }
+ return editableCell; }
+
+
+
+ public Object getElementAt(int row){
+ Object result = null;
+ if (cacheDataList != null){
+ result = cacheDataList.get(row);
+ }
+ return result;
+ }
+
+
+ /**
+ * to modifiy letter entry
+ */
+ @Override
+ public void setValueAt(Object value, int row, int column) {
+ int financialTransactionRow = 0;
+ if (cacheDataList != null) {
+ Object currentRow = cacheDataList.get(row);
+ if (currentRow instanceof Entry) {
+ Entry currentEntry = (Entry)currentRow;
+ switch (column) {
+ case 5 :
+ currentEntry.setLetter((Letter)value);
+ break;
+ }
+ try {
+ financialTransactionService.updateEntry(currentEntry);
+
+ } catch (LimaException eee) {
+ if (log.isDebugEnabled()){
+ log.error("Can't update entry", eee);
+ }
+ DialogHelper.showMessageDialog(eee.getMessage());
+ }
+ //update the financial transaction in entire
+ financialTransactionRow =
+ getDataList().indexOf(((Entry) currentRow).
+ getFinancialTransaction());
+ }
+ //on recharge la liste
+ cacheDataList = getDataList();
+ fireTableRowsUpdated(financialTransactionRow, getRowCount()-1);
+ }
+ }
+
+ @Override
+ public void notifyMethod(String serviceName, String methodeName) {
+ if (serviceName.contains("FinancialTransaction") || methodeName.contains("importEntries") || methodeName.contains("importAll")){
+ refresh();
+ }
+ }
+
+}
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,90 @@
+<!-- ##% Lima Swing
+ Copyright (C) 2008 - 2010 CodeLutin
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ ##% -->
+
+<Table>
+ <LetteringViewHandler id="handler" javaBean="new LetteringViewHandler(this)" />
+ <Boolean id="selectedRow" javaBean="false" />
+ <org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel id="modelFinancialPeriod"/>
+ <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/>
+ <script>
+ <![CDATA[
+ import org.chorem.lima.entity.FiscalPeriod;
+ import org.chorem.lima.entity.FinancialPeriod;
+ import org.chorem.lima.ui.lettering.LetteringFinancialPeriodComboBox;
+
+ LetteringFinancialPeriodComboBox financialPeriodComboBox = new LetteringFinancialPeriodComboBox(handler);
+
+
+ void $afterCompleteSetup() {
+ getHandler().refresh();
+ }
+
+ ]]>
+ </script>
+
+ <row weightx="1" weighty="0" anchor="center">
+ <cell anchor="east">
+ <JLabel id="fiscalPeriodLabel" text="lima.charts.fiscalyear"/>
+ </cell>
+ <cell anchor="west">
+ <JComboBox id="fiscalPeriodComboBox"
+ model="{getModelFiscalPeriod()}"
+ renderer="{new org.chorem.lima.ui.combobox.FiscalPeriodComboBoxRenderer()}"
+ onActionPerformed="getModelFinancialPeriod().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem());
+ getHandler().refresh()"
+ editable="false"/>
+ </cell>
+ <cell anchor="east">
+ <JLabel id="financialPeriodLabel" text="lima.common.period"
+ />
+ </cell>
+ <cell anchor="west">
+ <JComboBox javaBean="financialPeriodComboBox"/>
+ </cell>
+ <cell>
+ <JButton id="back" text="lima.common.buttonback"
+ onActionPerformed="financialPeriodComboBox.back()"/>
+ </cell>
+ <cell>
+ <JButton id="next" text="lima.common.buttonnext"
+ onActionPerformed="financialPeriodComboBox.next()"/>
+ </cell>
+ <cell>
+ <JButton text="lima.entries.lettering.add"
+ onActionPerformed="handler.addLetter()" toolTipText="lima.tooltip.lettering" enabled="{isSelectedRow()}"/>
+ </cell>
+ <cell>
+ <JButton text="lima.entries.lettering.remove"
+ onActionPerformed="handler.removeLetter()" enabled="{isSelectedRow()}"/>
+ </cell>
+
+ </row>
+ <row>
+ <cell fill="both" weightx="1" weighty="1" rows="3" columns="11">
+ <JScrollPane>
+ <org.chorem.lima.ui.lettering.LetteringTableModel
+ id="tableModel"/>
+ <org.chorem.lima.ui.lettering.LetteringTable
+ id="table" sortable="false" rowHeight="22"
+ constructorParams="getHandler()" model="{getTableModel()}"
+ selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION }" />
+ <javax.swing.ListSelectionModel javaBean="getTable().getSelectionModel()"
+ onValueChanged="setSelectedRow(table.getSelectedRow() != -1)"/>
+ </JScrollPane>
+ </cell>
+ </row>
+</Table>
\ No newline at end of file
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx
___________________________________________________________________
Added: svn:executable
+ *
Added: 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 (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,138 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.ui.lettering;
+
+import static org.nuiton.i18n.I18n._;
+import javax.swing.JComboBox;
+import javax.swing.JTextField;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.lima.business.FinancialTransactionServiceMonitorable;
+import org.chorem.lima.business.LimaException;
+import org.chorem.lima.entity.Letter;
+import org.chorem.lima.service.LimaServiceFactory;
+import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel;
+import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel;
+import org.chorem.lima.util.DialogHelper;
+
+
+/**
+ * Handler associated with financial transaction view.
+ *
+ * @author chatellier
+ * @version $Revision: 3015 $
+ *
+ * Last update : $Date: 2010-08-23 18:38:53 +0200 (lun., 23 août 2010) $
+ * By : $Author: jpepin $
+ */
+public class LetteringViewHandler {
+
+ /** log. */
+ private static final Log log =
+ LogFactory.getLog(LetteringViewHandler.class);
+
+ protected LetteringView view;
+
+ protected LetteringTable table;
+
+ protected LetteringTableModel tableModel;
+
+ protected FiscalPeriodComboBoxModel fiscalPeriodComboBoxModel;
+
+ protected FinancialPeriodComboBoxModel financialPeriodComboBoxModel;
+
+ /** Transaction service. */
+ protected final FinancialTransactionServiceMonitorable financialTransactionService;
+
+ protected Object clipBoard;
+
+ protected LetteringViewHandler(LetteringView view) {
+ this.view = view;
+
+ /* Services */
+ financialTransactionService =
+ LimaServiceFactory.getInstance().getService(
+ FinancialTransactionServiceMonitorable.class);
+ }
+
+
+
+ public void addLetter(){
+ Letter letter = null;
+ Boolean valid = true;
+
+ table = view.getTable();
+ tableModel = view.getTableModel();
+
+ AddLetterForm addLetterForm = new AddLetterForm();
+ JTextField newLetterTextField = addLetterForm.getNewLetterTextField();
+
+ try {
+ letter = financialTransactionService.getNewLetter();
+ newLetterTextField.setText(letter.getCode());
+ } catch (LimaException eee) {
+ log.error("Can't get new letter", eee);
+ }
+
+ addLetterForm.setLocationRelativeTo(view);
+ addLetterForm.setVisible(true);
+
+ //false = cancel Action
+ if (addLetterForm.validOk){
+ Object object = addLetterForm.getRadioButtons().getSelectedValue();
+ if (!(Boolean) object){
+ JComboBox comboBox = addLetterForm.getLetterListComboBox();
+ Object selectedObject = comboBox.getSelectedItem();
+ if (selectedObject instanceof Letter){
+ letter = (Letter) selectedObject;
+ }
+ else {
+ DialogHelper.showMessageDialog(_("lima.entries.lettering.noletterselected"));
+ valid = false;
+ }
+ }
+ if (valid){
+ //addLetters
+ int[] rows = table.getSelectedRows();
+ for (int i : rows) {
+ tableModel.setLetter(i, letter);
+ }
+ tableModel.refresh();
+ }
+ }
+ }
+
+ public void removeLetter(){
+
+ table = view.getTable();
+ tableModel = view.getTableModel();
+
+ //removeLetters
+ int[] rows = table.getSelectedRows();
+ for (int i : rows) {
+ tableModel.removeLetter(i);
+ }
+ tableModel.refresh();
+ }
+
+ public void refresh(){
+ tableModel = view.getTableModel();
+ tableModel.refresh();
+ }
+}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -18,7 +18,6 @@
* ##%*/
import static org.nuiton.i18n.I18n._;
-
import java.awt.Color;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/util/AccountToString.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/util/AccountToString.java 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/util/AccountToString.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -1,3 +1,21 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
package org.chorem.lima.util;
import org.chorem.lima.entity.Account;
Added: trunk/lima-swing/src/main/java/org/chorem/lima/util/LetterToString.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/util/LetterToString.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/util/LetterToString.java 2010-08-25 22:04:25 UTC (rev 3020)
@@ -0,0 +1,47 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.util;
+
+import org.chorem.lima.entity.Letter;
+import org.jdesktop.swingx.autocomplete.ObjectToStringConverter;
+
+public class LetterToString extends ObjectToStringConverter {
+
+ private static LetterToString converter;
+
+ @Override
+ public String getPreferredStringForItem(Object item) {
+ String result = null;
+ if (item != null){
+ if (item instanceof Letter){
+ Letter letter = (Letter) item;
+ result = letter.getCode();
+ }
+ }
+ return result;
+ }
+
+ public static LetterToString getInstance() {
+ if (converter == null) {
+ converter = new LetterToString();
+ }
+ return converter;
+ }
+
+}
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 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-08-25 22:04:25 UTC (rev 3020)
@@ -80,14 +80,25 @@
lima.entries=Entries
lima.entries.addEntry=Add entry
lima.entries.addTransaction=Add transaction
+lima.entries.lettering=Lettering
+lima.entries.lettering.add=Add letter
+lima.entries.lettering.noletterselected=Error \: No selected letter
+lima.entries.lettering.radiobutton.list=Existing letters
+lima.entries.lettering.radiobutton.new=New letter
+lima.entries.lettering.remove=Remove letter
lima.entries.searchtransaction=Search transaction
lima.entries.searchunbalancedtransaction=Incorrect transactions
lima.entries.writetransaction=Write entries
lima.enum.comboboxaccount.account=Account
lima.enum.comboboxaccount.accountlist=Account list
lima.enum.comboboxaccount.allaccount=All accounts
+lima.enum.comboboxamount.both=Both
+lima.enum.comboboxamount.credit=Credit
+lima.enum.comboboxamount.debit=Debit
lima.enum.comboboxentrybook.all=All entrybooks
lima.enum.comboboxentrybook.select_one=EntryBook
+lima.enum.comboboxletter.all=All letters
+lima.enum.comboboxletter.selectone=Letter
lima.enum.comboboxoperator.equal=Equal
lima.enum.comboboxoperator.inferior=Inferior
lima.enum.comboboxoperator.inferiororequal=Inferior or equal
@@ -220,4 +231,6 @@
lima.title=Lutin Invoice Monitoring and Accounting
lima.title.about=About Lima...
lima.title.about.description=Open sources accounting software
+lima.tooltip.filter=<html>Regular expression \:<br/>- accounts interval i..j <br/>- accounts list i,j,k <br/>- Exclude an account -i</html>
+lima.tooltip.lettering=<html>Add a letter on many entries <br/>Select many rows with combination ctrl + click</html>
lima.warning.nimbus.landf=Could not find Numbus Look&Feel
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 2010-08-24 16:54:17 UTC (rev 3019)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-08-25 22:04:25 UTC (rev 3020)
@@ -80,6 +80,12 @@
lima.entries=Traitement
lima.entries.addEntry=Ajouter entr\u00E9e
lima.entries.addTransaction=Ajouter transaction
+lima.entries.lettering=Lettrage
+lima.entries.lettering.add=Ajouter une lettre
+lima.entries.lettering.noletterselected=Erreur \: Aucune lettre s\u00E9lectionn\u00E9e.
+lima.entries.lettering.radiobutton.list=Lettres existantes
+lima.entries.lettering.radiobutton.new=Nouvelle lettre
+lima.entries.lettering.remove=Supprimer une lettre
lima.entries.searchtransaction=Rechercher des \u00E9critures
lima.entries.searchunbalancedtransaction=Entr\u00E9es incorrect
lima.entries.writetransaction=Saisir des \u00E9critures
@@ -91,6 +97,8 @@
lima.enum.comboboxamount.debit=D\u00E9bit
lima.enum.comboboxentrybook.all=Tous les journaux
lima.enum.comboboxentrybook.select_one=Journal
+lima.enum.comboboxletter.all=Toutes les lettres
+lima.enum.comboboxletter.selectone=Lettre
lima.enum.comboboxoperator.equal=\u00C9gal
lima.enum.comboboxoperator.inferior=Inf\u00E9rieur
lima.enum.comboboxoperator.inferiororequal=Inf\u00E9rieur ou \u00E9gal
@@ -223,4 +231,6 @@
lima.title=Lutin Invoice Monitoring and Accounting
lima.title.about=\u00C0 propos de Lima...
lima.title.about.description=Logiciel de comptabilit\u00E9 Libre
+lima.tooltip.filter=<html>Expression r\u00E9guli\u00E8re \:<br/>- intervalle de compte i..j <br/>- liste de compte i,j,k <br/>- Exclure un compte -i</html>
+lima.tooltip.lettering=<html>Pour ajouter une lettre \u00E0 plusieurs \u00E9critures <br/>S\u00E9lectionner plusieurs lignes avec la combinaison ctrl + click</html>
lima.warning.nimbus.landf=Le look and feel nymbus n'a pas \u00E9t\u00E9 trouv\u00E9
1
0
Author: jpepin
Date: 2010-08-24 18:54:17 +0200 (Tue, 24 Aug 2010)
New Revision: 3019
Url: http://chorem.org/repositories/revision/lima/3019
Log:
Ajout bouton next back pour rapports journaux, comptes, et la saisie d'?\195?\169criture.
Added:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java
trunk/src/site/resources/screens/
trunk/src/site/resources/screens/lima_charts_accounts.png
trunk/src/site/resources/screens/lima_charts_entrybooks.png
trunk/src/site/resources/screens/lima_charts_financialperiod.png
trunk/src/site/resources/screens/lima_charts_financialstatement.png
trunk/src/site/resources/screens/lima_charts_fiscalperiod.png
trunk/src/site/resources/screens/lima_entries.png
trunk/src/site/resources/screens/lima_financialstatement.png
trunk/src/site/resources/screens/lima_home.png
trunk/src/site/resources/screens/lima_reports_accounts.png
trunk/src/site/resources/screens/lima_reports_balance.png
trunk/src/site/resources/screens/lima_reports_entrybooks.png
trunk/src/site/resources/screens/lima_reports_financialstatement.png
trunk/src/site/resources/screens/lima_reports_ledger.png
trunk/src/site/resources/screens/lima_searchtransaction.png
trunk/src/site/resources/screens/lima_webreports.png
Removed:
trunk/src/site/rst/screenshots.rst
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/HttpServerServiceImpl.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountComboBox.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx
trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBookComboBox.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx
trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx
trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.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
trunk/src/site/rst/features.rst
trunk/src/site/rst/index.rst
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 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2010-08-24 16:54:17 UTC (rev 3019)
@@ -912,7 +912,11 @@
t.addCell(new Phrase(dateFormat.format(
entry.getFinancialTransaction().getTransactionDate()),
normalFont));
- t.addCell(new Phrase(entry.getAccount().getAccountNumber(), normalFont));
+ String account = "";
+ if (entry.getAccount() != null){
+ account = entry.getAccount().getAccountNumber();
+ }
+ t.addCell(new Phrase(account, normalFont));
t.addCell(new Phrase(entry.getVoucher(), normalFont));
t.addCell(new Phrase(entry.getDescription(), normalFont));
t.addCell(new Phrase(String.valueOf(
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2010-08-24 16:54:17 UTC (rev 3019)
@@ -48,6 +48,7 @@
import org.chorem.lima.business.ejbinterface.HttpServerServiceLocal;
import org.chorem.lima.business.utils.DocumentsEnum;
import org.chorem.lima.business.utils.FormatsEnum;
+import org.hibernate.exception.GenericJDBCException;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.ServletHolder;
@@ -113,6 +114,7 @@
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ try {
//get all params
String imageParam = req.getParameter("img");
String model = req.getParameter("model");
@@ -251,6 +253,9 @@
resp.getWriter().write(pageContent.toString());
}
+ }catch (GenericJDBCException eee) {
+ log.error("Can't read db", eee);
+ }
}
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountComboBox.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountComboBox.java 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountComboBox.java 2010-08-24 16:54:17 UTC (rev 3019)
@@ -51,7 +51,25 @@
this.addActionListener(this);
}
+ public void back(){
+ int row = this.getSelectedIndex();
+ log.debug(row);
+ if (row > 0){
+ this.getEditor().setItem(this.getItemAt(row-1));
+ handler.setAccount((Account) this.getSelectedItem());
+ }
+ }
+ public void next(){
+ int size = this.getModel().getSize();
+ int row = this.getSelectedIndex();
+ log.debug(row);
+
+ if (row < size-1){
+ this.getEditor().setItem(this.getItemAt(row+1));
+ handler.setAccount((Account) this.getSelectedItem());
+ }
+ }
@Override
public void actionPerformed(ActionEvent e) {
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx 2010-08-24 16:54:17 UTC (rev 3019)
@@ -23,7 +23,9 @@
<![CDATA[
import org.chorem.lima.enums.ComboBoxDatesEnum;
+ import org.chorem.lima.ui.accountsreports.AccountComboBox;
AccountsReportsPeriodSearchPanel periodSearchPanel = new AccountsReportsPeriodSearchPanel(handler);
+ AccountComboBox comboBox = new AccountComboBox(handler);
void $afterCompleteSetup() {
}
@@ -41,8 +43,16 @@
<JLabel id="accountSelectorLabel" text="lima.common.account"/>
</cell>
<cell anchor="west">
- <JComboBox javaBean='new org.chorem.lima.ui.accountsreports.AccountComboBox(getHandler())' />
+ <JComboBox javaBean='comboBox' />
</cell>
+ <cell>
+ <JButton id="back" text="lima.common.buttonback"
+ onActionPerformed="comboBox.back()"/>
+ </cell>
+ <cell>
+ <JButton id="next" text="lima.common.buttonnext"
+ onActionPerformed="comboBox.next()"/>
+ </cell>
</row>
<row>
<cell fill="both" weightx="1" weighty="1" columns="6">
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2010-08-24 16:54:17 UTC (rev 3019)
@@ -162,21 +162,23 @@
public void createDocument() {
- FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem();
- String address = LimaConfig.getInstance().getHostAdress();
-
- try {
- String url = "http://"+address+":"+port+"/?beginDate="
- +dateFormat.format(selectedBeginDate)
- +"&endDate="+dateFormat.format(selectedEndDate)+"&format="
- +selectedEnum.getExtension()+"&model="
- + DocumentsEnum.BALANCE.getFileName();
- Desktop.getDesktop().browse(new URI(url));
- } catch (IOException e) {
- log.error("Can't open browser", e);
- } catch (URISyntaxException e) {
- log.error("Can't create news URI", e);
- }
+ if (selectedBeginDate != null & selectedEndDate != null){
+ FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem();
+ String address = LimaConfig.getInstance().getHostAdress();
+
+ try {
+ String url = "http://"+address+":"+port+"/?beginDate="
+ +dateFormat.format(selectedBeginDate)
+ +"&endDate="+dateFormat.format(selectedEndDate)+"&format="
+ +selectedEnum.getExtension()+"&model="
+ + DocumentsEnum.BALANCE.getFileName();
+ Desktop.getDesktop().browse(new URI(url));
+ } catch (IOException e) {
+ log.error("Can't open browser", e);
+ } catch (URISyntaxException e) {
+ log.error("Can't create news URI", e);
+ }
+ }
}
@Override
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBookComboBox.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBookComboBox.java 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBookComboBox.java 2010-08-24 16:54:17 UTC (rev 3019)
@@ -52,7 +52,25 @@
this.addActionListener(this);
}
+ public void back(){
+ int row = this.getSelectedIndex();
+ log.debug(row);
+ if (row > 0){
+ this.getEditor().setItem(this.getItemAt(row-1));
+ handler.setEntryBook((EntryBook) this.getSelectedItem());
+ }
+ }
+ public void next(){
+ int size = this.getModel().getSize();
+ int row = this.getSelectedIndex();
+ log.debug(row);
+
+ if (row < size-1){
+ this.getEditor().setItem(this.getItemAt(row+1));
+ handler.setEntryBook((EntryBook) this.getSelectedItem());
+ }
+ }
@Override
public void actionPerformed(ActionEvent e) {
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx 2010-08-24 16:54:17 UTC (rev 3019)
@@ -24,7 +24,9 @@
<![CDATA[
import org.chorem.lima.enums.ComboBoxDatesEnum;
+ import org.chorem.lima.ui.entrybooksreports.EntryBookComboBox;
EntryBooksReportsPeriodSearchPanel periodSearchPanel = new EntryBooksReportsPeriodSearchPanel(handler);
+ EntryBookComboBox comboBox = new EntryBookComboBox(handler);
void $afterCompleteSetup() {
}
@@ -42,9 +44,17 @@
<JLabel id="entryBookSelectorLabel" text="lima.common.entrybook"/>
</cell>
<cell anchor="west">
- <JComboBox javaBean='new org.chorem.lima.ui.entrybooksreports.EntryBookComboBox(getHandler())' />
+ <JComboBox javaBean='comboBox' />
</cell>
<cell>
+ <JButton id="back" text="lima.common.buttonback"
+ onActionPerformed="comboBox.back()"/>
+ </cell>
+ <cell>
+ <JButton id="next" text="lima.common.buttonnext"
+ onActionPerformed="comboBox.next()"/>
+ </cell>
+ <cell>
<EnumEditor id='DocumentEditor'
constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'
onActionPerformed="getHandler().createDocument()"/>
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2010-08-24 16:54:17 UTC (rev 3019)
@@ -170,29 +170,31 @@
public void createDocument() {
- FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem();
- String address = LimaConfig.getInstance().getHostAdress();
-
- try {
- String url = "http://"+address+":"+port+"/?beginDate="
- +dateFormat.format(selectedBeginDate)
- +"&endDate="+dateFormat.format(selectedEndDate)
- +"&format="+selectedEnum.getExtension()+"&model="
- + DocumentsEnum.ENTRYBOOKS.getFileName();
- Desktop.getDesktop().browse(new URI(url));
-
- String url2 = "http://"+address+":"+port+"/?beginDate="
- +dateFormat.format(selectedBeginDate)
- +"&endDate="+dateFormat.format(selectedEndDate)
- +"&format="+selectedEnum.getExtension()+"&model="
- + DocumentsEnum.GENERAL_ENTRYBOOK.getFileName();
- Desktop.getDesktop().browse(new URI(url2));
-
- } catch (IOException e) {
- log.error("Can't open browser", e);
- } catch (URISyntaxException e) {
- log.error("Can't create news URI", e);
- }
+ if (selectedBeginDate != null && selectedEndDate != null){
+ FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem();
+ String address = LimaConfig.getInstance().getHostAdress();
+
+ try {
+ String url = "http://"+address+":"+port+"/?beginDate="
+ +dateFormat.format(selectedBeginDate)
+ +"&endDate="+dateFormat.format(selectedEndDate)
+ +"&format="+selectedEnum.getExtension()+"&model="
+ + DocumentsEnum.ENTRYBOOKS.getFileName();
+ Desktop.getDesktop().browse(new URI(url));
+
+ String url2 = "http://"+address+":"+port+"/?beginDate="
+ +dateFormat.format(selectedBeginDate)
+ +"&endDate="+dateFormat.format(selectedEndDate)
+ +"&format="+selectedEnum.getExtension()+"&model="
+ + DocumentsEnum.GENERAL_ENTRYBOOK.getFileName();
+ Desktop.getDesktop().browse(new URI(url2));
+
+ } catch (IOException e) {
+ log.error("Can't open browser", e);
+ } catch (URISyntaxException e) {
+ log.error("Can't create news URI", e);
+ }
+ }
}
@Override
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java 2010-08-24 16:54:17 UTC (rev 3019)
@@ -43,10 +43,10 @@
private static final Log log =
LogFactory.getLog(FinancialStatementReportPeriodSearchPanel.class);
- protected FinancialStatementReportViewHandler handler;
+ protected FinancialStatementReportTableModel model;
- public FinancialStatementReportPeriodSearchPanel(FinancialStatementReportViewHandler handler) {
- this.handler = handler;
+ public FinancialStatementReportPeriodSearchPanel(FinancialStatementReportTableModel model) {
+ this.model = model;
//init date
refresh(ComboBoxDatesEnum.FISCAL_PERIOD);
@@ -55,7 +55,7 @@
static final long serialVersionUID = 1L;
public void refresh(ComboBoxDatesEnum comboBoxPeriodEnum){
-
+
switch (comboBoxPeriodEnum) {
case PERIOD:
// get begin date
@@ -74,11 +74,11 @@
ActionListener beginDateActionListener = new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- handler.model.setBeginDate(beginDatePicker.getDate());
- handler.refresh();
+ model.setBeginDate(beginDatePicker.getDate());
+ model.refresh();
}
};
- handler.model.setBeginDate(beginDatePicker.getDate());
+ model.setBeginDate(beginDatePicker.getDate());
beginDatePicker.addActionListener(beginDateActionListener);
JLabel endDateLabel = new JLabel(_("lima.common.enddate"));
@@ -86,13 +86,13 @@
ActionListener endDateActionListener = new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- handler.model.setEndDate(endDatePicker.getDate());
- handler.refresh();
+ model.setEndDate(endDatePicker.getDate());
+ model.refresh();
}
};
- handler.model.setEndDate(endDatePicker.getDate());
+ model.setEndDate(endDatePicker.getDate());
endDatePicker.addActionListener(endDateActionListener);
- handler.refresh();
+ model.refresh();
this.removeAll();
this.add(beginDateLabel);
@@ -112,9 +112,9 @@
public void actionPerformed(ActionEvent e) {
FiscalPeriod fPeriod = (FiscalPeriod) fiscalPeriod.getSelectedItem();
if (fPeriod != null){
- handler.model.setBeginDate(fPeriod.getBeginDate());
- handler.model.setEndDate(fPeriod.getEndDate());
- handler.refresh();
+ model.setBeginDate(fPeriod.getBeginDate());
+ model.setEndDate(fPeriod.getEndDate());
+ model.refresh();
}
}
};
@@ -135,9 +135,9 @@
public void actionPerformed(ActionEvent e) {
FinancialPeriod fPeriod = (FinancialPeriod) financialPeriod.getSelectedItem();
if (fPeriod !=null){
- handler.model.setBeginDate(fPeriod.getBeginDate());
- handler.model.setEndDate(fPeriod.getEndDate());
- handler.refresh();
+ model.setBeginDate(fPeriod.getBeginDate());
+ model.setEndDate(fPeriod.getEndDate());
+ model.refresh();
}
}
};
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2010-08-24 16:54:17 UTC (rev 3019)
@@ -240,20 +240,21 @@
public void createDocument(FormatsEnum formatsEnum) {
- String address = LimaConfig.getInstance().getHostAdress();
-
- try {
- String url = "http://"+address+":"+port+"/?beginDate="
- +dateFormat.format(selectedBeginDate)
- +"&endDate="+dateFormat.format(selectedEndDate)
- +"&format="+formatsEnum.getExtension()+"&model="
- + DocumentsEnum.FINANCIALSTATEMENT.getFileName();
- Desktop.getDesktop().browse(new URI(url));
- } catch (IOException e) {
- log.error("Can't open browser", e);
- } catch (URISyntaxException e) {
- log.error("Can't create news URI", e);
- }
+ if (selectedBeginDate != null && selectedEndDate != null){
+ String address = LimaConfig.getInstance().getHostAdress();
+ try {
+ String url = "http://"+address+":"+port+"/?beginDate="
+ +dateFormat.format(selectedBeginDate)
+ +"&endDate="+dateFormat.format(selectedEndDate)
+ +"&format="+formatsEnum.getExtension()+"&model="
+ + DocumentsEnum.FINANCIALSTATEMENT.getFileName();
+ Desktop.getDesktop().browse(new URI(url));
+ } catch (IOException e) {
+ log.error("Can't open browser", e);
+ } catch (URISyntaxException e) {
+ log.error("Can't create news URI", e);
+ }
+ }
}
@Override
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2010-08-24 16:54:17 UTC (rev 3019)
@@ -22,49 +22,23 @@
<script>
<![CDATA[
- import org.chorem.lima.entity.Account;
- import org.apache.commons.lang.time.DateUtils;
- import java.util.Calendar;
+ import org.chorem.lima.enums.ComboBoxDatesEnum;
+ FinancialStatementReportPeriodSearchPanel periodSearchPanel =
+ new FinancialStatementReportPeriodSearchPanel(modelTable);
- // get begin date
- Calendar calendarBegin = Calendar.getInstance();
- // set begindate to JAN 1 - 0:00.000 of this years
- Date beginDate = calendarBegin.getTime();
- beginDate = DateUtils.truncate(beginDate, Calendar.YEAR);
-
- // get end date
- Calendar calendarEnd = Calendar.getInstance();
- Date endDate = calendarEnd.getTime();
-
- getBeginDatePicker().setDate(beginDate);
- getEndDatePicker().setDate(endDate);
- getModelTable().setBeginDate(beginDate);
- getModelTable().setEndDate(endDate);
-
void $afterCompleteSetup() {
- getHandler().refresh();
}
]]>
</script>
<row weightx="1" weighty="0" anchor="center">
- <cell anchor="east">
- <JLabel id="beginCalendarPanelLabel" text="lima.common.begindate"/>
- </cell>
- <cell anchor="west">
- <org.jdesktop.swingx.JXDatePicker id="beginDatePicker"
- onActionPerformed="getModelTable().setBeginDate(beginDatePicker.getDate());
- getHandler().refresh()" />
- </cell>
- <cell anchor="east">
- <JLabel id="endCalendarPanelLabel" text="lima.common.enddate"/>
- </cell>
- <cell anchor="west">
- <org.jdesktop.swingx.JXDatePicker id="endDatePicker"
- onActionPerformed="getModelTable().setEndDate(endDatePicker.getDate());
- getHandler().refresh()"/>
- </cell>
+ <cell fill='both'><Table><row>
+ <cell anchor="west"><JComboBox id="periodComboBox" javaBean="new JComboBox(ComboBoxDatesEnum.descriptions())"
+ onActionPerformed="periodSearchPanel.refresh(ComboBoxDatesEnum.valueOfDescription((String) periodComboBox.getSelectedItem()));
+ validate(); repaint()"/></cell>
+ <cell><FinancialStatementReportPeriodSearchPanel javaBean="periodSearchPanel"/></cell>
+ </row></Table></cell>
<cell>
<EnumEditor id='DocumentEditor'
constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2010-08-24 16:54:17 UTC (rev 3019)
@@ -52,6 +52,7 @@
public void createDocument() {
+ model = view.getModelTable();
FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem();
model.createDocument(selectedEnum);
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java 2010-08-24 16:54:17 UTC (rev 3019)
@@ -0,0 +1,90 @@
+/* *##% Lima Swing
+ * Copyright (C) 2008 - 2010 CodeLutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * ##%*/
+
+package org.chorem.lima.ui.financialtransaction;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import javax.swing.JComboBox;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.lima.entity.EntryBook;
+import org.chorem.lima.entity.FinancialPeriod;
+import org.chorem.lima.entity.FiscalPeriod;
+import org.chorem.lima.ui.combobox.EntryBookComboBoxModel;
+import org.chorem.lima.ui.combobox.EntryBookRenderer;
+import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel;
+import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer;
+import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel;
+import org.chorem.lima.util.EntryBookToString;
+import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
+
+public class FinancialPeriodComboBox extends JComboBox implements ActionListener {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final Log log =
+ LogFactory.getLog(FinancialPeriodComboBox.class);
+
+ protected FinancialTransactionViewHandler handler;
+
+ public FinancialPeriodComboBox(FinancialTransactionViewHandler handler) {
+ this.handler = handler;
+
+ FinancialPeriodComboBoxModel comboBoxModel = new FinancialPeriodComboBoxModel();
+ FinancialPeriodComboBoxRenderer comboBoxRenderer = new FinancialPeriodComboBoxRenderer();
+
+ setModel(comboBoxModel);
+ setRenderer(comboBoxRenderer);
+ addActionListener(this);
+
+ }
+
+ public void back(){
+ int row = this.getSelectedIndex();
+ log.debug(row);
+ if (row > 0){
+ this.setSelectedItem(this.getItemAt(row-1));
+ repaint();
+ handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem());
+ }
+ }
+
+ public void next(){
+ int size = this.getModel().getSize();
+ int row = this.getSelectedIndex();
+ log.debug(row);
+
+ if (row < size-1){
+ this.setSelectedItem(this.getItemAt(row+1));
+ repaint();
+ handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem());
+ }
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Object object = this.getSelectedItem();
+ if (object instanceof FinancialPeriod){
+ handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem());
+ }
+ }
+
+}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2010-08-24 16:54:17 UTC (rev 3019)
@@ -318,6 +318,7 @@
public void setFinancialPeriod(FinancialPeriod financialPeriod){
selectedFinancialPeriod = financialPeriod;
+ refresh();
}
/**
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2010-08-24 16:54:17 UTC (rev 3019)
@@ -24,22 +24,17 @@
<![CDATA[
import org.chorem.lima.entity.FiscalPeriod;
import org.chorem.lima.entity.FinancialPeriod;
+ import org.chorem.lima.ui.financialtransaction.FinancialPeriodComboBox;
+ FinancialPeriodComboBox financialPeriodComboBox = new FinancialPeriodComboBox(handler);
+
+
void $afterCompleteSetup() {
getHandler().refresh();
}
]]>
</script>
-
- <!-- <JPopupMenu id="MenuRightPanel">
- <JMenuItem text="lima.add.transaction" onActionPerformed='addEmptyTransaction()'/>
- <JMenuItem text="lima.print"/>
- </JPopupMenu>
- <JPopupMenu id="MenuRightTransaction">
- <JMenuItem text="lima.add" onActionPerformed='addEmptyTransaction()'/>
- <JMenuItem text="lima.print"/>
- </JPopupMenu> -->
<row weightx="1" weighty="0" anchor="center">
<cell anchor="east">
@@ -58,19 +53,21 @@
/>
</cell>
<cell anchor="west">
- <JComboBox id="financialPeriodComboBox"
- model="{getModelFinancialPeriod()}"
- renderer="{new org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer()}"
- onActionPerformed="getFinancialTransactionTableModel().setFinancialPeriod( (FinancialPeriod) financialPeriodComboBox.getSelectedItem());
- getHandler().refresh()"
- editable="false"
- />
+ <JComboBox javaBean="financialPeriodComboBox"/>
</cell>
<cell>
+ <JButton id="back" text="lima.common.buttonback"
+ onActionPerformed="financialPeriodComboBox.back()"/>
+ </cell>
+ <cell>
+ <JButton id="next" text="lima.common.buttonnext"
+ onActionPerformed="financialPeriodComboBox.next()"/>
+ </cell>
+ <cell>
<JButton text="lima.common.copy"
onActionPerformed="getHandler().copyRow()" enabled="{isSelectedRow()}"/>
</cell>
- <cell>
+ <cell>
<JButton text="lima.common.paste"
onActionPerformed="getHandler().pasteRow()" enabled="{isSelectedRow()}"/>
</cell>
@@ -88,7 +85,7 @@
</cell>
</row>
<row>
- <cell fill="both" weightx="1" weighty="1" rows="3" columns="9">
+ <cell fill="both" weightx="1" weighty="1" rows="3" columns="11">
<JScrollPane>
<org.chorem.lima.ui.financialtransaction.FinancialTransactionTableModel
id="financialTransactionTableModel"/>
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2010-08-24 16:54:17 UTC (rev 3019)
@@ -183,21 +183,23 @@
public void createDocument() {
- FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem();
- String address = LimaConfig.getInstance().getHostAdress();
-
- try {
- String url = "http://"+address+":"+port+"/?beginDate="
- +dateFormat.format(selectedBeginDate)
- +"&endDate="+dateFormat.format(selectedEndDate)
- +"&format="+selectedEnum.getExtension()+"&model="
- + DocumentsEnum.LEDGER.getFileName();
- Desktop.getDesktop().browse(new URI(url));
- } catch (IOException e) {
- log.error("Can't open browser", e);
- } catch (URISyntaxException e) {
- log.error("Can't create news URI", e);
- }
+ if (selectedBeginDate != null && selectedEndDate != null){
+ FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem();
+ String address = LimaConfig.getInstance().getHostAdress();
+
+ try {
+ String url = "http://"+address+":"+port+"/?beginDate="
+ +dateFormat.format(selectedBeginDate)
+ +"&endDate="+dateFormat.format(selectedEndDate)
+ +"&format="+selectedEnum.getExtension()+"&model="
+ + DocumentsEnum.LEDGER.getFileName();
+ Desktop.getDesktop().browse(new URI(url));
+ } catch (IOException e) {
+ log.error("Can't open browser", e);
+ } catch (URISyntaxException e) {
+ log.error("Can't create news URI", e);
+ }
+ }
}
@Override
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 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-08-24 16:54:17 UTC (rev 3019)
@@ -36,6 +36,8 @@
lima.common.amountcredit=Credit amount
lima.common.amountdebit=Debit amount
lima.common.begindate=Begin
+lima.common.buttonback=\u276E
+lima.common.buttonnext=\u276F
lima.common.cancel=Cancel
lima.common.close=Close
lima.common.closed=Closed
@@ -172,7 +174,7 @@
lima.message.help.usage=Options (set with --option <key> <value>\:
lima.misc.supportemail.description=Support email
lima.openejb.remotemode.description=
-lima.opening.accounts=<html><center>No account chart is load<br/>Select a default, <br/>import your personnal<br/> or cancel to create your own account chart.</center></html>
+lima.opening.accounts=<html><center>Select a default, <br/>import your personnal<br/> or cancel to create your own account chart.</center></html>
lima.opening.entrybook=<html>Tick box to import default accounts chart\:<br/> Achats, Ventes, Tr\u00E9sorerie, Op\u00E9ration diverses</html>
lima.opening.import=Import a CSV Save
lima.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR import instantanly your already existing save in CSV format<br/><br/><br/><br/></center></html>
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 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-08-24 16:54:17 UTC (rev 3019)
@@ -36,6 +36,8 @@
lima.common.amountcredit=Total Cr\u00E9dit
lima.common.amountdebit=Total D\u00E9bit
lima.common.begindate=D\u00E9but
+lima.common.buttonback=\u276E
+lima.common.buttonnext=\u276F
lima.common.cancel=Annuler
lima.common.close=Fermer
lima.common.closed=Ferm\u00E9
@@ -175,7 +177,7 @@
lima.message.help.usage=Options (set with --option <key> <value>\:
lima.misc.supportemail.description=Adresse email de support
lima.openejb.remotemode.description=
-lima.opening.accounts=<html><center>Aucun plan comptable charg\u00E9<br/>Veuillez s\u00E9lectionner un plan par d\u00E9fault, <br/>importer un plan personnalis\u00E9<br/> ou annuler pour cr\u00E9er votre propre plan.</center></html>
+lima.opening.accounts=<html><center>Veuillez s\u00E9lectionner un plan par d\u00E9fault, <br/>importer un plan personnalis\u00E9<br/> ou annuler pour cr\u00E9er votre propre plan.</center></html>
lima.opening.entrybook=<html>Cochez la case pour importer les journaux par d\u00E9faut \:<br/> Achats, Ventes, Tr\u00E9sorerie, Op\u00E9ration diverses</html>
lima.opening.import=Importer une sauvegarde CSV
lima.opening.welcome=<html><center>Bienvenue dans Lima<br/>Laissez vous guider par cet assistant pour d\u00E9marrer votre comptabilit\u00E9 en quelques instants\u0085<br/>Ou bien importer directement une ancienne sauvegarde de LIMA au format CSV<br/><br/><br/><br/></center></html>
Added: trunk/src/site/resources/screens/lima_charts_accounts.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_charts_accounts.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_charts_entrybooks.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_charts_entrybooks.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_charts_financialperiod.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_charts_financialperiod.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_charts_financialstatement.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_charts_financialstatement.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_charts_fiscalperiod.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_charts_fiscalperiod.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_entries.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_entries.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_financialstatement.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_financialstatement.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_home.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_home.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_reports_accounts.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_reports_accounts.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_reports_balance.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_reports_balance.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_reports_entrybooks.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_reports_entrybooks.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_reports_financialstatement.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_reports_financialstatement.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_reports_ledger.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_reports_ledger.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_searchtransaction.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_searchtransaction.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/resources/screens/lima_webreports.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/resources/screens/lima_webreports.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/src/site/rst/features.rst
===================================================================
--- trunk/src/site/rst/features.rst 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/src/site/rst/features.rst 2010-08-24 16:54:17 UTC (rev 3019)
@@ -8,29 +8,66 @@
Cette section permet de définir le cadre de la comptabilité :
- plan comptable
+
+.. image:: screens/lima_charts_accountschart.png
+
- journaux
+
+.. image:: screens/lima_charts_entrybooks.png
+
- exercices
+
+.. image:: screens/lima_charts_fiscalperiod.png
+
- période comptable
+
+.. image:: screens/lima_charts_financialperiod.png
+
- plan bilan / compte de résultat
+.. image:: screens/lima_charts_financialstatement.png
+
Traitement
-----------
La partie traitement regroupe les fonctions utiles au quotidien :
-Saisie et recherche
+- saisie
+.. image:: screenshots/lima_entries.png
+
+- recherche
+
+.. image:: screenshots/lima_searchtransaction.png
+
+
Rapports
-----------
Permet de visualiser les documents usuelles de la comptabilité :
+
- journal
+
+.. image:: screenshots/lima_reports_entrybooks.png
+
- comptes
+
+.. image:: screenshots/lima_reports_accounts.png
+
- balance
+
+.. image:: screenshots/lima_reports_balance.png
+
- grand-livre
+
+.. image:: screenshots/lima_reports_ledger.png
+
- Bilan et compte de résultat
+.. image:: screenshots/lima_reports_financialstatement.png
+
+
Les documents sont atteignables par les menu de LIMA et via un site internet embarqué.
@@ -42,5 +79,5 @@
-Actuellement LIMA permet l'import et l'export pour EBP. Il serait envisageable d'ajouté
-l'import / export pour d'autre logiciel à la demande.
+Actuellement LIMA permet l'import et l'export pour EBP. Il est possible d'ajouté
+à la demande l'import / export pour des formats de fichiers d'autres logiciels.
Modified: trunk/src/site/rst/index.rst
===================================================================
--- trunk/src/site/rst/index.rst 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/src/site/rst/index.rst 2010-08-24 16:54:17 UTC (rev 3019)
@@ -2,13 +2,11 @@
Introduction
==================
-Issu du projet Chorem_, et créé pour fonctionner en collaboration avec CALLAO_,
-LIMA_ est une interface graphique capable d'utiliser différents moteurs de
-comptabilité générale respectant les conventions ainsi que normes imposées par
-la législation française aux entreprises.
-Initialement, LIMA utilisait le moteur de comptabilité d'OfBiz-Neogia, CALLAO_
-est maintenant utilisé comme moteur de comptabilité par défaut.
-.. _ChoreM: http://chorem.org/
-.. _LIMA: http://chorem.org/projects/show/lima
-.. _CALLAO: http://chorem.org/projects/show/callao
\ No newline at end of file
+Acronyme de Lutin Invoice Monitoring and Accounting, l’application de comptabilité
+LIMA est un logiciel libre pensé pour être la plus ergonomique possible et facile
+d’accès à tout utilisateur quelque soit leur niveau en comptabilité : débutant
+comme confirmé.
+La particularité de LIMA est qu’il s’agit d’un produit évolutif permettant de
+répondre aux besoins spécifiques de toute entreprise ou organisation, tout en
+garantissant le maintien des données comptables.
\ No newline at end of file
Deleted: trunk/src/site/rst/screenshots.rst
===================================================================
--- trunk/src/site/rst/screenshots.rst 2010-08-24 12:31:17 UTC (rev 3018)
+++ trunk/src/site/rst/screenshots.rst 2010-08-24 16:54:17 UTC (rev 3019)
@@ -1,71 +0,0 @@
-====================
-Présentation de LIMA
-====================
-
-Présentation imagée
--------------------
-
-L'interface de Lima intègre les fonctionalités suivantes
-
-
-Interface multi utilisateurs avec authentification :
-
-.. image:: screenshots/lima-capture4-mini.png
-
-Connexion_
-
-.. _Connexion: screenshots/lima-capture4.png
-
-
-Gestion des écritures dans le journal :
-
-.. image:: screenshots/lima-capture-mini.png
-
-Ecritures_
-
-.. _Ecritures: screenshots/lima-capture.png
-
-
-Gestion des comptes du plan comptable général :
-
-.. image:: screenshots/lima-capture2-mini.png
-
-PCG_
-
-.. _PCG: screenshots/lima-capture2.png
-
-
-Edition des états comptables :
-
-.. image:: screenshots/etat-mini.png
-
-Etat_
-
-.. _Etat: screenshots/etat.png
-
-
-Recherches :
-
-.. image:: screenshots/recherche-mini.png
-
-Recherche_
-
-.. _Recherche: screenshots/recherche.png
-
-
-Les journaux :
-
-.. image:: screenshots/journaux-mini.png
-
-Journaux_
-
-.. _Journaux: screenshots/journaux.png
-
-
-Le lettrage :
-
-.. image:: screenshots/lettrage-mini.png
-
-Lettrage_
-
-.. _Lettrage: screenshots/lettrage.png
1
0