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

r3588 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-callao/src/main/java/org/chorem/lima/entity
by mallon＠users.chorem.org 08 Aug '12

08 Aug '12

Author: mallon Date: 2012-08-08 18:09:25 +0200 (Wed, 08 Aug 2012) New Revision: 3588 Url: http://chorem.org/repositories/revision/lima/3588 Log: fixes #748 Correction permettant d afficher une seule fois la transaction concernee et ses entrees. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 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 2012-08-08 15:20:05 UTC (rev 3587) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-08-08 16:09:25 UTC (rev 3588) @@ -59,7 +59,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; +import java.util.HashSet; import java.util.List; +import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -615,10 +617,14 @@ List<FinancialTransaction> financialTransactions = financialTransactionDAO.searchFinancialTransaction( financialTransactionSearch, accounts); + Set set = new HashSet() ; + set.addAll(financialTransactions) ; + ArrayList<FinancialTransaction> distinctFinancialTransactions = new ArrayList(set) ; + // merge result with sub entries EntryDAO entryDAO = getDaoHelper().getEntryDAO(); - for (FinancialTransaction financialTransaction : financialTransactions) { - result.add(financialTransaction); + for (FinancialTransaction financialTransaction : distinctFinancialTransactions) { + result.add(financialTransaction); List<Entry> entries = entryDAO.findAllByFinancialTransaction(financialTransaction); result.addAll(entries); @@ -626,6 +632,11 @@ } catch (Exception ex) { throw new LimaException("Can't search financial transaction", ex); } + + if (log.isDebugEnabled()) { + log.debug("Size of results list : " + result.size()); + } + return result; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-08 15:20:05 UTC (rev 3587) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-08 16:09:25 UTC (rev 3588) @@ -279,7 +279,7 @@ public List<FinancialTransaction> searchFinancialTransaction(FinancialTransactionSearch financialTransactionSearch, List<Account> accounts) throws TopiaException { String query = "SELECT T FROM " + FinancialTransaction.class.getName() + " T"+ - " LEFT JOIN T.entry AS E" + + " JOIN T.entry AS E" + " WHERE 1=1 "; // to not manage first where in all condition List<Object> args = new ArrayList<Object>(); @@ -376,6 +376,9 @@ args.add("amount2"); args.add(secondAmountBigDecimal); } else if (operator != null) { + if (log.isDebugEnabled()) { + log.debug("Value of first amount - BigDecimal, where operator not null : " + amountBigDecimal); + } query += " AND E.amount " + operator + " :amount"; args.add("amount"); args.add(amountBigDecimal); @@ -390,8 +393,17 @@ } } + if (log.isDebugEnabled()) { + log.debug("Generated query : " + query); + } + // perform query List<FinancialTransaction> result = context.findAll(query, args.toArray()); + + if (log.isDebugEnabled()) { + log.debug("Number of founded transactions : " + result.size()); + } + return result; }

1 0

r3587 - trunk
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 17:20:05 +0200 (Wed, 08 Aug 2012) New Revision: 3587 Url: http://chorem.org/repositories/revision/lima/3587 Log: updates to nuiton-utils 2.5.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-08 14:59:50 UTC (rev 3586) +++ trunk/pom.xml 2012-08-08 15:20:05 UTC (rev 3587) @@ -356,7 +356,7 @@ <projectId>lima</projectId>  - <nuitonUtilsVersion>2.5.3-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.11</topiaVersion> <jaxxVersion>2.5.4-SNAPSHOT</jaxxVersion>

1 0

r3586 - trunk/lima-callao/src/main/resources/i18n
by maven-release＠users.chorem.org 08 Aug '12

08 Aug '12

