This is an automated email from the git hooks/post-receive script. New commit to branch feature/1196-reports_font in repository lima. See http://git.chorem.org/lima.git commit fd942df26941e8694506eecf9e63fd4ebb70ec79 Author: dcosse <cosse@codelutin.com> Date: Wed Mar 11 15:06:33 2015 +0100 fixes #1196 changement de polices sur les rapports + correction à la génération de ceux ci --- .../ProvisionalEntryBookReportServiceImpl.java | 11 ++++--- lima-callao/src/main/xmi/accounting-model.zargo | Bin 57335 -> 57302 bytes lima-web/pom.xml | 5 +++ .../balance/BalanceReportAccountReport.jrxml | 4 +-- .../balance/BalanceSubAccountsReport.jrxml | 34 ++++++++++----------- .../jasperreports/balance/DocumentReport.jrxml | 10 +++--- .../jasperreports/entryBook/DocumentReport.jrxml | 14 ++++----- .../jasperreports/entryBook/EntryBookReport.jrxml | 6 ++-- .../entryBook/FinancialPeriodReport.jrxml | 14 ++++----- .../entryBook/TransactionReport.jrxml | 18 +++++------ .../generalEntryBook/DocumentReport.jrxml | 14 ++++----- .../GeneralEntryBookEntryReport.jrxml | 10 +++--- .../generalLedger/DocumentReport.jrxml | 10 +++--- .../generalLedger/GeneralLedgerEntryReport.jrxml | 6 ++-- .../generalLedger/GeneralLedgerReport.jrxml | 6 ++-- pom.xml | 6 ++++ 16 files changed, 91 insertions(+), 77 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java index ad88652..92abfc5 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java @@ -102,6 +102,7 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo documentReport.setCurrency(bigDecimalFormat.getDecimalFormatSymbols().getCurrencySymbol()); documentReport.setFromDate(beginDate); documentReport.setToDate(endDate); + documentReport.setFormatter(bigDecimalFormat); documentReport.setSubReport(entryBooksJasperReport); @@ -125,6 +126,7 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo entryBookReport.setLibelle(entryBook.getLabel()); entryBookReport.setCode(entryBook.getCode()); entryBookReport.setSubReport(financialPeriodsJasperReport); + entryBookReport.setFormatter(bigDecimalFormat); BigDecimal entryBookSoldeDebit = BigDecimal.ZERO; BigDecimal entryBookSoldeCredit = BigDecimal.ZERO; @@ -171,16 +173,17 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo if (financialPeriodDebit.compareTo(BigDecimal.ZERO) != 0 || financialPeriodCredit.compareTo(BigDecimal.ZERO) != 0) { - financialPeriodReport.setDebit(financialPeriodDebit); - financialPeriodReport.setCredit(financialPeriodCredit); +// financialPeriodReport.setDebit(financialPeriodDebit); +// financialPeriodReport.setCredit(financialPeriodCredit); financialPeriodReport.setEntryBookCode(entryBook.getCode()); + financialPeriodReport.setSoldeDebit(financialPeriodDebit); + financialPeriodReport.setSoldeCredit(financialPeriodCredit); + financialPeriodReport.setFormatter(bigDecimalFormat); entryBookReport.addFinancialPeriods(financialPeriodReport); entryBookSoldeDebit = entryBookSoldeDebit.add(financialPeriodDebit); entryBookSoldeCredit = entryBookSoldeCredit.add(financialPeriodCredit); - financialPeriodReport.setSoldeDebit(entryBookSoldeDebit); - financialPeriodReport.setSoldeCredit(entryBookSoldeCredit); } } diff --git a/lima-callao/src/main/xmi/accounting-model.zargo b/lima-callao/src/main/xmi/accounting-model.zargo index 85c30f8..fdccd99 100644 Binary files a/lima-callao/src/main/xmi/accounting-model.zargo and b/lima-callao/src/main/xmi/accounting-model.zargo differ diff --git a/lima-web/pom.xml b/lima-web/pom.xml index 62e5957..3fadc6f 100644 --- a/lima-web/pom.xml +++ b/lima-web/pom.xml @@ -74,6 +74,11 @@ <groupId>net.sf.jasperreports</groupId> <artifactId>jasperreports</artifactId> </dependency> + <dependency> + <groupId>net.sf.jasperreports</groupId> + <artifactId>jasperreports-fonts</artifactId> + </dependency> + <!-- FIXME tchemit 2015-02-27 Do we really need this here ? --> <dependency> <groupId>org.apache.pdfbox</groupId> diff --git a/lima-web/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml b/lima-web/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml index 3a0aada..3a33815 100644 --- a/lima-web/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml @@ -5,8 +5,8 @@ <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> <property name="com.jaspersoft.studio.unit." value="pixel"/> - <style name="Default" isDefault="true" fontName="Arial"/> - <style name="Default oblique" fontName="Monospaced"/> + <style name="Default" isDefault="true" fontName="DejaVu Sans"/> + <style name="Default oblique" fontName="DejaVu Sans Mono"/> <queryString> <![CDATA[]]> </queryString> diff --git a/lima-web/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml b/lima-web/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml index a9a5bd5..1e970a7 100644 --- a/lima-web/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-21T14:33:53 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-11T12:07:20 --> <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="20" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb"> <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> <property name="com.jaspersoft.studio.unit." value="pixel"/> - <style name="Default" isDefault="true" fontName="Arial"/> - <style name="Default oblique" fontName="Monospaced"/> + <style name="Default" isDefault="true" fontName="DejaVu Sans"/> + <style name="Default oblique" fontName="DejaVu Sans Mono"/> <queryString> <![CDATA[]]> </queryString> @@ -75,7 +75,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="8" isBold="false"/> + <font fontName="DejaVu Sans Mono" size="8" isBold="false"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{amountDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{amountDebit}) : ""]]></textFieldExpression> @@ -89,7 +89,7 @@ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="8" isBold="false"/> + <font fontName="DejaVu Sans Mono" size="8" isBold="false"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{amountCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{amountCredit}) : ""]]></textFieldExpression> @@ -105,7 +105,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{soldeDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeDebit}) : ""]]></textFieldExpression> @@ -119,7 +119,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{soldeCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeCredit}) : ""]]></textFieldExpression> @@ -158,7 +158,7 @@ <font size="8" isBold="true"/> <paragraph leftIndent="80"/> </textElement> - <textFieldExpression><![CDATA["Sous total pour" + $F{mainAccountLabel}]]></textFieldExpression> + <textFieldExpression><![CDATA["Sous total pour " + $F{mainAccountLabel}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> <reportElement key="" x="434" y="0" width="72" height="10" forecolor="#736343" uuid="9c59df76-21ef-428f-8266-0da4cade0a20"> @@ -177,7 +177,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> </box> <textElement textAlignment="Right"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{soldeDebitSolde}) : ""]]></textFieldExpression> @@ -198,7 +198,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> </box> <textElement textAlignment="Right"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{soldeCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{soldeCreditSolde}) : ""]]></textFieldExpression> @@ -222,7 +222,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> </box> <textElement textAlignment="Right"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{amountDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountDebitSolde}) : ""]]></textFieldExpression> @@ -245,7 +245,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> </box> <textElement textAlignment="Right"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{amountCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountCreditSolde}) : ""]]></textFieldExpression> @@ -304,7 +304,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> </box> <textElement textAlignment="Right"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{soldeDebitSolde}) : ""]]></textFieldExpression> @@ -325,7 +325,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> </box> <textElement textAlignment="Right"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{soldeCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{soldeCreditSolde}) : ""]]></textFieldExpression> @@ -349,7 +349,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> </box> <textElement textAlignment="Right"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{amountDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountDebitSolde}) : ""]]></textFieldExpression> @@ -372,7 +372,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> </box> <textElement textAlignment="Right"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{amountCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountCreditSolde}) : ""]]></textFieldExpression> diff --git a/lima-web/src/main/resources/jasperreports/balance/DocumentReport.jrxml b/lima-web/src/main/resources/jasperreports/balance/DocumentReport.jrxml index 920a489..251d1e4 100644 --- a/lima-web/src/main/resources/jasperreports/balance/DocumentReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/balance/DocumentReport.jrxml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> -<!-- 2015-03-02T12:48:06 --> +<!-- 2015-03-11T11:48:55 --> <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="Arial" fontSize="8"/> - <style name="Bold" fontName="Arial" fontSize="8"/> - <style name="Oblique" fontName="Monospaced" fontSize="8"/> - <style name="Column header" forecolor="#D0B48E" backcolor="#F2EBDF" fontName="Arial" fontSize="12" isBold="true"/> + <style name="Default" isDefault="true" fontName="DejaVu Sans" fontSize="8"/> + <style name="Bold" fontName="DejaVuSans-Bold" 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> diff --git a/lima-web/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml b/lima-web/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml index 95b2cae..b5a9494 100644 --- a/lima-web/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> -<!-- 2015-03-02T15:06:22 --> +<!-- 2015-03-11T11:55:35 --> <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="Arial" fontSize="8"/> - <style name="Bold" fontName="Arial" fontSize="8"/> - <style name="Oblique" fontName="Monospaced" fontSize="8"/> - <style name="Column header" forecolor="#D0B48E" backcolor="#F2EBDF" fontName="Arial" fontSize="12" isBold="true"/> + <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> @@ -317,7 +317,7 @@ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="12" isBold="true"/> + <font fontName="DejaVu Sans Mono" size="12" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{soldeDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeDebit}) : ""]]></textFieldExpression> @@ -334,7 +334,7 @@ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="12" isBold="true"/> + <font fontName="DejaVu Sans Mono" size="12" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{soldeCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeCredit}) : ""]]></textFieldExpression> diff --git a/lima-web/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml b/lima-web/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml index 70edefa..15581ab 100644 --- a/lima-web/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> -<!-- 2015-03-02T15:07:00 --> +<!-- 2015-03-11T11:57:53 --> <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="50" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" isIgnoreP [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> <property name="com.jaspersoft.studio.unit." value="pixel"/> - <style name="Default" isDefault="true" fontName="Arial"/> - <style name="Default oblique" fontName="Monospaced"/> + <style name="Default" isDefault="true" fontName="DejaVu Sans"/> + <style name="Default oblique" fontName="DejaVu Sans Mono"/> <queryString> <![CDATA[]]> </queryString> diff --git a/lima-web/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml b/lima-web/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml index e9e4e53..ae5b8fd 100644 --- a/lima-web/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> -<!-- 2015-03-02T15:19:55 --> +<!-- 2015-03-11T14:47:39 --> <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="51" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" isIgnoreP [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -13,8 +13,8 @@ <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="Arial"/> - <style name="Default oblique" fontName="Monospaced"/> + <style name="Default" isDefault="true" fontName="DejaVu Sans"/> + <style name="Default oblique" fontName="DejaVu Sans Mono"/> <queryString> <![CDATA[]]> </queryString> @@ -231,7 +231,7 @@ </textElement> <textFieldExpression><![CDATA["Solde pour le journal " + $F{entryBookCode} + " jusqu'à fin " + new SimpleDateFormat("MMMM yyyy").format($F{period})]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isBlankWhenNull="false"> <reportElement style="Default" x="434" y="0" width="72" height="10" forecolor="#736343" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e"> <property name="local_mesure_unity" value="pixel"/> <property name="com.jaspersoft.studio.unit.y" value="px"/> @@ -243,12 +243,12 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="8" isBold="true"/> + <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{soldeDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeDebit}) : ""]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isBlankWhenNull="false"> <reportElement style="Default" x="506" y="0" width="72" height="10" forecolor="#736343" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"> <property name="local_mesure_unity" value="pixel"/> <property name="com.jaspersoft.studio.unit.y" value="px"/> @@ -260,7 +260,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="8" isBold="true"/> + <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{soldeCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeCredit}) : ""]]></textFieldExpression> diff --git a/lima-web/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml b/lima-web/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml index 09c5e9f..64fdf12 100644 --- a/lima-web/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> -<!-- 2015-03-02T11:52:06 --> +<!-- 2015-03-11T11:59:00 --> <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="30" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb"> <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> <property name="com.jaspersoft.studio.unit." value="pixel"/> - <style name="Default" isDefault="true" fontName="Arial"/> - <style name="Default oblique" fontName="Monospaced"/> + <style name="Default" isDefault="true" fontName="DejaVu Sans"/> + <style name="Default oblique" fontName="DejaVu Sans Mono"/> <queryString> <![CDATA[]]> </queryString> @@ -117,7 +117,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{credit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{credit}) : ""]]></textFieldExpression> @@ -128,7 +128,7 @@ <property name="com.jaspersoft.studio.unit.width" value="px"/> </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{debit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{debit}) : ""]]></textFieldExpression> @@ -186,7 +186,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> </box> <textElement textAlignment="Right"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{EntryBookEndColomnDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{EntryBookEndColomnDebitSolde}) : ""]]></textFieldExpression> @@ -207,7 +207,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> </box> <textElement textAlignment="Right"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{EntryBookEndColomnCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{EntryBookEndColomnCreditSolde}) : ""]]></textFieldExpression> @@ -265,7 +265,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right"> - <font fontName="Courier 10 Pitch" size="8" isBold="true"/> + <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{entryBookDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{entryBookDebitSolde}) : ""]]></textFieldExpression> @@ -286,7 +286,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right"> - <font fontName="Courier 10 Pitch" size="8" isBold="true"/> + <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{EntryBookCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{EntryBookCreditSolde}) : ""]]></textFieldExpression> diff --git a/lima-web/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml b/lima-web/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml index aae7025..2d587cb 100644 --- a/lima-web/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> -<!-- 2015-03-02T15:08:52 --> +<!-- 2015-03-11T11:53:21 --> <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="Arial" fontSize="8"/> - <style name="Bold" fontName="Arial" fontSize="8"/> - <style name="Oblique" fontName="Monospaced" fontSize="8"/> - <style name="Column header" forecolor="#D0B48E" backcolor="#F2EBDF" fontName="Arial" fontSize="12" isBold="true"/> + <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> @@ -272,7 +272,7 @@ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="12" isBold="true"/> + <font fontName="DejaVu Sans Mono" size="12" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{soldeDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeDebit}) : ""]]></textFieldExpression> @@ -289,7 +289,7 @@ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="12" isBold="true"/> + <font fontName="DejaVu Sans Mono" size="12" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{soldeCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeCredit}) : ""]]></textFieldExpression> diff --git a/lima-web/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml b/lima-web/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml index f03ba1c..0a0444b 100644 --- a/lima-web/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> -<!-- 2015-03-02T11:55:38 --> +<!-- 2015-03-11T11:54:13 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="21" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb"> <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> <property name="com.jaspersoft.studio.unit." value="pixel"/> - <style name="Default" isDefault="true" fontName="Arial"/> - <style name="Default oblique" fontName="Monospaced"/> + <style name="Default" isDefault="true" fontName="DejaVu Sans"/> + <style name="Default oblique" fontName="DejaVu Sans Mono"/> <queryString> <![CDATA[]]> </queryString> @@ -58,7 +58,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{debit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{debit}) : ""]]></textFieldExpression> @@ -72,7 +72,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="Courier 10 Pitch" size="8"/> + <font fontName="DejaVu Sans Mono" size="8"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{credit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{credit}) : ""]]></textFieldExpression> diff --git a/lima-web/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml b/lima-web/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml index 961e077..130ea91 100644 --- a/lima-web/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> -<!-- 2015-03-02T16:44:25 --> +<!-- 2015-03-11T11:59:35 --> <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="Arial" fontSize="8"/> - <style name="Bold" fontName="Arial" fontSize="8"/> - <style name="Oblique" fontName="Monospaced" fontSize="8"/> - <style name="Column header" forecolor="#D0B48E" backcolor="#F2EBDF" fontName="Arial" fontSize="12" isBold="true"/> + <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> diff --git a/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml b/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml index 6e6aa41..6ec6335 100644 --- a/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> -<!-- 2015-03-02T16:58:32 --> +<!-- 2015-03-11T12:00:01 --> <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"/> @@ -13,8 +13,8 @@ <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="Arial"/> - <style name="Default oblique" fontName="Monospaced"/> + <style name="Default" isDefault="true" fontName="DejaVu Sans"/> + <style name="Default oblique" fontName="DejaVu Sans Mono"/> <queryString> <![CDATA[]]> </queryString> diff --git a/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml b/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml index f1a326e..7169223 100644 --- a/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> -<!-- 2015-03-02T16:31:43 --> +<!-- 2015-03-11T12:00:32 --> <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" uuid="75ff86c6-c370-4f0b-a2d3-e17324 [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -13,8 +13,8 @@ <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" mode="Transparent" fontName="Arial"/> - <style name="Default oblique" mode="Transparent" fontName="Monospaced"/> + <style name="Default" isDefault="true" mode="Transparent" fontName="DejaVu Sans"/> + <style name="Default oblique" mode="Transparent" fontName="DejaVu Sans Mono"/> <queryString> <![CDATA[]]> </queryString> diff --git a/pom.xml b/pom.xml index 1b8ffd5..3a0df6f 100644 --- a/pom.xml +++ b/pom.xml @@ -569,6 +569,12 @@ </dependency> <dependency> + <groupId>net.sf.jasperreports</groupId> + <artifactId>jasperreports-fonts</artifactId> + <version>6.0.0</version> + </dependency> + + <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> <version>${javaxServletVersion}</version> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.