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

r3452 - in trunk/lima-business/src/main: java/org/chorem/lima/business/ejb resources/i18n
by echatellier＠users.chorem.org June 7, 2012

June 7, 2012

Author: echatellier Date: 2012-06-07 10:04:04 +0200 (Thu, 07 Jun 2012) New Revision: 3452 Url: http://chorem.org/repositories/revision/lima/3452 Log: Amelioration du rapport journal general Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 15:32:14 UTC (rev 3451) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-07 08:04:04 UTC (rev 3452) @@ -715,9 +715,6 @@ return t; } - //############## EntryBooks ############## - - @Override public void createEntryBooksDocuments(Date beginDate, Date endDate, @@ -779,39 +776,24 @@ String title = _("lima-business.document.entrybooktitle", closedPeriodicEntryBook.getEntryBook().getLabel(), closedPeriodicEntryBook.getFinancialPeriod().getBeginDate()); - //list = list.subList(1, list.size()); - int i = 0; - int n = entries.size(); - int max = n; - // alloc nb rows max for pdf documents on one page - if (format == FormatsEnum.PDF) { - max = 35; - } - while (i < n) { - int j = i + max; - if (j > n) { - j = n; - } - List<Entry> subEntries = - entries.subList(i, j); - //create page - Table table = createEntryBooksTable(subEntries, debit, credit); - //new page - Chapter chapter = new Chapter(0); - //headerPage - chapter.add(createHeaderPage(title, identity, - beginDate, endDate)); - //n° page - chapter.add(createNumberPage(nbpages, newDate)); - //table - Paragraph paragraphTable = new Paragraph(); - paragraphTable.add(table); - chapter.add(paragraphTable); - //add page - document.add(chapter); - i = i + max; - nbpages++; - } + + //create page + Table table = createEntryBooksTable(entries, debit, credit); + //new page + Chapter chapter = new Chapter(0); + //headerPage + chapter.add(createHeaderPage(title, identity, + beginDate, endDate)); + //n° page + chapter.add(createNumberPage(nbpages, newDate)); + //table + Paragraph paragraphTable = new Paragraph(); + paragraphTable.add(table); + chapter.add(paragraphTable); + //add page + document.add(chapter); + + nbpages++; } document.close(); @@ -1203,45 +1185,28 @@ //create pages - int i = 0; - int n = list.size(); - int max = n; - // alloc nb rows max for pdf documents on one page - if (format == FormatsEnum.PDF) { - max = 35; - } - while (i < n) { - int j = i + max; - if (j > n) { - j = n; - } - List<GeneralEntryBooksDatas> subList = - list.subList(i, j); - //create page : header + table + footer - Table headerTable = createGeneralEntryBooksHeaderTable(); - Table table = createGeneralEntryBooksTable(subList); - //new page - Chapter chapter = new Chapter(0); - //headerPage - chapter.add(createHeaderPage( - DocumentsEnum.GENERAL_ENTRYBOOK.getDescription(), - identity, beginDate, - endDate)); - //n° page - chapter.add(createNumberPage(nbpages, newDate)); - //headerTable - Paragraph paragraphHeaderTable = new Paragraph(); - paragraphHeaderTable.add(headerTable); - chapter.add(paragraphHeaderTable); - //table - Paragraph paragraphTable = new Paragraph(); - paragraphTable.add(table); - chapter.add(paragraphTable); - //add page - document.add(chapter); - i = i + max; - nbpages++; - } + Table headerTable = createGeneralEntryBooksHeaderTable(); + Table table = createGeneralEntryBooksTable(list); + //new page + Chapter chapter = new Chapter(0); + //headerPage + chapter.add(createHeaderPage( + DocumentsEnum.GENERAL_ENTRYBOOK.getDescription(), + identity, beginDate, + endDate)); + //n° page + chapter.add(createNumberPage(nbpages, newDate)); + //headerTable + Paragraph paragraphHeaderTable = new Paragraph(); + paragraphHeaderTable.add(headerTable); + chapter.add(paragraphHeaderTable); + //table + Paragraph paragraphTable = new Paragraph(); + paragraphTable.add(table); + chapter.add(paragraphTable); + //add page + document.add(chapter); + nbpages++; document.close(); @@ -1250,7 +1215,7 @@ } } - public Table createGeneralEntryBooksHeaderTable() { + protected Table createGeneralEntryBooksHeaderTable() { Table t = null; try { t = new Table(5, 1); @@ -1314,8 +1279,7 @@ phrase = new Phrase(_("lima-business.document.amounts"), boldFont); } else { - phrase = new Phrase(_("lima-business.document.amounts") - + " " + generalEntryBooksDatas.getPeriod(), + phrase = new Phrase(_("lima-business.document.amountsperiod", generalEntryBooksDatas.getPeriod()), boldFont); } Cell cell2 = new Cell(phrase); Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-06-06 15:32:14 UTC (rev 3451) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-06-07 08:04:04 UTC (rev 3452) @@ -19,6 +19,7 @@ lima-business.defaultaccountingrules.missingentrybook=Can't block financialperiod / missing EntryBook in transactions lima-business.document.accountnumber=Account N° lima-business.document.amounts=Amounts +lima-business.document.amountsperiod=Amounts %1$tB %1$tY lima-business.document.balance=Balance lima-business.document.businessnumber=Business N° lima-business.document.carryback=Carry Back Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-06 15:32:14 UTC (rev 3451) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-07 08:04:04 UTC (rev 3452) @@ -19,6 +19,7 @@ lima-business.defaultaccountingrules.missingentrybook=Impossible de bloquer la période financière / il manque un journal dans une transaction (%1$te/%1$tm/%1$tY) lima-business.document.accountnumber=N° Compte lima-business.document.amounts=Totaux +lima-business.document.amountsperiod=Totaux %1$tB %1$tY lima-business.document.balance=Balance lima-business.document.businessnumber=N° Siret lima-business.document.carryback=Report