Author: maven-release Date: 2012-08-08 16:59:50 +0200 (Wed, 08 Aug 2012) New Revision: 3586 Url: http://chorem.org/repositories/revision/lima/3586 Log: add new end line Modified: trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties Modified: trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties =================================================================== --- trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties 2012-08-08 14:52:14 UTC (rev 3585) +++ trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties 2012-08-08 14:59:50 UTC (rev 3586) @@ -1,3 +1,3 @@ lima.enum.comboboxamount.both=All lima.enum.comboboxamount.credit=Credit -lima.enum.comboboxamount.debit=Debit \ No newline at end of file +lima.enum.comboboxamount.debit=Debit Modified: trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties =================================================================== --- trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties 2012-08-08 14:52:14 UTC (rev 3585) +++ trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties 2012-08-08 14:59:50 UTC (rev 3586) @@ -1,3 +1,3 @@ lima.enum.comboboxamount.both=Tous lima.enum.comboboxamount.credit=Crédit -lima.enum.comboboxamount.debit=Débit \ No newline at end of file +lima.enum.comboboxamount.debit=Débit

1 0

08 Aug '12

Author: tchemit Date: 2012-08-08 16:52:14 +0200 (Wed, 08 Aug 2012) New Revision: 3585 Url: http://chorem.org/repositories/revision/lima/3585 Log: add missing svn properties + license header Modified: trunk/lima-business-api/src/license/THIRD-PARTY.properties trunk/lima-business-api/src/site/site_fr.xml trunk/lima-business/src/main/java/org/chorem/lima/LimaXAResource.java trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java trunk/lima-business/src/main/java/org/chorem/lima/service/package-info.java trunk/lima-business/src/site/site_fr.xml trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearService.java trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceImpl.java trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml trunk/lima-business/src/test/resources/lima-test.properties trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties trunk/lima-callao/src/site/site_fr.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/BetaLayerUI.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AccountComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookListRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodListRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodListRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalListener.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AbstractHomePane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/package-info.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/package-info.java trunk/lima-swing/src/main/resources/META-INF/aop.xml trunk/lima-swing/src/site/site_fr.xml Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/LimaXAResource.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java 2012-08-08 14:52:14 UTC (rev 3585) @@ -2,8 +2,8 @@ /* * #%L * Lima :: business - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/service/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/lima-business/src/site/site_fr.xml =================================================================== --- trunk/lima-business/src/site/site_fr.xml 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-business/src/site/site_fr.xml 2012-08-08 14:52:14 UTC (rev 3585) @@ -1,5 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <body> Property changes on: trunk/lima-business/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 2012-08-08 14:52:14 UTC (rev 3585) @@ -1,7 +1,7 @@ /* * #%L - * $Id: FinancialTransactionServiceImplTest.java 3408 2012-05-09 15:37:59Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -44,10 +44,10 @@ * Test on financial transaction service. * * @author chatellier - * @version $Revision: 3408 $ + * @version $Revision$ * - * Last update : $Date: 2012-05-09 17:37:59 +0200 (mer. 09 mai 2012) $ - * By : $Author: echatellier $ + * Last update : $Date$ + * By : $Author$ */ public class FinancialTransactionServiceImplTest extends AbstractLimaTest { Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java 2012-08-08 14:52:14 UTC (rev 3585) @@ -2,8 +2,8 @@ /* * #%L * Lima :: business - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin * %% Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/entity/AccountDAOTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml =================================================================== --- trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml 2012-08-08 14:52:14 UTC (rev 3585) @@ -3,8 +3,8 @@ #%L Lima business - $Id: ejb-jar.xml 3278 2011-08-16 14:09:44Z tchemit $ - $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/resources/META-… $ + $Id$ + $HeadURL$ %% Copyright (C) 2012 CodeLutin, Chatellier Eric %% Property changes on: trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/resources/lima-test.properties =================================================================== --- trunk/lima-business/src/test/resources/lima-test.properties 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-business/src/test/resources/lima-test.properties 2012-08-08 14:52:14 UTC (rev 3585) @@ -2,8 +2,8 @@ # #%L # Lima business # -# $Id: lima.properties 3278 2011-08-16 14:09:44Z tchemit $ -# $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/resources/lima.… $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric # %% Property changes on: trunk/lima-business/src/test/resources/lima-test.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business-api/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/site/site_fr.xml =================================================================== --- trunk/lima-business-api/src/site/site_fr.xml 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-business-api/src/site/site_fr.xml 2012-08-08 14:52:14 UTC (rev 3585) @@ -1,5 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <body> Property changes on: trunk/lima-business-api/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java 2012-08-08 14:52:14 UTC (rev 3585) @@ -2,8 +2,8 @@ * #%L * Lima callao * - * $Id: FinancialStatementWayEnum.java 3289 2011-09-17 12:55:16Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-callao/src/main/java/org/chorem/l… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/lima-callao/src/site/site_fr.xml =================================================================== --- trunk/lima-callao/src/site/site_fr.xml 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-callao/src/site/site_fr.xml 2012-08-08 14:52:14 UTC (rev 3585) @@ -1,5 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <body> Property changes on: trunk/lima-callao/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/BetaLayerUI.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableRenderer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-08 14:52:14 UTC (rev 3585) @@ -2,8 +2,8 @@ /* * #%L * Lima :: Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin * %% Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AccountComboBoxModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookListRenderer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodComboBoxModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodListRenderer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodComboBoxModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodListRenderer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalListener.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalPanel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java 2012-08-08 14:52:14 UTC (rev 3585) @@ -2,8 +2,8 @@ /* * #%L * Lima :: Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin * %% Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AbstractHomePane.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-08-08 14:52:14 UTC (rev 3585) @@ -1,8 +1,8 @@ /* * #%L * Lima :: Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin * %% Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java 2012-08-08 14:52:14 UTC (rev 3585) @@ -2,8 +2,8 @@ /* * #%L * Lima :: Swing - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin * %% Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringSelectionModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/lima-swing/src/main/resources/META-INF/aop.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/lima-swing/src/site/site_fr.xml =================================================================== --- trunk/lima-swing/src/site/site_fr.xml 2012-08-08 14:48:33 UTC (rev 3584) +++ trunk/lima-swing/src/site/site_fr.xml 2012-08-08 14:52:14 UTC (rev 3585) @@ -1,5 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <body> Property changes on: trunk/lima-swing/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

