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

r3649 - in trunk: . lima-business lima-callao lima-swing lima-swing/src/main/assembly lima-swing/src/main/java/org/chorem/lima/ui lima-swing/src/main/resources/i18n
by tchemit＠users.chorem.org 18 Sep '12

18 Sep '12

Author: tchemit Date: 2012-09-18 19:14:25 +0200 (Tue, 18 Sep 2012) New Revision: 3649 Url: http://chorem.org/repositories/revision/lima/3649 Log: refs #754: Possibilit?\195?\169 de s?\195?\169lectionner la langue anglaise alors que la traduction n'est pas pr?\195?\169sente (ajout onglet pour aider ?\195?\160 la traduction) Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/lima-swing/src/main/assembly/bin.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-business/pom.xml 2012-09-18 17:14:25 UTC (rev 3649) @@ -137,7 +137,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-callao/pom.xml 2012-09-18 17:14:25 UTC (rev 3649) @@ -110,7 +110,7 @@ </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-swing/pom.xml 2012-09-18 17:14:25 UTC (rev 3649) @@ -191,7 +191,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <id>scan-sources</id> @@ -212,6 +212,10 @@ <goals> <goal>bundle</goal> </goals> + <configuration> + <generateCsvFile>true</generateCsvFile> + <bundleCsvFile>${project.build.directory}/lima-i18n.csv</bundleCsvFile> + </configuration> </execution> </executions> </plugin> Modified: trunk/lima-swing/src/main/assembly/bin.xml =================================================================== --- trunk/lima-swing/src/main/assembly/bin.xml 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-swing/src/main/assembly/bin.xml 2012-09-18 17:14:25 UTC (rev 3649) @@ -86,5 +86,12 @@ <include>*.properties</include> </includes> </fileSet> + <fileSet> + <directory>target</directory> + <outputDirectory>i18n</outputDirectory> + <includes> + <include>lima-i18n.csv</include> + </includes> + </fileSet> </fileSets> </assembly> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-09-18 17:14:25 UTC (rev 3649) @@ -58,10 +58,16 @@ import org.nuiton.util.DesktopUtil; import org.nuiton.widget.SwingSession; -import javax.swing.*; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JEditorPane; +import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; +import javax.swing.JTextArea; +import javax.swing.UIManager; import javax.swing.border.LineBorder; import javax.swing.plaf.BorderUIResource; -import java.awt.*; +import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -111,7 +117,7 @@ } //Get xml lima state file - protected File getLimaStateFile(){ + protected File getLimaStateFile() { LimaConfig limaConfig = LimaConfig.getInstance(); @@ -236,6 +242,19 @@ about.setIconPath("/icons/lima.png"); about.setLicenseFile("META-INF/lima-LICENSE.txt"); about.setThirdpartyFile("META-INF/lima-THIRD-PARTY.txt"); + + JScrollPane component = new JScrollPane(); + JEditorPane translateArea = new JEditorPane(); + translateArea.setContentType("text/html"); + translateArea.setEditable(false); + if (translateArea.getFont() != null) { + translateArea.setFont(translateArea.getFont().deriveFont((float) 11)); + } + translateArea.setBorder(null); + String text = _("lima.about.translate.content"); + translateArea.setText(text); + component.getViewport().add(translateArea); + about.getTabs().add(_("lima.title.about.translate"), component); about.init(); about.showInDialog(ui, true); } Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-09-18 17:14:25 UTC (rev 3649) @@ -2,6 +2,7 @@ -= lima-business.document.entrybooks= lima-business.document.generalentrybook= +lima.about.translate.content=<h3>How to translate Lima</h3>You can help us to translate or improve label in Lima.<br/><ul><li>Get the <strong>lima-i18n.csv</strong> file in the <strong>i18n</strong> directory</li><li>open it in Libre office (separator caracter is <strong>Tab</strong>)</li><li>Do you work \:)</li><li>At last, send us back the modified file</li></ul><br/>We will apply the patch before next release. lima.accountsreports.listerror=Can't get entries list lima.action.commandline.help=Show help in console lima.action.fullscreen=Full screen @@ -209,6 +210,7 @@ lima.table.voucher=Voucher lima.title.about=About Lima... lima.title.about.description=Open sources accounting software +lima.title.about.translate=Translate Lima lima.tooltip.filter=<html>Regular expression \:<br/>- accounts interval i..j <br/>- accounts list i,j,k <br/>- Exclude an account -i</html> lima.tooltip.lettering=<html>Add a letter on many entries <br/>Select many rows with combination ctrl + click</html> lima.ui.account.addaccount= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-09-18 17:14:25 UTC (rev 3649) @@ -2,6 +2,7 @@ -= lima-business.document.entrybooks= lima-business.document.generalentrybook= +lima.about.translate.content=<h2>Comment traduire Lima</h2>Vous pouvez nous aider à traduire Lima.<hr/><br/><ul><li>Récupérer le fichier <strong>lima-i18n.csv</strong> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur (le caractère séprateur est une Tabultation)</li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul><br/>Nous intégrerons vos modifications avant la prochaine version. lima.accountsreports.listerror=Erreur lors de la récupération des données de la liste lima.action.commandline.help=Afficher l'aide en console lima.action.fullscreen=Plein Ecran @@ -208,6 +209,7 @@ lima.table.voucher=Pièce comptable lima.title.about=À propos de Lima... lima.title.about.description=Logiciel de comptabilité Libre +lima.title.about.translate=traduire Lima lima.tooltip.filter=<html>Expression régulière \:<br/>- intervalle de compte i..j <br/>- liste de compte i,j,k <br/>- Exclure un compte -i</html> lima.tooltip.lettering=<html>Pour ajouter une lettre à plusieurs écritures <br/>Sélectionner plusieurs lignes avec la combinaison ctrl + click</html> lima.ui.account.addaccount=Nouveau compte Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-18 16:05:43 UTC (rev 3648) +++ trunk/pom.xml 2012-09-18 17:14:25 UTC (rev 3649) @@ -387,7 +387,7 @@ <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.11</topiaVersion> <jaxxVersion>2.5.5</jaxxVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> <openEjbVersion>4.0.0</openEjbVersion> <slf4jVersion>1.6.6</slf4jVersion> <swingxVersion>1.6.4</swingxVersion> @@ -410,7 +410,7 @@  <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin>

1 0

r3648 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by tchemit＠users.chorem.org 18 Sep '12

18 Sep '12