1 0

r3451 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org June 6, 2012

June 6, 2012

Author: echatellier Date: 2012-06-06 17:32:14 +0200 (Wed, 06 Jun 2012) New Revision: 3451 Url: http://chorem.org/repositories/revision/lima/3451 Log: Correction des 3 trois tableaux diff?\195?\169rents qui causait un probl?\195?\168me d'alignement des colonnes. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 14:08:42 UTC (rev 3450) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 15:32:14 UTC (rev 3451) @@ -75,6 +75,7 @@ import com.lowagie.text.BadElementException; import com.lowagie.text.Cell; import com.lowagie.text.Chapter; +import com.lowagie.text.DocWriter; import com.lowagie.text.Document; import com.lowagie.text.DocumentException; import com.lowagie.text.Element; @@ -728,12 +729,13 @@ String filePath = path + File.separator + DocumentsEnum.ENTRYBOOKS.getFileName(); FileOutputStream fileOut = new FileOutputStream(filePath + format.getExtension()); + DocWriter writer = null; switch (format) { case HTML: - HtmlWriter htmlWriter = HtmlWriter.getInstance(document, fileOut); + writer = HtmlWriter.getInstance(document, fileOut); break; case PDF: - PdfWriter pdfWriter = PdfWriter.getInstance(document, fileOut); + writer = PdfWriter.getInstance(document, fileOut); break; } document.open(); @@ -758,8 +760,8 @@ List<Object[]> results = entryDAO.getDebitCreditOfTransaction(closedPeriodicEntryBook.getEntryBook(), closedPeriodicEntryBook.getFinancialPeriod().getBeginDate(), closedPeriodicEntryBook.getFinancialPeriod().getEndDate()); - BigDecimal debit = null; - BigDecimal credit = null; + BigDecimal debit = BigDecimal.ZERO; + BigDecimal credit = BigDecimal.ZERO; int nbAmount = results.size(); if (nbAmount == 2) { debit = (BigDecimal) results.get(0)[1]; @@ -792,9 +794,8 @@ } List<Entry> subEntries = entries.subList(i, j); - //create page : header + table + footer - Table headerTable = createEntryBooksHeaderTable(); - Table table = createEntryBooksTable(subEntries); + //create page + Table table = createEntryBooksTable(subEntries, debit, credit); //new page Chapter chapter = new Chapter(0); //headerPage @@ -802,21 +803,10 @@ beginDate, endDate)); //n° page chapter.add(createNumberPage(nbpages, newDate)); - //headerTable - Paragraph paragraphHeaderTable = new Paragraph(); - paragraphHeaderTable.add(headerTable); - chapter.add(paragraphHeaderTable); //table Paragraph paragraphTable = new Paragraph(); paragraphTable.add(table); chapter.add(paragraphTable); - //final amounts - if (i >= n - max) { - Paragraph finalAmountParagraph = new Paragraph(); - finalAmountParagraph.add(createEntryBooksAmountTable( - _("lima-business.document.amounts"), debit, credit)); - chapter.add(finalAmountParagraph); - } //add page document.add(chapter); i = i + max; @@ -825,52 +815,45 @@ } document.close(); - + writer.close(); } catch (Exception ex) { throw new LimaException("Can't create document", ex); } } - - protected Table createEntryBooksHeaderTable() { - Table t = null; - try { - t = new Table(6, 1); - float[] widths = {0.1f, 0.1f, 0.1f, 0.4f, 0.15f, 0.15f}; - t.setWidths(widths); - t.setWidth(100f); - t.setPadding(3f); - //defaut cell - Cell cell = new Cell(); - cell.setBorder(Rectangle.LEFT); - cell.setHorizontalAlignment(Element.ALIGN_CENTER); - t.setDefaultCell(cell); - t.setOffset(8); - t.addCell(new Phrase(_("lima-business.document.date"), boldFont)); - t.addCell(new Phrase(_("lima-business.document.accountnumber"), boldFont)); - t.addCell(new Phrase(_("lima-business.document.voucher"), boldFont)); - t.addCell(new Phrase(_("lima-business.document.description"), boldFont)); - t.addCell(new Phrase(_("lima-business.document.debit"), boldFont)); - t.addCell(new Phrase(_("lima-business.document.credit"), boldFont)); - - } catch (BadElementException eeBEE) { - log.error("Can't create table", eeBEE); - } - return t; - - } - - protected Table createEntryBooksTable(List<Entry> entries) { + + protected Table createEntryBooksTable(List<Entry> entries, BigDecimal debit, BigDecimal credit) { int nbrow = entries.size(); Table t = null; try { //define table - t = new Table(6, nbrow); + t = new Table(6, nbrow + 1); t.setWidth(100f); float[] widths = {0.1f, 0.1f, 0.1f, 0.4f, 0.15f, 0.15f}; t.setWidths(widths); t.setPadding(1.5f); t.setBorderWidth(1); t.setOffset(0); + + Cell cell1 = new Cell(_("lima-business.document.date")); + cell1.setHeader(true); + t.addCell(cell1); + Cell cell2 = new Cell(_("lima-business.document.accountnumber")); + cell2.setHeader(true); + t.addCell(cell2); + Cell cell3 = new Cell(_("lima-business.document.voucher")); + cell3.setHeader(true); + t.addCell(cell3); + Cell cell4 = new Cell(_("lima-business.document.description")); + cell4.setHeader(true); + t.addCell(cell4); + Cell cell5 = new Cell(_("lima-business.document.debit")); + cell5.setHeader(true); + t.addCell(cell5); + Cell cell6 = new Cell(_("lima-business.document.credit")); + cell6.setHeader(true); + t.addCell(cell6); + t.endHeaders(); + //define default cell Cell cell = new Cell(); cell.setBorder(Rectangle.LEFT); @@ -892,33 +875,15 @@ t.addCell(new Phrase(String.valueOf( !entry.getDebit() ? entry.getAmount() : 0), normalFont)); } - - } catch (BadElementException eeBEE) { - log.error("Can't create table", eeBEE); - } - return t; - } - - protected Table createEntryBooksAmountTable(String title, - BigDecimal credit, - BigDecimal debit) { - Table t = null; - try { - t = new Table(3, 1); - float[] widths = {0.7f, 0.15f, 0.15f}; - t.setWidths(widths); - t.setWidth(100f); - t.setPadding(3f); - t.setOffset(0); - //defaut cell - Cell cell = new Cell(); - cell.setBorder(Rectangle.RIGHT); - cell.setHorizontalAlignment(Element.ALIGN_RIGHT); - t.setDefaultCell(cell); - - t.addCell(new Phrase(title, boldFont)); + + // total + Cell cellTotal = new Cell(new Phrase(_("lima-business.document.amounts"), boldFont)); + cellTotal.setColspan(4); + cellTotal.setHorizontalAlignment(Element.ALIGN_RIGHT); + t.addCell(cellTotal); t.addCell(new Phrase(debit.toString(), boldFont)); t.addCell(new Phrase(credit.toString(), boldFont)); + } catch (BadElementException eeBEE) { log.error("Can't create table", eeBEE); } @@ -1187,8 +1152,8 @@ BigDecimal subAmountCredit = new BigDecimal(0); for (ClosedPeriodicEntryBook closedPeriodicEntryBook : closedPeriodicEntryBookList) { - BigDecimal debit = null; - BigDecimal credit = null; + BigDecimal debit = BigDecimal.ZERO; + BigDecimal credit = BigDecimal.ZERO; List<Object[]> results = entryDAO.getDebitCreditOfTransaction(closedPeriodicEntryBook.getEntryBook(), closedPeriodicEntryBook.getFinancialPeriod().getBeginDate(),