r3584 - in trunk/src/site/rst: . callao devel
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:48:33 +0200 (Wed, 08 Aug 2012) New Revision: 3584 Url: http://chorem.org/repositories/revision/lima/3584 Log: fix rst docs Modified: trunk/src/site/rst/assistant.rst trunk/src/site/rst/callao/callao.rst trunk/src/site/rst/callao/classes.rst trunk/src/site/rst/callao/contact.rst trunk/src/site/rst/callao/lexique.rst trunk/src/site/rst/callao/news.rst trunk/src/site/rst/callao/roadmap.rst trunk/src/site/rst/callao/todo.rst trunk/src/site/rst/callao/usecases.rst trunk/src/site/rst/contact.rst trunk/src/site/rst/devel/glossary.rst trunk/src/site/rst/devel/modificationarchitecture.rst trunk/src/site/rst/devel/openejb.rst trunk/src/site/rst/devel/server.rst trunk/src/site/rst/features.rst trunk/src/site/rst/importexport.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/rst/rapports.rst trunk/src/site/rst/saisie.rst Modified: trunk/src/site/rst/assistant.rst =================================================================== --- trunk/src/site/rst/assistant.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/assistant.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,23 +22,21 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - -============ + +========= 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 @@ -48,9 +46,8 @@ .. image:: screens/lima_open_identity.png -~~~~~~~~~~~~~~~~~ Plan comptable -~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~ Par défaut LIMA propose les trois plans comptables de la norme française : - abrégé ; @@ -74,10 +71,8 @@ .. image:: screens/lima_open_account.png - -~~~~~~~~~~~~~~~~~ Journaux -~~~~~~~~~~~~~~~~~ +~~~~~~~~ Par défaut les quatres journaux les plus courants sont proposés au chargement : - achat ; @@ -90,9 +85,8 @@ .. 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. Modified: trunk/src/site/rst/callao/callao.rst =================================================================== --- trunk/src/site/rst/callao/callao.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/callao/callao.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,9 +22,11 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + ====================== Présentation de CALLAO ====================== + (Computing Active Layer for Lutin's Accounting Organization) ``1. Présentation`` Modified: trunk/src/site/rst/callao/classes.rst =================================================================== --- trunk/src/site/rst/callao/classes.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/callao/classes.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + ==================== Diagramme de classes ==================== Modified: trunk/src/site/rst/callao/contact.rst =================================================================== --- trunk/src/site/rst/callao/contact.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/callao/contact.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + ============ Contact list ============ Modified: trunk/src/site/rst/callao/lexique.rst =================================================================== --- trunk/src/site/rst/callao/lexique.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/callao/lexique.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + ========================== Lexique de la comptabilité ========================== Modified: trunk/src/site/rst/callao/news.rst =================================================================== --- trunk/src/site/rst/callao/news.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/callao/news.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + ==== News ==== Modified: trunk/src/site/rst/callao/roadmap.rst =================================================================== --- trunk/src/site/rst/callao/roadmap.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/callao/roadmap.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + ======= RoadMap ======= Modified: trunk/src/site/rst/callao/todo.rst =================================================================== --- trunk/src/site/rst/callao/todo.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/callao/todo.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + +==== TODO ==== Modified: trunk/src/site/rst/callao/usecases.rst =================================================================== --- trunk/src/site/rst/callao/usecases.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/callao/usecases.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + ===================== Les Cas d'Utilisation ===================== Modified: trunk/src/site/rst/contact.rst =================================================================== --- trunk/src/site/rst/contact.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/contact.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + ============ Contact list ============ @@ -33,9 +34,8 @@ Liste développeurs : (..DEVEL_) Liste de discussions des développeurs de LIMA_ Liste des commits : (..COMMITS_) Liste des modifications du code de LIMA_ -======= Support -======= +~~~~~~~ Code Lutin est une société de services en logiciels libres spécialisée dans les @@ -60,8 +60,6 @@ .. _Plus: http://www.codelutin.com - - .. _USERS: http://list.chorem.org/cgi-bin/mailman/listinfo/lima-users .. _DEVEL: http://list.chorem.org/cgi-bin/mailman/listinfo/lima-devel .. _COMMITS: http://list.chorem.org/cgi-bin/mailman/listinfo/lima-commits Modified: trunk/src/site/rst/devel/glossary.rst =================================================================== --- trunk/src/site/rst/devel/glossary.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/devel/glossary.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,8 +22,10 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + +====================================== Lexique des objets manipulés dans Lima --------------------------------------- +====================================== Ce lexique vise à clarifier les termes utilisé dans les objets de Lima (entités beans...) par rapport à leur traduction francaise. Modified: trunk/src/site/rst/devel/modificationarchitecture.rst =================================================================== --- trunk/src/site/rst/devel/modificationarchitecture.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/devel/modificationarchitecture.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + +============================================= Modification de l'architecture de LIMA/CALLAO ============================================= Modified: trunk/src/site/rst/devel/openejb.rst =================================================================== --- trunk/src/site/rst/devel/openejb.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/devel/openejb.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + +======= OpenEJB ======= Modified: trunk/src/site/rst/devel/server.rst =================================================================== --- trunk/src/site/rst/devel/server.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/devel/server.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + +=================== Lima en mode server =================== Modified: trunk/src/site/rst/features.rst =================================================================== --- trunk/src/site/rst/features.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/features.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,13 +22,13 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ------------------ + +=============== Fonctionnalités ------------------ +=============== -~~~~~~~~~~~~~ Structure -~~~~~~~~~~~~~ +~~~~~~~~~ Cette section permet de définir le cadre de la comptabilité : @@ -52,9 +52,8 @@ .. image:: screens/lima_charts_financialstatement.png -~~~~~~~~~~~~~ Traitement -~~~~~~~~~~~~~ +~~~~~~~~~~ La partie traitement regroupe les fonctions utiles au quotidien : @@ -70,9 +69,8 @@ .. image:: screens/lima_lettering.png -~~~~~~~~~~~~~ Rapports -~~~~~~~~~~~~~ +~~~~~~~~ Permet de visualiser les documents usuelles de la comptabilité : @@ -99,15 +97,11 @@ 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. - - 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/importexport.rst =================================================================== --- trunk/src/site/rst/importexport.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/importexport.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,9 +22,10 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - -================== + +=============== 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. Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/index.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,9 +22,10 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - -================== + +============ Introduction -================== +============ .. image:: extras/puzzle_icon.png Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/install.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + +------------------------- Installer et lancer Lima ------------------------- Modified: trunk/src/site/rst/lexique.rst =================================================================== --- trunk/src/site/rst/lexique.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/lexique.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -30,9 +30,9 @@ à l'appréhension du fonctionnement de LIMA. -~~~~~~~~~~~~~~~~~ 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 @@ -47,18 +47,16 @@ 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 @@ -79,10 +77,9 @@ 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. - -~~~~~~~~~~~~~~~~~ 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, @@ -90,10 +87,9 @@ exercice, une fois fini, doit être clôturé, ce qui interdit alors toutes modifications sur les informations comptables concernant cet exercice. - -~~~~~~~~~~~~~~~~~ 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, @@ -102,32 +98,28 @@ transactions entre différentes personnes, chacune responsable d'un domaine précis (achat, vente, stock...). On parle alors de comptabilité multi-journaux. - -~~~~~~~~~~~~~~~~~ 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. - -~~~~~~~~~~~~~~~~~ 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 @@ -135,10 +127,9 @@ On peut également établir un bilan provisoire avant la fin de l'exercice. - -~~~~~~~~~~~~~~~~~~~~ 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 Modified: trunk/src/site/rst/presentation.rst =================================================================== --- trunk/src/site/rst/presentation.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/presentation.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,13 +22,13 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - -======================== + +==================== Présentation de LIMA -======================== +==================== ------------------- Introduction ------------------- +------------ Acronyme de Lutin Invoice Monitoring and Accounting, l’application de comptabilité LIMA est un logiciel libre pensé pour être la plus ergonomique possible et facile @@ -47,9 +47,8 @@ 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. @@ -69,16 +68,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 réalité composé de trois projets Java : lima-business, lima-callao, lima-swing. -~~~~~~~~~~~~~ Lima-callao -~~~~~~~~~~~~~ +~~~~~~~~~~~ Ce projet permet de définir les entités appelées objets (données informatiques regroupant les principales caractéristiques des éléments du monde réel) nécessaires @@ -92,7 +89,6 @@ de définir les méthodes associées à la base de données pour le stockage de ces entités : ajout, modification, suppression. -~~~~~~~~~~~~~ lima-business ~~~~~~~~~~~~~ @@ -107,9 +103,8 @@ service des périodes financières, service des entrées, services des rapports, etc... On peut ajouter, modifier et supprimer des services selon les besoins de l'activité. -~~~~~~~~~~~~~ lima-swing -~~~~~~~~~~~~~ +~~~~~~~~~~ Il s’agit du projet qui permet d’exécuter l’UI (interface utilisateur) de LIMA. Le design de l’application y est défini : fenêtres, boutons, tableaux,... @@ -122,9 +117,8 @@ les bons messages, d’appeler les services correspondants, et de retourner les donné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 Modified: trunk/src/site/rst/rapports.rst =================================================================== --- trunk/src/site/rst/rapports.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/rapports.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + ======== Rapports ======== Modified: trunk/src/site/rst/saisie.rst =================================================================== --- trunk/src/site/rst/saisie.rst 2012-08-08 14:48:19 UTC (rev 3583) +++ trunk/src/site/rst/saisie.rst 2012-08-08 14:48:33 UTC (rev 3584) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + ====== Saisie ======

