This is an automated email from the git hooks/post-receive script. New commit to branch feature/newReportBuilder in repository lima. See http://git.chorem.org/lima.git commit c34e00d99d068643a358dcf1249d59220e240619 Author: dcosse <japbiw74> Date: Wed Jan 14 15:12:07 2015 +0100 refs #769 set BigDecimal format for general entry book report --- .../lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java | 3 +++ .../main/jasperreports/generalEntryBook/EntryBookMainReport.jrxml | 2 +- .../main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml | 2 +- .../generalEntryBook/GeneralEntryBookEntryReport.jrxml | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java index 6b0550c..70fef04 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java @@ -90,6 +90,7 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple result.setFromDate(beginDate); result.setToDate(endDate); result.setSubReportPath(entryBookPeriodReportPath); + result.setFormatter(bigDecimalFormat); List<FinancialPeriod> financialPeriods = financialPeriodService.getFinancialPeriods(beginDate, endDate); @@ -116,6 +117,7 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple GeneralEntryBookEntry generalEntryBookEntry = generalEntryBookEntryByEntryBookCode.get(entryBookCode); if (generalEntryBookEntry == null) { generalEntryBookEntry = new GeneralEntryBookEntryImpl(); + generalEntryBookEntry.setFormatter(bigDecimalFormat); generalEntryBookEntry.setCode(closedPeriodicEntryBook.getEntryBook().getCode()); generalEntryBookEntry.setLibelle(closedPeriodicEntryBook.getEntryBook().getLabel()); generalEntryBookEntryByEntryBookCode.put(entryBookCode, generalEntryBookEntry); @@ -160,6 +162,7 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple if (subAmountCredit.compareTo(BigDecimal.ZERO) != 0 && subAmountDebit.compareTo(BigDecimal.ZERO) != 0) { EntryBookPeriodReport entryBookPeriodReport = new EntryBookPeriodReportImpl(); + entryBookPeriodReport.setFormatter(bigDecimalFormat); entryBookPeriodReport.setPeriod(financialPeriod.getBeginDate()); entryBookPeriodReport.setSubReportPath(generalEntryBookEntryBookReportPath); entryBookPeriodReport.setSoldeDebit(subAmountDebit); diff --git a/lima-web/src/main/jasperreports/generalEntryBook/EntryBookMainReport.jrxml b/lima-web/src/main/jasperreports/generalEntryBook/EntryBookMainReport.jrxml index 763c01f..23c6cb0 100644 --- a/lima-web/src/main/jasperreports/generalEntryBook/EntryBookMainReport.jrxml +++ b/lima-web/src/main/jasperreports/generalEntryBook/EntryBookMainReport.jrxml @@ -1,6 +1,6 @@ <?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-14T11:33:46 --> +<!-- 2015-01-14T15:09:41 --> <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"/> diff --git a/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml b/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml index 81361d0..03f40b2 100644 --- a/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml +++ b/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml @@ -1,6 +1,6 @@ <?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-14T14:58:26 --> +<!-- 2015-01-14T15:09:41 --> <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" 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"/> diff --git a/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml b/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml index 7e53691..44b60d8 100644 --- a/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml +++ b/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml @@ -1,6 +1,6 @@ <?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-14T14:57:39 --> +<!-- 2015-01-14T15:09:41 --> <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"/> @@ -49,7 +49,7 @@ </textElement> <textFieldExpression><![CDATA[$F{libelle}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="false"> + <textField isBlankWhenNull="true"> <reportElement x="434" y="0" width="72" height="10" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -63,7 +63,7 @@ </textElement> <textFieldExpression><![CDATA[new Boolean($F{debit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{debit}) : ""]]></textFieldExpression> </textField> - <textField isBlankWhenNull="false"> + <textField isBlankWhenNull="true"> <reportElement x="506" y="0" width="72" height="10" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.