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

r3088 - trunk
by echatellier＠users.chorem.org 02 May '11

02 May '11

Author: echatellier Date: 2011-05-02 11:18:45 +0200 (Mon, 02 May 2011) New Revision: 3088 Url: http://chorem.org/repositories/revision/lima/3088 Log: Try to update all nuiton's libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 08:47:33 UTC (rev 3087) +++ trunk/pom.xml 2011-05-02 09:18:45 UTC (rev 3088) @@ -275,11 +275,11 @@ <projectId>lima</projectId>  - <nuitonUtilsVersion>1.4</nuitonUtilsVersion> - <eugenePluginVersion>2.1.1</eugenePluginVersion> + <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> + <eugenePluginVersion>2.2</eugenePluginVersion> <topiaVersion>2.4.2</topiaVersion> - <jaxxVersion>2.1</jaxxVersion> - <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <jaxxVersion>2.3</jaxxVersion> + <nuitonI18nVersion>2.3.2</nuitonI18nVersion> <openEjbVersion>3.1.4</openEjbVersion> <slf4jVersion>1.6.1</slf4jVersion>

1 0

r3087 - trunk
by tchemit＠users.chorem.org 11 Apr '11

11 Apr '11

Author: tchemit Date: 2011-04-11 10:47:33 +0200 (Mon, 11 Apr 2011) New Revision: 3087 Url: http://chorem.org/repositories/revision/lima/3087 Log: Update mavenpom4redmine to 2.5.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-24 15:31:17 UTC (rev 3086) +++ trunk/pom.xml 2011-04-11 08:47:33 UTC (rev 3087) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.2</version> + <version>2.5.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r3086 - trunk/src/site/rst
by echatellier＠users.chorem.org 24 Mar '11

24 Mar '11

Author: echatellier Date: 2011-03-24 16:31:17 +0100 (Thu, 24 Mar 2011) New Revision: 3086 Url: http://chorem.org/repositories/revision/lima/3086 Log: Fix apostrophes Modified: trunk/src/site/rst/index.rst Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2011-03-24 15:30:04 UTC (rev 3085) +++ trunk/src/site/rst/index.rst 2011-03-24 15:31:17 UTC (rev 3086) @@ -28,10 +28,10 @@ .. image:: extras/puzzle_icon.png -Acronyme de Lutin Invoice Monitoring and Accounting, l’application de comptabilité +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 -d’accès à tout utilisateur quelque soit leur niveau en comptabilité : débutant +d'accès à tout utilisateur quelque soit leur niveau en comptabilité : débutant comme confirmé. -La particularité de LIMA est qu’il s’agit d’un produit évolutif permettant de +La particularité de LIMA est qu'il s'agit d'un produit évolutif permettant de répondre aux besoins spécifiques de toute entreprise ou organisation, tout en -garantissant le maintien des données comptables. \ No newline at end of file +garantissant le maintien des données comptables.

1 0

r3085 - in trunk/src/site: . rst/devel
by echatellier＠users.chorem.org 24 Mar '11

24 Mar '11

Author: echatellier Date: 2011-03-24 16:30:04 +0100 (Thu, 24 Mar 2011) New Revision: 3085 Url: http://chorem.org/repositories/revision/lima/3085 Log: Ajout de la doc pour le mode serveur Added: trunk/src/site/rst/devel/server.rst Modified: trunk/src/site/site_fr.xml Added: trunk/src/site/rst/devel/server.rst =================================================================== --- trunk/src/site/rst/devel/server.rst (rev 0) +++ trunk/src/site/rst/devel/server.rst 2011-03-24 15:30:04 UTC (rev 3085) @@ -0,0 +1,41 @@ +.. - +.. * #%L +.. * Lima +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2008 - 2011 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 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 Public License for more details. +.. * +.. * You should have received a copy of the GNU General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - +Lima en mode server +=================== + +Serveur +------- + +Télécharger et lancer le module serveur de lima : +http://www.chorem.org/projects/list_files/lima + +Client +------ + +Configurer le client pour se connecter au serveur via le fichier de +configuration : $HOME/.config/lima-config.properties:: + + java.naming.factory.initial=org.apache.openejb.client.RemoteInitialContextFactory + java.naming.provider.url=ejbd://192.168.99.9:4201 Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-03-24 12:38:05 UTC (rev 3084) +++ trunk/src/site/site_fr.xml 2011-03-24 15:30:04 UTC (rev 3085) @@ -55,6 +55,9 @@ <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>