Author: tchemit Date: 2012-09-18 18:05:43 +0200 (Tue, 18 Sep 2012) New Revision: 3648 Url: http://chorem.org/repositories/revision/lima/3648 Log: refs #809: Patch rapports html (apply patch, thanks!) 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-09-18 15:59:06 UTC (rev 3647) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-09-18 16:05:43 UTC (rev 3648) @@ -132,9 +132,7 @@ try { - financialReport = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" + - "<html>\n" + - "<body>\n"; + financialReport = constructHtmlHeader(""); //Split list by financialstatement type List<List<FinancialStatementAmounts>> listList = @@ -182,13 +180,13 @@ if (printedType == 0) { String[] columnHeaderTable = {boldBegin+_("lima-business.document.label")+boldEnd, boldBegin+_("lima-business.document.grossamount")+boldEnd, boldBegin+_("lima-business.document.provisiondeprecationamount")+boldEnd, boldBegin+_("lima-business.document.netamount")+boldEnd}; - financialReport += constructColumnsHtml(columnHeaderTable, ""); + financialReport += constructTableLine(columnHeaderTable); } else if (printedType == 1) { String[] columnHeaderTable = {boldBegin+_("lima-business.document.label")+boldEnd, boldBegin+_("lima-business.document.amount")+boldEnd}; - financialReport += constructColumnsHtml(columnHeaderTable, ""); + financialReport += constructTableLine(columnHeaderTable); } else { String[] columnHeaderTable = {boldBegin+_("lima-business.document.label")+boldEnd, boldBegin+_("lima-business.document.amount")+boldEnd}; - financialReport += constructColumnsHtml(columnHeaderTable, ""); + financialReport += constructTableLine(columnHeaderTable); } for (FinancialStatementAmounts financialStatementAmount : subFinancialStatementAmounts) { @@ -217,10 +215,10 @@ if (label == null) { if (printedType == 0) { String [] emptyColumn = {"","","",""}; - financialReport += constructColumnsHtml(emptyColumn, fontColor); + financialReport += constructTableLine(emptyColumn); } else { String [] emptyColumn = {"", ""}; - financialReport += constructColumnsHtml(emptyColumn, fontColor); + financialReport += constructTableLine(emptyColumn); } } else { //cell1 @@ -257,14 +255,11 @@ if (printedType == 0) { String [] columns = {tabLabel, grossAmountStr, provisionDeprecationAmountStr, soldeStr}; - financialReport += constructColumnsHtml(columns, ""); + financialReport += constructTableLine(columns); } else /*if (printedType == 1)*/ { String [] columns = {tabLabel, soldeStr}; - financialReport += constructColumnsHtml(columns, ""); - } /*else { - String [] columns = {tabLabel, grossAmountStr, provisionDeprecationAmountStr, soldeStr}; - financialReport += constructColumnsHtml(columns, ""); - }*/ + financialReport += constructTableLine(columns); + } } } i = i + max; @@ -288,13 +283,10 @@ Date endDate) throws LimaException { List<Object> list = new ArrayList<Object>(); - String ledgerReport = ""; - ledgerReport += "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" + - "<html>\n"; + String ledgerReport = constructHtmlHeader(_("lima-business.document.ledger")); if (beginDate != null && endDate != null) { try { - ledgerReport += "<body>\n"; String boldBegin = "<b>"; String boldEnd = "</b>"; @@ -335,22 +327,23 @@ String [] columnsCarryBack = {boldBegin + accountcarry + boldEnd, boldBegin + _("lima-business.document.carryback") + boldEnd, boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, boldBegin + currentAmountDebit.subtract(currentAmountCredit).toString() + boldEnd}; - ledgerReport += constructColumnsHtml(columnsCarryBack, ""); + ledgerReport += constructTableLine(columnsCarryBack); } - ledgerReport += "<table align=\"left\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n" + - "<tr>\n"; + ledgerReport += "<table align=\"left\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n"; - String [] columnsNames = {boldBegin + _("lima-business.document.account")+ boldEnd, boldBegin + _("lima-business.document.debit") + boldEnd, - boldBegin + _("lima-business.document.credit") + boldEnd, boldBegin + _("lima-business.document.solde") + boldEnd}; - ledgerReport += constructColumnsHtml(columnsNames, ""); + String [] columnsNames = {_("lima-business.document.account"), _("lima-business.document.debit"), + _("lima-business.document.credit"), _("lima-business.document.solde")}; + ledgerReport += constructTableHeader(columnsNames); + ledgerReport += "<tbody>\n"; int indexEntry = -1; + boolean even = true; for (Object object : subList) { if (object instanceof ReportsDatas) { if (indexEntry != -1) { indexEntry = -1; - ledgerReport += "</table>" + + ledgerReport += "</tbody></table>" + "</td>" + "</tr>"; } @@ -364,10 +357,10 @@ BigDecimal amountCredit = reportsDatas.getAmountCredit(); BigDecimal amountDebit = reportsDatas.getAmountDebit(); - String [] columnsTable = {boldBegin + accountS + boldEnd, - boldBegin + amountDebit.toString() + boldEnd, boldBegin + amountCredit.toString() + boldEnd, - boldBegin + amountDebit.subtract(amountCredit).toString() + boldEnd}; - ledgerReport += constructColumnsHtml(columnsTable, ""); + String [] columnsTable = {accountS, + amountDebit.toString(), amountCredit.toString(), + amountDebit.subtract(amountCredit).toString()}; + ledgerReport += constructTableHeader(columnsTable); } else { indexEntry++; @@ -388,20 +381,20 @@ ledgerReport +="<tr>"; if (indexEntry == 0) { - ledgerReport += "<td><table align=\"right\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n" + - "<tr>\n"; - String [] columnsEntry = {boldBegin + _("lima-business.document.date")+ boldEnd, - boldBegin + _("lima-business.document.entrybook") + boldEnd, boldBegin + _("lima-business.document.voucher") + boldEnd, - boldBegin + _("lima-business.document.description") + boldEnd, boldBegin + _("lima-business.document.debit") + boldEnd, - boldBegin + _("lima-business.document.credit") + boldEnd, boldBegin + _("lima-business.document.solde") + boldEnd}; - ledgerReport += constructColumnsHtml(columnsEntry, ""); + ledgerReport += "<td><table align=\"right\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n"; + String [] columnsEntry = {_("lima-business.document.date"), + _("lima-business.document.entrybook"), _("lima-business.document.voucher"), + _("lima-business.document.description"), _("lima-business.document.debit"), + _("lima-business.document.credit"), _("lima-business.document.solde")}; + ledgerReport += constructTableHeader(columnsEntry); + ledgerReport += "<tbody>"; } String [] columnsTable = {_("lima-business.document.dateformat",entry.getFinancialTransaction().getTransactionDate()), entryBookCode, entry.getVoucher(), entry.getDescription(), amountDebit.toString(), amountCredit.toString(), amountDebit.subtract(amountCredit).toString()}; - ledgerReport += constructColumnsHtml(columnsTable, ""); - ledgerReport += "</tr>"; + ledgerReport += constructTableLine(columnsTable, even); + even = !even; } } @@ -427,18 +420,20 @@ String [] columnsTable = {"", boldBegin + _("lima-business.document.carryforward") + boldEnd, boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, boldBegin + currentAmountDebit.subtract(currentAmountCredit).toString() + boldEnd}; - ledgerReport += constructColumnsHtml(columnsTable, ""); + ledgerReport += constructTableLine(columnsTable, even); + even = !even; } //final amounts if (i >= n - max) { String [] columnsTable = { boldBegin + _("lima-business.document.amounts") + boldEnd, boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, boldBegin + currentAmountDebit.subtract(currentAmountCredit).toString() + boldEnd}; - ledgerReport += constructColumnsHtml(columnsTable, ""); + ledgerReport += constructTableLine(columnsTable, even); + even = !even; } i = i + max; } - ledgerReport += "</table></body>\n</html>"; + ledgerReport += "</tbody></table></body>\n</html>"; }catch (Exception ex) { log.error("Can't create document", ex); } @@ -452,12 +447,8 @@ String entryBookReport; SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MMMMM yyyy"); try { - entryBookReport = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" + - "<html>\n"; + entryBookReport = constructHtmlHeader(_("lima-business.document.entrybooks")); - String titre = _("lima-business.document.entrybooks"); - entryBookReport += constructHeadHtml(titre); - if (beginDate != null && endDate != null) { ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = @@ -468,7 +459,6 @@ List<ClosedPeriodicEntryBook> closedPeriodicEntryBookList = closedPeriodicEntryBookDAO.findAllByDates(beginDate, endDate); - entryBookReport += "<body>\n"; String journal = ""; for (ClosedPeriodicEntryBook closedPeriodicEntryBook : closedPeriodicEntryBookList) { @@ -508,7 +498,7 @@ entryBookReport += constructSubTitleHtml("", subTitleSecPart); } - entryBookReport += "<p><table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" + + entryBookReport += "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" + "<tr align=\"center\">\n"; String [] columnNames = {_("lima-business.document.date"), _("lima-business.document.accountnumber"), @@ -516,7 +506,7 @@ _("lima-business.document.debit"), _("lima-business.document.credit")}; - entryBookReport += constructColumnsHtml(columnNames, ""); + entryBookReport += constructTableHeader(columnNames); for (Entry entry : entries) { String numaccount = null; @@ -529,10 +519,10 @@ (entry.getDebit() ? entry.getAmount() : BigDecimal.ZERO).toString(), (entry.getDebit() ? BigDecimal.ZERO : entry.getAmount()).toString()}; - entryBookReport += constructColumnsHtml(columnData, ""); + entryBookReport += constructTableHeader(columnData); } String [] columnDataTotal = {"", "", "", _("lima-business.document.amounts"), debit.toString(), credit.toString()}; - entryBookReport += constructColumnsHtml(columnDataTotal, ""); + entryBookReport += constructTableHeader(columnDataTotal); entryBookReport += "</table></p>\n"; } } @@ -556,9 +546,7 @@ List<ReportsDatas> list = (List<ReportsDatas>) balanceTrial.getReportsDatas(); - String balanceReport = ""; - balanceReport += "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" + - "<html>\n"; + String balanceReport = constructHtmlHeader(_("lima-business.document.balance")); if (beginDate != null && endDate != null) { try{ @@ -581,85 +569,15 @@ } List<ReportsDatas> subList = list.subList(i, j); - balanceReport += "<body>\n"; balanceReport += constructHeaderTitle(_("lima-business.document.balance"), beginDate, endDate); - /*balanceReport += "<table>" + - "<tr> " + - "<td>" + - "<table align=\"left\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n" + - "<tr>\n"; + balanceReport += "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n"; - String boldItalicBegin = "<b>" + "<i>"; - String boldItalicEnd = "</i>" + "</b>"; - - String [] columnsNameSociety = {boldItalicBegin + identity.getName()+ boldItalicEnd}; - balanceReport += constructColumnsHtml(columnsNameSociety, ""); - - balanceReport += "<tr>\n"; - String [] columnsDescription = {"<i>" + identity.getDescription()+ "</i>"}; - balanceReport += constructColumnsHtml(columnsDescription, ""); - - balanceReport += "<tr>\n"; - String [] columnsAdressOne = {"<i>" + identity.getAddress() + "</i>"}; - balanceReport += constructColumnsHtml(columnsAdressOne, ""); - - balanceReport += "<tr>\n"; - String [] columnsAdressTwo = {"<i>" + identity.getAddress2() + "</i>"}; - balanceReport += constructColumnsHtml(columnsAdressTwo, ""); - - balanceReport += "<tr>\n"; - String [] columnsZipCode = {"<i>" + identity.getZipCode() + "</i>"}; - balanceReport += constructColumnsHtml(columnsZipCode, ""); - - balanceReport += "<tr>\n"; - String [] columnsCity = {"<i>" + identity.getCity()+ "</i>"}; - balanceReport += constructColumnsHtml(columnsCity, ""); - - balanceReport += "</table>\n" + - "</td>" + - "<td valign=\"middle\" align=\"center\" style=\"width:100%\">" + - "<p style=\"font-size:30px;\">" + _("lima-business.document.balance") + "</p>" + - "</td>" + - "<td>" + - "<table align=\"right\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n"; - - balanceReport += "<tr>\n"; - String [] columnsBusinessNumber = {boldItalicBegin + _("lima-business.document.businessnumber") + - boldItalicEnd, "<i>" + identity.getBusinessNumber()+ "</i>"}; - balanceReport += constructColumnsHtml(columnsBusinessNumber, ""); - - balanceReport += "<tr>\n"; - String [] columnsClassifCode = {boldItalicBegin + _("lima-business.document.classificationcode") + - boldItalicEnd, "<i>" + identity.getClassificationCode()+ "</i>"}; - balanceReport += constructColumnsHtml(columnsClassifCode, ""); - - balanceReport += "<tr>\n"; - String [] columnsVatNumber = {boldItalicBegin + _("lima-business.document.vatnumber") + boldItalicEnd, - "<i>" + identity.getVatNumber()+ "</i>", }; - balanceReport += constructColumnsHtml(columnsVatNumber, ""); - - balanceReport += "<tr>\n"; - String [] columnsPeriodOne = {boldItalicBegin + _("lima-business.document.period1") + boldItalicEnd, "<i>" - + _("lima-business.document.period1format", beginDate)+ "</i>"}; - balanceReport += constructColumnsHtml(columnsPeriodOne, ""); - - balanceReport += "<tr>\n"; - String [] columnsPeriodTwo = {boldItalicBegin + _("lima-business.document.period2") + boldItalicEnd, "<i>" - + _("lima-business.document.period2format", endDate)+ "</i>"}; - balanceReport += constructColumnsHtml(columnsPeriodTwo, ""); - - balanceReport += "</table>" + - "</td>" + - "</table>"*/ - - balanceReport += "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" + - "<tr align=\"center\">\n"; - String [] columnsNames = {_("lima-business.document.accountnumber"), _("lima-business.document.description"), _("lima-business.document.movementdebit"), _("lima-business.document.movementcredit"), _("lima-business.document.soldedebit"), _("lima-business.document.soldecredit")}; - balanceReport += constructColumnsHtml(columnsNames, ""); + balanceReport += constructTableHeader(columnsNames); + balanceReport += "\t\t<tbody>\n"; if (n > max) { String boldBegin = "<b>"; @@ -667,10 +585,11 @@ String [] columnsBalanceAmount = {"", boldBegin + _("lima-business.document.carryback") + boldEnd, boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, boldBegin + currentSoldeDebit.toString() + boldEnd,boldBegin + currentSoldeCredit.toString() + boldEnd}; - balanceReport += constructColumnsHtml(columnsBalanceAmount, ""); - balanceReport += "</table>\n"; + balanceReport += constructTableLine(columnsBalanceAmount); + balanceReport += "</tbody></table>\n"; } + boolean even = true; for (ReportsDatas reportsDatas : subList) { String soldeDebit = String.valueOf(reportsDatas.getSoldeDebit() ? reportsDatas.getAmountSolde() : 0); String soldeCredit = String.valueOf(reportsDatas.getSoldeDebit() ? 0 : reportsDatas.getAmountSolde()); @@ -678,7 +597,8 @@ String [] columnsBalanceAmount = {reportsDatas.getAccount().getAccountNumber(), reportsDatas.getAccount().getLabel(), reportsDatas.getAmountDebit().toString(), reportsDatas.getAmountCredit().toString(), soldeDebit, soldeCredit}; - balanceReport += constructColumnsHtml(columnsBalanceAmount, ""); + balanceReport += constructTableLine(columnsBalanceAmount, even); + even = !even; } for (ReportsDatas reportsDatas : subList) { @@ -697,8 +617,9 @@ String [] columnsBalanceAmount = {"", boldBegin + _("lima-business.document.carryforward") + boldEnd, boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, boldBegin + currentSoldeDebit.toString() + boldEnd,boldBegin + currentSoldeCredit.toString() + boldEnd}; - balanceReport += constructColumnsHtml(columnsBalanceAmount, ""); - balanceReport += "</table>\n"; + balanceReport += constructTableLine(columnsBalanceAmount, even); + even = !even; + balanceReport += "</tbody></table>\n"; } //final amounts @@ -708,8 +629,9 @@ String [] columnsBalanceAmount = {"", boldBegin + _("lima-business.document.amounts") + boldEnd, boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, boldBegin + currentSoldeDebit.toString() + boldEnd,boldBegin + currentSoldeCredit.toString() + boldEnd}; - balanceReport += constructColumnsHtml(columnsBalanceAmount, ""); - balanceReport += "</table>\n"; + balanceReport += constructTableLine(columnsBalanceAmount, even); + even = !even; + balanceReport += "</tbody></table>\n"; } i = i + max; } @@ -731,13 +653,15 @@ String entryBookReport; try { - entryBookReport = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" + - "<html>\n"; + entryBookReport = constructHtmlHeader(_("lima-business.document.entrybook")); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMMMM yyyy"); - String titre = _("lima-business.document.entrybook"); - entryBookReport += constructHeadHtml(titre); - if (beginDate != null && endDate != null) { + String subTitle = _("lima-business.document.period1") + + simpleDateFormat.format(beginDate) + " " + + _("lima-business.document.period2") + + simpleDateFormat.format(endDate); + entryBookReport += constructSubTitleHtml(subTitle); FinancialPeriodDAO financialPeriodDAO = getDaoHelper().getFinancialPeriodDAO(); @@ -815,16 +739,16 @@ generalEntryBooksDatas.setDebit(amountDebit); list.add(generalEntryBooksDatas); - entryBookReport += "<body>\n" + - "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" + - "<tr align=\"center\">\n"; + entryBookReport += "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n"; String[] columnNames = {_("lima-business.document.entrybook"), _("lima-business.document.label"), _("lima-business.document.date"), _("lima-business.document.debit"), _("lima-business.document.credit")}; - entryBookReport += constructColumnsHtml(columnNames, ""); + entryBookReport += constructTableHeader(columnNames); + entryBookReport += "\t\t<tbody>\n"; String entryBookCode = ""; + boolean even = true; for (GeneralEntryBooksDatas generalEntryBooksDataInList : list) { if (!generalEntryBooksDataInList.getDebit().equals(BigDecimal.ZERO) && !generalEntryBooksDataInList.getCredit().equals(BigDecimal.ZERO)) { @@ -843,7 +767,8 @@ _("lima-business.document.monthformat", generalEntryBooksDataInList.getPeriod()), generalEntryBooksDataInList.getDebit().toString(), generalEntryBooksDataInList.getCredit().toString()}; - entryBookReport += constructColumnsHtml(columnData, ""); + entryBookReport += constructTableLine(columnData, even); + even = !even; } else { String amount; if (generalEntryBooksDataInList.getAmount()) { @@ -851,14 +776,18 @@ } else { amount = _("lima-business.document.amountsperiod", generalEntryBooksDataInList.getPeriod()); } - String[] columnDataTotal = {"", "", "<b>"+ (StringUtils.isBlank(amount)?"":amount) + "</b>", + String[] columnDataTotal = {"", "", (StringUtils.isBlank(amount)?"":amount), generalEntryBooksDataInList.getDebit().toString(), generalEntryBooksDataInList.getCredit().toString()}; - entryBookReport += constructColumnsHtml(columnDataTotal, ""); + entryBookReport += constructTableLine(columnDataTotal, even); + even = !even; entryBookCode = ""; } } } + entryBookReport += "\t\t</tbody>\n" + + "\t</table>\n" + + "</body>\n</html>"; } } catch (Exception ex) { throw new LimaException("Can't generate document", ex); @@ -954,10 +883,7 @@ Account accountFormat = accountDAO.findByTopiaId(account); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMMMM yyyy"); - accountReport += "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n" + - "<html>\n"; - String title = _("lima.reports.accounts"); - accountReport = constructHeadHtml(title); + accountReport = constructHtmlHeader(_("lima.reports.accounts")); ReportsDatas results; @@ -975,12 +901,12 @@ _("lima.table.voucher"), _("lima.table.description"), _("lima.table.letter"), _("lima.table.debit"), _("lima.table.credit")}; - accountReport += "<body>\n" + - "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" + - "<tr align=\"center\">\n"; + accountReport += "\t<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n"; - accountReport += constructColumnsHtml(columnNames, ""); - + accountReport += constructTableHeader(columnNames); + accountReport += "\t\t<tbody>\n"; + + boolean even = true; for(Entry entry : entries) { String accountNumber = entry.getAccount().getAccountNumber(); @@ -1000,11 +926,12 @@ (entry.getDebit() ? entry.getAmount() : BigDecimal.ZERO).toString(), (entry.getDebit() ? BigDecimal.ZERO : entry.getAmount()).toString()}; - accountReport += constructColumnsHtml(columnData, ""); + accountReport += constructTableLine(columnData, even); + even = !even; } - accountReport += "</table>\n" + - "</body>\n"; + accountReport += "\t\t</tbody>\n\t</table>\n" + + "</body>\n"; } else { JOptionPane.showMessageDialog(null, _("lima.reports.account.noaccount"), _("lima.reports.account.noaccounttitle"), JOptionPane.INFORMATION_MESSAGE); @@ -1022,45 +949,59 @@ return accountReport; } - protected String constructHeadHtml(String title) { - String head = - "<head>\n" + - "<title>"+title+"</title>\n" + - "</head>\n" + - "<p align=\"center\">" + - "<font size=5>\n" + - title + - "</font>\n" + - "</p>\n" + - "<p>"; - + protected String constructHtmlHeader(String title) { + String head = "<!DOCTYPE html>\n" + + "<html>\n" + + "<head>\n" + + "\t<meta charset=\"UTF-8\" />\n" + + "\t<title>" + title + "</title>\n" + + "</head>\n" + + "<body>\n" + + "\t<h1>" + title + "</h1>\n"; return head; } + protected String constructSubTitleHtml(String subTitle) { + return "\t<h2>" + subTitle + "</h2>\n"; + } + protected String constructSubTitleHtml(String subTitleFirstpart, String subTitleSecPart) { - String subTitle = "<font size=3>\n" + + String subTitle = "\t<h2>\n" + subTitleFirstpart + - "</p>\n" + - "<p>" + + "<br/>\n" + subTitleSecPart + - "</font>"+ - "</p>"; + "</h2>\n"; return subTitle; } - protected String constructColumnsHtml(String[] columnsNames, String fontColor) { - - String columns = ""; - + protected String constructTableHeader(String[] columnsNames) { + String header = "\t\t<thead>\n\t\t\t<tr>\n"; for (String name : columnsNames) { - columns += "<td style=\"background-color:"+fontColor+";\">" + name + "</td>\n"; + header += "\t\t\t\t<th>" + name + "</th>\n"; } - columns += "<tr>\n"; + header += "\t\t\t</tr>\t\t\n</thead>\n"; + return header; + } - - return columns; + protected String constructTableLine(String[] cells, boolean even) { + String style = even ? "line_even" : "line_odd"; + String line = "\t\t<tr class=\"" + style + "\">\n"; + for (String cell : cells) { + line += "\t\t\t<td>" + cell + "</td>\n"; + } + line += "\t\t</tr>\n"; + return line; } + + protected String constructTableLine(String[] cells) { + String line = "\t\t<tr>\n"; + for (String cell : cells) { + line += "\t\t\t<td>" + cell + "</td>\n"; + } + line += "\t\t</tr>\n"; + return line; + } protected String constructHeaderTitle(String title, Date beginDate, Date endDate) { String headerTitle = ""; @@ -1076,59 +1017,47 @@ String boldItalicEnd = "</i>" + "</b>"; String [] columnsNameSociety = {boldItalicBegin + identity.getName()+ boldItalicEnd}; - headerTitle += constructColumnsHtml(columnsNameSociety, ""); + headerTitle += constructTableLine(columnsNameSociety); - headerTitle += "<tr>\n"; String [] columnsDescription = {"<i>" + identity.getDescription()+ "</i>"}; - headerTitle += constructColumnsHtml(columnsDescription, ""); + headerTitle += constructTableLine(columnsDescription); - headerTitle += "<tr>\n"; String [] columnsAdressOne = {"<i>" + identity.getAddress() + "</i>"}; - headerTitle += constructColumnsHtml(columnsAdressOne, ""); - headerTitle += "<tr>\n"; + headerTitle += constructTableLine(columnsAdressOne); String [] columnsAdressTwo = {"<i>" + identity.getAddress2() + "</i>"}; - headerTitle += constructColumnsHtml(columnsAdressTwo, ""); + headerTitle += constructTableLine(columnsAdressTwo); - headerTitle += "<tr>\n"; String [] columnsZipCode = {"<i>" + identity.getZipCode() + "</i>"}; - headerTitle += constructColumnsHtml(columnsZipCode, ""); + headerTitle += constructTableLine(columnsZipCode); - headerTitle += "<tr>\n"; String [] columnsCity = {"<i>" + identity.getCity()+ "</i>"}; - headerTitle += constructColumnsHtml(columnsCity, ""); + headerTitle += constructTableLine(columnsCity); headerTitle += "</table>\n" + "</td>" + - "<td valign=\"middle\" align=\"center\" style=\"width:100%\">" + - "<p style=\"font-size:30px;\">" + title + "</p>" + - "</td>" + "<td>" + "<table align=\"right\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n"; - headerTitle += "<tr>\n"; String [] columnsBusinessNumber = {boldItalicBegin + _("lima-business.document.businessnumber") + boldItalicEnd, "<i>" + identity.getBusinessNumber()+ "</i>"}; - headerTitle += constructColumnsHtml(columnsBusinessNumber, ""); + headerTitle += constructTableLine(columnsBusinessNumber); - headerTitle += "<tr>\n"; String [] columnsClassifCode = {boldItalicBegin + _("lima-business.document.classificationcode") + boldItalicEnd, "<i>" + identity.getClassificationCode()+ "</i>"}; - headerTitle += constructColumnsHtml(columnsClassifCode, ""); + headerTitle += constructTableLine(columnsClassifCode); - headerTitle += "<tr>\n"; String [] columnsVatNumber = {boldItalicBegin + _("lima-business.document.vatnumber") + boldItalicEnd, "<i>" + identity.getVatNumber()+ "</i>", }; - headerTitle += constructColumnsHtml(columnsVatNumber, ""); + headerTitle += constructTableLine(columnsVatNumber); - headerTitle += "<tr>\n"; String [] columnsPeriodOne = {boldItalicBegin + _("lima-business.document.period1") + boldItalicEnd, "<i>" + _("lima-business.document.period1format", beginDate)+ "</i>"}; - headerTitle += constructColumnsHtml(columnsPeriodOne, ""); + headerTitle += constructTableLine(columnsPeriodOne); headerTitle += "<tr>\n"; String [] columnsPeriodTwo = {boldItalicBegin + _("lima-business.document.period2") + boldItalicEnd, "<i>" + _("lima-business.document.period2format", endDate)+ "</i>"}; - headerTitle += constructColumnsHtml(columnsPeriodTwo, ""); + headerTitle += constructTableLine(columnsPeriodTwo); headerTitle += "</table>" + "</td>" +