1 0

r3583 - in trunk: lima-callao/src/main lima-callao/src/main/resources lima-callao/src/main/resources/i18n lima-swing/src/main/resources/i18n
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:48:19 +0200 (Wed, 08 Aug 2012) New Revision: 3583 Url: http://chorem.org/repositories/revision/lima/3583 Log: add i18n for callao module Added: trunk/lima-callao/src/main/resources/ trunk/lima-callao/src/main/resources/i18n/ trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Added: trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties =================================================================== --- trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties (rev 0) +++ trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties 2012-08-08 14:48:19 UTC (rev 3583) @@ -0,0 +1,3 @@ +lima.enum.comboboxamount.both=All +lima.enum.comboboxamount.credit=Credit +lima.enum.comboboxamount.debit=Debit \ No newline at end of file Property changes on: trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties =================================================================== --- trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties (rev 0) +++ trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties 2012-08-08 14:48:19 UTC (rev 3583) @@ -0,0 +1,3 @@ +lima.enum.comboboxamount.both=Tous +lima.enum.comboboxamount.credit=Crédit +lima.enum.comboboxamount.debit=Débit \ No newline at end of file Property changes on: trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native 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 2012-08-08 14:43:20 UTC (rev 3582) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-08-08 14:48:19 UTC (rev 3583) @@ -104,9 +104,6 @@ lima.enum.comboboxaccount.account=Account lima.enum.comboboxaccount.accountlist=Account list lima.enum.comboboxaccount.allaccount=All accounts -lima.enum.comboboxamount.both=All -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 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 2012-08-08 14:43:20 UTC (rev 3582) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-08-08 14:48:19 UTC (rev 3583) @@ -104,9 +104,6 @@ lima.enum.comboboxaccount.account=Compte lima.enum.comboboxaccount.accountlist=Liste de comptes lima.enum.comboboxaccount.allaccount=Tous les comptes -lima.enum.comboboxamount.both=Tous -lima.enum.comboboxamount.credit=Crédit -lima.enum.comboboxamount.debit=Débit lima.enum.comboboxentrybook.all=Tous les journaux lima.enum.comboboxentrybook.select_one=Journal lima.enum.comboboxletter.all=Toutes les lettres