1 0

r3084 - trunk/lima-swing/src/license
by echatellier＠users.chorem.org 24 Mar '11

24 Mar '11

Author: echatellier Date: 2011-03-24 13:38:05 +0100 (Thu, 24 Mar 2011) New Revision: 3084 Url: http://chorem.org/repositories/revision/lima/3084 Log: Update license Modified: trunk/lima-swing/src/license/THIRD-PARTY.properties Modified: trunk/lima-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-swing/src/license/THIRD-PARTY.properties 2011-03-24 11:51:22 UTC (rev 3083) +++ trunk/lima-swing/src/license/THIRD-PARTY.properties 2011-03-24 12:38:05 UTC (rev 3084) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - ANTLR 2 License @@ -6,7 +6,6 @@ # - Apache License Version 1.1 # - 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 @@ -25,7 +24,6 @@ # - 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 @@ -36,7 +34,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Nov 22 08:53:54 CET 2010 +#Thu Mar 24 13:26:50 CET 2011 antlr--antlr--2.7.6--jar=ANTLR 2 License com.sun.xml.bind--jaxb-impl--2.1.9--jar=Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license commons-jxpath--commons-jxpath--1.3--jar=The Apache Software License, Version 2.0 @@ -48,6 +46,6 @@ javax.transaction--jta--1.1--jar=License Agreement for Java Transaction API Classes opensymphony--ognl--2.6.11--jar=OpenSymphony Software License, Version 1.1 org.apache.commons--commons-email--1.2--jar=The Apache Software License, Version 2.0 +org.apache.geronimo.specs--geronimo-j2ee-management_1.0_spec--1.0--jar=The Apache Software License, Version 2.0 org.codehaus.swizzle--swizzle-stream--1.0.1--jar=The Apache Software License, Version 2.0 -org.osgi--org.osgi.core--4.1.0--jar=The Apache Software License, Version 2.0 quartz--quartz--1.5.2--jar=The Apache Software License, Version 2.0

1 0

r3083 - trunk/lima-business
by echatellier＠users.chorem.org 24 Mar '11

24 Mar '11

Author: echatellier Date: 2011-03-24 12:51:22 +0100 (Thu, 24 Mar 2011) New Revision: 3083 Url: http://chorem.org/repositories/revision/lima/3083 Log: Add lima server main Modified: trunk/lima-business/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-03-24 11:47:56 UTC (rev 3082) +++ trunk/lima-business/pom.xml 2011-03-24 11:51:22 UTC (rev 3083) @@ -92,6 +92,10 @@ <properties>  <maven.jar.main.class>org.chorem.lima.LimaServer</maven.jar.main.class> + + <redmine.releaseFiles> + target/lima-server-${project.version}-bin.zip, + </redmine.releaseFiles> </properties>

1 0

r3082 - trunk/lima-business/src/main/java/org/chorem/lima
by echatellier＠users.chorem.org 24 Mar '11

24 Mar '11

