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

03/28: refs #1241 ne pas afficher les lignes ne comportant aucun montant de renseigné
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1241-account-report in repository lima. See http://git.chorem.org/lima.git commit 4c16fcbfa4fd587e9a5cbfcce97a5ece73ed0864 Author: dcosse <cosse(a)codelutin.com> Date: Mon Jun 29 10:14:15 2015 +0200 refs #1241 ne pas afficher les lignes ne comportant aucun montant de renseigné --- .../org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java index 8251a9a..aa08a2c 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java @@ -72,7 +72,7 @@ public class AccountReportServiceImpl extends AbstractLimaService implements Acc if (CollectionUtils.isNotEmpty(entries)) { for (Entry entry : entries) { - if (entry.getAmount() == null || BigDecimal.ZERO.equals(entry.getAmount())) { + if (entry.getAmount() == null || BigDecimal.ZERO.compareTo(entry.getAmount()) == 0) { continue; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/28: refs #1241 gérération des rapport de compte avec Jasper
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1241-account-report in repository lima. See http://git.chorem.org/lima.git commit 03e84c68bbffd4caeefa3c9d4dbd43721789d942 Author: dcosse <cosse(a)codelutin.com> Date: Sat Jun 27 00:53:48 2015 +0200 refs #1241 gérération des rapport de compte avec Jasper --- .../jasperreports/account/AccountEntry.jrxml | 247 ++++++++++++++++++ .../jasperreports/account/DocumentReport.jrxml | 288 +++++++++++++++++++++ 2 files changed, 535 insertions(+) diff --git a/lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml b/lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml new file mode 100644 index 0000000..319105e --- /dev/null +++ b/lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml @@ -0,0 +1,247 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<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="31" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff [...] + <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"/> + <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"/> + <style name="Default" isDefault="true" fontName="DejaVu Sans"/> + <style name="Default oblique" fontName="DejaVu Sans Mono"/> + <field name="accountNumber" class="java.lang.String"/> + <field name="transactionDate" class="java.util.Date"/> + <field name="code" class="java.lang.String"/> + <field name="voucher" class="java.lang.String"/> + <field name="description" class="java.lang.String"/> + <field name="lettering" class="java.lang.String"/> + <field name="debit" class="java.math.BigDecimal"/> + <field name="credit" class="java.math.BigDecimal"/> + <field name="formatter" class="java.text.DecimalFormat"/> + <variable name="subTotalDebit" class="java.math.BigDecimal" calculation="Sum"> + <variableExpression><![CDATA[$F{debit}]]></variableExpression> + <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> + </variable> + <variable name="subTotalCredit" class="java.math.BigDecimal" calculation="Sum"> + <variableExpression><![CDATA[$F{credit}]]></variableExpression> + <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> + </variable> + <detail> + <band height="10" splitType="Stretch"> + <property name="com.jaspersoft.studio.unit.height" value="pixel"/> + <textField isBlankWhenNull="true"> + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="84" height="10" uuid="3df46955-605d-424c-a464-3096d7e231f4"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + </reportElement> + <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="Left" verticalAlignment="Middle"> + <font size="8" isBold="false"/> + <paragraph lineSpacingSize="0.0" leftIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$F{accountNumber}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="84" y="0" width="62" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + </reportElement> + <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="Left" verticalAlignment="Middle"> + <font size="8" isBold="false"/> + <paragraph lineSpacingSize="0.0" leftIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$F{transactionDate}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement x="146" y="0" width="36" height="10" uuid="0bcc6e5d-b2ee-474f-8e66-475933d55a16"> + <property name="local_mesure_unity" value="pixel"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + </reportElement> + <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="Left" verticalAlignment="Middle"> + <font size="8" isBold="false"/> + <paragraph lineSpacingSize="0.0" leftIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$F{code}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement x="182" y="0" width="108" height="10" uuid="e774e638-6353-46d0-9968-15992ef50bd3"> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + </reportElement> + <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="false"/> + <paragraph lineSpacingSize="0.0" rightIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$F{voucher}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="290" y="0" width="108" height="10" uuid="daac5561-4c81-4582-aabf-e8034c2cf93e"> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + </reportElement> + <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="false"/> + <paragraph lineSpacingSize="0.0" rightIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$F{description}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement x="398" y="0" width="36" height="10" uuid="961e8048-c6ef-4b58-a857-31f9f29406c8"> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <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"> + <font size="8" isBold="false"/> + <paragraph rightIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$F{lettering}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="434" y="0" width="72" height="10" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e"> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + </reportElement> + <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="false"/> + <paragraph lineSpacingSize="0.0" rightIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[new Boolean($F{debit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{debit}) : ""]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="506" y="0" width="72" height="10" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + </reportElement> + <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="false"/> + <paragraph lineSpacingSize="0.0" rightIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[new Boolean($F{credit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{credit}) : ""]]></textFieldExpression> + </textField> + </band> + </detail> + <columnFooter> + <band height="10"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <frame> + <reportElement x="0" y="0" width="578" height="10" uuid="5863f40f-6423-4463-ad4a-c4cecab0323c"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + </reportElement> + <box> + <topPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> + <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> + </box> + <textField> + <reportElement x="0" y="0" width="434" height="10" forecolor="#736343" uuid="3deefb8e-456b-4bbb-8574-1a02651e5d7f"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <textElement> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA["Sous total"]]></textFieldExpression> + </textField> + <textField> + <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + </reportElement> + <textElement textAlignment="Right"> + <font size="8"/> + <paragraph rightIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[new Boolean($V{subTotalCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{subTotalCredit}) : ""]]></textFieldExpression> + </textField> + <textField> + <reportElement x="434" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + </reportElement> + <textElement textAlignment="Right"> + <font size="8"/> + <paragraph rightIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[new Boolean($V{subTotalDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{subTotalDebit}) : ""]]></textFieldExpression> + </textField> + </frame> + </band> + </columnFooter> +</jasperReport> diff --git a/lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml new file mode 100644 index 0000000..6b60042 --- /dev/null +++ b/lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml @@ -0,0 +1,288 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<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" whenNoDataType="BlankPage" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" isSummaryNewPage="true" isSummaryWithPageHeaderAndFooter="true" isFloa [...] + <property name="com.jaspersoft.studio.unit." value="pixel"/> + <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> + <style name="Default" isDefault="true" fontName="DejaVu Sans" fontSize="8"/> + <style name="Bold" fontName="DejaVu Sans" fontSize="8"/> + <style name="Oblique" fontName="DejaVu Sans Mono" fontSize="8"/> + <style name="Column header" forecolor="#D0B48E" backcolor="#F2EBDF" fontName="DejaVu Sans" fontSize="12" isBold="true"/> + <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="accounts" class="java.util.List"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> + <field name="companyName" class="java.lang.String"/> + <field name="title" class="java.lang.String"/> + <field name="soldeDebit" class="java.math.BigDecimal"/> + <field name="soldeCredit" class="java.math.BigDecimal"/> + <field name="formatter" class="java.text.DecimalFormat"/> + <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="#FDCA97"/> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> + <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> + </box> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="0" y="0" width="578" height="20" forecolor="#736343" uuid="9ee9d5f1-6e74-4526-83a4-3b386f2733a8"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="14" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$F{title}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true"> + <reportElement style="Default" x="444" y="0" width="134" height="20" forecolor="#736343" uuid="a60d5d40-69ac-4c50-a33a-67c26cce05f3"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font size="8" isBold="false"/> + <paragraph rightIndent="5"/> + </textElement> + <textFieldExpression><![CDATA["Edition du: " + new SimpleDateFormat("dd/MM/yyyy à HH:mm").format(new java.util.Date())]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy" isBlankWhenNull="true"> + <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 textAlignment="Right" verticalAlignment="Middle"> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA["Du " + new SimpleDateFormat("dd/MM/yyyy").format($F{fromDate})]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy" isBlankWhenNull="true"> + <reportElement style="Default" x="290" 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[" au " + new SimpleDateFormat("dd/MM/yyyy").format($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 size="10" isBold="true"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{companyName}]]></textFieldExpression> + </textField> + </frame> + </band> + </title> + <pageHeader> + <band height="45" splitType="Stretch"> + <textField isBlankWhenNull="true"> + <reportElement style="Oblique" x="444" y="9" width="134" 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="Right" verticalAlignment="Middle"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA["Devise: " + $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" backcolor="#FDCA97" 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="#804000"/> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + </box> + <staticText> + <reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="84" height="20" forecolor="#804000" backcolor="#FFFFFF" uuid="63da28a1-a793-4bf5-81d4-6a4d6fc1e4df"> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + </reportElement> + <box> + <rightPen lineWidth="0.6"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="8" isBold="true"/> + </textElement> + <text><![CDATA[N° Compte]]></text> + </staticText> + <staticText> + <reportElement x="84" y="0" width="62" height="20" forecolor="#804000" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" 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" isBold="true"/> + </textElement> + <text><![CDATA[Date]]></text> + </staticText> + <staticText> + <reportElement x="146" y="0" width="36" height="20" forecolor="#804000" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" 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" isBold="true"/> + </textElement> + <text><![CDATA[Journal]]></text> + </staticText> + <staticText> + <reportElement x="182" y="0" width="108" height="20" forecolor="#804000" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" 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" isBold="true"/> + </textElement> + <text><![CDATA[Pièce comptable]]></text> + </staticText> + <staticText> + <reportElement x="290" y="0" width="108" height="20" forecolor="#804000" 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="#804000"/> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="8" isBold="true"/> + </textElement> + <text><![CDATA[Description]]></text> + </staticText> + <staticText> + <reportElement x="398" y="0" width="36" height="20" forecolor="#804000" uuid="f0c1ae81-733f-42ba-844d-082b51c95040"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="local_mesure_unitx" value="pixel"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + <property name="local_mesure_unitwidth" value="pixel"/> + <property name="com.jaspersoft.studio.unit.width" 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" isBold="true"/> + </textElement> + <text><![CDATA[Lettre]]></text> + </staticText> + <staticText> + <reportElement x="434" y="0" width="72" height="20" forecolor="#804000" 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" lineColor="#804000"/> + <leftPen lineWidth="0.6" lineColor="#804000"/> + <bottomPen lineWidth="0.6" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineColor="#804000"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="8" isBold="true"/> + </textElement> + <text><![CDATA[Débit]]></text> + </staticText> + <staticText> + <reportElement x="506" y="0" width="72" height="20" forecolor="#804000" uuid="c4f9f592-7052-4b66-abc2-f04cc5f3972c"> + <property name="local_mesure_unitheight" value="pixel"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <box> + <topPen lineColor="#804000"/> + <leftPen lineColor="#804000"/> + <bottomPen lineColor="#804000"/> + <rightPen lineWidth="0.6" lineColor="#804000"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="8" isBold="true"/> + </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[$F{subReport}]]></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"/> + <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> + <textField isBlankWhenNull="false"> + <reportElement x="0" y="0" width="288" height="10" uuid="7efdc24b-643b-4927-89e5-30edca53124f"/> + <textElement textAlignment="Right"> + <paragraph lineSpacingSize="0.0"/> + </textElement> + <textFieldExpression><![CDATA["Page " + $V{PAGE_NUMBER}]]></textFieldExpression> + </textField> + <textField evaluationTime="Report"> + <reportElement x="288" y="0" width="287" height="10" uuid="78cfa3db-28e7-420e-b2e4-441f37387159"/> + <textElement textAlignment="Left"> + <paragraph lineSpacingSize="0.0"/> + </textElement> + <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression> + </textField> + </band> + </pageFooter> +</jasperReport> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/28: refs #1241 gérération des rapport de compte avec Jasper
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1241-account-report in repository lima. See http://git.chorem.org/lima.git commit f0e4f29b522a5df7483ca49cc5e1a278f290dbd9 Author: dcosse <cosse(a)codelutin.com> Date: Sat Jun 27 00:52:55 2015 +0200 refs #1241 gérération des rapport de compte avec Jasper --- .../business/api/report/AccountReportService.java | 46 +++++++++ .../business/ejb/csv/FiscalControlExportModel.java | 2 +- .../ejb/report/AccountReportServiceImpl.java | 109 +++++++++++++++++++++ lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 57316 -> 57764 bytes .../chorem/lima/report/DocumentReportTypes.java | 1 + .../org/chorem/lima/report/LimaReportConfig.java | 38 +++---- .../lima/report/service/DocumentService.java | 95 +++--------------- .../chorem/lima/report/service/JasperReports.java | 10 ++ 8 files changed, 202 insertions(+), 99 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/AccountReportService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/AccountReportService.java new file mode 100644 index 0000000..b6a29c9 --- /dev/null +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/AccountReportService.java @@ -0,0 +1,46 @@ +package org.chorem.lima.business.api.report; + +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 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% + */ + +import net.sf.jasperreports.engine.JasperReport; +import org.chorem.lima.beans.DocumentReport; + +import java.text.DecimalFormat; +import java.util.Date; + +/** + * Created by davidcosse on 26/26/15. + */ +public interface AccountReportService { + + /** + * Generate the necessary beans to make account report. + * + * @param account requested account + * @param from from date + * @param to to date + * @param bigDecimalFormat format used for amount representation + * @return model for account report + */ + DocumentReport getAccountDocumentReport(String account, Date from, Date to, JasperReport accountsJasperReport, DecimalFormat bigDecimalFormat); +} diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java index 241cae1..e1dcccb 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java @@ -23,7 +23,7 @@ package org.chorem.lima.business.ejb.csv; */ import com.google.common.collect.Maps; -import org.chorem.lima.beans.Account; +import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialTransaction; diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java new file mode 100644 index 0000000..8251a9a --- /dev/null +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java @@ -0,0 +1,109 @@ +package org.chorem.lima.business.ejb.report; + +import net.sf.jasperreports.engine.JasperReport; +import org.apache.commons.collections4.CollectionUtils; +import org.chorem.lima.beans.AccountEntry; +import org.chorem.lima.beans.AccountEntryImpl; +import org.chorem.lima.beans.DocumentReport; +import org.chorem.lima.beans.DocumentReportImpl; +import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.business.api.IdentityService; +import org.chorem.lima.business.api.ReportService; +import org.chorem.lima.business.api.report.AccountReportService; +import org.chorem.lima.business.ejb.AbstractLimaService; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.AccountTopiaDao; +import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.Identity; + +import javax.ejb.EJB; +import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; + +/** + * Created by davidcosse on 26/06/15. + */ +@Stateless +(a)Remote(AccountReportService.class) +@TransactionAttribute +public class AccountReportServiceImpl extends AbstractLimaService implements AccountReportService { + + protected static final String TITLE = "COMPTE"; + + @EJB + protected IdentityService identityService; + @EJB + protected ReportService reportService; + + @Override + public DocumentReport getAccountDocumentReport(String accountId, Date from, Date to, JasperReport accountsEntryJasperReport, DecimalFormat bigDecimalFormat) { + + DocumentReport documentReport = new DocumentReportImpl(); + documentReport.setFormatter(bigDecimalFormat); + + Identity identity = identityService.getIdentity(); + String companyName = identity == null ? "" : identity.getName(); + documentReport.setCompanyName(companyName); + + // general info about balance report + documentReport.setTitle(TITLE); + documentReport.setCurrency(bigDecimalFormat.getDecimalFormatSymbols().getCurrencySymbol()); + documentReport.setFromDate(from); + documentReport.setToDate(to); + documentReport.setSubReport(accountsEntryJasperReport); + + AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao(); + Account account = accountTopiaDao.forTopiaIdEquals(accountId).findUniqueOrNull(); + + if (from != null && to != null && account != null) { + + Collection<AccountEntry> accountEntries = new ArrayList<>(); + + ReportsDatas results = reportService.generateAccountsReports(account, true, from, to); + List<Entry> entries = results.getListEntry(); + + if (CollectionUtils.isNotEmpty(entries)) { + for (Entry entry : entries) { + + if (entry.getAmount() == null || BigDecimal.ZERO.equals(entry.getAmount())) { + continue; + } + + String entryAccountNumber = entry.getAccount().getAccountNumber(); + String code = ""; + if (entry.getFinancialTransaction().getEntryBook() != null) { + code = entry.getFinancialTransaction().getEntryBook().getCode(); + } + + AccountEntry accountEntry = new AccountEntryImpl(); + accountEntry.setAccountNumber(entryAccountNumber); + accountEntry.setTransactionDate(entry.getFinancialTransaction().getTransactionDate()); + accountEntry.setCode(code); + accountEntry.setVoucher(entry.getVoucher()); + accountEntry.setDescription(entry.getDescription()); + accountEntry.setLettering(entry.getLettering()); + accountEntry.setDebit(entry.isDebit() ? entry.getAmount() : BigDecimal.ZERO); + accountEntry.setCredit(entry.isDebit() ? BigDecimal.ZERO : entry.getAmount()); + accountEntry.setFormatter(bigDecimalFormat); + accountEntries.add(accountEntry); + } + } + + documentReport.addAllAccounts(accountEntries); + + } else { + if (log.isWarnEnabled()) { + log.warn("No account present"); + } + } + + return documentReport; + } +} diff --git a/lima-callao/src/main/xmi/lima-callao-model.zargo b/lima-callao/src/main/xmi/lima-callao-model.zargo index 2b9a7e5..659fb03 100644 Binary files a/lima-callao/src/main/xmi/lima-callao-model.zargo and b/lima-callao/src/main/xmi/lima-callao-model.zargo differ diff --git a/lima-report/src/main/java/org/chorem/lima/report/DocumentReportTypes.java b/lima-report/src/main/java/org/chorem/lima/report/DocumentReportTypes.java index cbc142d..6dafd4c 100644 --- a/lima-report/src/main/java/org/chorem/lima/report/DocumentReportTypes.java +++ b/lima-report/src/main/java/org/chorem/lima/report/DocumentReportTypes.java @@ -28,6 +28,7 @@ package org.chorem.lima.report; */ public enum DocumentReportTypes { ACCOUNT, + ACCOUNT_ENTRY, BALANCE, BALANCE_MAIN_ACCOUNTS, BALANCE_SUB_ACCOUNTS, diff --git a/lima-report/src/main/java/org/chorem/lima/report/LimaReportConfig.java b/lima-report/src/main/java/org/chorem/lima/report/LimaReportConfig.java index bfb438f..00b00b8 100644 --- a/lima-report/src/main/java/org/chorem/lima/report/LimaReportConfig.java +++ b/lima-report/src/main/java/org/chorem/lima/report/LimaReportConfig.java @@ -146,56 +146,59 @@ public class LimaReportConfig { } public URL getReportModelUrl(DocumentReportTypes documentType) { - URL mainReportBuilderPath = null; + URL jasperSourceFileUrl = null; switch (documentType) { case ACCOUNT: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.ACCOUNT_DOCUMENT_REPORT_MODEL_PATH.getKey()); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.ACCOUNT_DOCUMENT_REPORT_MODEL_PATH.getKey()); + break; + case ACCOUNT_ENTRY: + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.ACCOUNT_ENTRY_REPORT_MODEL_PATH.getKey()); break; case BALANCE: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.BALANCE_DOCUMENT_REPORT_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.BALANCE_DOCUMENT_REPORT_MODEL_PATH.key); break; case BALANCE_MAIN_ACCOUNTS: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.BALANCE_ACCOUNT_REPORT_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.BALANCE_ACCOUNT_REPORT_MODEL_PATH.key); break; case BALANCE_SUB_ACCOUNTS: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.BALANCE_SUB_ACCOUNT_REPORT_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.BALANCE_SUB_ACCOUNT_REPORT_MODEL_PATH.key); break; case ENTRY_BOOKS: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH.key); break; case ENTRY_BOOKS_ENTRY_BOOKS: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.ENTRY_BOOK_ENTRY_BOOK_REPORT_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.ENTRY_BOOK_ENTRY_BOOK_REPORT_MODEL_PATH.key); break; case ENTRY_BOOKS_FINANCIAL_PERIODS: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_MODEL_PATH.key); break; case ENTRY_BOOKS_TRANSACTION: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.ENTRY_BOOK_TRANSACTION_REPORT_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.ENTRY_BOOK_TRANSACTION_REPORT_MODEL_PATH.key); break; case GENERAL_ENTRY_BOOK: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.GENERAL_ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.GENERAL_ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH.key); break; case GENERAL_ENTRY_BOOK_GENERAL_ENTRY_BOOKS: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.GENERAL_ENTRY_BOOK_REPORT_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.GENERAL_ENTRY_BOOK_REPORT_MODEL_PATH.key); break; case GENERAL_ENTRY_BOOK_ENTRIES: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.GENERAL_ENTRY_BOOK_ENTRY_REPORT_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.GENERAL_ENTRY_BOOK_ENTRY_REPORT_MODEL_PATH.key); break; case LEDGER: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.GENERAL_LEDGER_DOCUMENT_REPORT_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.GENERAL_LEDGER_DOCUMENT_REPORT_MODEL_PATH.key); break; case LEDGER_GENERAL_LEDGERS: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.GENERAL_LEDGER_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.GENERAL_LEDGER_MODEL_PATH.key); break; case LEDGER_ENTRIES: - mainReportBuilderPath = getReportModelUrl(ReportConfigOption.GENERAL_LEDGER_ENTRY_MODEL_PATH.key); + jasperSourceFileUrl = getReportModelUrl(ReportConfigOption.GENERAL_LEDGER_ENTRY_MODEL_PATH.key); break; } - return mainReportBuilderPath; + return jasperSourceFileUrl; } public void setBalanceDocumentReportModelPath(String path) { @@ -334,7 +337,8 @@ public class LimaReportConfig { REPORTS_MODEL_DIR("lima.reports.dir",n("lima.config.reports.dir.description"),"${lima.data.dir}/reports", File.class, false, false), - ACCOUNT_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.account.documentReportModelPath", n("lima.config.documentReport.account.documentReportModelPath.description"), "/jasperreports/accounts/DocumentReport.jrxml",String.class, false, false), + ACCOUNT_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.account.documentReportModelPath", n("lima.config.documentReport.account.documentReportModelPath.description"), "/jasperreports/account/DocumentReport.jrxml",String.class, false, false), + ACCOUNT_ENTRY_REPORT_MODEL_PATH("lima.config.documentReport.account.accountEntryReportModelPath", n("lima.config.documentReport.account.accountEntryReportModelPath.description"), "/jasperreports/account/AccountEntry.jrxml",String.class, false, false), BALANCE_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.balance.documentReportModelPath", n("lima.config.documentReport.balance.documentReportModelPath.description"), "/jasperreports/balance/DocumentReport.jrxml", String.class, false, false), BALANCE_ACCOUNT_REPORT_MODEL_PATH("lima.config.documentReport.balance.balanceAccountReportModelPath", n("lima.config.documentReport.balance.balanceAccountReportModelPath.description"), "/jasperreports/balance/BalanceReportAccountReport.jrxml", String.class, false, false), diff --git a/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java b/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java index dea0e41..4821c7f 100644 --- a/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java +++ b/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java @@ -31,20 +31,18 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaTechnicalException; import org.chorem.lima.beans.DocumentReport; import org.chorem.lima.beans.FinancialStatementAmounts; -import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.FinancialStatementService; import org.chorem.lima.business.api.IdentityService; import org.chorem.lima.business.api.OptionsService; -import org.chorem.lima.business.api.ReportService; +import org.chorem.lima.business.api.report.AccountReportService; import org.chorem.lima.business.api.report.BalanceReportService; import org.chorem.lima.business.api.report.GeneralEntryBookReportService; import org.chorem.lima.business.api.report.LedgerReportService; import org.chorem.lima.business.api.report.ProvisionalEntryBookReportService; import org.chorem.lima.business.utils.BigDecimalToString; import org.chorem.lima.entity.Account; -import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.Identity; import org.chorem.lima.report.DocumentsEnum; import org.chorem.lima.report.LimaReportConfig; @@ -56,7 +54,6 @@ import java.io.InputStream; import java.math.BigDecimal; import java.net.URL; import java.text.DecimalFormat; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -72,7 +69,7 @@ public class DocumentService { private FinancialStatementService financialStatementService; - private ReportService reportService; + protected AccountReportService accountReportService; protected BalanceReportService balanceReportService; @@ -86,6 +83,7 @@ public class DocumentService { protected JasperReports jasperReports; + protected String accountFilePath; protected String balanceFilePath; protected String generalEntryBookReportPdfFilePath; protected String entryBooksReportPdfFilePath; @@ -94,9 +92,9 @@ public class DocumentService { public DocumentService() { identityService = LimaServiceFactory.getService(IdentityService.class); financialStatementService = LimaServiceFactory.getService(FinancialStatementService.class); - reportService = LimaServiceFactory.getService(ReportService.class); accountService = LimaServiceFactory.getService(AccountService.class); + accountReportService = LimaServiceFactory.getService(AccountReportService.class); balanceReportService = LimaServiceFactory.getService(BalanceReportService.class); generalEntryBookReportService = LimaServiceFactory.getService(GeneralEntryBookReportService.class); entryBookReportService = LimaServiceFactory.getService(ProvisionalEntryBookReportService.class); @@ -116,6 +114,7 @@ public class DocumentService { String reportDirPath = reportDir.getAbsolutePath(); + accountFilePath = reportDirPath + File.separator + DocumentsEnum.ACCOUNT.getFileName() + ".pdf"; balanceFilePath = reportDirPath + File.separator + DocumentsEnum.BALANCE.getFileName() + ".pdf"; generalEntryBookReportPdfFilePath = reportDirPath + File.separator + DocumentsEnum.GENERAL_ENTRY_BOOK.getFileName() + ".pdf"; entryBooksReportPdfFilePath = reportDirPath + File.separator + DocumentsEnum.ENTRY_BOOKS.getFileName() + ".pdf"; @@ -338,80 +337,6 @@ public class DocumentService { // } - public String createAccountDocument(Date beginDate, Date endDate, String account) { - - String accountReport; - - try { - - Account accountFormat = accountService.findAccountById(account); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMMMM yyyy"); - - accountReport = constructHtmlHeader(t("lima.reports.accounts")); - - ReportsDatas results; - - if (beginDate != null && endDate != null && accountFormat != null) { - - String subTitleFirstpart = t("lima.fiscalperiod.fiscalperiod") + " : " + simpleDateFormat.format(beginDate) + " - " + simpleDateFormat.format(endDate); - String subTitleSecPart = t("lima.financialtransaction.account") + " : " + accountFormat.getAccountNumber() + " - " + accountFormat.getLabel(); - accountReport += constructSubTitleHtml(subTitleFirstpart, subTitleSecPart); - - results = reportService.generateAccountsReports(accountFormat, true, - beginDate, endDate); - List<Entry> entries = results.getListEntry(); - - String[] columnNames = {t("lima.table.number"), t("lima.table.date"), t("lima.table.entryBook"), - t("lima.table.voucher"), t("lima.table.description"), t("lima.table.letter"), - t("lima.table.debit"), t("lima.table.credit")}; - - accountReport += "\t<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n"; - - accountReport += constructTableHeader(columnNames); - accountReport += "\t\t<tbody>\n"; - - boolean even = true; - for (Entry entry : entries) { - - String accountNumber = entry.getAccount().getAccountNumber(); - String transactionDate = simpleDateFormat.format(entry.getFinancialTransaction().getTransactionDate()); - String code = ""; - if (entry.getFinancialTransaction().getEntryBook() != null) { - code = entry.getFinancialTransaction().getEntryBook().getCode(); - } - String voucher = entry.getVoucher(); - String description = entry.getDescription(); - String lettering = entry.getLettering(); - - - String[] columnData = {(StringUtils.isBlank(accountNumber) ? "" : accountNumber), (StringUtils.isBlank(transactionDate) ? "" : transactionDate), - (StringUtils.isBlank(code) ? "" : code), (StringUtils.isBlank(voucher) ? "" : voucher), - (StringUtils.isBlank(description) ? "" : description), (StringUtils.isBlank(lettering) ? "" : lettering), - (entry.isDebit() ? entry.getAmount() : BigDecimal.ZERO).toString(), - (entry.isDebit() ? BigDecimal.ZERO : entry.getAmount()).toString()}; - - accountReport += constructTableLine(columnData, even); - even = !even; - } - - accountReport += "\t\t</tbody>\n\t</table>\n" + - "</body>\n"; - - } else { - if (log.isWarnEnabled()) { - log.warn("No account present"); - } - } - - accountReport += "</html>"; - - } catch (Exception e) { - throw new LimaTechnicalException("Can't create document", e); - } - - return accountReport; - } - protected String constructHtmlHeader(String title) { String head = "<!DOCTYPE html>\n" + "<html>\n" + @@ -543,6 +468,14 @@ public class DocumentService { return result; } + //############## account ############## + public void createAccountDocument(String account, Date beginDate, Date endDate) { + JasperReport acountEntryReport = jasperReports.getAccountEntryReport(); + DocumentReport report = accountReportService.getAccountDocumentReport(account, beginDate, endDate, acountEntryReport, getDecimalFormat()); + jasperReports.generatePDFReport(DocumentsEnum.ACCOUNT, accountFilePath, Lists.newArrayList(report)); + } + + //############## balance ############## public void createBalanceDocuments(Date beginDate, Date endDate, String fromToAccount) { JasperReport balanceMainAccountsReport = jasperReports.getBalanceManAccountsReport(); @@ -601,7 +534,7 @@ public class DocumentService { createBalanceDocuments(beginDate, endDate, null); break; case ACCOUNT: - stringResult = createAccountDocument(beginDate, endDate, account); + createAccountDocument(account, beginDate, endDate); break; case ENTRY_BOOKS: createEntryBooksDocuments(beginDate, endDate, null); diff --git a/lima-report/src/main/java/org/chorem/lima/report/service/JasperReports.java b/lima-report/src/main/java/org/chorem/lima/report/service/JasperReports.java index 7674e09..2a1242d 100644 --- a/lima-report/src/main/java/org/chorem/lima/report/service/JasperReports.java +++ b/lima-report/src/main/java/org/chorem/lima/report/service/JasperReports.java @@ -52,6 +52,9 @@ public class JasperReports { private static final Log log = LogFactory.getLog(JasperReports.class); + protected JasperReport accountDocumentReport; + protected JasperReport accountEntryReport; + protected JasperReport balanceDocumentReport; protected JasperReport balanceManAccountsReport; protected JasperReport balanceSubAccountsReport; @@ -79,6 +82,9 @@ public class JasperReports { LimaReportConfig config = LimaReportConfig.getInstance(); // compile phase + accountDocumentReport = prepareJasperReport(config.getReportModelUrl(DocumentReportTypes.ACCOUNT)); + accountEntryReport = prepareJasperReport(config.getReportModelUrl(DocumentReportTypes.ACCOUNT_ENTRY)); + balanceDocumentReport = prepareJasperReport(config.getReportModelUrl(DocumentReportTypes.BALANCE)); balanceManAccountsReport = prepareJasperReport(config.getReportModelUrl(DocumentReportTypes.BALANCE_MAIN_ACCOUNTS)); balanceSubAccountsReport = prepareJasperReport(config.getReportModelUrl(DocumentReportTypes.BALANCE_SUB_ACCOUNTS)); @@ -97,6 +103,7 @@ public class JasperReports { generalLedgerEntriesReport = prepareJasperReport(config.getReportModelUrl(DocumentReportTypes.LEDGER_ENTRIES)); reportsByDocumentType = Maps.newHashMap(); + reportsByDocumentType.put(DocumentsEnum.ACCOUNT, accountDocumentReport); reportsByDocumentType.put(DocumentsEnum.BALANCE, balanceDocumentReport); reportsByDocumentType.put(DocumentsEnum.GENERAL_ENTRY_BOOK, generalEntryBookDocumentReport); reportsByDocumentType.put(DocumentsEnum.ENTRY_BOOKS, entryBookDocumentReport); @@ -139,6 +146,9 @@ public class JasperReports { } + public JasperReport getAccountEntryReport() { + return accountEntryReport; + } public JasperReport getBalanceManAccountsReport() { return balanceManAccountsReport; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/1210-client-server-params updated (d2dd63f -> fd35125)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1210-client-server-params in repository lima. See http://git.chorem.org/lima.git from d2dd63f refs #1210 allow to configure defferent address for Ejb than Http adds 9243835 change remove icon on tab adds 47dacdc refs #1187 : account popups adds 0e30c25 refs #1187 : entry book popups adds 4ac2c21 refs #1187 : fiscal period popups adds ece040e refs #1187 : inancial statement popups adds 1f5f807 refs #1187 : Vat chart popups adds 37937e4 refs #1187 : identitiy popups adds 964faf1 fixes #1187: Améliorer l'apparence des Popup Merge branch 'feature/1187' into develop adds 3c0f684 refs #1221: Erreur à l'annulation des import/export adds 80adf13 fixes #1221 Erreur à l'annulation des import/export Merge branch 'feature/1221' into develop adds 9aa89d0 refs #1222: Le lettrage ne fonctionne plus adds cc2841b fixes #1222 Le lettrage ne fonctionne plus Merge branch 'feature/1222' into develop adds 8da87c9 refs #1209: A l'ajout automatique d'une écriture le focus ne correspond pas à la cellule éditée adds 275821d fixes #1209 A l'ajout automatique d'une écriture le focus ne correspond pas à la cellule éditée Merge branch 'feature/1209' into develop adds 89caf6e refs #1218: Plan BCR : exception à la deuxième modification d'un regrouppement adds 3e445d8 fixes #1218 Plan BCR : exception à la deuxième modification d'un regrouppement Merge branch 'feature/1218' into develop adds c771213 refs #1223: l'onglet lettrage est peu réactif adds c6e0e9a fixes #1223: l'onglet lettrage est peu réactif Merge branch 'feature/1223' into develop adds ead303a refs #1207 : correction d'erreurs criticals adds a0b7cbf refs #1207 corrections d'erreurs majeures adds 78602e6 refs #1207 corrections d'erreurs majeures adds 248ce54 rebase to develop (refs #1207) adds b7877b3 Merge branch 'feature/1207' into develop adds 0047b54 Merge branch 'feature/1210-client-server-params' into develop adds 951e181 [jgitflow-maven-plugin]updating poms for 0.8.4-SNAPSHOT development adds a2addde [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ccbe508 [jgitflow-maven-plugin]updating poms for branch '0.8.3' with snapshot versions adds 21b81ce remove licences fron thirdparty adds 556fc85 [jgitflow-maven-plugin]updating poms for branch'release/0.8.3' with non-snapshot versions adds 10b0c67 Merge branch 'release/0.8.3' adds 24b6f47 Merge branch 'master' into develop adds 750c191 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 8021dbe [jgitflow-maven-plugin]updating poms for 0.8.5-SNAPSHOT development adds c016677 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds adf3308 [jgitflow-maven-plugin]updating poms for branch'release/0.8.4' with non-snapshot versions adds c95d5a1 Merge branch 'release/0.8.4' adds 5464ca5 Merge branch 'master' into develop adds f2a70f9 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 9a1e21c correction de la javadoc adds bf21713 refs #1199 : ajout de l'export du fichier des écritures comptables adds fbab021 fixes #1228 : correction import comptes. adds 10e2882 Merge branch 'feature/1228' into develop adds a1679da fixes #1119 : changement du layout pour les toolbar possiblement trop large adds f5f01d4 Merge branch 'feature/1119' into develop adds 565f06b fixes #1208 : ajouter le moi en toutes lettres + afficher la période dans la bar de statut adds f60f3ab fixes #1225 : si l'exercice est sur deux années afficher les deux années (ex : "2015 - 2016") adds b557829 refs #1208 : correction de la marge a droite de la balance. adds 5d95df9 refs #1199 : ajout de l'export du fichier des écritures comptables adds 12ce7b8 fixes #1228 : correction import comptes. adds 449120d fixes #1119 : changement du layout pour les toolbar possiblement trop large adds 1c0d6fb fixes #1208 : ajouter le moi en toutes lettres + afficher la période dans la bar de statut adds 99faafa refs #1208 : correction de la marge a droite de la balance. adds 807085c Merge branch 'feature/1208' into develop adds 931a9e6 fixes #1229 : recherche d'un compt sur tout ou partie du code ou de la désignation adds d0e4e99 refs #1229 : suppression d'une variable non utilisé. adds acf87ab Merge branch 'feature/1229' into develop adds 7c15303 fixes #1224 : Ajout la date et le journal de la transaction ainssi qu'un id permettant de distinguer les transactions adds 33d60db fixes #1231 : déplacement débit, crédit et solde. adds 6291377 refs #1186 : text d'a propos adds 66e4193 refs #1186 : correction text adds b6a5de8 refs #1186 : rendre dynamique l'année du copyright adds 8f3b127 refs #1186 : correction du text d'à propos et de la traduction. adds 5486747 Merge branch 'feature/1186' into develop adds 28e0454 refs #1199 : corrextion d'un index hors limites, ey précision d'un label. adds 1d60b71 fixes #1232 : ne pas clôturer un exercice avec des transactions en erreur adds cd3af52 refs #1233 : test du service des comptes + retructuration des initialiseur de test adds 391ae16 refs #1233 : test du service des journaux adds 89b999b refs #1233 : test du service des périodes fiscales (suppresion des fonctions de service non utilisé) adds d54b68d refs #1233 : test du service des transaction + correction et amélioration du code adds 47e387f refs #1233 : test du service des exercices adds 56d8305 Merge branch 'feature/1233' into develop adds 43a92d4 refs #1233 : test du service des exercices adds 4fa9916 refs #1233 : fix test and update log adds 30a62a3 fixes #1235 : fix import plan BCR (and journaux) adds b33247a fixes #1236 : afficher les exceptions métier adds 9c806ea fixes #1237 : fix id menu item adds f9c60c6 change Datepiker pattern adn fix account combobox dimension adds 96c285b refs #1176 : mise a jours des impressions d'écrans. et correction adds 6565524 refs #1176 : mise a jour d'un imprime écran et du tableau des fichierd CSV adds e93d950 Merge branch 'feature/1176-2' into develop adds 372bc24 mise à jour du pom parents adds 2f4f28c [jgitflow-maven-plugin]updating poms for 0.8.6-SNAPSHOT development adds 26817eb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e57c000 fixes releases : add headers adds 6b45377 [jgitflow-maven-plugin]updating poms for branch'release/0.8.5' with non-snapshot versions adds 5062bb3 [jgitflow-maven-plugin]merging 'release/0.8.5' into 'master' adds 4024d64 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 19a980d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 34f7074 refs #1240 ajout de controles adds 0112481 refs #1290 A la création d'une transaction si aucune n'a été créée lors de la même session est qu'une transaction est sélectionnée alors la nouvelle trasaction prend la date de celle-ci adds d100451 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées adds acefd82 refs #1289refactoring adds 32aa3f8 refs #1289 Le solde est positif si le solde est débiteur adds 13b9893 Merge branch 'feature/1289-SearchEntriescomputeSold' into develop adds 26111c4 refs #1293 "Onglet Saisie des écritures" La saisie dans le champ jour est dirrectement prise en compte adds 54e25dd refs #1293 Auto selection du compte si un seul compte correspond à la recherche adds 785fc80 refs #1295 Même objet sélectionné entre la combobox et le model adds c51843f Merge branch 'feature/1295-improveEditEntryView' into develop adds 2d2c8a4 refs #1241 ordonne les entrée par date adds 8ef9bf6 refs #1286 Regrouppement des entrées par pièces comptable dans la saisie d'écriture adds bce1075 refs #1286 La solution adopter n'est pas idéale, il faudra revoir le model pour ordonnée les entrée d'une transaction voir ref #1207 adds 4bbfd4d Merge branch 'feature/1286-ordered-entries' into develop adds 636a5ba refs #1242 verifivation que l'on filtre bien sur un compte adds ae8502c fixes #1243 la sortie du champ date ou le clic sur une autre action entraine bien la prise en compte des dates saisies adds 2dc6345 refs #1242 Modification pour plus de lisibilité suite à revue de code Kevin adds 79ebf7d refs #1242 Refactoring pour plus de lisibilité adds 4d8ac91 refs #1242 correction de merge adds 7288ae1 Merge branch 'feature/1242-no-account-research-exception' into develop adds 9fd0c2f refs #1297correction pour ne pas remonter les entitées ayant une date > à celle indiquée dans la période adds bde8128 refs #1298 corrige NPE dans le cas ou aucune donnée existe adds e3d95f9 refs #1242 ordre des traductions revu adds d9b4a7d Merge branch 'feature/1298-FixNPE' into develop adds 959bbc3 refs #1268 l'interface de saisie d'un plan de TVA est de nouveau fonctionnelle adds 6b2e99c refs #1268 utilisation de JXTreeTable à la place de VatChartTreeTable adds 73a9813 refs #1268 déplacement du ListSelectionModel dans le handler adds b44dada Merge branch 'feature/1268-vat-statement-usable' into develop adds 635828d refs #1242 correction sur refactoring adds a0857b1 Mise à jour de la déclaration de licences adds d5f467a refs #1295 Le tableau de la saisie des écritures n'est pas éditable si la période est cloturé pour le journal sélectionné adds 4a1b1d5 refs #1158 Ajout de commentaires + désactivation du boutton de création d'une transaction adds 253998b refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. adds 9957610 Merge branch 'feature/1158-NotEditableTableForClose' into develop adds b4b645f refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. adds b119160 import manquant adds 7cd3ef3 correction suite au merge adds fd35125 Merge branch 'feature/1158' into develop No new revisions were added by this update. Summary of changes: lima-business-api/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 12 +- .../org/chorem/lima/LimaTechnicalException.java | 2 +- .../chorem/lima/business/ImportExportResults.java | 2 +- .../org/chorem/lima/business/ServiceListener.java | 2 +- .../chorem/lima/business/api/AccountService.java | 5 +- .../api/ClosedPeriodicEntryBookService.java | 3 + .../chorem/lima/business/api/ExportService.java | 9 + .../lima/business/api/FinancialPeriodService.java | 4 - .../business/api/FinancialStatementService.java | 8 +- .../business/api/FinancialTransactionService.java | 19 +- .../lima/business/api/FiscalPeriodService.java | 38 +- .../lima/business/api/VatStatementService.java | 5 +- .../lima/business/exceptions/AccountException.java | 9 +- .../exceptions/AfterLastFiscalPeriodException.java | 2 +- ...on.java => AlreadyAffectedVatBoxException.java} | 14 +- .../exceptions/AlreadyExistAccountException.java | 2 +- ...> AlreadyExistFinancialStatementException.java} | 8 +- .../AlreadyExistVatStatementException.java | 4 +- .../AlreadyLockedFiscalPeriodException.java | 2 +- .../BeforeFirstFiscalPeriodException.java | 2 +- .../BeginAfterEndFiscalPeriodException.java | 2 +- .../ClosedPeriodicEntryBookException.java | 4 +- .../ClosedPeriodicEntryBooksException.java | 4 +- .../lima/business/exceptions/DateException.java | 4 +- .../lima/business/exceptions/EntriesException.java | 4 +- .../business/exceptions/EntryBookException.java | 4 +- .../exceptions/FinancialPeriodException.java | 4 +- .../exceptions/FinancialTransactionsException.java | 4 +- .../business/exceptions/FiscalPeriodException.java | 4 +- .../business/exceptions/ImportEbpException.java | 2 +- .../business/exceptions/ImportFileException.java | 2 +- .../exceptions/InvalidAccountNumberException.java | 2 +- .../LastUnlockedFiscalPeriodException.java | 2 +- .../exceptions/LockedEntryBookException.java | 2 +- .../exceptions/LockedFinancialPeriodException.java | 2 +- .../MoreOneUnlockFiscalPeriodException.java | 11 +- .../exceptions/NoEmptyFiscalPeriodException.java | 2 +- .../NoFoundFinancialPeriodException.java | 2 +- .../exceptions/NotAllowedLabelException.java | 2 +- ...NotBeginNextDayOfLastFiscalPeriodException.java | 2 +- ...NotLockedClosedPeriodicEntryBooksException.java | 2 +- .../NotNumberAccountNumberException.java | 2 +- ...lException.java => RequiredFieldException.java} | 14 +- .../exceptions/UnbalancedEntriesException.java | 2 +- .../UnbalancedFinancialTransactionsException.java | 5 +- .../exceptions/UnfilledEntriesException.java | 2 +- .../business/exceptions/UsedAccountException.java | 2 +- .../exceptions/UsedEntryBookException.java | 2 +- ...outEntryBookFinancialTransactionsException.java | 2 +- .../business/utils/FinancialPeriodComparator.java | 4 - lima-business/pom.xml | 2 +- .../org/chorem/lima/business/AccountingRules.java | 35 +- .../accountingrules/DefaultAccountingRules.java | 190 +++-- .../accountingrules/FranceAccountingRules.java | 10 +- .../lima/business/ejb/AccountServiceImpl.java | 16 +- .../ejb/ClosedPeriodicEntryBookServiceImpl.java | 11 + .../lima/business/ejb/ExportServiceImpl.java | 50 +- .../business/ejb/FinancialPeriodServiceImpl.java | 18 - .../ejb/FinancialStatementServiceImpl.java | 62 +- .../ejb/FinancialTransactionServiceImpl.java | 51 +- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 62 +- .../lima/business/ejb/ImportServiceImpl.java | 116 ++- .../lima/business/ejb/VatStatementServiceImpl.java | 74 +- .../chorem/lima/business/ejb/csv/EntryModel.java | 98 ++- .../business/ejb/csv/FiscalControlExportModel.java | 153 ++++ .../ejb/report/BalanceReportServiceImpl.java | 24 +- .../lima/business/utils/EntryEBPComparator.java | 7 +- .../utils/FinancialTransactionComparator.java | 42 -- .../org/chorem/lima/entity/AccountTopiaDao.java | 2 +- .../entity/ClosedPeriodicEntryBookTopiaDao.java | 29 +- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 81 +- .../lima/entity/FinancialPeriodTopiaDao.java | 14 - .../lima/entity/FinancialTransactionTopiaDao.java | 1 - .../chorem/lima/entity/FiscalPeriodTopiaDao.java | 24 - .../org/chorem/lima/entity/GeneratorHQuery.java | 2 +- .../org/chorem/lima/business/AbstractLimaTest.java | 575 ++------------ .../org/chorem/lima/business/AccountDaoTest.java | 7 +- .../lima/business/AccountServiceImplTest.java | 332 +++++--- .../lima/business/EntryBookServiceImplTest.java | 147 +++- .../business/FinancialPeriodServiceImplTest.java | 260 ++++++- .../FinancialTransactionServiceImplTest.java | 638 +++++++++++++++- .../lima/business/FiscalPeriodServiceImplTest.java | 640 +++++++++++++--- .../lima/business/ImportExportServiceTest.java | 47 +- .../lima/business/ReportServiceImplTest.java | 7 +- .../lima/entity/FinancialTransactionDAOTest.java | 5 +- lima-business/src/test/resources/log4j.properties | 4 +- lima-callao/pom.xml | 2 +- .../org/chorem/lima/FinancialStatementWayEnum.java | 42 +- .../lima/beans/AbstractBigDecimalCondition.java | 4 +- .../chorem/lima/beans/AbstractStringCondition.java | 4 +- .../org/chorem/lima/beans/AccountCondition.java | 2 +- .../main/java/org/chorem/lima/beans/Condition.java | 2 +- .../org/chorem/lima/beans/CreditCondition.java | 2 +- .../java/org/chorem/lima/beans/DateCondition.java | 4 +- .../chorem/lima/beans/DateIntervalCondition.java | 2 +- .../java/org/chorem/lima/beans/DebitCondition.java | 2 +- .../chorem/lima/beans/DescriptionCondition.java | 2 +- .../org/chorem/lima/beans/EntryBookCondition.java | 2 +- .../lima/beans/FinancialPeriodCondition.java | 2 +- .../lima/beans/FinancialTransactionCondition.java | 2 +- .../chorem/lima/beans/FiscalPeriodCondition.java | 2 +- .../main/java/org/chorem/lima/beans/Labeled.java | 2 +- .../org/chorem/lima/beans/LetteringCondition.java | 2 +- .../org/chorem/lima/beans/VisitorCondition.java | 2 +- .../org/chorem/lima/beans/VoucherCondition.java | 2 +- .../java/org/chorem/lima/clause/AndClause.java | 2 +- .../java/org/chorem/lima/clause/BooleanClause.java | 2 +- .../main/java/org/chorem/lima/clause/Clause.java | 2 +- .../java/org/chorem/lima/clause/DateClause.java | 2 +- .../java/org/chorem/lima/clause/NotClause.java | 2 +- .../java/org/chorem/lima/clause/NumberClause.java | 2 +- .../main/java/org/chorem/lima/clause/OrClause.java | 2 +- .../java/org/chorem/lima/clause/SetClause.java | 2 +- .../java/org/chorem/lima/clause/StringClause.java | 2 +- .../org/chorem/lima/clause/SubFilterClause.java | 2 +- .../java/org/chorem/lima/clause/VisitorClause.java | 2 +- .../org/chorem/lima/filter/AbstractFilter.java | 2 +- .../java/org/chorem/lima/filter/AccountFilter.java | 2 +- .../org/chorem/lima/filter/EntryBookFilter.java | 2 +- .../java/org/chorem/lima/filter/EntryFilter.java | 2 +- .../main/java/org/chorem/lima/filter/Filter.java | 2 +- .../org/chorem/lima/filter/FilterGenerator.java | 2 +- .../lima/filter/FinancialTransactionFilter.java | 2 +- .../java/org/chorem/lima/filter/VisitorFilter.java | 2 +- .../resources/i18n/lima-callao_en_GB.properties | 6 +- .../resources/i18n/lima-callao_fr_FR.properties | 6 +- lima-report/pom.xml | 2 +- lima-report/src/license/THIRD-PARTY.properties | 14 +- .../java/org/chorem/lima/report/DocumentsEnum.java | 2 +- .../lima/report/service/DocumentService.java | 56 +- lima-server/pom.xml | 2 +- .../java/org/chorem/lima/server/FormatsEnum.java | 2 +- .../java/org/chorem/lima/server/LimaServer.java | 12 +- lima-swing/pom.xml | 6 +- lima-swing/src/license/THIRD-PARTY.properties | 1 + .../chorem/lima/LimaSwingApplicationContext.java | 6 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 23 +- .../org/chorem/lima/enums/AccountsChartEnum.java | 29 +- .../java/org/chorem/lima/enums/EncodingEnum.java | 13 +- .../lima/enums/FinancialStatementsChartEnum.java | 22 +- .../org/chorem/lima/enums/ImportExportEnum.java | 4 - .../chorem/lima/enums/VatStatementsChartEnum.java | 23 +- .../java/org/chorem/lima/ui/ClosableTabHeader.css | 14 +- .../AccountCondition/AccountConditionHandler.java | 18 +- .../AccountCondition/AccountConditionView.css | 8 +- .../AccountCondition/AccountConditionView.jaxx | 11 +- .../BigDecimalConditionHandler.java | 6 +- .../CreditConditionHandler.java | 2 +- .../BigDecimalCondition/CreditConditionView.java | 2 +- .../BigDecimalCondition/DebitConditionHandler.java | 2 +- .../BigDecimalCondition/DebitConditionView.java | 2 +- .../chorem/lima/ui/Filter/ConditionHandler.java | 8 +- .../EntryBookConditionHandler.java | 10 +- .../DescriptionConditionHandler.java | 2 +- .../StringCondition/DescriptionConditionView.java | 2 +- .../StringCondition/LetteringConditionHandler.java | 2 +- .../StringCondition/LetteringConditionView.java | 2 +- .../StringCondition/StringConditionHandler.java | 9 +- .../StringCondition/VoucherConditionHandler.java | 2 +- .../StringCondition/VoucherConditionView.java | 2 +- .../Filter/dateCondition/DateConditionHandler.java | 9 +- .../ui/Filter/dateCondition/DateConditionView.jaxx | 2 +- .../DateIntervalConditionHandler.java | 9 +- .../DateIntervalConditionView.jaxx | 7 +- .../FinancialPeriodConditionHandler.java | 13 +- .../FinancialTransactionConditionHandler.java | 2 +- .../FiscalPeriodConditionHandler.java | 10 +- .../java/org/chorem/lima/ui/LimaRendererUtil.java | 8 +- .../src/main/java/org/chorem/lima/ui/MainView.css | 11 +- .../src/main/java/org/chorem/lima/ui/MainView.jaxx | 4 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 23 +- .../org/chorem/lima/ui/account/AccountForm.css | 2 + .../org/chorem/lima/ui/account/AccountForm.jaxx | 20 +- .../chorem/lima/ui/account/AccountImportForm.css | 39 +- .../chorem/lima/ui/account/AccountImportForm.jaxx | 61 +- .../chorem/lima/ui/account/AccountViewHandler.java | 29 +- .../chorem/lima/ui/account/UpdateAccountForm.css | 2 + .../chorem/lima/ui/account/UpdateAccountForm.jaxx | 17 +- .../lima/ui/celleditor/AccountTableCellEditor.java | 86 +-- .../ui/celleditor/AccountTableCellRenderer.java | 2 +- .../ui/celleditor/AutoCompleteTableCellEditor.java | 8 +- .../ui/celleditor/DateLimaTableCellRenderer.java | 2 +- .../lima/ui/celleditor/DateTableCellEditor.java | 11 +- .../celleditor/DayTableCellEditor.java} | 24 +- .../celleditor/DefaultLimaTableCellRenderer.java | 2 +- .../lima/ui/celleditor/EmptyCellRenderer.java | 4 - .../ui/celleditor/EntryBookTableCellRender.java | 2 +- .../ui/celleditor/NumberSeparatorCellRenderer.java | 2 +- .../NumberSeparatorTableCellRenderer.java | 2 +- .../lima/ui/celleditor/StringTableCellEditor.java | 2 +- .../lima/ui/celleditor/TableCellErrorDetector.java | 2 +- ...ountComboBoxModel.java => AccountComboBox.java} | 70 +- .../lima/ui/combobox/AccountComboBoxModel.java | 102 --- .../lima/ui/combobox/EntryBookComboBoxModel.java | 9 +- .../ui/combobox/FinancialPeriodComboBoxModel.java | 167 ----- .../ui/combobox/FiscalPeriodComboBoxModel.java | 16 +- .../lima/ui/combobox/LeafAccountComboBoxModel.java | 4 - .../lima/ui/combobox/LetterComboBoxModel.java | 100 --- .../org/chorem/lima/ui/common/AbstractColumn.java | 2 +- .../chorem/lima/ui/common/AbstractLimaTable.java | 2 +- .../lima/ui/common/AbstractLimaTableModel.java | 2 +- .../lima/ui/common/AccountComboBoxModel.java | 54 -- .../lima/ui/common/CellRouteHorizontalAction.java | 2 +- .../lima/ui/common/CellRouteVerticalAction.java | 2 +- .../java/org/chorem/lima/ui/common/Column.java | 2 +- .../ui/common/FinancialPeriodListRenderer.java | 14 +- .../ui/common/FinancialTransactionTableModel.java | 119 ++- .../lima/ui/common/FiscalPeriodListRenderer.java | 21 +- .../chorem/lima/ui/common/IntervalListener.java | 29 - .../lima/ui/common/LabelListCellRenderer.java | 2 +- .../chorem/lima/ui/common/TableModelWithGroup.java | 16 +- .../org/chorem/lima/ui/entrybook/EntryBookForm.css | 2 + .../chorem/lima/ui/entrybook/EntryBookForm.jaxx | 20 +- .../lima/ui/entrybook/EntryBookImportForm.css | 2 + .../lima/ui/entrybook/EntryBookImportForm.jaxx | 26 +- .../lima/ui/entrybook/EntryBookViewHandler.java | 23 +- .../FinancialPeriodErrorDetector.java | 2 +- .../FinancialStatementChartTreeTableModel.java | 98 +-- .../FinancialStatementChartViewHandler.java | 35 +- .../FinancialStatementHeaderForm.css | 25 +- .../FinancialStatementHeaderForm.jaxx | 65 +- .../FinancialStatementImportForm.css | 41 +- .../FinancialStatementImportForm.jaxx | 84 +-- .../FinancialStatementMovementForm.css | 16 +- .../FinancialStatementMovementForm.jaxx | 63 +- .../ui/financialtransaction/AccountColumn.java | 57 +- .../ui/financialtransaction/BalanceColumn.java | 37 +- .../lima/ui/financialtransaction/CreditColumn.java | 2 +- .../lima/ui/financialtransaction/DateColumn.java | 2 +- .../lima/ui/financialtransaction/DayColumn.java | 6 +- .../lima/ui/financialtransaction/DebitColumn.java | 2 +- .../ui/financialtransaction/DescriptionColumn.java | 2 +- .../ui/financialtransaction/EntryBookColumn.java | 2 +- .../FinancialTransactionDefaultTable.java | 11 +- .../FinancialTransactionErrorDetector.java | 2 +- .../FinancialTransactionTable.java | 11 +- .../FinancialTransactionView.css | 28 +- .../FinancialTransactionView.jaxx | 7 +- .../FinancialTransactionViewHandler.java | 147 +++- .../lima/ui/financialtransaction/LetterColumn.java | 2 +- .../ui/financialtransaction/VoucherColumn.java | 2 +- .../FinancialTransactionSearchTableModel.java | 12 +- .../FinancialTransactionSearchViewHandler.java | 15 +- .../FiscalControlExportView.css} | 58 +- .../FiscalControlExportView.jaxx | 85 +++ .../FiscalControlExportViewHandler.java | 229 ++++++ .../org/chorem/lima/ui/fiscalperiod/AddPeriod.css | 6 +- .../org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx | 28 +- .../ui/fiscalperiod/FiscalPeriodErrorDetector.java | 2 +- .../ui/fiscalperiod/FiscalPeriodTableModel.java | 4 - .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 170 +++-- .../fiscalperiod/RetainedEarningsEntryBookForm.css | 33 +- .../RetainedEarningsEntryBookForm.jaxx | 85 +-- .../java/org/chorem/lima/ui/home/AccountsPane.java | 6 +- .../org/chorem/lima/ui/home/EntryBooksPane.java | 8 +- .../lima/ui/home/FinancialTransactionsPane.java | 6 +- .../org/chorem/lima/ui/home/FiscalYearsPane.java | 10 +- .../org/chorem/lima/ui/identity/IdentityForm.css | 18 +- .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 130 ++-- .../chorem/lima/ui/importexport/ImportExport.java | 88 ++- .../lima/ui/lettering/LetteringEditModel.java | 80 +- ...tionModel.java => LetteringSelectionModel.java} | 31 +- .../lima/ui/lettering/LetteringTableModel.java | 38 + .../org/chorem/lima/ui/lettering/LetteringView.css | 47 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 65 +- .../lima/ui/lettering/LetteringViewHandler.java | 195 ++--- .../org/chorem/lima/ui/lettering/TypeEntry.java | 10 +- .../ui/opening/CreateIdentityPanelHandler.java | 9 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 69 +- .../chorem/lima/ui/vatchart/VatChartImportForm.css | 35 +- .../lima/ui/vatchart/VatChartImportForm.jaxx | 84 +-- .../lima/ui/vatchart/VatChartMovementForm.css | 31 +- .../lima/ui/vatchart/VatChartMovementForm.jaxx | 72 +- .../chorem/lima/ui/vatchart/VatChartTreeTable.java | 134 ---- .../lima/ui/vatchart/VatChartTreeTableModel.java | 226 ------ .../org/chorem/lima/ui/vatchart/VatChartView.jaxx | 26 +- .../lima/ui/vatchart/VatChartViewHandler.java | 399 ++++++---- .../chorem/lima/ui/vatchart/VatChartViewModel.java | 191 +++++ .../java/org/chorem/lima/util/ErrorHelper.java | 19 - .../java/org/chorem/lima/util/ReportDialogView.css | 5 +- .../org/chorem/lima/util/ReportDialogView.jaxx | 2 +- .../org/chorem/lima/util/WrapToolBarLayout.java | 129 ++++ .../resources/i18n/lima-swing_en_GB.properties | 61 +- .../resources/i18n/lima-swing_fr_FR.properties | 104 ++- .../src/main/resources/icons/action-cancel.png | Bin 0 -> 587 bytes ...on-vatStatement-remove.png => action-close.png} | Bin .../src/main/resources/icons/action-closeTab.png | Bin 3140 -> 0 bytes .../icons/action-financialPeriod-close.png | Bin 715 -> 452 bytes .../resources/icons/action-fiscalControlExport.png | Bin 0 -> 1244 bytes lima-swing/src/main/resources/icons/action-ok.png | Bin 0 -> 537 bytes lima-swing/src/main/resources/icons/warning.png | Bin 0 -> 965 bytes .../src/main/resources/import/pcg_developed.csv | 831 ++++++++++++++++++++- .../src/main/resources/import/vat_developed.csv | 56 -- .../src/main/resources/import/vat_shortened.csv | 56 -- lima-swing/src/main/resources/lima-swing.config | 1 + lima-swing/src/main/resources/log4j.properties | 2 +- pom.xml | 6 +- src/site/procedure.txt | 15 + src/site/resources/extras/exemple_ecritures.csv | 162 ++-- src/site/resources/screens/export_ebp_1.png | Bin 114103 -> 94362 bytes src/site/resources/screens/export_ebp_2.png | Bin 17856 -> 8139 bytes src/site/resources/screens/export_ebp_3.png | Bin 71482 -> 54392 bytes src/site/resources/screens/export_ebp_4.png | Bin 24204 -> 14348 bytes src/site/resources/screens/export_ebp_5.png | Bin 30588 -> 14741 bytes src/site/resources/screens/export_ebp_6.png | Bin 26990 -> 11937 bytes src/site/resources/screens/export_ebp_7.png | Bin 17221 -> 6030 bytes .../resources/screens/lima_charts_accounts.png | Bin 133980 -> 66178 bytes .../resources/screens/lima_charts_entrybooks.png | Bin 43275 -> 34352 bytes .../screens/lima_charts_financialperiod.png | Bin 136544 -> 55293 bytes .../screens/lima_charts_financialstatement.png | Bin 92981 -> 53248 bytes .../resources/screens/lima_charts_fiscalperiod.png | Bin 53467 -> 36434 bytes src/site/resources/screens/lima_entries.png | Bin 140056 -> 37587 bytes .../resources/screens/lima_financialstatement.png | Bin 71670 -> 66083 bytes src/site/resources/screens/lima_home.png | Bin 50198 -> 36968 bytes src/site/resources/screens/lima_import_charset.png | Bin 56032 -> 42025 bytes src/site/resources/screens/lima_import_limaall.png | Bin 64072 -> 46841 bytes .../resources/screens/lima_incorrectEntries.png | Bin 110247 -> 30473 bytes src/site/resources/screens/lima_lettering.png | Bin 170873 -> 59893 bytes src/site/resources/screens/lima_open_account.png | Bin 39308 -> 26602 bytes src/site/resources/screens/lima_open_entrybook.png | Bin 31108 -> 21208 bytes .../resources/screens/lima_open_fiscalperiod.png | Bin 28827 -> 19797 bytes src/site/resources/screens/lima_open_identity.png | Bin 31849 -> 27903 bytes src/site/resources/screens/lima_open_welcome.png | Bin 35463 -> 24208 bytes .../resources/screens/lima_reports_accounts.png | Bin 64174 -> 38541 bytes .../resources/screens/lima_reports_balance.png | Bin 56936 -> 34936 bytes .../resources/screens/lima_reports_entrybooks.png | Bin 61887 -> 0 bytes .../screens/lima_reports_financialstatement.png | Bin 57424 -> 0 bytes src/site/resources/screens/lima_reports_ledger.png | Bin 57008 -> 0 bytes src/site/resources/screens/lima_searchEntry.png | Bin 66603 -> 47531 bytes .../resources/screens/lima_searchtransaction.png | Bin 93053 -> 0 bytes src/site/rst/assistant.rst | 18 +- src/site/rst/features.rst | 31 +- src/site/rst/importexport.rst | 40 +- src/site/rst/install.rst | 4 +- 335 files changed, 6529 insertions(+), 4269 deletions(-) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => AlreadyAffectedVatBoxException.java} (74%) rename lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{AlreadyExistFinancialStatement.java => AlreadyExistFinancialStatementException.java} (82%) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => RequiredFieldException.java} (74%) create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/utils/FinancialTransactionComparator.java copy lima-swing/src/main/java/org/chorem/lima/{util/BigDecimalToString.java => ui/celleditor/DayTableCellEditor.java} (60%) copy lima-swing/src/main/java/org/chorem/lima/ui/combobox/{LeafAccountComboBoxModel.java => AccountComboBox.java} (56%) delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/common/AccountComboBoxModel.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalListener.java copy lima-swing/src/main/java/org/chorem/lima/ui/{financialtransactionunbalanced/FinancialTransactionUnbalancedView.css => fiscalControlExport/FiscalControlExportView.css} (51%) create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportView.jaxx create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportViewHandler.java rename lima-swing/src/main/java/org/chorem/lima/ui/lettering/{LettringSelectionModel.java => LetteringSelectionModel.java} (82%) delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewModel.java create mode 100644 lima-swing/src/main/java/org/chorem/lima/util/WrapToolBarLayout.java create mode 100644 lima-swing/src/main/resources/icons/action-cancel.png copy lima-swing/src/main/resources/icons/{action-vatStatement-remove.png => action-close.png} (100%) delete mode 100644 lima-swing/src/main/resources/icons/action-closeTab.png create mode 100644 lima-swing/src/main/resources/icons/action-fiscalControlExport.png create mode 100644 lima-swing/src/main/resources/icons/action-ok.png create mode 100644 lima-swing/src/main/resources/icons/warning.png delete mode 100644 lima-swing/src/main/resources/import/vat_developed.csv delete mode 100644 lima-swing/src/main/resources/import/vat_shortened.csv create mode 100644 src/site/procedure.txt delete mode 100644 src/site/resources/screens/lima_reports_entrybooks.png delete mode 100644 src/site/resources/screens/lima_reports_financialstatement.png delete mode 100644 src/site/resources/screens/lima_reports_ledger.png delete mode 100644 src/site/resources/screens/lima_searchtransaction.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (9957610 -> fd35125)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from 9957610 Merge branch 'feature/1158-NotEditableTableForClose' into develop new b4b645f refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. new b119160 import manquant new 7cd3ef3 correction suite au merge new fd35125 Merge branch 'feature/1158' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit fd351258c962fa48e695d662430167317c1d4468 Merge: 9957610 7cd3ef3 Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 10:50:02 2015 +0100 Merge branch 'feature/1158' into develop commit 7cd3ef34507e48ff1a7cbfe30785ed2e0ef7cf2e Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 10:30:21 2015 +0100 correction suite au merge commit b1191604f2236351540bb93added3e253e1c9dd6 Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 10:12:09 2015 +0100 import manquant commit b4b645f61af063699eb418f0d860eb8bb9266c50 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Apr 1 10:52:41 2015 +0200 refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. Summary of changes: .../api/ClosedPeriodicEntryBookService.java | 3 ++ .../ejb/ClosedPeriodicEntryBookServiceImpl.java | 11 +++++ .../entity/ClosedPeriodicEntryBookTopiaDao.java | 23 +++++++++ .../ui/common/FinancialTransactionTableModel.java | 55 ++++++++++++++++++++-- .../FinancialTransactionSearchTableModel.java | 9 ++-- 5 files changed, 94 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 4