1 0

r3450 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org June 6, 2012

June 6, 2012

Author: echatellier Date: 2012-06-06 16:08:42 +0200 (Wed, 06 Jun 2012) New Revision: 3450 Url: http://chorem.org/repositories/revision/lima/3450 Log: Fix debit/credit affich?\195?\169 a chaque fois Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 14:06:43 UTC (rev 3449) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 14:08:42 UTC (rev 3450) @@ -890,7 +890,7 @@ t.addCell(new Phrase(String.valueOf( entry.getDebit() ? entry.getAmount() : 0), normalFont)); t.addCell(new Phrase(String.valueOf( - entry.getDebit() ? entry.getAmount() : 0), normalFont)); + !entry.getDebit() ? entry.getAmount() : 0), normalFont)); } } catch (BadElementException eeBEE) {

1 0

r3449 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org June 6, 2012

June 6, 2012

Author: echatellier Date: 2012-06-06 16:06:43 +0200 (Wed, 06 Jun 2012) New Revision: 3449 Url: http://chorem.org/repositories/revision/lima/3449 Log: Add doc Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 13:36:35 UTC (rev 3448) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 14:06:43 UTC (rev 3449) @@ -34,7 +34,6 @@ import java.io.FileOutputStream; import java.io.InputStream; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -321,7 +320,7 @@ } } - public Table createFinancialStatementsHeaderTable() { + protected Table createFinancialStatementsHeaderTable() { Table t = null; try { t = new Table(4, 1); @@ -351,7 +350,7 @@ } - public Table createFinancialStatementsTable(List<FinancialStatementAmounts> financialStatementAmounts) { + protected Table createFinancialStatementsTable(List<FinancialStatementAmounts> financialStatementAmounts) { int nbrow = financialStatementAmounts.size(); Table t = null; try { @@ -576,7 +575,7 @@ } } - public Table createLedgerHeaderTable() { + protected Table createLedgerHeaderTable() { Table t = null; try { t = new Table(7, 1); @@ -605,7 +604,7 @@ } - public Table createLedgerTable(List<Object> subList) { + protected Table createLedgerTable(List<Object> subList) { int nbrow = subList.size(); Table t = null; try { @@ -683,7 +682,7 @@ return t; } - public Table createLedgerAmountTable(String account, + protected Table createLedgerAmountTable(String account, String title, BigDecimal debit, BigDecimal credit) { @@ -832,7 +831,7 @@ } } - public Table createEntryBooksHeaderTable() { + protected Table createEntryBooksHeaderTable() { Table t = null; try { t = new Table(6, 1); @@ -900,7 +899,7 @@ return t; } - public Table createEntryBooksAmountTable(String title, + protected Table createEntryBooksAmountTable(String title, BigDecimal credit, BigDecimal debit) { Table t = null; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-06-06 13:36:35 UTC (rev 3448) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-06-06 14:06:43 UTC (rev 3449) @@ -107,14 +107,14 @@ } } - @Override public int getHttpPort() { return port; } - - /** this servlet send a static html page */ + /** + * This servlet send a static html page. + */ public class MainServlet extends HttpServlet { private static final long serialVersionUID = 1L; @@ -145,8 +145,7 @@ //if doc pdf or html else if (model != null && format != null && beginDate != null && endDate != null) { FormatsEnum formatsEnum = FormatsEnum.valueOfExtension(format); - URL doc = new URL("file:" + path + File.separator - + model + formatsEnum.getExtension()); + //create docs try { Date beginDateFormat = DATEFORMAT.parse(beginDate); @@ -184,6 +183,12 @@ } catch (ParseException eeePE) { log.error("Can't parse date", eeePE); } + + // FIXME echatellier 20120606 on connait le fichier + // ou sera généré le rapport, et on peut donc le relire + // après génération + // fonctionne pour le moment, mais a modifier + URL doc = new URL("file:" + path + File.separator + model + formatsEnum.getExtension()); resp.setContentType(formatsEnum.getMimeType()); InputStream in = doc.openStream(); OutputStream out = resp.getOutputStream(); @@ -276,8 +281,6 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { doGet(req, resp); - } } - }