Author: echatellier Date: 2011-03-24 12:47:56 +0100 (Thu, 24 Mar 2011) New Revision: 3082 Url: http://chorem.org/repositories/revision/lima/3082 Log: Add lima server main Added: trunk/lima-business/src/main/java/org/chorem/lima/LimaServer.java Added: trunk/lima-business/src/main/java/org/chorem/lima/LimaServer.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/LimaServer.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/LimaServer.java 2011-03-24 11:47:56 UTC (rev 3082) @@ -0,0 +1,77 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima; + +import java.util.Properties; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.apache.openejb.client.LocalInitialContextFactory; + +/** + * Lima server class. + * + * Starts openejb server. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class LimaServer { + + /** + * Lima server. + * + * @param args + * @throws NamingException + */ + public static void main(String... args) throws NamingException { + Properties properties = new Properties(); + properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName()); + properties.setProperty("openejb.embedded.remotable", "true"); + // Uncomment these properties to change the defaults + //properties.setProperty("ejbd.port", "4202"); + properties.setProperty("ejbd.bind", "0.0.0.0"); + //properties.setProperty("ejbd.threads", "200"); + //properties.setProperty("ejbd.disabled", "false"); + //properties.setProperty("ejbd.only_from", "127.0.0.1,192.168.1.1"); + + new InitialContext(properties); + + // block main otherwize, main will end + synchronized (properties) { + try { + properties.wait(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + System.out.println("Server shutdown"); + } +} Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/LimaServer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3081 - in trunk: . lima-business lima-business/src/license lima-business/src/main lima-business/src/main/assembly lima-swing
by echatellier＠users.chorem.org 24 Mar '11

24 Mar '11