branch feature/1158 deleted (was 7cd3ef3)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1158 in repository lima. See http://git.chorem.org/lima.git was 7cd3ef3 correction suite au merge This change permanently discards the following revisions: discards 7cd3ef3 correction suite au merge discards b119160 import manquant discards b4b645f refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/1158 updated (ca5bde2 -> 7cd3ef3)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1158 in repository lima. See http://git.chorem.org/lima.git discards ca5bde2 correction suite au merge discards 783fce3 import manquant discards 48cc69d refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. adds d5f467a refs #1295 Le tableau de la saisie des écritures n'est pas éditable si la période est cloturé pour le journal sélectionné adds 4a1b1d5 refs #1158 Ajout de commentaires + désactivation du boutton de création d'une transaction adds 253998b refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. adds 9957610 Merge branch 'feature/1158-NotEditableTableForClose' into develop new b4b645f refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. new b119160 import manquant new 7cd3ef3 correction suite au merge This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ca5bde2) \ N -- N -- N refs/heads/feature/1158 (7cd3ef3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7cd3ef34507e48ff1a7cbfe30785ed2e0ef7cf2e Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 10:30:21 2015 +0100 correction suite au merge commit b1191604f2236351540bb93added3e253e1c9dd6 Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 10:12:09 2015 +0100 import manquant commit b4b645f61af063699eb418f0d860eb8bb9266c50 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Apr 1 10:52:41 2015 +0200 refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. Summary of changes: .../business/api/FinancialTransactionService.java | 7 ++ .../ejb/FinancialTransactionServiceImpl.java | 12 +++ .../java/org/chorem/lima/entity/EntryTopiaDao.java | 24 ++++++ .../FinancialTransactionView.css | 15 ++-- .../FinancialTransactionView.jaxx | 2 +- .../FinancialTransactionViewHandler.java | 50 ++++++++---- .../lima/ui/lettering/LetteringEditModel.java | 80 +++++++++---------- ...tionModel.java => LetteringSelectionModel.java} | 31 ++------ .../lima/ui/lettering/LetteringTableModel.java | 38 +++++++++ .../org/chorem/lima/ui/lettering/LetteringView.css | 6 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 2 +- .../lima/ui/lettering/LetteringViewHandler.java | 85 +++++++++++---------- .../resources/i18n/lima-swing_en_GB.properties | 5 ++ .../resources/i18n/lima-swing_fr_FR.properties | 7 +- .../icons/action-financialPeriod-close.png | Bin 715 -> 452 bytes lima-swing/src/main/resources/log4j.properties | 2 +- 16 files changed, 234 insertions(+), 132 deletions(-) rename lima-swing/src/main/java/org/chorem/lima/ui/lettering/{LettringSelectionModel.java => LetteringSelectionModel.java} (82%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch develop updated (a0857b1 -> 9957610)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from a0857b1 Mise à jour de la déclaration de licences new d5f467a refs #1295 Le tableau de la saisie des écritures n'est pas éditable si la période est cloturé pour le journal sélectionné new 4a1b1d5 refs #1158 Ajout de commentaires + désactivation du boutton de création d'une transaction new 253998b refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. new 9957610 Merge branch 'feature/1158-NotEditableTableForClose' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9957610abb440a267846ca956de2cd0f5452cb4c Merge: a0857b1 253998b Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 10:45:23 2015 +0100 Merge branch 'feature/1158-NotEditableTableForClose' into develop commit 253998babea7a288c1df81a9be793e2bad937459 Author: dcosse <cosse(a)codelutin.com> Date: Mon Sep 28 16:24:18 2015 +0200 refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. commit 4a1b1d576c5378110831420f13b1b67e86447c2b Author: dcosse <cosse(a)codelutin.com> Date: Fri Sep 25 15:43:32 2015 +0200 refs #1158 Ajout de commentaires + désactivation du boutton de création d'une transaction commit d5f467ad3f5497a56313d3871156d301a74bd78f Author: dcosse <cosse(a)codelutin.com> Date: Fri Sep 25 11:17:40 2015 +0200 refs #1295 Le tableau de la saisie des écritures n'est pas éditable si la période est cloturé pour le journal sélectionné Summary of changes: .../business/api/FinancialTransactionService.java | 7 ++ .../ejb/FinancialTransactionServiceImpl.java | 12 +++ .../java/org/chorem/lima/entity/EntryTopiaDao.java | 24 ++++++ .../FinancialTransactionView.css | 15 ++-- .../FinancialTransactionView.jaxx | 2 +- .../FinancialTransactionViewHandler.java | 50 ++++++++---- .../lima/ui/lettering/LetteringEditModel.java | 80 +++++++++---------- ...tionModel.java => LetteringSelectionModel.java} | 31 ++------ .../lima/ui/lettering/LetteringTableModel.java | 38 +++++++++ .../org/chorem/lima/ui/lettering/LetteringView.css | 6 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 2 +- .../lima/ui/lettering/LetteringViewHandler.java | 85 +++++++++++---------- .../resources/i18n/lima-swing_en_GB.properties | 5 ++ .../resources/i18n/lima-swing_fr_FR.properties | 7 +- .../icons/action-financialPeriod-close.png | Bin 715 -> 452 bytes lima-swing/src/main/resources/log4j.properties | 2 +- 16 files changed, 234 insertions(+), 132 deletions(-) rename lima-swing/src/main/java/org/chorem/lima/ui/lettering/{LettringSelectionModel.java => LetteringSelectionModel.java} (82%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 4