1 0

r3647 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: . financialtransaction financialtransactionsearch financialtransactionunbalanced lettering
by tchemit＠users.chorem.org 18 Sep '12

18 Sep '12

Author: tchemit Date: 2012-09-18 17:59:06 +0200 (Tue, 18 Sep 2012) New Revision: 3647 Url: http://chorem.org/repositories/revision/lima/3647 Log: fixes #810: Patch affichage du nom de compte (using Decorator API) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java 2012-09-18 15:51:37 UTC (rev 3646) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java 2012-09-18 15:59:06 UTC (rev 3647) @@ -24,9 +24,11 @@ */ package org.chorem.lima.ui; +import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; +import org.nuiton.util.decorator.Decorator; import org.nuiton.util.decorator.DecoratorProvider; /** @@ -41,6 +43,7 @@ protected void loadDecorators() { registerJXPathDecorator(EntryBook.class, "${code}$s - ${label}$s"); + registerJXPathDecorator(Account.class, "${accountNumber}$s - ${label}$s"); registerMultiJXPathDecorator( FiscalPeriod.class, Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-09-18 15:51:37 UTC (rev 3646) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-09-18 15:59:06 UTC (rev 3647) @@ -27,11 +27,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.LimaContext; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorProvider; import javax.swing.table.AbstractTableModel; import java.math.BigDecimal; @@ -59,8 +62,18 @@ protected List<Object> transactionAndEntries; + /** + * To decorate account objects. + */ + protected final Decorator<Account> accountDecorator; + public FinancialTransactionTableModel() { - financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); + financialTransactionService = + LimaServiceFactory.getService(FinancialTransactionService.class); + + DecoratorProvider decoratorProvider = + LimaContext.get().getDecoratorProvider(); + accountDecorator = decoratorProvider.getDecoratorByType(Account.class); } public void setTransactionAndEntries(List<Object> transactionAndEntries) { @@ -190,12 +203,11 @@ result = currentEntry.getVoucher(); break; case 2: // account - if (currentEntry.getAccount() != null) { + if (currentEntry.getAccount() == null) { + result = null; + } else { Account acc = currentEntry.getAccount(); - result = acc.getAccountNumber() + " - " - + acc.getLabel(); - } else { - result = null; + result = accountDecorator.toString(acc); } break; case 3: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2012-09-18 15:51:37 UTC (rev 3646) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2012-09-18 15:59:06 UTC (rev 3647) @@ -37,6 +37,7 @@ import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.LimaContext; import org.chorem.lima.beans.FinancialTransactionSearch; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.FinancialPeriodService; @@ -50,6 +51,8 @@ import org.chorem.lima.entity.FinancialTransactionImpl; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorProvider; /** * Basic transaction table model. @@ -86,7 +89,12 @@ protected List<Object> cacheDataList; + /** + * To decorate account objects. + */ + protected final Decorator<Account> accountDecorator; + /** * Model constructor. * <p/> @@ -101,6 +109,9 @@ financialPeriodService = LimaServiceFactory.getService( FinancialPeriodService.class); + DecoratorProvider decoratorProvider = + LimaContext.get().getDecoratorProvider(); + accountDecorator = decoratorProvider.getDecoratorByType(Account.class); } /** @@ -280,12 +291,11 @@ result = currentEntry.getVoucher(); //Voucher break; case 3: // account - if (currentEntry.getAccount() != null) { + if (currentEntry.getAccount() == null) { + result = null; + } else { Account acc = currentEntry.getAccount(); - result = acc.getAccountNumber() + " - " - + acc.getLabel(); - } else { - result = null; + result = accountDecorator.toString(acc); } break; case 4: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2012-09-18 15:51:37 UTC (rev 3646) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2012-09-18 15:59:06 UTC (rev 3647) @@ -35,6 +35,7 @@ import javax.swing.table.AbstractTableModel; +import org.chorem.lima.LimaContext; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.utils.EntryComparator; @@ -45,6 +46,8 @@ import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorProvider; /** * Basic transaction table model. @@ -53,10 +56,6 @@ * * @author ore * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ */ public class FinancialTransactionUnbalancedTableModel extends AbstractTableModel implements ServiceListener { @@ -73,20 +72,19 @@ protected List<Object> cacheDataList; /** - * collection - * <p/> - * <p/> - * /** - * Model constructor. - * <p/> - * Just init service proxies. + * To decorate account objects. */ + protected final Decorator<Account> accountDecorator; + public FinancialTransactionUnbalancedTableModel() { - /* Services */ financialTransactionService = LimaServiceFactory.getService( FinancialTransactionService.class); LimaServiceFactory.addServiceListener(financialTransactionService, this); + + DecoratorProvider decoratorProvider = + LimaContext.get().getDecoratorProvider(); + accountDecorator = decoratorProvider.getDecoratorByType(Account.class); } /** @@ -268,12 +266,11 @@ result = currentEntry.getVoucher(); break; case 3: // account - if (currentEntry.getAccount() != null) { - Account acc = currentEntry.getAccount(); - result = acc.getAccountNumber() + " - " - + acc.getLabel(); - } else { + if (currentEntry.getAccount() == null) { result = null; + } else { + Account acc = currentEntry.getAccount(); + result = accountDecorator.toString(acc); } break; case 4: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-09-18 15:51:37 UTC (rev 3646) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-09-18 15:59:06 UTC (rev 3647) @@ -25,8 +25,12 @@ package org.chorem.lima.ui.lettering; +import org.chorem.lima.LimaContext; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorProvider; + import javax.swing.table.AbstractTableModel; import java.math.BigDecimal; import java.util.Date; @@ -42,10 +46,6 @@ * * @author ore * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ */ public class LetteringTableModel extends AbstractTableModel{ @@ -62,6 +62,17 @@ protected List<Date> datesEntree; protected List<String> entryBooks; + /** + * To decorate account objects. + */ + protected final Decorator<Account> accountDecorator; + + public LetteringTableModel() { + DecoratorProvider decoratorProvider = + LimaContext.get().getDecoratorProvider(); + accountDecorator = decoratorProvider.getDecoratorByType(Account.class); + } + public List<Entry> getEntries(){ return entries; } @@ -188,10 +199,9 @@ case 0: result = datesEntree.get(row); // date break; - case 1: + case 1: // account Account acc = currentEntry.getAccount(); - result = acc.getAccountNumber() + " - " - + acc.getLabel(); + result = accountDecorator.toString(acc); break; case 2: result = currentEntry.getVoucher();