Author: echatellier Date: 2011-03-24 12:47:35 +0100 (Thu, 24 Mar 2011) New Revision: 3081 Url: http://chorem.org/repositories/revision/lima/3081 Log: Update to openejb 3.1.4 Added: trunk/lima-business/src/main/assembly/ trunk/lima-business/src/main/assembly/bin.xml trunk/lima-business/src/main/assembly/lima-server Modified: trunk/lima-business/pom.xml trunk/lima-business/src/license/THIRD-PARTY.properties trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-03-12 14:22:58 UTC (rev 3080) +++ trunk/lima-business/pom.xml 2011-03-24 11:47:35 UTC (rev 3081) @@ -19,10 +19,6 @@ <artifactId>lima-callao</artifactId> <version>${project.version}</version> </dependency> -  <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> @@ -74,15 +70,17 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-core</artifactId> - <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> - <artifactId>javaee-api</artifactId> - <scope>provided</scope> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-ejbd</artifactId> </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>ejb31-api-experimental</artifactId> + </dependency> </dependencies>  @@ -91,25 +89,16 @@ <name>Lima :: business</name> <description>Business module for lima</description> + <properties> +  + <maven.jar.main.class>org.chorem.lima.LimaServer</maven.jar.main.class> + </properties> +    <build> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> <pluginManagement> <plugins> <plugin> @@ -126,27 +115,80 @@ </excludes> </configuration> </plugin> - -  <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <artifactId>maven-jar-plugin</artifactId> <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <attach>false</attach> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + </manifest> + </archive> </configuration> </plugin> - - </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> + + <profiles> + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>lima-server-${project.version}</finalName> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> - - Modified: trunk/lima-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-business/src/license/THIRD-PARTY.properties 2011-03-12 14:22:58 UTC (rev 3080) +++ trunk/lima-business/src/license/THIRD-PARTY.properties 2011-03-24 11:47:35 UTC (rev 3081) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - ANTLR 2 License @@ -6,7 +6,6 @@ # - Apache License Version 1.1 # - 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 @@ -21,7 +20,6 @@ # - 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 # - http://asm.ow2.org/license.html @@ -31,7 +29,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Nov 22 08:53:03 CET 2010 +#Thu Mar 24 12:12:43 CET 2011 antlr--antlr--2.7.6--jar=ANTLR 2 License com.sun.xml.bind--jaxb-impl--2.1.9--jar=Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license commons-net--commons-net--2.0--jar=The Apache Software License, Version 2.0 @@ -39,6 +37,6 @@ dom4j--dom4j--1.6.1--jar=jdomlicence javassist--javassist--3.8.0.GA--jar=GNU Lesser General Public License javax.transaction--jta--1.1--jar=License Agreement for Java Transaction API Classes +org.apache.geronimo.specs--geronimo-j2ee-management_1.0_spec--1.0--jar=The Apache Software License, Version 2.0 org.codehaus.swizzle--swizzle-stream--1.0.1--jar=The Apache Software License, Version 2.0 -org.osgi--org.osgi.core--4.1.0--jar=The Apache Software License, Version 2.0 quartz--quartz--1.5.2--jar=The Apache Software License, Version 2.0 Added: trunk/lima-business/src/main/assembly/bin.xml =================================================================== --- trunk/lima-business/src/main/assembly/bin.xml (rev 0) +++ trunk/lima-business/src/main/assembly/bin.xml 2011-03-24 11:47:35 UTC (rev 3081) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.1.xsd"> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + + <files> + <file> + <source>target/${project.build.finalName}.${project.packaging}</source> + <destName>lima-server.${project.packaging}</destName> + </file> + <file> + <source>src/main/assembly/lima-server</source> + <fileMode>0755</fileMode> + </file> + </files> + <fileSets> + <fileSet> + <directory>target/lib</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>junit-*.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: trunk/lima-business/src/main/assembly/lima-server =================================================================== --- trunk/lima-business/src/main/assembly/lima-server (rev 0) +++ trunk/lima-business/src/main/assembly/lima-server 2011-03-24 11:47:35 UTC (rev 3081) @@ -0,0 +1,9 @@ +#!/bin/sh +MX=512M +cd `dirname $0` +if [ -n "$JAVA_HOME" ]; then + $JAVA_HOME/bin/java -Xmx$MX -Xms$MX -jar ./lima-server.jar $* +else + java -Xmx$MX -Xms$MX -jar ./lima-server.jar $* +fi +cd "$OLDPWD" Property changes on: trunk/lima-business/src/main/assembly/lima-server ___________________________________________________________________ Added: svn:executable + * Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-03-12 14:22:58 UTC (rev 3080) +++ trunk/lima-swing/pom.xml 2011-03-24 11:47:35 UTC (rev 3081) @@ -93,19 +93,19 @@ </dependency> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-core</artifactId> </dependency>  <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-client</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-loader</artifactId> </dependency> </dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-12 14:22:58 UTC (rev 3080) +++ trunk/pom.xml 2011-03-24 11:47:35 UTC (rev 3081) @@ -107,26 +107,31 @@  <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-core</artifactId> <version>${openEjbVersion}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> - <artifactId>javaee-api</artifactId> - <version>5.0.3</version> + <groupId>org.apache.openejb</groupId> + <artifactId>ejb31-api-experimental</artifactId> + <version>${openEjbVersion}</version> </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>openejb-ejbd</artifactId> + <version>${openEjbVersion}</version> + </dependency>  <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-client</artifactId> <version>${openEjbVersion}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.ext.openejb</groupId> + <groupId>org.apache.openejb</groupId> <artifactId>openejb-loader</artifactId> <version>${openEjbVersion}</version> </dependency> @@ -275,8 +280,8 @@ <topiaVersion>2.4.2</topiaVersion> <jaxxVersion>2.1</jaxxVersion> <nuitonI18nVersion>1.2.2</nuitonI18nVersion> - <openEjbVersion>3.1.3.0</openEjbVersion> - <slf4jVersion>1.6.0</slf4jVersion> + <openEjbVersion>3.1.4</openEjbVersion> + <slf4jVersion>1.6.1</slf4jVersion>

1 0

r3080 - trunk
by tchemit＠users.chorem.org 12 Mar '11

12 Mar '11