branch feature/1158-NotEditableTableForClose deleted (was 253998b)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1158-NotEditableTableForClose in repository lima. See http://git.chorem.org/lima.git was 253998b refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. This change permanently discards the following revisions: discards 253998b refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. discards 4a1b1d5 refs #1158 Ajout de commentaires + désactivation du boutton de création d'une transaction discards d5f467a refs #1295 Le tableau de la saisie des écritures n'est pas éditable si la période est cloturé pour le journal sélectionné -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/1158-NotEditableTableForClose updated (dfe90c3 -> 253998b)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1158-NotEditableTableForClose in repository lima. See http://git.chorem.org/lima.git discards dfe90c3 refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. discards d5544bc refs #1158 Ajout de commentaires + désactivation du boutton de création d'une transaction discards 29698fb refs #1295 Le tableau de la saisie des écritures n'est pas éditable si la période est cloturé pour le journal sélectionné adds 0112481 refs #1290 A la création d'une transaction si aucune n'a été créée lors de la même session est qu'une transaction est sélectionnée alors la nouvelle trasaction prend la date de celle-ci adds d100451 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées adds acefd82 refs #1289refactoring adds 32aa3f8 refs #1289 Le solde est positif si le solde est débiteur adds 13b9893 Merge branch 'feature/1289-SearchEntriescomputeSold' into develop adds 26111c4 refs #1293 "Onglet Saisie des écritures" La saisie dans le champ jour est dirrectement prise en compte adds 54e25dd refs #1293 Auto selection du compte si un seul compte correspond à la recherche adds 785fc80 refs #1295 Même objet sélectionné entre la combobox et le model adds c51843f Merge branch 'feature/1295-improveEditEntryView' into develop adds 2d2c8a4 refs #1241 ordonne les entrée par date adds 8ef9bf6 refs #1286 Regrouppement des entrées par pièces comptable dans la saisie d'écriture adds bce1075 refs #1286 La solution adopter n'est pas idéale, il faudra revoir le model pour ordonnée les entrée d'une transaction voir ref #1207 adds 4bbfd4d Merge branch 'feature/1286-ordered-entries' into develop adds 636a5ba refs #1242 verifivation que l'on filtre bien sur un compte adds ae8502c fixes #1243 la sortie du champ date ou le clic sur une autre action entraine bien la prise en compte des dates saisies adds 2dc6345 refs #1242 Modification pour plus de lisibilité suite à revue de code Kevin adds 79ebf7d refs #1242 Refactoring pour plus de lisibilité adds 4d8ac91 refs #1242 correction de merge adds 7288ae1 Merge branch 'feature/1242-no-account-research-exception' into develop adds 9fd0c2f refs #1297correction pour ne pas remonter les entitées ayant une date > à celle indiquée dans la période adds bde8128 refs #1298 corrige NPE dans le cas ou aucune donnée existe adds e3d95f9 refs #1242 ordre des traductions revu adds d9b4a7d Merge branch 'feature/1298-FixNPE' into develop adds 959bbc3 refs #1268 l'interface de saisie d'un plan de TVA est de nouveau fonctionnelle adds 6b2e99c refs #1268 utilisation de JXTreeTable à la place de VatChartTreeTable adds 73a9813 refs #1268 déplacement du ListSelectionModel dans le handler adds b44dada Merge branch 'feature/1268-vat-statement-usable' into develop adds 635828d refs #1242 correction sur refactoring adds a0857b1 Mise à jour de la déclaration de licences new d5f467a refs #1295 Le tableau de la saisie des écritures n'est pas éditable si la période est cloturé pour le journal sélectionné new 4a1b1d5 refs #1158 Ajout de commentaires + désactivation du boutton de création d'une transaction new 253998b refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (dfe90c3) \ N -- N -- N refs/heads/feature/1158-NotEditableTableForClose (253998b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 253998babea7a288c1df81a9be793e2bad937459 Author: dcosse <cosse(a)codelutin.com> Date: Mon Sep 28 16:24:18 2015 +0200 refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. commit 4a1b1d576c5378110831420f13b1b67e86447c2b Author: dcosse <cosse(a)codelutin.com> Date: Fri Sep 25 15:43:32 2015 +0200 refs #1158 Ajout de commentaires + désactivation du boutton de création d'une transaction commit d5f467ad3f5497a56313d3871156d301a74bd78f Author: dcosse <cosse(a)codelutin.com> Date: Fri Sep 25 11:17:40 2015 +0200 refs #1295 Le tableau de la saisie des écritures n'est pas éditable si la période est cloturé pour le journal sélectionné Summary of changes: .../org/chorem/lima/business/ServiceListener.java | 2 +- .../lima/business/api/VatStatementService.java | 5 +- ...on.java => AlreadyAffectedVatBoxException.java} | 14 +- ...lException.java => RequiredFieldException.java} | 14 +- .../lima/business/ejb/AccountServiceImpl.java | 9 +- .../ejb/FinancialTransactionServiceImpl.java | 2 +- .../lima/business/ejb/ImportServiceImpl.java | 17 +- .../lima/business/ejb/VatStatementServiceImpl.java | 74 ++-- .../entity/ClosedPeriodicEntryBookTopiaDao.java | 6 +- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 19 +- lima-swing/src/license/THIRD-PARTY.properties | 1 + .../chorem/lima/enums/VatStatementsChartEnum.java | 5 +- .../AccountCondition/AccountConditionHandler.java | 6 +- .../ui/Filter/dateCondition/DateConditionView.jaxx | 2 +- .../DateIntervalConditionView.jaxx | 7 +- .../chorem/lima/ui/account/AccountViewHandler.java | 3 +- .../lima/ui/celleditor/AccountTableCellEditor.java | 28 +- .../lima/ui/celleditor/DayTableCellEditor.java | 30 +- .../lima/ui/combobox/EntryBookComboBoxModel.java | 4 +- .../ui/combobox/FiscalPeriodComboBoxModel.java | 4 +- .../ui/common/FinancialTransactionTableModel.java | 56 ++- .../lima/ui/entrybook/EntryBookViewHandler.java | 8 +- .../ui/financialtransaction/AccountColumn.java | 48 ++- .../ui/financialtransaction/BalanceColumn.java | 35 +- .../lima/ui/financialtransaction/DayColumn.java | 6 +- .../FinancialTransactionViewHandler.java | 45 ++- .../FinancialTransactionSearchTableModel.java | 15 +- .../FiscalControlExportViewHandler.java | 2 +- .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 4 +- .../java/org/chorem/lima/ui/home/AccountsPane.java | 6 +- .../org/chorem/lima/ui/home/EntryBooksPane.java | 8 +- .../lima/ui/home/FinancialTransactionsPane.java | 6 +- .../org/chorem/lima/ui/home/FiscalYearsPane.java | 10 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 69 +--- .../lima/ui/vatchart/VatChartMovementForm.css | 2 + .../lima/ui/vatchart/VatChartMovementForm.jaxx | 19 +- .../chorem/lima/ui/vatchart/VatChartTreeTable.java | 134 ------- .../lima/ui/vatchart/VatChartTreeTableModel.java | 226 ------------ .../org/chorem/lima/ui/vatchart/VatChartView.jaxx | 26 +- .../lima/ui/vatchart/VatChartViewHandler.java | 401 +++++++++++++-------- .../chorem/lima/ui/vatchart/VatChartViewModel.java | 191 ++++++++++ .../resources/i18n/lima-swing_en_GB.properties | 3 + .../resources/i18n/lima-swing_fr_FR.properties | 5 +- .../src/main/resources/import/vat_developed.csv | 56 --- .../src/main/resources/import/vat_shortened.csv | 56 --- pom.xml | 2 +- 46 files changed, 831 insertions(+), 860 deletions(-) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => AlreadyAffectedVatBoxException.java} (74%) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => RequiredFieldException.java} (74%) copy lima-business-api/src/main/java/org/chorem/lima/LimaTechnicalException.java => lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DayTableCellEditor.java (64%) delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewModel.java delete mode 100644 lima-swing/src/main/resources/import/vat_developed.csv delete mode 100644 lima-swing/src/main/resources/import/vat_shortened.csv -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3