1 0

r3646 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: financialtransaction financialtransactionsearch financialtransactionunbalanced lettering
by tchemit＠users.chorem.org 18 Sep '12

18 Sep '12

Author: tchemit Date: 2012-09-18 17:51:37 +0200 (Tue, 18 Sep 2012) New Revision: 3646 Url: http://chorem.org/repositories/revision/lima/3646 Log: refs #810: Patch affichage du nom de compte Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-09-18 15:41:42 UTC (rev 3645) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-09-18 15:51:37 UTC (rev 3646) @@ -150,6 +150,7 @@ Object result = transactionAndEntries.get(row); if (result instanceof FinancialTransaction) { + // Transaction "header" line FinancialTransaction currentRow = (FinancialTransaction) result; BigDecimal amountDebit = currentRow.getAmountDebit(); BigDecimal amountCredit = currentRow.getAmountCredit(); @@ -178,6 +179,7 @@ break; } } else if (result instanceof Entry) { + // Transaction content line Entry currentEntry = (Entry) result; switch (column) { @@ -189,7 +191,9 @@ break; case 2: // account if (currentEntry.getAccount() != null) { - result = currentEntry.getAccount().getAccountNumber(); + Account acc = currentEntry.getAccount(); + result = acc.getAccountNumber() + " - " + + acc.getLabel(); } else { result = null; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2012-09-18 15:41:42 UTC (rev 3645) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2012-09-18 15:51:37 UTC (rev 3646) @@ -281,7 +281,9 @@ break; case 3: // account if (currentEntry.getAccount() != null) { - result = currentEntry.getAccount().getAccountNumber(); + Account acc = currentEntry.getAccount(); + result = acc.getAccountNumber() + " - " + + acc.getLabel(); } else { result = null; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2012-09-18 15:41:42 UTC (rev 3645) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2012-09-18 15:51:37 UTC (rev 3646) @@ -216,6 +216,7 @@ result = cacheDataList.get(row); if (result instanceof FinancialTransaction) { + // Values for a transaction "header" FinancialTransaction currentRow = (FinancialTransaction) result; BigDecimal amountDebit = currentRow.getAmountDebit(); BigDecimal amountCredit = currentRow.getAmountCredit(); @@ -254,12 +255,13 @@ break; } } else if (result instanceof Entry) { + // Values for transaction content Entry currentEntry = (Entry) result; switch (column) { case 0: - result = null; // date + result = null; // date, set in header break; - case 1: // entry book + case 1: // entry book, set in header result = null; break; case 2: @@ -267,7 +269,9 @@ break; case 3: // account if (currentEntry.getAccount() != null) { - result = currentEntry.getAccount().getAccountNumber(); + Account acc = currentEntry.getAccount(); + result = acc.getAccountNumber() + " - " + + acc.getLabel(); } else { result = null; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-09-18 15:41:42 UTC (rev 3645) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-09-18 15:51:37 UTC (rev 3646) @@ -189,7 +189,9 @@ result = datesEntree.get(row); // date break; case 1: - result = currentEntry.getAccount().getAccountNumber(); + Account acc = currentEntry.getAccount(); + result = acc.getAccountNumber() + " - " + + acc.getLabel(); break; case 2: result = currentEntry.getVoucher();