1 0

r3448 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/resources/i18n lima-callao/src/main/xmi lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports
by echatellier＠users.chorem.org June 6, 2012

June 6, 2012

Author: echatellier Date: 2012-06-06 15:36:35 +0200 (Wed, 06 Jun 2012) New Revision: 3448 Url: http://chorem.org/repositories/revision/lima/3448 Log: D?\195?\169placement des dateformat en dur dans les fichiers i18n Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-callao/src/main/xmi/accounting.zargo trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 13:36:02 UTC (rev 3447) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 13:36:35 UTC (rev 3448) @@ -93,7 +93,6 @@ @TransactionAttribute public class DocumentServiceImpl extends AbstractLimaService implements DocumentService { - //Services @EJB private IdentityService identityService; @@ -108,17 +107,6 @@ protected String path; - //SDFs - private static final SimpleDateFormat dateFormat = - new SimpleDateFormat("dd/MM/yyyy"); - - private static final SimpleDateFormat hourFormat = - new SimpleDateFormat("HH:mm"); - - private static final SimpleDateFormat monthYearFormat = - new SimpleDateFormat("MMM yyyy"); - - //FONTs private static final Font titleFont = new Font(Font.HELVETICA, 14, Font.BOLD, Color.BLACK); @@ -134,16 +122,23 @@ private static final Font bolditalicFont = new Font(Font.HELVETICA, 9, Font.BOLDITALIC, Color.BLACK); - public DocumentServiceImpl() { path = LimaConfig.getInstance().getReportsDir().getAbsolutePath(); } - - public Paragraph createHeaderPage(String title, + /** + * Crée l'entete du document avec le titre, l'ientité, et les dates. + * + * @param title + * @param identity + * @param beginDate + * @param endDate + * @return + */ + protected Paragraph createHeaderPage(String title, Identity identity, - String beginDate, - String endDate) { + Date beginDate, + Date endDate) { Paragraph paragraphHeaderPage = new Paragraph(); Table t = null; try { @@ -186,14 +181,14 @@ t.addCell(""); t.addCell(new Phrase(_("lima-business.document.period1"), bolditalicFont)); - t.addCell(new Phrase(beginDate, italicFont)); + t.addCell(new Phrase(_("lima-business.document.period1format", beginDate), italicFont)); //line 5 t.addCell(new Phrase(identity.getZipCode() + " " + identity.getCity(), italicFont)); t.addCell(""); t.addCell(new Phrase(_("lima-business.document.period2"), bolditalicFont)); - t.addCell(new Phrase(endDate, italicFont)); + t.addCell(new Phrase(_("lima-business.document.period2format", endDate), italicFont)); } catch (BadElementException eeBEE) { log.error("Can't create table", eeBEE); } @@ -202,10 +197,15 @@ return paragraphHeaderPage; } - - public Paragraph createNumberPage(int nbPages, - String dateS, - String hourS) throws BadElementException { + /** + * Sous tableau. + * + * @param nbPages + * @param date + * @return + * @throws BadElementException + */ + protected Paragraph createNumberPage(int nbPages, Date date) throws BadElementException { //n° page Paragraph paragraphPage = new Paragraph(); Table infos = new Table(2); @@ -216,18 +216,12 @@ c.setBorder(Rectangle.NO_BORDER); c.setHorizontalAlignment(Element.ALIGN_CENTER); infos.setDefaultCell(c); - infos.addCell(new Phrase(_("lima-business.document.createdate1") - + dateS + _("lima-business.document.createdate2") - + hourS, normalFont)); - infos.addCell(new Phrase(_("lima-business.document.pagenumber") - + nbPages, normalFont)); + infos.addCell(new Phrase(_("lima-business.document.createdate", date), normalFont)); + infos.addCell(new Phrase(_("lima-business.document.pagenumber", nbPages), normalFont)); paragraphPage.add(infos); return paragraphPage; } - //############## FinancialStatements ############## - - @Override public void createFinancialStatementsDocuments(Date beginDate, Date endDate, @@ -238,9 +232,6 @@ financialStatementService.financialStatementReport(beginDate, endDate); Date newDate = new Date(); - String dateS = dateFormat.format(newDate); - String hourS = hourFormat.format(newDate); - String filePath = path + File.separator + DocumentsEnum.FINANCIALSTATEMENT.getFileName(); try { @@ -303,10 +294,9 @@ //new page Chapter chapter = new Chapter(0); //headerPage - chapter.add(createHeaderPage(title, identity, - dateFormat.format(beginDate), dateFormat.format(endDate))); + chapter.add(createHeaderPage(title, identity, beginDate, endDate)); //n° page - chapter.add(createNumberPage(nbpages, dateS, hourS)); + chapter.add(createNumberPage(nbpages, newDate)); //headerTable Paragraph paragraphHeaderTable = new Paragraph(); paragraphHeaderTable.add(headerTable); @@ -480,8 +470,6 @@ } Date newDate = new Date(); - String dateS = dateFormat.format(newDate); - String hourS = hourFormat.format(newDate); BigDecimal currentAmountDebit = new BigDecimal(0); BigDecimal currentAmountCredit = new BigDecimal(0); @@ -521,9 +509,9 @@ Chapter chapter = new Chapter(0); //headerPage chapter.add(createHeaderPage(DocumentsEnum.LEDGER.getDescription(), identity, - dateFormat.format(beginDate), dateFormat.format(endDate))); + beginDate, endDate)); //n° page - chapter.add(createNumberPage(nbpages, dateS, hourS)); + chapter.add(createNumberPage(nbpages, newDate)); //headerTable Paragraph paragraphHeaderTable = new Paragraph(); paragraphHeaderTable.add(headerTable); @@ -673,9 +661,8 @@ amountCredit = entry.getAmount(); } - t.addCell(new Phrase(dateFormat.format( - entry.getFinancialTransaction().getTransactionDate()), - normalFont)); + t.addCell(new Phrase(_("lima-business.document.dateformat", + entry.getFinancialTransaction().getTransactionDate()), normalFont)); t.addCell(new Phrase(entryBookCode, normalFont)); t.addCell(new Phrase(entry.getVoucher(), normalFont)); t.addCell(new Phrase(entry.getDescription(), normalFont)); @@ -739,8 +726,6 @@ try { Date newDate = new Date(); - String dateS = dateFormat.format(newDate); - String hourS = hourFormat.format(newDate); String filePath = path + File.separator + DocumentsEnum.ENTRYBOOKS.getFileName(); FileOutputStream fileOut = new FileOutputStream(filePath + format.getExtension()); @@ -790,8 +775,8 @@ } //create pages - String title = closedPeriodicEntryBook.getEntryBook().getLabel() - + "\n" + monthYearFormat.format( + String title = _("lima-business.document.entrybooktitle", + closedPeriodicEntryBook.getEntryBook().getLabel(), closedPeriodicEntryBook.getFinancialPeriod().getBeginDate()); //list = list.subList(1, list.size()); int i = 0; @@ -815,9 +800,9 @@ Chapter chapter = new Chapter(0); //headerPage chapter.add(createHeaderPage(title, identity, - dateFormat.format(beginDate), dateFormat.format(endDate))); + beginDate, endDate)); //n° page - chapter.add(createNumberPage(nbpages, dateS, hourS)); + chapter.add(createNumberPage(nbpages, newDate)); //headerTable Paragraph paragraphHeaderTable = new Paragraph(); paragraphHeaderTable.add(headerTable); @@ -875,7 +860,7 @@ } - public Table createEntryBooksTable(List<Entry> entries) { + protected Table createEntryBooksTable(List<Entry> entries) { int nbrow = entries.size(); Table t = null; try { @@ -894,9 +879,8 @@ t.setDefaultCell(cell); for (Entry entry : entries) { - t.addCell(new Phrase(dateFormat.format( - entry.getFinancialTransaction().getTransactionDate()), - normalFont)); + t.addCell(new Phrase(_("lima-business.document.dateformat", + entry.getFinancialTransaction().getTransactionDate()), normalFont)); String account = ""; if (entry.getAccount() != null) { account = entry.getAccount().getAccountNumber(); @@ -957,9 +941,6 @@ try { Date newDate = new Date(); - String dateS = dateFormat.format(newDate); - String hourS = hourFormat.format(newDate); -// String fileDateS = filedateFormat.format(newDate); BigDecimal currentAmountDebit = new BigDecimal(0); BigDecimal currentAmountCredit = new BigDecimal(0); @@ -999,9 +980,10 @@ //new page Chapter chapter = new Chapter(0); //headerPage - chapter.add(createHeaderPage(DocumentsEnum.BALANCE.getDescription(), identity, dateFormat.format(beginDate), dateFormat.format(endDate))); + chapter.add(createHeaderPage(DocumentsEnum.BALANCE.getDescription(), + identity, beginDate, endDate)); //n° page - chapter.add(createNumberPage(nbpages, dateS, hourS)); + chapter.add(createNumberPage(nbpages, newDate)); //headerTable Paragraph paragraphHeaderTable = new Paragraph(); paragraphHeaderTable.add(headerTable); @@ -1169,8 +1151,6 @@ try { Date newDate = new Date(); - String dateS = dateFormat.format(newDate); - String hourS = hourFormat.format(newDate); String filePath = path + File.separator + DocumentsEnum.GENERAL_ENTRYBOOK.getFileName(); FileOutputStream fileOut = new FileOutputStream(filePath + format.getExtension()); @@ -1233,8 +1213,7 @@ closedPeriodicEntryBook.getEntryBook().getCode()); generalEntryBooksDatas.setDescription( closedPeriodicEntryBook.getEntryBook().getLabel()); - generalEntryBooksDatas.setPeriod( - monthYearFormat.format(financialPeriod.getBeginDate())); + generalEntryBooksDatas.setPeriod(financialPeriod.getBeginDate()); generalEntryBooksDatas.setCredit(credit); generalEntryBooksDatas.setDebit(debit); list.add(generalEntryBooksDatas); @@ -1246,8 +1225,7 @@ generalEntryBooksDatas.setSubAmount(true); generalEntryBooksDatas.setCredit(subAmountCredit); generalEntryBooksDatas.setDebit(subAmountDebit); - generalEntryBooksDatas.setPeriod( - monthYearFormat.format(financialPeriod.getBeginDate())); + generalEntryBooksDatas.setPeriod(financialPeriod.getBeginDate()); list.add(generalEntryBooksDatas); amountCredit = amountCredit.add(subAmountCredit); amountDebit = amountDebit.add(subAmountDebit); @@ -1283,10 +1261,10 @@ //headerPage chapter.add(createHeaderPage( DocumentsEnum.GENERAL_ENTRYBOOK.getDescription(), - identity, dateFormat.format(beginDate), - dateFormat.format(endDate))); + identity, beginDate, + endDate)); //n° page - chapter.add(createNumberPage(nbpages, dateS, hourS)); + chapter.add(createNumberPage(nbpages, newDate)); //headerTable Paragraph paragraphHeaderTable = new Paragraph(); paragraphHeaderTable.add(headerTable); @@ -1359,9 +1337,8 @@ generalEntryBooksDatas.getCode(), normalFont)); t.addCell(new Phrase( generalEntryBooksDatas.getDescription(), normalFont)); + t.addCell(new Phrase(_("lima-business.document.monthformat", generalEntryBooksDatas.getPeriod()), normalFont)); t.addCell(new Phrase( - generalEntryBooksDatas.getPeriod(), normalFont)); - t.addCell(new Phrase( String.valueOf(generalEntryBooksDatas.getDebit()), normalFont)); t.addCell(new Phrase( Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-06-06 13:36:02 UTC (rev 3447) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-06-06 13:36:35 UTC (rev 3448) @@ -24,26 +24,30 @@ lima-business.document.carryback=Carry Back lima-business.document.carryforward=reporterÀ lima-business.document.classificationcode=Classification Code -lima-business.document.createdate1=Editing Date -lima-business.document.createdate2=to +lima-business.document.createdate=Editing Date %1$tm/%1$te/%1$tY at %1$tH\:%1$tM lima-business.document.credit=Credit lima-business.document.date=Date lima-business.document.date.begin=Begin date lima-business.document.date.end=End date +lima-business.document.dateformat=%1$tm/%1$te/%1$tY lima-business.document.debit=Debit lima-business.document.description=Description lima-business.document.entrybook=EntryBook +lima-business.document.entrybooktitle=%s\n%2$tB %2$tY lima-business.document.financialstatement=FinancialStatement lima-business.document.generalentrybook=General EntryBook lima-business.document.grossamount=Gross Amount lima-business.document.label=Label lima-business.document.ledger=Ledger +lima-business.document.monthformat=%1$tB %1$tY lima-business.document.movementcredit=Credit movement lima-business.document.movementdebit=Debit movement lima-business.document.netamount=Net Amount -lima-business.document.pagenumber=Page N° +lima-business.document.pagenumber=Page N° %d lima-business.document.period1=Periode from +lima-business.document.period1format=%1$tm/%1$te/%1$tY lima-business.document.period2=to +lima-business.document.period2format=%1$tm/%1$te/%1$tY lima-business.document.provisiondeprecationamount=Provision Deprecation Amount lima-business.document.solde=Solde lima-business.document.soldecredit=Credit solde Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-06 13:36:02 UTC (rev 3447) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-06 13:36:35 UTC (rev 3448) @@ -24,26 +24,30 @@ lima-business.document.carryback=Report lima-business.document.carryforward=À reporter lima-business.document.classificationcode=NAF -lima-business.document.createdate1=Date de tirage -lima-business.document.createdate2=à +lima-business.document.createdate=Date de tirage %1$te/%1$tm/%1$tY à %1$tH\:%1$tM lima-business.document.credit=Crédit lima-business.document.date=Date lima-business.document.date.begin=Date de début \: lima-business.document.date.end=Date de fin \: +lima-business.document.dateformat=%1$te/%1$tm/%1$tY lima-business.document.debit=Débit lima-business.document.description=Description lima-business.document.entrybook=Journal +lima-business.document.entrybooktitle=%s\n%2$tB %2$tY lima-business.document.financialstatement=Bilan et compte de résultat lima-business.document.generalentrybook=Journal Général lima-business.document.grossamount=Brut lima-business.document.label=Libellé lima-business.document.ledger=Grand Livre +lima-business.document.monthformat=%1$tB %1$tY lima-business.document.movementcredit=Mouvement Créditeur lima-business.document.movementdebit=Mouvement Débiteur lima-business.document.netamount=Net -lima-business.document.pagenumber=N° page +lima-business.document.pagenumber=N° page %d lima-business.document.period1=Période du +lima-business.document.period1format=%1$te/%1$tm/%1$tY lima-business.document.period2=au +lima-business.document.period2format=%1$te/%1$tm/%1$tY lima-business.document.provisiondeprecationamount=Amortissements et provisions lima-business.document.solde=Solde lima-business.document.soldecredit=Solde Créditeur Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2012-06-06 13:36:02 UTC (rev 3447) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2012-06-06 13:36:35 UTC (rev 3448) @@ -187,13 +187,16 @@ } //shows error message to user if the fiscalPeriod is unblocked - if (error) { + //FIXME echatellier 20120605 why ? + // ui is only filled with non blocked periods, else case + // can NEVER happen + /*if (error) { JOptionPane.showMessageDialog( view, _("lima.entrybooksreports.documentcreationfiscalerror"), _("lima.entrybooksreports.documentcreationfiscaltitle"), JOptionPane.ERROR_MESSAGE); - } else { + } else {*/ int port = LimaServiceFactory.getService(HttpServerService.class).getHttpPort(); FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem(); @@ -219,7 +222,7 @@ } catch (URISyntaxException e) { log.error("Can't create news URI", e); } - } + //} } }