1 0

r3582 - trunk/lima-callao
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:43:20 +0200 (Wed, 08 Aug 2012) New Revision: 3582 Url: http://chorem.org/repositories/revision/lima/3582 Log: optimize dependencies Modified: trunk/lima-callao/pom.xml Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-08-08 14:21:22 UTC (rev 3581) +++ trunk/lima-callao/pom.xml 2012-08-08 14:43:20 UTC (rev 3582) @@ -27,7 +27,13 @@ <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency>

1 0

r3581 - trunk/lima-swing/src/main/java/org/chorem/lima/ui
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:21:22 +0200 (Wed, 08 Aug 2012) New Revision: 3581 Url: http://chorem.org/repositories/revision/lima/3581 Log: do not use variable for constant + add missing directory Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 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 2012-08-08 14:20:55 UTC (rev 3580) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-08-08 14:21:22 UTC (rev 3581) @@ -188,8 +188,7 @@ ConfigUIHelper helper = new ConfigUIHelper(config); - LimaConfig.Option colorSelectionFocus = LimaConfig.Option.COLOR_SELECTION_FOCUS; - helper.registerCallBack(colorSelectionFocus.key, _("lima.config.colorselectionfocus"), new ImageIcon(), new Runnable() { + helper.registerCallBack(LimaConfig.Option.COLOR_SELECTION_FOCUS.key, _("lima.config.colorselectionfocus"), new ImageIcon(), new Runnable() { @Override public void run() { UIManager.put("Table.focusCellHighlightBorder", new BorderUIResource(new LineBorder(config.getColorSelectionFocus(), 2))); @@ -209,8 +208,8 @@ /*Pas de 'callBack' sur le changement de comportement lors de l'édition d'une cellule, * car les deux éditeurs concernés rappellent la config dans un listener ('focusGained')*/ helper.addOption(LimaConfig.Option.COMPORTMENT_EDITING_CELL); - helper.addOption(colorSelectionFocus); - helper.setOptionCallBack(colorSelectionFocus.key); + helper.addOption(LimaConfig.Option.COLOR_SELECTION_FOCUS); + helper.setOptionCallBack(LimaConfig.Option.COLOR_SELECTION_FOCUS.key); helper.buildUI(context, _("lima.config.category.directories")); helper.displayUI(ui, false);