1 0

r3645 - trunk/lima-swing/src/main/resources/i18n
by tchemit＠users.chorem.org 18 Sep '12

18 Sep '12

Author: tchemit Date: 2012-09-18 17:41:42 +0200 (Tue, 18 Sep 2012) New Revision: 3645 Url: http://chorem.org/repositories/revision/lima/3645 Log: refs #687: Patch textes (clef i18n en double) Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-09-18 15:10:23 UTC (rev 3644) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-09-18 15:41:42 UTC (rev 3645) @@ -229,7 +229,6 @@ lima.ui.common.error=Erreur lima.ui.common.ok=Ok lima.ui.common.refresh=Actualiser -lima.ui.common.refresh=Rafraîchir lima.ui.common.remove=Supprimer lima.ui.common.solde=Solde lima.ui.common.update=Modifier @@ -328,7 +327,6 @@ lima.ui.importexport.importcsv=Import/Export CSV lima.ui.importexport.importebp=Import/Export EBP lima.ui.importexport.importerror=Une erreur est survenue lors de l'import -lima.ui.importexport.importerror=Echec de l'import lima.ui.importexport.importtitle=Erreur d'import lima.ui.importexport.vatstatements=Plan TVA lima.ui.importexport.wait=Traitement en cours…

1 0

r3644 - in trunk: . lima-swing/src/main/java/org/chorem/lima/ui/home lima-swing/src/main/resources/i18n
by tchemit＠users.chorem.org 18 Sep '12