1 0

r3447 - trunk/lima-callao/src/main/java/org/chorem/lima/entity
by echatellier＠users.chorem.org June 6, 2012

June 6, 2012

Author: echatellier Date: 2012-06-06 15:36:02 +0200 (Wed, 06 Jun 2012) New Revision: 3447 Url: http://chorem.org/repositories/revision/lima/3447 Log: Fix queries Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-06-05 16:05:09 UTC (rev 3446) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-06-06 13:36:02 UTC (rev 3447) @@ -112,7 +112,7 @@ Date endDate) throws TopiaException { String query = "FROM " + ClosedPeriodicEntryBook.class.getName() + - " WHERE :begindate <= financialPeriod.beginDate " + + " WHERE :beginDate <= financialPeriod.beginDate " + " AND financialPeriod.beginDate <= :endDate" + " ORDER BY entryBook.code"; return context.find(query, "beginDate", beginDate, "endDate", endDate); Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-06-05 16:05:09 UTC (rev 3446) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-06-06 13:36:02 UTC (rev 3447) @@ -108,8 +108,8 @@ public List<Entry> findAllEntryOfBalancedTransaction(EntryBook entryBook, Date beginDate, Date endDate) throws TopiaException { String query = getEquilibredTransactionQuery(beginDate, endDate) + - // concerne le compte - " AND E = :entryBook" + + // concerne le journal + " AND E.financialTransaction.entryBook = :entryBook" + // fix order " ORDER BY E.financialTransaction.transactionDate, E.financialTransaction.topiaId"; @@ -132,8 +132,8 @@ Date beginDate, Date endDate) throws TopiaException { String query = "SELECT E.debit, sum(E.amount) " + getEquilibredTransactionQuery(beginDate, endDate) + - // concerne le compte - " AND E = :entryBook" + + // concerne le journal + " AND E.financialTransaction.entryBook = :entryBook" + " GROUP BY E.debit"; List<Object[]> result = context.find(query, "beginDate", beginDate, @@ -156,8 +156,8 @@ // entre les 2 dates " WHERE :beginDate <= E.financialTransaction.transactionDate" + " AND E.financialTransaction.transactionDate <= :endDate" + - // concerne le compte - " AND E.entryBook = :entryBook"; + // concerne le journal + " AND E.financialTransaction.entryBook = :entryBook"; List<Entry> entries = context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); @@ -181,8 +181,8 @@ // entre les 2 dates " WHERE :beginDate <= E.financialTransaction.transactionDate" + " AND E.financialTransaction.transactionDate <= :endDate" + - // concerne le compte - " AND E.entryBook = :entryBook" + + // concerne le journal + " AND E.financialTransaction.entryBook = :entryBook" + " GROUP BY E.debit"; List<Object[]> result = context.find(query, "beginDate", beginDate,