1 0

r3580 - trunk/lima-swing/src/main/java/org/chorem/lima
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:20:55 +0200 (Wed, 08 Aug 2012) New Revision: 3580 Url: http://chorem.org/repositories/revision/lima/3580 Log: do not translate i18n option keys Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2012-08-08 14:20:17 UTC (rev 3579) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2012-08-08 14:20:55 UTC (rev 3580) @@ -106,9 +106,7 @@ public LimaConfig() { // set defaut option (included configuration file name : important) - for (Option o : Option.values()) { - setDefaultOption(o.key, o.defaultValue); - } + loadDefaultOptions(Option.values()); // set action alias for (Action a : Action.values()) { @@ -140,7 +138,7 @@ instance.setConfigFileName(configFileName); try { - instance.parse(new String[0]); + instance.parse(); } catch (ArgumentsParserException ex) { if (log.isErrorEnabled()) { log.error("Can't read configuration", ex); @@ -428,8 +426,8 @@ OPENEJB_REMOTEMODE("lima.openejb.remotemode", n_("lima.openejb.remotemode.description"), "false", String.class, false, false), LIMA_HOST_ADDRESS("lima.host.address", n_("lima.config.host.adress"), "localhost", String.class, false, false), LIMA_STATE_FILE("lima.ui.state.file", n_("lima.config.state.file"), "${lima.data.dir}/limaState.xml", String.class, false, false), - COLOR_SELECTION_FOCUS("lima.ui.table.cell.colorSelectionFocus", _("lima.config.colorselectionfocus"), "#000000", Color.class, false, false), - COMPORTMENT_EDITING_CELL("lima.ui.table.cell.comportmentEditingCell", _("lima.config.comportmenteditingcell"), "ALL", comportmentEditingCellEnum.class, false, false); + COLOR_SELECTION_FOCUS("lima.ui.table.cell.colorSelectionFocus", n_("lima.config.colorselectionfocus"), "#000000", Color.class, false, false), + COMPORTMENT_EDITING_CELL("lima.ui.table.cell.comportmentEditingCell",n_("lima.config.comportmenteditingcell"), "ALL", comportmentEditingCellEnum.class, false, false); public enum comportmentEditingCellEnum {ALL, NOTHING}