18 Sep '12

Author: tchemit Date: 2012-09-18 17:10:23 +0200 (Tue, 18 Sep 2012) New Revision: 3644 Url: http://chorem.org/repositories/revision/lima/3644 Log: add C?\195?\169dric as contributor fixes #687: Patch textes (patch apply, thanks!) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties trunk/pom.xml Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2012-09-18 14:56:35 UTC (rev 3643) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2012-09-18 15:10:23 UTC (rev 3644) @@ -101,26 +101,26 @@ log.debug("Rafraîchissement financial transaction pane"); String htmlBegin = "<font face='sans-serif' size=3>" - + "<p style=vertical-align:'bottom', horizontal-align:'center'>"; + + "<p style=vertical-align:'bottom', horizontal-align:'center'>"; String htmlEnd = "</p></font>"; try { List<FiscalPeriod> unblockedFiscalPeriods = - fiscalPeriodService.getAllUnblockedFiscalPeriods(); + fiscalPeriodService.getAllUnblockedFiscalPeriods(); List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); //Au moins un exercice ouvert et un journal ouvert if (unblockedFiscalPeriods.size() != 0 && entryBooks.size() != 0) { - List<FinancialTransaction> financialTransactionsUnbal = - financialTransactionService. - getAllInexactFinancialTransactions(unblockedFiscalPeriods.get(0)); - if (financialTransactionsUnbal.size() > 0) { + List<FinancialTransaction> financialTransactionsInexact = + financialTransactionService. + getAllInexactFinancialTransactions(unblockedFiscalPeriods.get(0)); + if (financialTransactionsInexact.size() > 0) { setBackground(RED_BACKGROUND); - String transactionsString = financialTransactionsUnbal.size() - + " " + _("lima.ui.home.transaction.unbalanced") + String transactionsString = financialTransactionsInexact.size() + + " " + _("lima.ui.home.transaction.inexact") + "<br/><br/><a href='#financialtransactionunbalanced'>" - + _("lima.ui.home.transaction.modifiy.unbalanced") + "</a>"; + + _("lima.ui.home.transaction.modifiy.inexact") + "</a>"; //set Text setText(htmlBegin + transactionsString + htmlEnd); } else { Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-09-18 14:56:35 UTC (rev 3643) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-09-18 15:10:23 UTC (rev 3644) @@ -170,7 +170,7 @@ lima.message.help.usage=Options (set with --option <key> <value>\: lima.misc.supportemail.description=Support email lima.openejb.remotemode.description= -lima.opening.accounts= +lima.opening.accounts=Import accounts from\: lima.preferences=Preferences lima.reports=Reports lima.reports.account.noaccount= @@ -226,13 +226,13 @@ lima.ui.account.updateaccounttitle= lima.ui.common.amountcredit= lima.ui.common.amountdebit= -lima.ui.common.cancel= -lima.ui.common.error= -lima.ui.common.ok= -lima.ui.common.refresh= -lima.ui.common.remove= +lima.ui.common.cancel=Cancel +lima.ui.common.error=Error +lima.ui.common.ok=Ok +lima.ui.common.refresh=Refresh +lima.ui.common.remove=Remove lima.ui.common.solde= -lima.ui.common.update= +lima.ui.common.update=Update lima.ui.entrybook.add= lima.ui.entrybook.code= lima.ui.entrybook.default= @@ -285,32 +285,32 @@ lima.ui.fiscalperiod.entrybooks.create= lima.ui.fiscalperiod.fiscalperiod= lima.ui.fiscalperiod.open= -lima.ui.home.account= -lima.ui.home.chartaccounts.create= -lima.ui.home.chartaccounts.modify= -lima.ui.home.chartaccounts.nothing= -lima.ui.home.chartaccounts.state1_2= -lima.ui.home.chartaccounts.state2_2= -lima.ui.home.daily= -lima.ui.home.entrybooks= -lima.ui.home.entrybooks.create= -lima.ui.home.entrybooks.modify= -lima.ui.home.entrybooks.nothing= -lima.ui.home.entrybooks.state.single= -lima.ui.home.entrybooks.state1_2.plural= -lima.ui.home.entrybooks.state2_2.plural= +lima.ui.home.account=Chart of accounts +lima.ui.home.chartaccounts.create=Create the chart of accounts +lima.ui.home.chartaccounts.modify=Edit the chart of accounts +lima.ui.home.chartaccounts.nothing=No account set\! +lima.ui.home.chartaccounts.state1_2=The chart of accounts has +lima.ui.home.chartaccounts.state2_2=accounts +lima.ui.home.daily=Daily tasks +lima.ui.home.entrybooks=Books +lima.ui.home.entrybooks.create=Create books +lima.ui.home.entrybooks.modify=Edit books +lima.ui.home.entrybooks.nothing=No book +lima.ui.home.entrybooks.state.single=The book is\: +lima.ui.home.entrybooks.state1_2.plural=The +lima.ui.home.entrybooks.state2_2.plural=books are\: lima.ui.home.fiscalperiod.closed= lima.ui.home.fiscalperiod.create= lima.ui.home.fiscalperiod.modify= lima.ui.home.fiscalperiod.noopen= lima.ui.home.fiscalperiod.opened= -lima.ui.home.fiscalyear= -lima.ui.home.transaction.balanced= -lima.ui.home.transaction.create= -lima.ui.home.transaction.modifiy.balanced= -lima.ui.home.transaction.modifiy.unbalanced= -lima.ui.home.transaction.nothing= -lima.ui.home.transaction.unbalanced= +lima.ui.home.fiscalyear=Fiscal year +lima.ui.home.transaction.balanced=moves, all balanced +lima.ui.home.transaction.create=Add moves +lima.ui.home.transaction.inexact=moves are not valid\! +lima.ui.home.transaction.modifiy.balanced=Edit moves +lima.ui.home.transaction.modifiy.inexact=Edit incorrect moves +lima.ui.home.transaction.nothing=No move lima.ui.importexport.accountcharts=Accounts chart lima.ui.importexport.all=All lima.ui.importexport.csv=Import/Export CSV @@ -327,7 +327,7 @@ lima.ui.importexport.import.vatpdfimport=The PDF has been imported. It can be found inside the Lima resources directory lima.ui.importexport.importcsv= lima.ui.importexport.importebp= -lima.ui.importexport.importerror= +lima.ui.importexport.importerror=An error has occured during import lima.ui.importexport.importtitle= lima.ui.importexport.vatstatements=VAT chart lima.ui.importexport.wait=Job in progress… @@ -353,11 +353,11 @@ lima.ui.lettering.selectSolde=Balance lima.ui.mainview.title=Lutin Invoice Monitoring and Accounting lima.ui.opening.accounts=<html><center>Select a default, <br/>import your personnal<br/> or cancel to create your own account chart.</center></html> -lima.ui.opening.close= -lima.ui.opening.end= -lima.ui.opening.entrybook=<html>Tick box to import default accounts chart\:<br/> Achats, Ventes, Trésorerie, Opération diverses</html> -lima.ui.opening.import=Import a CSV Save -lima.ui.opening.next= +lima.ui.opening.close=Close +lima.ui.opening.end=Finish +lima.ui.opening.entrybook=<html>Tick box to import default accounts chart\:<br/> Achats, Ventes, Trésorerie, Opération diverses</html> +lima.ui.opening.import=Import a CSV backup +lima.ui.opening.next=Next lima.ui.opening.title= lima.ui.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR import instantanly your already existing save in CSV format<br/><br/><br/><br/></center></html> lima.vatreport.listerror=Can't get entries list Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-09-18 14:56:35 UTC (rev 3643) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-09-18 15:10:23 UTC (rev 3644) @@ -169,7 +169,7 @@ lima.message.help.usage=Options (set with --option <key> <value>\: lima.misc.supportemail.description=Adresse email de support lima.openejb.remotemode.description= -lima.opening.accounts= +lima.opening.accounts=Importer le plan de comptes depuis \: lima.preferences=Préférences lima.reports=Rapports lima.reports.account.noaccount= @@ -228,6 +228,7 @@ lima.ui.common.cancel=Annuler lima.ui.common.error=Erreur lima.ui.common.ok=Ok +lima.ui.common.refresh=Actualiser lima.ui.common.refresh=Rafraîchir lima.ui.common.remove=Supprimer lima.ui.common.solde=Solde @@ -304,12 +305,12 @@ lima.ui.home.fiscalperiod.noopen=Aucun exercice ouvert \! lima.ui.home.fiscalperiod.opened=exercices ouverts lima.ui.home.fiscalyear=Exercices -lima.ui.home.transaction.balanced=transactions, toutes sont équilibrées +lima.ui.home.transaction.balanced=écritures, toutes sont équilibrées lima.ui.home.transaction.create=Ajouter des écritures +lima.ui.home.transaction.inexact=écritures ne sont pas valides \! lima.ui.home.transaction.modifiy.balanced=Modifier les écritures -lima.ui.home.transaction.modifiy.unbalanced=Modifier les écritures incorrectes +lima.ui.home.transaction.modifiy.inexact=Modifier les écritures incorrectes lima.ui.home.transaction.nothing=Aucune écriture -lima.ui.home.transaction.unbalanced=transactions ne sont pas équilibrées \! lima.ui.importexport.accountcharts=Plan des comptes lima.ui.importexport.all=Tout lima.ui.importexport.csv=Import/Export CSV @@ -326,6 +327,7 @@ lima.ui.importexport.import.vatpdfimport=Le PDF a bien été importé dans le répertoire des ressources de Lima lima.ui.importexport.importcsv=Import/Export CSV lima.ui.importexport.importebp=Import/Export EBP +lima.ui.importexport.importerror=Une erreur est survenue lors de l'import lima.ui.importexport.importerror=Echec de l'import lima.ui.importexport.importtitle=Erreur d'import lima.ui.importexport.vatstatements=Plan TVA @@ -344,7 +346,7 @@ lima.ui.lettering.checkLettredEntry=Lettrées lima.ui.lettering.checkNoLettredEntry=Non-lettrées lima.ui.lettering.endFinancialPeriod=A -lima.ui.lettering.entry=Ecritures +lima.ui.lettering.entry=Écritures lima.ui.lettering.period=Périodes lima.ui.lettering.selectCredit=Crédit lima.ui.lettering.selectDebit=Débit @@ -353,7 +355,7 @@ lima.ui.mainview.title=Lutin Invoice Monitoring and Accounting lima.ui.opening.accounts=<html><center>Veuillez sélectionner un plan par défault, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> lima.ui.opening.close=Fermer -lima.ui.opening.end= +lima.ui.opening.end=Terminer lima.ui.opening.entrybook=<html>Cochez la case pour importer les journaux par défaut \:<br/> Achats, Ventes, Trésorerie, Opération diverses</html> lima.ui.opening.import=Importer une sauvegarde CSV lima.ui.opening.next=Suivant Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-18 14:56:35 UTC (rev 3643) +++ trunk/pom.xml 2012-09-18 15:10:23 UTC (rev 3644) @@ -312,6 +312,16 @@ <contributors> <contributor> + <name>Cédric Houbart</name> + <email>cedric(a)scil.coop</email> + <organization>scil.coop</organization> + <organizationUrl>http://www.scil.coop/</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </contributor> + <contributor> <name>Rémi Chapelet</name> <email>chapelet(a)codelutin.com</email> <organization>Code Lutin</organization>

1 0

r3643 - trunk/lima-swing
by tchemit＠users.chorem.org 18 Sep '12

18 Sep '12

Author: tchemit Date: 2012-09-18 16:56:35 +0200 (Tue, 18 Sep 2012) New Revision: 3643 Url: http://chorem.org/repositories/revision/lima/3643 Log: fixes #760: Licence et ?\194?\171 tierce party ?\194?\187 manquantes Modified: trunk/lima-swing/pom.xml Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-08-30 14:45:24 UTC (rev 3642) +++ trunk/lima-swing/pom.xml 2012-09-18 14:56:35 UTC (rev 3643) @@ -234,6 +234,20 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>update-project-license</goal> + <goal>add-third-party</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> <pluginManagement>

1 0