1 0

r3446 - trunk
by echatellier＠users.chorem.org June 5, 2012

June 5, 2012

Author: echatellier Date: 2012-06-05 18:05:09 +0200 (Tue, 05 Jun 2012) New Revision: 3446 Url: http://chorem.org/repositories/revision/lima/3446 Log: Update some libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-05 16:02:31 UTC (rev 3445) +++ trunk/pom.xml 2012-06-05 16:05:09 UTC (rev 3446) @@ -208,13 +208,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>8.1.3.v20120416</version> + <version>8.1.4.v20120524</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>8.1.3.v20120416</version> + <version>8.1.4.v20120524</version> </dependency>  @@ -330,7 +330,7 @@ <jaxxVersion>2.5-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>4.0.0</openEjbVersion> - <slf4jVersion>1.6.4</slf4jVersion> + <slf4jVersion>1.6.5</slf4jVersion>  <license.licenseName>gpl_v3</license.licenseName>

1 0

r3445 - trunk
by echatellier＠users.chorem.org June 5, 2012

June 5, 2012

Author: echatellier Date: 2012-06-05 18:02:31 +0200 (Tue, 05 Jun 2012) New Revision: 3445 Url: http://chorem.org/repositories/revision/lima/3445 Log: Update to h2 1.3.167 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-05 15:54:08 UTC (rev 3444) +++ trunk/pom.xml 2012-06-05 16:02:31 UTC (rev 3445) @@ -103,7 +103,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.166</version> + <version>1.3.167</version> <scope>runtime</scope> </dependency>