Author: tchemit Date: 2011-03-12 15:22:58 +0100 (Sat, 12 Mar 2011) New Revision: 3080 Url: http://chorem.org/repositories/revision/lima/3080 Log: Update mavenpom4redmine to 2.5.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-03 17:10:14 UTC (rev 3079) +++ trunk/pom.xml 2011-03-12 14:22:58 UTC (rev 3080) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.1</version> + <version>2.5.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r3079 - in trunk/src/site: resources/screens rst
by jcouteau＠users.chorem.org 03 Mar '11

03 Mar '11

Author: jcouteau Date: 2011-03-03 18:10:14 +0100 (Thu, 03 Mar 2011) New Revision: 3079 Url: http://chorem.org/repositories/revision/lima/3079 Log: Evolution #313 - Faire la documentation des parties Saisie d'?\195?\169critures et rapports - doc saisie ok, reste le lettrage Added: trunk/src/site/resources/screens/lima_incorrectEntries.png trunk/src/site/resources/screens/lima_searchEntry.png Modified: trunk/src/site/rst/saisie.rst Added: trunk/src/site/resources/screens/lima_incorrectEntries.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/screens/lima_incorrectEntries.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/screens/lima_searchEntry.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/screens/lima_searchEntry.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/site/rst/saisie.rst =================================================================== --- trunk/src/site/rst/saisie.rst 2011-03-03 11:03:04 UTC (rev 3078) +++ trunk/src/site/rst/saisie.rst 2011-03-03 17:10:14 UTC (rev 3079) @@ -22,8 +22,66 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - -============ +====== Saisie -============ +====== -TODO \ No newline at end of file +L'étape la plus importante de la comptabilité consiste bien entendu à saisir +les différentes écritures comptables. + +Saisir des entrées comptables +----------------------------- + +Pour saisir vos entrées comptables, rendez-vous sur +'Traitement->Saisir des écritures' + +.. image:: screens/lima_entries.png + +Choisissez alors l'exercice et la période dans laquelle vous souhaitez ajouter +des écritures. Pour ajouter une transaction, cliquez sur 'Ajouter une +transaction'. Saisissez la date, puis le journal concerné par l'écriture. +Pour ajouter une entrée, Cliquez sur 'Ajouter entrée' + +Note : Vous pouvez saisir plus rapidement en utilisant la touche 'Tab' pour +changer de cellule et tapper directement la valeur souhaitée. Si vous appuyez +sur 'Tab en fin de ligne, soit la transaction est équilibrée alors une nouvelle +transaction sera créée, soit la transaction n'est pas équilibrée et une nouvelle +entrée sera ajoutée. + +Les entrées non équilibrées +--------------------------- + +Les transactions non équilibrées sont affichées en rouge dans l'interface de +saisie. Vous pouvez aussi toutes les retrouver sur un même écran pour les +corriger en cliquant sur 'Traitement->Entrées incorrectes'. + +Choisissez votre Exercice, les entrées incorrectes s'affichent. Vous pouvez soit +supprimer les transactions, soit modifier les entrées pour équilibre la +transaction. Le raffraichissement n'est pas automatique. Une fois que vous avez +effectué vos modifications. Vous pouvez revérifier vos entrées en cliquant sur +le bouton de rafraichissement, en haut à gauche du tableau. + +.. image:: screens/lima_incorrectEntries.png + +Rechercher des écritures +------------------------ + +Vous pouvez utiliser un filtre avancé pour rechercher une écriture. Pour accéder +à l'écran, cliquez sur 'Traitement->Rechercher une écriture'. + +.. image:: screens/lima_searchEntry.png + +Bous pouvez utiliser un ou plusieurs filtres en les combinants. Les filtres +possibles sont : + +* Période (Exercice, période comptable ou dates) +* Pièce comptable (Texte de la pièce comptable, ex 'FA-001') +* Description (Texte de la description, ex 'Cartes de visite') +* Compte +* Journal +* Montant (Il est possible de choisir le montant au crédit, au débit ou les + deux, ainsi que de faire différentes comparaisons sur les chiffres (=, <, <=, + intervalle…) + +Lettrage +-------- \ No newline at end of file

1 0