This is an automated email from the git hooks/post-receive script. New commit to branch feature/newReportBuilder in repository lima. See http://git.chorem.org/lima.git commit 94b7adb2119161a722ccb8b4897ae8301c9dbd1f Author: dcosse <japbiw74> Date: Mon Nov 17 11:48:16 2014 +0100 refs #769 nettoyage suite à la création du module web --- lima-business/pom.xml | 31 -- lima-business/src/main/assembly/bin.xml | 67 ---- lima-business/src/main/assembly/lima-server | 9 - .../jasperreports/accounts/AccountReport.jrxml | 161 ---------- .../main/jasperreports/balance/BalanceReport.jrxml | 347 --------------------- .../balance/BalanceReportAccountReport.jrxml | 132 -------- .../balance/BalanceSubAccountsReport.jrxml | 109 ------- .../src/main/java/org/chorem/lima/LimaServer.java | 75 ----- lima-swing/src/main/assembly/bin.xml | 4 +- .../main/resources/i18n/lima-web_en_GB.properties | 55 ++++ .../main/resources/i18n/lima-web_fr_FR.properties | 55 ++++ .../src/main/resources/images/accounts.png | Bin .../src/main/resources/images/entries.png | Bin .../src/main/resources/images/entrybooks.png | Bin .../src/main/resources/images/fiscalperiods.png | Bin .../src/main/resources/images/identity.png | Bin .../src/main/resources/images/puzzle_icon_mini.png | Bin .../src/main/resources/reports/vat_form_fr.pdf | Bin 18 files changed, 113 insertions(+), 932 deletions(-) diff --git a/lima-business/pom.xml b/lima-business/pom.xml index d892ce1..e4b17ee 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -169,37 +169,6 @@ </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>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> <profile> <id>reporting</id> diff --git a/lima-business/src/main/assembly/bin.xml b/lima-business/src/main/assembly/bin.xml deleted file mode 100644 index 90d5813..0000000 --- a/lima-business/src/main/assembly/bin.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Lima :: business - %% - Copyright (C) 2008 - 2010 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 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% - --> - -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.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> - <fileSet> - <directory>src/main/resources/reports</directory> - <outputDirectory>reports</outputDirectory> - <includes> - <include>*.pdf</include> - </includes> - </fileSet> - </fileSets> -</assembly> diff --git a/lima-business/src/main/assembly/lima-server b/lima-business/src/main/assembly/lima-server deleted file mode 100755 index f79c621..0000000 --- a/lima-business/src/main/assembly/lima-server +++ /dev/null @@ -1,9 +0,0 @@ -#!/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" diff --git a/lima-business/src/main/jasperreports/accounts/AccountReport.jrxml b/lima-business/src/main/jasperreports/accounts/AccountReport.jrxml deleted file mode 100644 index 014e820..0000000 --- a/lima-business/src/main/jasperreports/accounts/AccountReport.jrxml +++ /dev/null @@ -1,161 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.1.final using JasperReports Library version 5.6.1 --> -<!-- 2014-10-02T11:45:07 --> -<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="AccountReportC" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="988d60dc-e878-4a6d-8789-7dffd9f27769"> - <property name="com.jaspersoft.studio.data.defaultdataadapter" value="AccountBeanAdaptor2"/> - <property name="com.jaspersoft.studio.unit." value="pixel"/> - <property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/> - <property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/> - <property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/> - <property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/> - <property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/> - <property name="net.sf.jasperreports.awt.ignore.missing.font" value="true"/> - <style name="Title" fontName="Times New Roman" fontSize="50" isBold="true" pdfFontName="Times-Bold"/> - <style name="SubTitle" forecolor="#736343" fontName="Times New Roman" pdfFontName="Times-Roman" fontSize="18"/> - <style name="Column header" forecolor="#666666" fontName="Times New Roman" pdfFontName="Times-Roman" fontSize="12" isBold="true"/> - <style name="Detail" backcolor="#CCFFCC" fontName="Times New Roman" fontSize="12" pdfFontName="Times-Roman"/> - <style name="Row" mode="Transparent"> - <conditionalStyle> - <conditionExpression><![CDATA[$V{REPORT_COUNT}%2 == 0]]></conditionExpression> - <style backcolor="#E6DAC3"/> - </conditionalStyle> - </style> - <queryString language="SQL"> - <![CDATA[]]> - </queryString> - <field name="accountNumber" class="java.lang.String"/> - <field name="label" class="java.lang.String"/> - <group name="Group1"> - <groupExpression><![CDATA[(int)($V{REPORT_COUNT}/15)]]></groupExpression> - </group> - <group name="Group2"> - <groupExpression><![CDATA[(int)($V{REPORT_COUNT}/5)]]></groupExpression> - </group> - <background> - <band splitType="Stretch"/> - </background> - <title> - <band height="50" splitType="Stretch"> - <staticText> - <reportElement style="Title" x="170" y="0" width="263" height="30" uuid="f4b151ca-f4bb-45fa-8fa7-416c74bda6ed"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font fontName="Times New Roman" size="14" pdfFontName="Times-Roman"/> - </textElement> - <text><![CDATA[Liste des Comptes]]></text> - </staticText> - <textField pattern="EEEEE dd MMMMM yyyy"> - <reportElement style="Column header" x="450" y="10" width="115" height="20" forecolor="#736343" uuid="6e0a2e2e-bfe6-4208-b2b8-a2ee0fd23bc3"/> - <textElement verticalAlignment="Middle"> - <font size="10" isBold="false"/> - </textElement> - <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> - </textField> - </band> - </title> - <pageHeader> - <band splitType="Stretch"/> - </pageHeader> - <columnHeader> - <band height="20" splitType="Stretch"> - <frame> - <reportElement mode="Opaque" x="100" y="0" width="100" height="20" forecolor="#B89F7D" backcolor="#F2EBDF" uuid="cfea52a4-a7c7-4222-96c0-3ff78a050aa4"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> - <staticText> - <reportElement x="0" y="0" width="100" height="20" uuid="0768a37f-c1c8-4247-9546-9ea7c6117ed9"/> - <box> - <topPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - </box> - <text><![CDATA[label]]></text> - </staticText> - </frame> - <frame> - <reportElement mode="Opaque" x="0" y="0" width="99" height="20" forecolor="#B89F7D" backcolor="#F2EBDF" uuid="13e75fe2-71fa-484b-9a2c-cd7a178deb17"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> - <staticText> - <reportElement x="0" y="0" width="99" height="20" uuid="cdbebdf6-fb7e-40a1-b5a3-00ac9d5389ef"/> - <box> - <topPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - </box> - <text><![CDATA[Compte]]></text> - </staticText> - </frame> - </band> - </columnHeader> - <detail> - <band height="20" splitType="Stretch"> - <textField> - <reportElement x="0" y="0" width="100" height="20" uuid="c940221c-a753-4c62-a407-465456d450b6"/> - <box> - <topPen lineWidth="0.5"/> - <leftPen lineWidth="0.5"/> - <bottomPen lineWidth="0.5"/> - <rightPen lineWidth="0.5"/> - </box> - <textFieldExpression><![CDATA[$F{accountNumber}]]></textFieldExpression> - </textField> - <textField> - <reportElement x="100" y="0" width="100" height="20" uuid="2a034b82-680f-47b7-b951-f11dd97ffabf"/> - <box> - <topPen lineWidth="0.5"/> - <leftPen lineWidth="0.5"/> - <bottomPen lineWidth="0.5"/> - <rightPen lineWidth="0.5"/> - </box> - <textFieldExpression><![CDATA[$F{label}]]></textFieldExpression> - </textField> - </band> - </detail> - <columnFooter> - <band height="45" splitType="Stretch"/> - </columnFooter> - <pageFooter> - <band height="25" splitType="Stretch"> - <frame> - <reportElement mode="Opaque" x="-21" y="1" width="597" height="24" forecolor="#D0B48E" backcolor="#F2EBDF" uuid="b5834407-22ff-4e5d-a7f8-3b5be0962706"/> - <textField evaluationTime="Report"> - <reportElement style="Column header" x="533" y="0" width="40" height="20" forecolor="#736343" uuid="df3c3050-1890-4a3b-a4b4-1e8f28016a1c"/> - <textElement verticalAlignment="Middle"> - <font size="10" isBold="false"/> - </textElement> - <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression> - </textField> - <textField> - <reportElement style="Column header" x="453" y="0" width="80" height="20" forecolor="#736343" uuid="3d887e8a-f0d7-4d38-8553-dbf76dd04d36"/> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="10" isBold="false"/> - </textElement> - <textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression> - </textField> - <textField pattern="EEEEE dd MMMMM yyyy"> - <reportElement style="Column header" x="22" y="1" width="197" height="20" forecolor="#736343" uuid="1cc9564c-479d-46b3-a4bf-9221ae6d4f01"/> - <textElement verticalAlignment="Middle"> - <font size="10" isBold="false"/> - </textElement> - <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> - </textField> - </frame> - </band> - </pageFooter> - <summary> - <band splitType="Stretch"/> - </summary> -</jasperReport> diff --git a/lima-business/src/main/jasperreports/balance/BalanceReport.jrxml b/lima-business/src/main/jasperreports/balance/BalanceReport.jrxml deleted file mode 100644 index a0339b9..0000000 --- a/lima-business/src/main/jasperreports/balance/BalanceReport.jrxml +++ /dev/null @@ -1,347 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2014-11-04T17:37:18 --> -<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceReport" pageWidth="595" pageHeight="842" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" uuid="66929b65-d52d-4e6b-8d8e-8bd4ef5ac821"> - <property name="com.jaspersoft.studio.unit." value="pixel"/> - <property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/> - <property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/> - <property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/> - <property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/> - <property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/> - <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> - <style name="Column header" forecolor="#D0B48E" backcolor="#F2EBDF" fontName="Arial" fontSize="12" isBold="true"/> - <style name="Default" isDefault="true" fontName="Arial" /> - <style name="Default oblique" isDefault="true" fontName="Monospaced" /> - <queryString> - <![CDATA[]]> - </queryString> - <field name="fromDate" class="java.util.Date"/> - <field name="toDate" class="java.util.Date"/> - <field name="currency" class="java.lang.String"/> - <field name="fromAccount" class="java.lang.String"/> - <field name="toAccount" class="java.lang.String"/> - <field name="accounts" class="java.util.List"/> - <field name="balanceReportAccountPath" class="java.lang.String"/> - <field name="companyName" class="java.lang.String"/> - <variable name="accounts" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> - <variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{accounts})]]></variableExpression> - </variable> - <group name="accounts"/> - <background> - <band splitType="Stretch"/> - </background> - <title> - <band height="41" splitType="Stretch"> - <frame> - <reportElement style="Default" mode="Opaque" x="0" y="1" width="578" height="40" forecolor="#D0B48E" backcolor="#F2EBDF" uuid="1aba49d4-0acc-4925-8731-13c1cc1a90f4"/> - <box> - <topPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textField pattern="dd/MM/yyyy"> - <reportElement style="Default" x="210" y="20" width="80" height="20" forecolor="#736343" uuid="37d0a47c-0197-4f09-8358-823b39a2a42a"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <textElement verticalAlignment="Middle"> - <font isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$F{fromDate}]]></textFieldExpression> - </textField> - <staticText> - <reportElement style="Default" x="0" y="0" width="578" height="20" forecolor="#736343" uuid="e7bf1b4c-d748-4c99-b9e2-838903711b48"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="14" isBold="true" pdfFontName="Times-Roman"/> - </textElement> - <text><![CDATA[Balance]]></text> - </staticText> - <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement style="Default" x="480" y="0" width="98" height="20" forecolor="#736343" uuid="a60d5d40-69ac-4c50-a33a-67c26cce05f3"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="10" isBold="false"/> - </textElement> - <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> - </textField> - <staticText> - <reportElement style="Default" x="422" y="0" width="58" height="20" forecolor="#736343" uuid="ddf50f55-7669-44be-b427-d03bc72cc264"/> - <textElement textAlignment="Center" verticalAlignment="Middle"/> - <text><![CDATA[Edition du:]]></text> - </staticText> - <staticText> - <reportElement style="Default" x="190" y="20" width="20" height="20" forecolor="#736343" uuid="08282b18-8e67-4bcb-878e-ac97dc0bbc5b"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <textElement verticalAlignment="Middle"> - <font isBold="true"/> - </textElement> - <text><![CDATA[Du]]></text> - </staticText> - <staticText> - <reportElement style="Default" x="290" y="20" width="20" height="20" forecolor="#736343" uuid="e149a451-2c1c-4d8d-9b01-85e35144eb86"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <textElement verticalAlignment="Middle"> - <font isBold="true"/> - </textElement> - <text><![CDATA[au]]></text> - </staticText> - <textField pattern="dd/MM/yyyy"> - <reportElement style="Default" x="310" y="20" width="80" height="20" forecolor="#736343" uuid="5fc4df4a-5930-4ccd-b450-cf7aac6be57b"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <textElement verticalAlignment="Middle"> - <font isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$F{toDate}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="Default" x="0" y="0" width="190" height="20" forecolor="#736343" uuid="5aa3ceb9-e407-42da-bdc3-097875bdd5f5"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <textElement verticalAlignment="Middle" rotation="None"> - <font isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$F{companyName}]]></textFieldExpression> - </textField> - </frame> - </band> - </title> - <pageHeader> - <band height="25" splitType="Stretch"> - <staticText> - <reportElement style="Default oblique" x="0" y="9" width="42" height="16" uuid="33ba6496-bc27-466f-9764-7336b6741c13"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <textElement verticalAlignment="Middle"> - <font size="8" isItalic="true"/> - </textElement> - <text><![CDATA[Comptes :]]></text> - </staticText> - <textField isBlankWhenNull="true"> - <reportElement style="Default oblique" x="42" y="9" width="402" height="16" uuid="9db3917c-44e3-46d2-b95a-6463e5eff328"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <textElement textAlignment="Left" verticalAlignment="Middle"> - <font size="8" isItalic="true"/> - </textElement> - <textFieldExpression><![CDATA[$F{fromAccount}]]></textFieldExpression> - </textField> - <staticText> - <reportElement style="Default oblique" x="444" y="9" width="30" height="16" forecolor="#000000" uuid="02207af8-5ccd-43c9-b475-acb534bcd6cf"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <textElement verticalAlignment="Middle"> - <font size="8"/> - </textElement> - <text><![CDATA[Devise:]]></text> - </staticText> - <textField> - <reportElement style="Default oblique" x="474" y="9" width="104" height="16" forecolor="#000000" uuid="abcb18cb-7d0e-4eb8-a9f5-aca4baffa9ae"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <textElement textAlignment="Left" verticalAlignment="Middle"> - <font size="8"/> - </textElement> - <textFieldExpression><![CDATA[$F{currency}]]></textFieldExpression> - </textField> - </band> - </pageHeader> - <columnHeader> - <band height="20"> - <frame> - <reportElement style="Column header" mode="Opaque" x="0" y="0" width="578" height="20" uuid="6c2c2b44-eebf-41d3-8b56-47d4a20a4b24"> - <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> - </reportElement> - <box> - <topPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <staticText> - <reportElement x="0" y="0" width="40" height="20" uuid="63da28a1-a793-4bf5-81d4-6a4d6fc1e4df"> - <property name="local_mesure_unitwidth" value="pixel"/> - </reportElement> - <box> - <rightPen lineWidth="0.6"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="8"/> - </textElement> - <text><![CDATA[Compte]]></text> - </staticText> - <staticText> - <reportElement x="40" y="0" width="250" height="20" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"> - <property name="local_mesure_unitheight" value="pixel"/> - </reportElement> - <box> - <topPen lineWidth="0.6"/> - <leftPen lineWidth="0.6"/> - <bottomPen lineWidth="0.6"/> - <rightPen lineWidth="0.6"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="8"/> - </textElement> - <text><![CDATA[Intitulé]]></text> - </staticText> - <staticText> - <reportElement x="290" y="0" width="144" height="10" uuid="caadc464-ad77-4b53-b5cb-11e29c0a18ce"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="8"/> - </textElement> - <text><![CDATA[Total Période]]></text> - </staticText> - <staticText> - <reportElement x="290" y="10" width="72" height="10" uuid="e6928f86-fe5c-4c14-996c-19728e6abf44"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box> - <rightPen lineWidth="0.6"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="8"/> - </textElement> - <text><![CDATA[Débit]]></text> - </staticText> - <staticText> - <reportElement x="362" y="10" width="72" height="10" uuid="13dd0f7b-3331-4ca4-8ef8-5468fb65fc3e"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box> - <rightPen lineWidth="0.6"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="8"/> - </textElement> - <text><![CDATA[Crédit]]></text> - </staticText> - <staticText> - <reportElement x="434" y="0" width="144" height="10" uuid="1bc6ab8b-d490-46a2-9a10-8f4c4f219889"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="8"/> - </textElement> - <text><![CDATA[Solde Période]]></text> - </staticText> - <staticText> - <reportElement x="434" y="10" width="72" height="10" uuid="b6ea8597-d637-47d1-9a39-7c99101594e9"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.6"/> - <leftPen lineWidth="0.6"/> - <bottomPen lineWidth="0.6"/> - <rightPen lineWidth="0.6"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="8"/> - </textElement> - <text><![CDATA[Débit]]></text> - </staticText> - <staticText> - <reportElement x="506" y="10" width="72" height="10" uuid="c4f9f592-7052-4b66-abc2-f04cc5f3972c"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box> - <rightPen lineWidth="0.6"/> - </box> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="8"/> - </textElement> - <text><![CDATA[Crédit]]></text> - </staticText> - </frame> - </band> - </columnHeader> - <detail> - <band height="20" splitType="Stretch"> - <subreport isUsingCache="false" runToBottom="false"> - <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/> - <dataSourceExpression><![CDATA[$V{accounts}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{balanceReportAccountPath})]]></subreportExpression> - </subreport> - </band> - </detail> - <pageFooter> - <band height="10" splitType="Stretch"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <textField> - <reportElement x="295" y="0" width="50" height="10" uuid="bbf610ed-68ca-4ff7-992a-b894a61b2379"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <textElement> - <font size="8"/> - </textElement> - <textFieldExpression><![CDATA[$V{PAGE_COUNT}]]></textFieldExpression> - </textField> - <textField> - <reportElement x="235" y="0" width="50" height="10" uuid="7f4c8e82-7fe3-4207-ab07-1a8c4d977a94"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <textElement> - <font size="8"/> - </textElement> - <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> - </textField> - <staticText> - <reportElement x="285" y="0" width="10" height="10" uuid="2609dfd4-556d-4dbd-8d23-74474c5b344c"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <textElement textAlignment="Center"> - <font size="8"/> - </textElement> - <text><![CDATA[/]]></text> - </staticText> - </band> - </pageFooter> -</jasperReport> diff --git a/lima-business/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml b/lima-business/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml deleted file mode 100644 index e16efa2..0000000 --- a/lima-business/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml +++ /dev/null @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2014-11-04T15:21:19 --> -<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="21" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb"> - <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> - <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> - <property name="com.jaspersoft.studio.unit." value="pixel"/> - <style name="Default" isDefault="true" fontName="Arial" /> - <style name="Default oblique" isDefault="true" fontName="Monospaced" /> - <queryString> - <![CDATA[]]> - </queryString> - <field name="accountNumber" class="java.lang.String"/> - <field name="label" class="java.lang.String"/> - <field name="amountDebit" class="java.lang.String"/> - <field name="amountCredit" class="java.lang.String"/> - <field name="soldeDebit" class="java.lang.String"/> - <field name="soldeCredit" class="java.lang.String"/> - <field name="subAccounts" class="java.util.List"/> - <field name="balanceSubAccountsReportPath" class="java.lang.String"/> - <variable name="subAccounts" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> - <variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{subAccounts})]]></variableExpression> - </variable> - <detail> - <band height="10" splitType="Stretch"> - <subreport isUsingCache="false" runToBottom="false"> - <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/> - <dataSourceExpression><![CDATA[$V{subAccounts}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{balanceSubAccountsReportPath})]]></subreportExpression> - </subreport> - </band> - <band height="10" splitType="Stretch"> - <textField isBlankWhenNull="true"> - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="40" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Left" verticalAlignment="Middle"> - <font size="8" isBold="true"/> - <paragraph lineSpacingSize="0.0" leftIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{accountNumber}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement x="40" y="0" width="250" height="10" uuid="0bcc6e5d-b2ee-474f-8e66-475933d55a16"> - <property name="local_mesure_unity" value="pixel"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Left" verticalAlignment="Middle"> - <font size="8" isBold="true"/> - <paragraph lineSpacingSize="0.0" leftIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{label}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement x="290" y="0" width="72" height="10" uuid="e774e638-6353-46d0-9968-15992ef50bd3"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8" isBold="true"/> - <!--<font fontName="Courier 10 Pitch" size="8" isBold="true"/>--> - <paragraph lineSpacingSize="0.0" rightIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{amountDebit}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="Default" x="362" y="0" width="72" height="10" uuid="daac5561-4c81-4582-aabf-e8034c2cf93e"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8" isBold="true"/> - <!--<font fontName="Courier 10 Pitch" size="8" isBold="true"/>--> - <paragraph lineSpacingSize="0.0" rightIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{amountCredit}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="Default" x="434" y="0" width="72" height="10" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8" isBold="true"/> - <!--<font fontName="Courier 10 Pitch" size="8" isBold="true"/>--> - <paragraph lineSpacingSize="0.0" rightIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{soldeDebit}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="Default" x="506" y="0" width="72" height="10" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8" isBold="true"/> - <!--<font fontName="Courier 10 Pitch" size="8" isBold="true"/>--> - <paragraph lineSpacingSize="0.0" rightIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{soldeCredit}]]></textFieldExpression> - </textField> - </band> - </detail> - <columnFooter> - <band height="1"> - <line> - <reportElement style="Default" x="0" y="0" width="578" height="1" uuid="ca761e3c-0dba-448f-a60d-afc241c74411"/> - </line> - </band> - </columnFooter> -</jasperReport> diff --git a/lima-business/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml b/lima-business/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml deleted file mode 100644 index b6fb933..0000000 --- a/lima-business/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2014-11-04T15:21:33 --> -<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="21" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb"> - <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> - <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> - <property name="com.jaspersoft.studio.unit." value="pixel"/> - <style name="Default" isDefault="true" fontName="Arial" /> - <style name="Default oblique" isDefault="true" fontName="Monospaced" /> - <queryString> - <![CDATA[]]> - </queryString> - <field name="accountNumber" class="java.lang.String"/> - <field name="label" class="java.lang.String"/> - <field name="amountDebit" class="java.lang.String"/> - <field name="amountCredit" class="java.lang.String"/> - <field name="soldeDebit" class="java.lang.String"/> - <field name="soldeCredit" class="java.lang.String"/> - <detail> - <band height="10" splitType="Stretch"> - <textField isBlankWhenNull="true"> - <reportElement style="Default" x="0" y="0" width="40" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Left" verticalAlignment="Middle"> - <font size="8"/> - <paragraph leftIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{accountNumber}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="Default" x="40" y="0" width="250" height="10" uuid="0bcc6e5d-b2ee-474f-8e66-475933d55a16"> - <property name="local_mesure_unity" value="pixel"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Left" verticalAlignment="Middle"> - <font size="8"/> - <paragraph leftIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{label}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="Default" x="290" y="0" width="72" height="10" uuid="e774e638-6353-46d0-9968-15992ef50bd3"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <!--<font fontName="Courier 10 Pitch" size="8"/>--> - <paragraph rightIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{amountDebit}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="Default" x="362" y="0" width="72" height="10" uuid="daac5561-4c81-4582-aabf-e8034c2cf93e"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <!--<font fontName="Courier 10 Pitch" size="8"/>--> - <paragraph rightIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{amountCredit}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="Default" x="434" y="0" width="72" height="10" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <!--<font fontName="Courier 10 Pitch" size="8"/>--> - <paragraph rightIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{soldeDebit}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="Default" x="506" y="0" width="72" height="10" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <!--<font fontName="Courier 10 Pitch" size="8"/>--> - <paragraph rightIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{soldeCredit}]]></textFieldExpression> - </textField> - </band> - </detail> -</jasperReport> diff --git a/lima-business/src/main/java/org/chorem/lima/LimaServer.java b/lima-business/src/main/java/org/chorem/lima/LimaServer.java deleted file mode 100644 index e412dc5..0000000 --- a/lima-business/src/main/java/org/chorem/lima/LimaServer.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * #%L - * Lima :: business - * %% - * 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 org.apache.openejb.core.LocalInitialContextFactory; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import java.util.Properties; - -/** - * Lima server class. - * <p/> - * Starts openejb server. - * - * @author chatellier - * @version $Revision$ - * <p/> - * 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"); - } -} diff --git a/lima-swing/src/main/assembly/bin.xml b/lima-swing/src/main/assembly/bin.xml index af3b899..d405bed 100644 --- a/lima-swing/src/main/assembly/bin.xml +++ b/lima-swing/src/main/assembly/bin.xml @@ -21,7 +21,9 @@ #L% --> -<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"> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> <id>bin</id> <formats> <format>zip</format> diff --git a/lima-web/src/main/resources/i18n/lima-web_en_GB.properties b/lima-web/src/main/resources/i18n/lima-web_en_GB.properties new file mode 100644 index 0000000..a609e70 --- /dev/null +++ b/lima-web/src/main/resources/i18n/lima-web_en_GB.properties @@ -0,0 +1,55 @@ +lima-business.document.account= +lima-business.document.accountnumber= +lima-business.document.adress= +lima-business.document.adresssuite= +lima-business.document.amount= +lima-business.document.amounts= +lima-business.document.amountsperiod= +lima-business.document.balance= +lima-business.document.businessnumber= +lima-business.document.city= +lima-business.document.classificationcode= +lima-business.document.credit= +lima-business.document.date= +lima-business.document.date.begin= +lima-business.document.date.end= +lima-business.document.dateformat= +lima-business.document.debit= +lima-business.document.description= +lima-business.document.entrybook= +lima-business.document.entrybooks= +lima-business.document.financialstatement= +lima-business.document.generalentrybook= +lima-business.document.grossamount= +lima-business.document.label= +lima-business.document.ledger= +lima-business.document.monthformat= +lima-business.document.movementcredit= +lima-business.document.movementdebit= +lima-business.document.netamount= +lima-business.document.period1= +lima-business.document.period1format= +lima-business.document.period2= +lima-business.document.period2format= +lima-business.document.provisiondeprecationamount= +lima-business.document.society= +lima-business.document.solde= +lima-business.document.soldecredit= +lima-business.document.soldedebit= +lima-business.document.vat= +lima-business.document.vatnumber= +lima-business.document.voucher= +lima-business.document.zipcode= +lima.financialtransaction.account= +lima.fiscalperiod.fiscalperiod= +lima.reports.account.noaccount= +lima.reports.account.noaccounttitle= +lima.reports.accounts= +lima.table.credit= +lima.table.date= +lima.table.debit= +lima.table.description= +lima.table.entrybook= +lima.table.letter= +lima.table.number= +lima.table.voucher= diff --git a/lima-web/src/main/resources/i18n/lima-web_fr_FR.properties b/lima-web/src/main/resources/i18n/lima-web_fr_FR.properties new file mode 100644 index 0000000..a609e70 --- /dev/null +++ b/lima-web/src/main/resources/i18n/lima-web_fr_FR.properties @@ -0,0 +1,55 @@ +lima-business.document.account= +lima-business.document.accountnumber= +lima-business.document.adress= +lima-business.document.adresssuite= +lima-business.document.amount= +lima-business.document.amounts= +lima-business.document.amountsperiod= +lima-business.document.balance= +lima-business.document.businessnumber= +lima-business.document.city= +lima-business.document.classificationcode= +lima-business.document.credit= +lima-business.document.date= +lima-business.document.date.begin= +lima-business.document.date.end= +lima-business.document.dateformat= +lima-business.document.debit= +lima-business.document.description= +lima-business.document.entrybook= +lima-business.document.entrybooks= +lima-business.document.financialstatement= +lima-business.document.generalentrybook= +lima-business.document.grossamount= +lima-business.document.label= +lima-business.document.ledger= +lima-business.document.monthformat= +lima-business.document.movementcredit= +lima-business.document.movementdebit= +lima-business.document.netamount= +lima-business.document.period1= +lima-business.document.period1format= +lima-business.document.period2= +lima-business.document.period2format= +lima-business.document.provisiondeprecationamount= +lima-business.document.society= +lima-business.document.solde= +lima-business.document.soldecredit= +lima-business.document.soldedebit= +lima-business.document.vat= +lima-business.document.vatnumber= +lima-business.document.voucher= +lima-business.document.zipcode= +lima.financialtransaction.account= +lima.fiscalperiod.fiscalperiod= +lima.reports.account.noaccount= +lima.reports.account.noaccounttitle= +lima.reports.accounts= +lima.table.credit= +lima.table.date= +lima.table.debit= +lima.table.description= +lima.table.entrybook= +lima.table.letter= +lima.table.number= +lima.table.voucher= diff --git a/lima-business/src/main/resources/images/accounts.png b/lima-web/src/main/resources/images/accounts.png similarity index 100% rename from lima-business/src/main/resources/images/accounts.png rename to lima-web/src/main/resources/images/accounts.png diff --git a/lima-business/src/main/resources/images/entries.png b/lima-web/src/main/resources/images/entries.png similarity index 100% rename from lima-business/src/main/resources/images/entries.png rename to lima-web/src/main/resources/images/entries.png diff --git a/lima-business/src/main/resources/images/entrybooks.png b/lima-web/src/main/resources/images/entrybooks.png similarity index 100% rename from lima-business/src/main/resources/images/entrybooks.png rename to lima-web/src/main/resources/images/entrybooks.png diff --git a/lima-business/src/main/resources/images/fiscalperiods.png b/lima-web/src/main/resources/images/fiscalperiods.png similarity index 100% rename from lima-business/src/main/resources/images/fiscalperiods.png rename to lima-web/src/main/resources/images/fiscalperiods.png diff --git a/lima-business/src/main/resources/images/identity.png b/lima-web/src/main/resources/images/identity.png similarity index 100% rename from lima-business/src/main/resources/images/identity.png rename to lima-web/src/main/resources/images/identity.png diff --git a/lima-business/src/main/resources/images/puzzle_icon_mini.png b/lima-web/src/main/resources/images/puzzle_icon_mini.png similarity index 100% rename from lima-business/src/main/resources/images/puzzle_icon_mini.png rename to lima-web/src/main/resources/images/puzzle_icon_mini.png diff --git a/lima-business/src/main/resources/reports/vat_form_fr.pdf b/lima-web/src/main/resources/reports/vat_form_fr.pdf similarity index 100% rename from lima-business/src/main/resources/reports/vat_form_fr.pdf rename to lima-web/src/main/resources/reports/vat_form_fr.pdf -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.