1 0

r3444 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by echatellier＠users.chorem.org June 5, 2012

June 5, 2012

Author: echatellier Date: 2012-06-05 17:54:08 +0200 (Tue, 05 Jun 2012) New Revision: 3444 Url: http://chorem.org/repositories/revision/lima/3444 Log: Fix NPE Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-06-05 15:08:46 UTC (rev 3443) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-06-05 15:54:08 UTC (rev 3444) @@ -25,6 +25,7 @@ package org.chorem.lima.ui.financialtransaction; +import org.apache.commons.collections.CollectionUtils; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; @@ -53,8 +54,14 @@ /** * Table des transaction qui ajoute des comportement (keys). + * + * <ul> + * <li>Auto creation des entrees si la transaction est vide (tab) + * <li>positionnement automatique sur les cellules editables + * </ul> * * @author jpepin + * @author echatellier */ public class FinancialTransactionTable extends JXTable { @@ -189,14 +196,13 @@ } } - /** + /* * Touche tab * Incrémente le curseur de case tant que la case n'est pas editable * Ajoute une entrée comptable si tab est sur - * la dernière cellule et si la transaction est non équilibré + * la dernière cellule et si la transaction est non équilibrée * sinon rajoute une transaction */ - if (e.getKeyChar() == KeyEvent.VK_TAB) { int max_x = getColumnCount(); int max_y = getRowCount(); @@ -222,7 +228,7 @@ //if transaction, add entry if (object instanceof FinancialTransaction) { FinancialTransaction financialTransaction = (FinancialTransaction) object; - if (financialTransaction.getEntry().size() == 0) { + if (CollectionUtils.isEmpty(financialTransaction.getEntry())) { handler.addEntry(); setColumnSelectionInterval(1, 1); }

1 0

r3443 - in trunk/lima-business/src/main/java/org/chorem/lima/business: accountingrules ejb
by echatellier＠users.chorem.org June 5, 2012

June 5, 2012