1 0

r3579 - trunk/src/site
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:20:17 +0200 (Wed, 08 Aug 2012) New Revision: 3579 Url: http://chorem.org/repositories/revision/lima/3579 Log: site configuration 2 Modified: trunk/src/site/site_fr.xml Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-08 14:19:59 UTC (rev 3578) +++ trunk/src/site/site_fr.xml 2012-08-08 14:20:17 UTC (rev 3579) @@ -26,39 +26,91 @@ <project name="Lima"> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> - </poweredBy> - - <body> - <menu name="Le projet" inherit="top"> - <item name="Présentation" href="presentation.html"/> - <item name="Fonctionnalités" href="features.html"/> - <item name="Lancer Lima en ligne" href="lima-swing/jnlp/launch.jnlp" /> - <item name="Téléchargements" href="http://www.chorem.org/projects/lima/files" /> - <item name="Contacts" href="contact.html" /> - <item name="Dépôt SVN" href="http://svn.chorem.org/svn/lima/"/> - </menu> - <menu name="Mode d'emploi" inherit="top" > - <item name="Installer et lancer" href="install.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" /> - <item name="Lexique comptable" href="lexique.html" /> - </menu> - <menu name="Développeur" inherit="top" > - <item name="Mode serveur" href="devel/server.html" /> - </menu> - <menu ref="reports"/> - </body> - + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>false</topBarEnabled> + <googleSearch/> + <sideBarEnabled>true</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" + img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="${project.url}/images/jaxx-logo.png"/> + </poweredBy> + + <body> + + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + </head> + + <menu name="Le projet" inherit="top"> + <item name="Présentation" href="presentation.html"/> + <item name="Fonctionnalités" href="features.html"/> + <item name="Lancer Lima en ligne" href="lima-swing/jnlp/launch.jnlp"/> + <item name="Téléchargements" + href="http://www.chorem.org/projects/lima/files"/> + <item name="Contacts" href="contact.html"/> + <item name="Dépôt SVN" href="http://svn.chorem.org/svn/lima/"/> + </menu> + <menu name="Mode d'emploi" inherit="top"> + <item name="Installer et lancer" href="install.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"/> + <item name="Lexique comptable" href="lexique.html"/> + </menu> + <menu name="Développeur" inherit="top"> + <item name="Mode serveur" href="devel/server.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + </project>

1 0