Author: echatellier Date: 2012-06-05 17:08:46 +0200 (Tue, 05 Jun 2012) New Revision: 3443 Url: http://chorem.org/repositories/revision/lima/3443 Log: Corrige l'operation de cloture d'un exercice Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-06-05 14:51:55 UTC (rev 3442) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-06-05 15:08:46 UTC (rev 3443) @@ -208,7 +208,7 @@ closedPeriodicEntryBook = closedPeriodicEntryBookDAO.findByTopiaId(closedPeriodicEntryBook.getTopiaId()); // Check if all financial transactions of closedperiodicentrybook are equilibrate - // FIMXE echatellier 20120504 unutile de recuperer une liste + // FIXME echatellier 20120504 unutile de recuperer une liste // entiere juste pour tester l'existence FinancialPeriod period = closedPeriodicEntryBook.getFinancialPeriod(); List<FinancialTransaction> result = financialTransactionDAO.getAllUnbalancedTransaction(period.getBeginDate(), @@ -220,18 +220,16 @@ // Check if all financial transactions of this closedperiodicentrybook/financialPeriod are well filled in result = financialTransactionDAO.getAllUnfilledTransaction(period.getBeginDate(), period.getEndDate(), closedPeriodicEntryBook.getEntryBook()); - // FIMXE echatellier 20120504 unutile de recuperer une liste + // FIXME echatellier 20120504 unutile de recuperer une liste // entiere juste pour tester l'existence if (result.size() > 0) { throw new LimaBusinessException(_("lima-business.defaultaccountingrules.missingelements")); } // Check if all financial transactions have EntryBooks - // FIXME echatellier 20120605 only check in interval defined - // by period to block (not all database) result = financialTransactionDAO.getAllTransactionWithoutEntryBook(period.getBeginDate(), period.getEndDate()); - // FIMXE echatellier 20120504 unutile de recuperer une liste + // FIXME echatellier 20120504 unutile de recuperer une liste // entiere juste pour tester l'existence if (result.size() > 0) { FinancialTransaction transaction = result.get(0); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-06-05 14:51:55 UTC (rev 3442) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-06-05 15:08:46 UTC (rev 3443) @@ -263,7 +263,7 @@ } catch (TopiaException ex) { throw new LimaException("Can't find fiscal period", ex); } - + //sets dates // - endRetainedEarnings: last day of the closing year // - beginRetainedEarnings: first open day of the following year @@ -280,6 +280,7 @@ found = true; } } + //if entrybook isn't found //then create it if (!found) { @@ -305,8 +306,7 @@ accountMaster = new AccountImpl(); accountMaster.setAccountNumber("89"); accountMaster.setLabel("BILAN"); - accountService.createAccount(accountMaster); - accountMaster = accountService.getAccountByNumber("89"); + accountMaster = accountService.createAccount(accountMaster); } //890 Bilan d'ouverture @@ -315,8 +315,7 @@ beginRetainedAccount = new AccountImpl(); beginRetainedAccount.setAccountNumber("890"); beginRetainedAccount.setLabel("Bilan d'ouverture"); - accountService.createAccount(beginRetainedAccount); - beginRetainedAccount = accountService.getAccountByNumber("890"); + beginRetainedAccount = accountService.createAccount(beginRetainedAccount); } //891 Bilan de cloture @@ -325,19 +324,18 @@ endRetainedAccount = new AccountImpl(); endRetainedAccount.setAccountNumber("891"); endRetainedAccount.setLabel("Bilan de clôture"); - accountService.createAccount(endRetainedAccount); - endRetainedAccount = accountService.getAccountByNumber("891"); + endRetainedAccount = accountService.createAccount(endRetainedAccount); } //look for the last financial period from the previous fiscal year + //check if the last financial period isn't blocked Collection<FinancialPeriod> fperiod = localFiscalPeriod.getFinancialPeriod(); - Iterator<FinancialPeriod> itr = fperiod.iterator(); FinancialPeriod lastFPeriod = null; while (itr.hasNext()) { lastFPeriod = itr.next(); } - //check if the last financial period isn't blocked + if (lastFPeriod.getLocked()) { throw new LimaBusinessException(_("lima-business.fiscalperiod.previousfiscalperiodalreadyblocked")); } @@ -378,7 +376,7 @@ //Sets the endfinancialTransaction endfinancialTransaction.setEntryBook(entryBook); endfinancialTransaction.setTransactionDate(localFiscalPeriod.getEndDate()); - financialTransactionService.createFinancialTransaction(endfinancialTransaction); + endfinancialTransaction = financialTransactionService.createFinancialTransaction(endfinancialTransaction); } //holds entries of all opening transactions @@ -388,7 +386,7 @@ //Sets the endfinancialTransaction beginfinancialTransaction.setEntryBook(entryBook); beginfinancialTransaction.setTransactionDate(beginfinancialPeriod.getBeginDate()); - financialTransactionService.createFinancialTransaction(beginfinancialTransaction); + beginfinancialTransaction = financialTransactionService.createFinancialTransaction(beginfinancialTransaction); } } @@ -397,9 +395,6 @@ calendar.setTime(fiscalPeriod.getEndDate()); //Sets entries - Entry beginEntry; - - BalanceTrial results = reportService.generateBalanceTrial(localFiscalPeriod.getBeginDate(), localFiscalPeriod.getEndDate(), null, false, false); @@ -410,7 +405,7 @@ if (Integer.valueOf(report.getAccount().getAccountNumber().substring(0, 1)) < 6 && !report.getAmountSolde().equals(BigDecimal.ZERO)) { //close accounts by removing amounts from all class 1 to 5 accounts - beginEntry = new EntryImpl(); + Entry beginEntry = new EntryImpl(); beginEntry.setDescription(_("lima-business.financialtransaction.retainedearnings.description") + " (" + calendar.get(Calendar.YEAR) + ")"); beginEntry.setVoucher(_("lima-business.financialtransaction.retainedearnings.voucher")); beginEntry.setFinancialTransaction(endfinancialTransaction);

1 0