Author: jpepin Date: 2010-06-23 18:26:43 +0200 (Wed, 23 Jun 2010) New Revision: 2946 Url: http://chorem.org/repositories/revision/lima/2946 Log: G?\195?\169n?\195?\169ration bilan et compte de r?\195?\169sultat (suite). Ajout d'un champ de calcul ?\195?\160 partir d'une extension de compte, pour calculer le r?\195?\169sultat. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java trunk/lima-callao/src/main/xmi/accounting.zargo trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.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 Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -302,20 +302,22 @@ // Check rules for account if have entries accountingRules.removeAccountRules(account, transaction); - + + // remove account + Account accountToDelete = accountDAO.findByTopiaId(account.getTopiaId()); + accountDAO.delete(accountToDelete); + //get all subaccounts List<Account> accounts = getAllChildrenAccounts(account, new ArrayList<Account>()); - //if account have sub accounts if (accounts.size() > 0){ for (Account subAccount : accounts) { // Check rules for subaccount if have entries - accountingRules.removeAccountRules(account, transaction); - accountDAO.delete(subAccount); + accountingRules.removeAccountRules(subAccount, transaction); + Account subAccountToDelete = accountDAO.findByTopiaId(subAccount.getTopiaId()); + accountDAO.delete(subAccountToDelete); } } - // remove account - accountDAO.delete(account); //commit commitTransaction(transaction); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -21,11 +21,15 @@ import static org.nuiton.i18n.I18n._; import java.util.ArrayList; -import java.util.Collection; import java.util.Date; +import java.util.HashSet; import java.util.List; +import java.util.StringTokenizer; + import javax.ejb.EJB; import javax.ejb.Stateless; + +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.FinancialStatementAmounts; @@ -125,20 +129,24 @@ TopiaContext transaction = null; try { transaction = beginTransaction(); - FinancialStatementDAO financialStatementHeaderDAO = + FinancialStatementDAO financialStatementDAO = LimaCallaoDAOHelper.getFinancialStatementDAO(transaction); - //get all subFinancialStatementHeader and FinancialStatementMovement + + // remove financialstatement + FinancialStatement financialStatementToDelete = financialStatementDAO.findByTopiaId(financialStatement.getTopiaId()); + financialStatementDAO.delete(financialStatementToDelete); + + //get all subFinancialStatement List<FinancialStatement> financialStatements = getAllChildrenFinancialStatement(financialStatement, new ArrayList<FinancialStatement>()); - //if FinancialStatementHeader have subFinancialStatementHeader + //if FinancialStatement have subFinancialStatement if (financialStatements.size() > 0){ for (FinancialStatement subFinancialStatement : financialStatements) { - financialStatementHeaderDAO.delete(subFinancialStatement); + FinancialStatement subFinancialStatementToDelete = financialStatementDAO.findByTopiaId(subFinancialStatement.getTopiaId()); + financialStatementDAO.delete(subFinancialStatementToDelete); } } - // remove account - financialStatementHeaderDAO.delete(financialStatement); //commit commitTransaction(transaction); @@ -180,7 +188,8 @@ TopiaQuery query = financialStatementDAO.createQuery(); - query.addEquals("masterFinancialStatement", masterFinancialStatement); + query.addEquals("masterFinancialStatement", masterFinancialStatement) + .addOrder(FinancialStatement.LABEL); financialStatements = financialStatementDAO.findAllByQuery(query); } catch (TopiaException ex) { @@ -259,9 +268,40 @@ FinancialStatementDatas financialStatementDatas = financialStatementReport(subFinancialStatement, selectedBeginDate, selectedEndDate, result, topiaContext); grossAmount += financialStatementDatas.getFinancialStatementAmounts().getGrossAmount(); provisionDeprecationAmount += financialStatementDatas.getFinancialStatementAmounts().getProvisionDeprecationAmount(); - subResult.add(financialStatementDatas.getFinancialStatementAmounts()); - if (financialStatementDatas.getListResult() != null){ - subResult.addAll(financialStatementDatas.getListResult()); + + + FinancialStatementAmounts headerfinancialStatementAmounts = financialStatementDatas.getFinancialStatementAmounts(); + //Si sous-total + if (subFinancialStatement.getSubAmount()){ + FinancialStatementAmounts header = new FinancialStatementAmountsImpl(); + header.setLabel(headerfinancialStatementAmounts.getLabel()); + header.setLevel(headerfinancialStatementAmounts.getLevel()); + header.setHeader(true); + //ajoute header + subResult.add(header); + //ajoute liste + if (financialStatementDatas.getListResult() != null){ + subResult.addAll(financialStatementDatas.getListResult()); + } + //ajoute sstotal + FinancialStatementAmounts subAmount = new FinancialStatementAmountsImpl(); + subAmount.setLabel("TOTAL "+headerfinancialStatementAmounts.getLabel()); + subAmount.setLevel(headerfinancialStatementAmounts.getLevel()); + subAmount.setGrossAmount(headerfinancialStatementAmounts.getGrossAmount()); + subAmount.setProvisionDeprecationAmount(headerfinancialStatementAmounts.getProvisionDeprecationAmount()); + subAmount.setSubAmount(true); + subResult.add(subAmount); + //ajoute ligne vide + subResult.add(new FinancialStatementAmountsImpl()); + + }//sinon + else { + //ajoute head avec amount + subResult.add(headerfinancialStatementAmounts); + //ajoute liste + if (financialStatementDatas.getListResult() != null){ + subResult.addAll(financialStatementDatas.getListResult()); + } } } } @@ -290,52 +330,121 @@ new FinancialStatementAmountsImpl(); try { + // DEBIT & CREDIT String accountsString = financialStatement.getAccounts(); - List<Account> accountsList = accountServiceLocal. - stringToListAccountsWithTransaction(accountsString, topiaContext); Double amount = 0.0; - for (Account account : accountsList) { - ReportsDatas reportsDatas = reportServiceLocal. - generateAccountReportsWithTransaction(account, - selectedBeginDate, selectedEndDate, topiaContext); - amount += reportsDatas.getAmountSolde(); + if (accountsString != null){ + List<Account> accountsList = accountServiceLocal. + stringToListAccountsWithTransaction(accountsString, topiaContext); + for (Account account : accountsList) { + ReportsDatas reportsDatas = reportServiceLocal. + generateAccountReportsWithTransaction(account, + selectedBeginDate, selectedEndDate, topiaContext); + amount += reportsDatas.getAmountSolde(); + } } + // CREDIT String creditAccountsString = financialStatement.getCreditAccounts(); - List<Account> creditAccountsList = accountServiceLocal. - stringToListAccountsWithTransaction(creditAccountsString, topiaContext); Double creditAmount = 0.0; - for (Account account : creditAccountsList) { - ReportsDatas reportsDatas = reportServiceLocal. - generateAccountReportsWithTransaction(account, - selectedBeginDate, selectedEndDate, topiaContext); - creditAmount += reportsDatas.getAmountCredit(); + if (creditAccountsString != null){ + List<Account> creditAccountsList = accountServiceLocal. + stringToListAccountsWithTransaction(creditAccountsString, topiaContext); + for (Account account : creditAccountsList) { + ReportsDatas reportsDatas = reportServiceLocal. + generateAccountReportsWithTransaction(account, + selectedBeginDate, selectedEndDate, topiaContext); + creditAmount += reportsDatas.getAmountCredit(); + } } + + // DEBIT String debitAccountsString = financialStatement.getDebitAccounts(); - List<Account> debitAccountsList = accountServiceLocal. - stringToListAccountsWithTransaction(debitAccountsString, topiaContext); Double debitAmount = 0.0; - for (Account account : debitAccountsList) { - ReportsDatas reportsDatas = reportServiceLocal. - generateAccountReportsWithTransaction(account, - selectedBeginDate, selectedEndDate, topiaContext); - debitAmount += reportsDatas.getAmountCredit(); + if (debitAccountsString != null){ + List<Account> debitAccountsList = accountServiceLocal. + stringToListAccountsWithTransaction(debitAccountsString, topiaContext); + for (Account account : debitAccountsList) { + ReportsDatas reportsDatas = reportServiceLocal. + generateAccountReportsWithTransaction(account, + selectedBeginDate, selectedEndDate, topiaContext); + debitAmount += reportsDatas.getAmountCredit(); + } } + + // PROVISION & DEPRECATION String provisionDeprecationAccountsString = financialStatement.getProvisionDeprecationAccounts(); - List<Account> provisionDeprecationAccountsList = accountServiceLocal. + Double provisionDeprecationAmount = 0.0; + if (provisionDeprecationAccountsString != null){ + List<Account> provisionDeprecationAccountsList = accountServiceLocal. stringToListAccountsWithTransaction(provisionDeprecationAccountsString, topiaContext); - Double provisionDeprecationAmount = 0.0; - for (Account account : provisionDeprecationAccountsList) { - ReportsDatas reportsDatas = reportServiceLocal. - generateAccountReportsWithTransaction(account, - selectedBeginDate, selectedEndDate, topiaContext); - provisionDeprecationAmount += reportsDatas.getAmountSolde(); + for (Account account : provisionDeprecationAccountsList) { + ReportsDatas reportsDatas = reportServiceLocal. + generateAccountReportsWithTransaction(account, + selectedBeginDate, selectedEndDate, topiaContext); + provisionDeprecationAmount += reportsDatas.getAmountSolde(); + } } + - financialStatementAmounts.setGrossAmount(amount+creditAmount+debitAmount); + // FORMULA + String formulaString = + financialStatement.getFormula(); + Double formulaAmount = 0.0; + if (formulaString != null){ + //Remove Spaces + formulaString = StringUtils.deleteWhitespace(formulaString); + log.debug(formulaString); + //Split simple quote + StringTokenizer stQuote = new StringTokenizer(formulaString, "'"); + while (stQuote.hasMoreTokens()) { + String s = stQuote.nextToken(); + log.debug(s); + if (s.contentEquals("-")){ + s = stQuote.nextToken(); + List<Account> accountsStringList = accountServiceLocal. + stringToListAccountsWithTransaction(s, topiaContext); + Double resAmount = 0.0; + for (Account accountString : accountsStringList) { + ReportsDatas reportsDatas = reportServiceLocal. + generateAccountReportsWithTransaction(accountString, + selectedBeginDate, selectedEndDate, topiaContext); + resAmount += reportsDatas.getAmountSolde(); + } + formulaAmount-=resAmount; + } + else if (s.contains("-")){ + List<Account> accountsStringList = accountServiceLocal. + stringToListAccountsWithTransaction(s, topiaContext); + Double resAmount = 0.0; + for (Account accountString : accountsStringList) { + ReportsDatas reportsDatas = reportServiceLocal. + generateAccountReportsWithTransaction(accountString, + selectedBeginDate, selectedEndDate, topiaContext); + resAmount += reportsDatas.getAmountSolde(); + } + formulaAmount+=resAmount; + } + else{ + List<Account> accountsStringList = accountServiceLocal. + stringToListAccountsWithTransaction(s, topiaContext); + Double resAmount = 0.0; + for (Account accountString : accountsStringList) { + ReportsDatas reportsDatas = reportServiceLocal. + generateAccountReportsWithTransaction(accountString, + selectedBeginDate, selectedEndDate, topiaContext); + resAmount += reportsDatas.getAmountSolde(); + } + formulaAmount+=resAmount;} + } + } + + + // set result + financialStatementAmounts.setGrossAmount(amount+creditAmount+debitAmount+formulaAmount); financialStatementAmounts.setLabel(financialStatement.getLabel()); financialStatementAmounts.setProvisionDeprecationAmount(provisionDeprecationAmount); financialStatementAmounts.setLevel( Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2010-06-23 16:26:43 UTC (rev 2946) @@ -145,7 +145,7 @@ <JMenuItem text="lima.reports.entrybooks" onActionPerformed='getHandler().showEntryBookReports(this)'/> <JMenuItem text="lima.reports.balance" onActionPerformed='getHandler().showBalanceView(this)'/> <JMenuItem text="lima.reports.ledger" onActionPerformed='getHandler().showLedgerView(this)'/> - <JMenuItem text="lima.financialstatementreports" onActionPerformed='getHandler().showFinancialStatementReportsView(this)' actionIcon='rapport'/> + <JMenuItem text="lima.reports.financialstatement" onActionPerformed='getHandler().showFinancialStatementReportsView(this)' actionIcon='rapport'/> </JMenu> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableModel.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableModel.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -70,10 +70,10 @@ String res = null; switch (column) { case 0: - res = _("lima.account.number"); + res = _("lima.table.number"); break; case 1: - res = _("lima.account.label"); + res = _("lima.table.label"); break; } return res; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -103,22 +103,22 @@ String res = "n/a"; switch (column) { case 0: - res = _("lima.transaction.column.date"); //Date + res = _("lima.table.date"); //Date break; case 1: - res = _("lima.transaction.column.entrybook"); //EntryBook + res = _("lima.table.entrybook"); //EntryBook break; case 2: - res = _("lima.transaction.column.voucher"); // Voucher + res = _("lima.table.voucher"); // Voucher break; case 3: - res = _("lima.transaction.column.description"); //Description + res = _("lima.table.description"); //Description break; case 4: - res = _("lima.transaction.column.debit"); //Debit + res = _("lima.table.debit"); //Debit break; case 5: - res = _("lima.transaction.column.credit"); //Credit + res = _("lima.table.credit"); //Credit break; } return res; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -92,22 +92,22 @@ String res = "n/a"; switch (column) { case 0: - res = _("lima.account.number"); // Numero de compte + res = _("lima.table.number"); // Numero de compte break; case 1: - res = _("lima.account.label"); // Label + res = _("lima.table.label"); // Label break; case 2: - res = _("lima.balance.move.debit"); // Total Debit + res = _("lima.table.move.debit"); // Total Debit break; case 3: - res = _("lima.balance.move.credit"); // Total Credit + res = _("lima.table.move.credit"); // Total Credit break; case 4: - res = _("lima.balance.solde.debit"); //Solde Debit + res = _("lima.table.solde.debit"); //Solde Debit break; case 5: - res = _("lima.balance.solde.credit"); //Solde Credit + res = _("lima.table.solde.credit"); //Solde Credit break; } return res; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -80,13 +80,13 @@ String res = "n/a"; switch (column) { case 0: - res = _("lima.entrybook.code"); + res = _("lima.table.code"); break; case 1: - res = _("lima.entrybook.label"); + res = _("lima.table.label"); break; case 2: - res = _("lima.entrybook.type"); + res = _("lima.table.type"); break; } return res; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -102,22 +102,22 @@ String res = "n/a"; switch (column) { case 0: - res = _("lima.transaction.column.date"); //Date + res = _("lima.table.date"); //Date break; case 1: - res = _("lima.transaction.column.account"); //Account + res = _("lima.table.account"); //Account break; case 2: - res = _("lima.transaction.column.voucher"); // Voucher + res = _("lima.table.voucher"); // Voucher break; case 3: - res = _("lima.transaction.column.description"); //Description + res = _("lima.table.description"); //Description break; case 4: - res = _("lima.transaction.column.debit"); //Debit + res = _("lima.table.debit"); //Debit break; case 5: - res = _("lima.transaction.column.credit"); //Credit + res = _("lima.table.credit"); //Credit break; } return res; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -82,13 +82,13 @@ switch(columnIndex) { case 0 : - result = _("lima.model.period"); + result = _("lima.table.period"); break; case 1: - result = _("lima.entrybook"); + result = _("lima.table.entrybook"); break; case 2: - result = _("lima.closure"); + result = _("lima.table.closure"); break; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -69,7 +69,7 @@ String res = null; switch (column) { case 0: - res = _("lima.account.label"); + res = _("lima.table.label"); break; } return res; @@ -195,7 +195,7 @@ /** - * Update financialStatementHeader. + * Update financialStatement * * @param path * @param account @@ -210,7 +210,7 @@ /** - * Remove financialStatementHeader or financialStatementMovement + * Remove financialStatement * * @param path * @param object Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -48,11 +48,7 @@ private static final Log log = LogFactory.getLog(FinancialStatementChartViewHandler.class); protected FinancialStatementChartView view; - - protected JXTreeTable treeTable; - - protected FinancialStatementChartTreeTableModel treeTableModel; - + protected FinancialStatementChartViewHandler(FinancialStatementChartView view) { this.view = view; } @@ -61,10 +57,10 @@ * Add new account with account form. */ public void addFinancialStatementHeader() { - treeTable = view.getTreeTable(); - treeTableModel = - (FinancialStatementChartTreeTableModel) treeTable.getTreeTableModel(); + JXTreeTable treeTable = view.getTreeTable(); + FinancialStatementChartTreeTableModel treeTableModel = (FinancialStatementChartTreeTableModel) treeTable.getTreeTableModel(); + FinancialStatement newFinancialStatementHeader = new FinancialStatementImpl(); FinancialStatementHeaderForm financialStatementHeaderForm = new FinancialStatementHeaderForm(view); financialStatementHeaderForm.setFinancialStatement(newFinancialStatementHeader); @@ -107,9 +103,8 @@ public void addFinancialStatementMovement(){ - treeTable = view.getTreeTable(); - treeTableModel = - (FinancialStatementChartTreeTableModel) treeTable.getTreeTableModel(); + JXTreeTable treeTable = view.getTreeTable(); + FinancialStatementChartTreeTableModel treeTableModel = (FinancialStatementChartTreeTableModel) treeTable.getTreeTableModel(); FinancialStatement newFinancialStatementMovement = new FinancialStatementImpl(); FinancialStatementMovementForm financialStatementMovementForm = new FinancialStatementMovementForm(view); @@ -151,9 +146,8 @@ */ public void updateFinancialStatement() { - treeTable = view.getTreeTable(); - treeTableModel = - (FinancialStatementChartTreeTableModel) treeTable.getTreeTableModel(); + JXTreeTable treeTable = view.getTreeTable(); + FinancialStatementChartTreeTableModel treeTableModel = (FinancialStatementChartTreeTableModel) treeTable.getTreeTableModel(); // get selected account int selectedRow = view.treeTable.getSelectedRow(); @@ -207,9 +201,8 @@ * Ask for user to remove for selected account, and remove it if confirmed. */ public void removeFinancialStatement() { - treeTable = view.getTreeTable(); - treeTableModel = - (FinancialStatementChartTreeTableModel) treeTable.getTreeTableModel(); + JXTreeTable treeTable = view.getTreeTable(); + FinancialStatementChartTreeTableModel treeTableModel = (FinancialStatementChartTreeTableModel) treeTable.getTreeTableModel(); // Any row selected int selectedRow = view.treeTable.getSelectedRow(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx 2010-06-23 16:26:43 UTC (rev 2946) @@ -86,6 +86,17 @@ onRemoveUpdate='getFinancialStatement().setProvisionDeprecationAccounts(getProvisionDeprecationAccountsTextField().getText())' /> </cell> </row> + <row> + <cell fill="horizontal"> + <JLabel text="lima.financialstatement.formula"/> + </cell> + <cell fill="horizontal"> + <JTextField id="formulaTextField" text="{getFinancialStatement().getFormula()}"/> + <javax.swing.text.Document javaBean="getFormulaTextField().getDocument()" + onInsertUpdate='getFinancialStatement().setFormula(getFormulaTextField().getText())' + onRemoveUpdate='getFinancialStatement().setFormula(getFormulaTextField().getText())' /> + </cell> + </row> <row> <cell fill="none"> <JButton text="lima.common.ok" onActionPerformed="dispose()"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.beans.FinancialStatementAmounts; import org.chorem.lima.business.FinancialPeriodService; import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.ClosedPeriodicEntryBook; @@ -66,7 +67,7 @@ //highlight financial financial transactions colorTitle1(); - // addTitle2(); + colorTitle2(); //Renderer for font FinancialStatementReportTableCellRenderer renderer = new FinancialStatementReportTableCellRenderer(); @@ -77,7 +78,7 @@ } /* - * Color the background row in grey if the month number is even (pair in french) + * Color the background row in grey if the level is 1 */ protected void colorTitle1() { @@ -87,11 +88,10 @@ public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { Boolean result = false; - FinancialStatement financialStatementHeader = new FinancialStatementImpl(); Object object = model.getElementAt(adapter.row); - if (model.getElementAt(adapter.row) instanceof FinancialStatement){ - financialStatementHeader = (FinancialStatement) object; - result = financialStatementHeader.getLevel() == 1; + if (model.getElementAt(adapter.row) instanceof FinancialStatementAmounts){ + FinancialStatementAmounts financialStatementAmounts = (FinancialStatementAmounts) object; + result = financialStatementAmounts.getLevel() == 1; } return result; } @@ -102,32 +102,27 @@ } /* - * Color the font in red if period are closed + * Color the background in light grey if is a subamount */ - protected void addTitle2() { - /* HighlightPredicate predicate = new HighlightPredicate() { - @Override - public boolean isHighlighted(Component renderer, - ComponentAdapter adapter) { - ClosedPeriodicEntryBook closedPeriodicEntryBook = - new ClosedPeriodicEntryBookImpl(); - ClosedPeriodicEntryBook selectedClosedPeriodicEntryBook = - (ClosedPeriodicEntryBook) model.getElementAt(adapter.row); - // true if locked - try { - closedPeriodicEntryBook = - financialPeriodService.getClosedPeriodicEntryBook( - selectedClosedPeriodicEntryBook.getEntryBook(), - selectedClosedPeriodicEntryBook.getFinancialPeriod()); - } catch (LimaException eee) { - log.debug("Can't get closePeriodicEntryBook",eee); - } - return (closedPeriodicEntryBook.getLocked()); - } - }; - colorTransaction = - new ColorHighlighter(predicate, null, new Color(222,0,0)); - addHighlighter(colorTransaction);*/ - } + protected void colorTitle2() { + + + HighlightPredicate predicate = new HighlightPredicate() { + @Override + public boolean isHighlighted(Component renderer, + ComponentAdapter adapter) { + Boolean result = false; + Object object = model.getElementAt(adapter.row); + if (model.getElementAt(adapter.row) instanceof FinancialStatementAmounts){ + FinancialStatementAmounts financialStatementAmounts = (FinancialStatementAmounts) object; + result = financialStatementAmounts.getSubAmount(); + } + return result; + } + }; + colorTransaction = + new ColorHighlighter(predicate, new Color(244,244,244), null); + addHighlighter(colorTransaction); + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -46,32 +46,24 @@ table, value, isSelected, hasFocus, row, column); // Si le bilan est un soustotal, alors la ligne est en gras - if (object instanceof FinancialStatement){ - FinancialStatement financialStatementHeader = (FinancialStatement) object; + if (object instanceof FinancialStatementAmounts){ + FinancialStatementAmounts financialStatementAmounts = (FinancialStatementAmounts) object; - if (financialStatementHeader.getLevel() == 1) + if (financialStatementAmounts.getLevel() == 1) { setFont(new Font("Verdana", Font.BOLD, 14)); } - if (financialStatementHeader.getLevel() == 2) + if (financialStatementAmounts.getHeader()) { setFont(new Font("Verdana", Font.BOLD, 12)); } - } - else { - - if (column == 0){ - cell.setFont(new Font("Verdana", Font.ITALIC, 12)); - } - if (object instanceof FinancialStatementAmounts){ - if (((FinancialStatementAmounts) object).getHeader()){ - cell.setFont(new Font("Verdana", Font.BOLD, 12)); + if (!financialStatementAmounts.getHeader() && !financialStatementAmounts.getSubAmount()){ + if (column == 0){ + cell.setFont(new Font("Verdana", Font.ITALIC, 12)); } - } - + } } - // Alignement des cellules /* switch (column) { case 0: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -64,9 +64,6 @@ /** DatePicker EndDate. */ protected Date selectedEndDate; - /** Text field Accounts */ - protected String selectedAccounts; - /** data cache */ protected List<FinancialStatementAmounts> cacheDataList; @@ -121,48 +118,44 @@ public Object getValueAt(int row, int column) { Object result = cacheDataList.get(row); //get entries for the period for the current row - if (result instanceof FinancialStatement) { - FinancialStatement currentRow = (FinancialStatement) result; - switch (column) { - case 0: - result = ""; - for (int i = 0; i < currentRow.getLevel(); i++) { - result = result+"\t"; - } - result = result+currentRow.getLabel(); - break; - case 1: - result = null; - break; - case 2: - result = null; - break; - case 3: - result = null; - break; - } - - } - else { + if (result instanceof FinancialStatementAmounts) { FinancialStatementAmounts currentRow = (FinancialStatementAmounts) result; Double grossAmount = currentRow.getGrossAmount(); Double provisionDeprecationAmount = currentRow.getProvisionDeprecationAmount(); switch (column) { - case 0: + case 0: result = ""; - for (int i = 0; i <= currentRow.getLevel(); i++) { - result = result+"\t"; - } - result = result+currentRow.getLabel(); + String label = currentRow.getLabel(); + if ( label != null){ + for (int i = 0; i <= currentRow.getLevel(); i++) { + result = result+"\t"; + } + result = result+label; + } break; case 1: - result = grossAmount; + if (grossAmount == 0){ + result = null; + } + else { + result = grossAmount; + } break; case 2: - result = provisionDeprecationAmount; + if (provisionDeprecationAmount == 0){ + result = null; + } + else { + result = provisionDeprecationAmount; + } break; case 3: - result = grossAmount-provisionDeprecationAmount; + if (grossAmount-provisionDeprecationAmount == 0){ + result = null; + } + else { + result = grossAmount-provisionDeprecationAmount; + } break; } } @@ -185,10 +178,6 @@ selectedEndDate = date; } - public void setAccountFilter(String accounts) { - selectedAccounts = accounts; - } - /** * get all account fot the selected period * @return Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2010-06-23 16:26:43 UTC (rev 2946) @@ -68,21 +68,14 @@ onActionPerformed="getModelTable().setEndDate(endDatePicker.getDate()); getHandler().refresh()"/> </cell> - <cell anchor="east"> - <JTextField id="accountFilter"/> - </cell> - <cell anchor="west"> - <JButton text="lima.accountsreports.accountfilter" - onActionPerformed="getModelTable().setAccountFilter(accountFilter.getText()); - getHandler().refresh()"/> - </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="7"> <JScrollPane> - <org.jdesktop.swingx.JXTable id="table" rowHeight="24" - model="{getModelTable()}" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}"/> + <org.chorem.lima.ui.financialstatementreport.FinancialStatementReportTable id="table" rowHeight="24" + constructorParams="getHandler()" + model="{getModelTable()}" + selectionMode="{ListSelectionModel.SINGLE_SELECTION}"/> <javax.swing.ListSelectionModel javaBean="getTable().getSelectionModel()"/> </JScrollPane> </cell> 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 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -186,31 +186,31 @@ switch (column) { case 0: - result = _("lima.transaction.column.date"); + result = _("lima.table.date"); break; case 1: - result = _("lima.transaction.column.entrybook"); + result = _("lima.table.entrybook"); break; case 2: - result = _("lima.transaction.column.voucher"); + result = _("lima.table.voucher"); break; case 3: - result = _("lima.transaction.column.account"); + result = _("lima.table.account"); break; case 4: - result = _("lima.transaction.column.description"); + result = _("lima.table.description"); break; case 5: - result = _("lima.transaction.column.position"); + result = _("lima.table.position"); break; case 6: - result = _("lima.transaction.column.debit"); + result = _("lima.table.debit"); break; case 7: - result = _("lima.transaction.column.credit"); + result = _("lima.table.credit"); break; case 8: - result = _("lima.transaction.column.balance"); + result = _("lima.table.balance"); break; } 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 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -168,31 +168,31 @@ switch (column) { case 0: - result = _("lima.transaction.column.date"); + result = _("lima.table.date"); break; case 1: - result = _("lima.transaction.column.entrybook"); + result = _("lima.table.entrybook"); break; case 2: - result = _("lima.transaction.column.voucher"); + result = _("lima.table.voucher"); break; case 3: - result = _("lima.transaction.column.account"); + result = _("lima.table.account"); break; case 4: - result = _("lima.transaction.column.description"); + result = _("lima.table.description"); break; case 5: - result = _("lima.transaction.column.position"); + result = _("lima.table.position"); break; case 6: - result = _("lima.transaction.column.debit"); + result = _("lima.table.debit"); break; case 7: - result = _("lima.transaction.column.credit"); + result = _("lima.table.credit"); break; case 8: - result = _("lima.transaction.column.balance"); + result = _("lima.table.balance"); break; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -93,10 +93,10 @@ switch(columnIndex) { case 0 : - result = _("lima.tab.fiscalperiod"); + result = _("lima.table.fiscalperiod"); break; case 1: - result = _("lima.closure"); + result = _("lima.table.closure"); break; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java 2010-06-23 16:26:43 UTC (rev 2946) @@ -107,28 +107,28 @@ String res = "n/a"; switch (column) { case 0: - res = _("lima.transaction.column.account"); //Account + res = _("lima.table.account"); //Account break; case 1: - res = _("lima.transaction.column.date"); //Date + res = _("lima.table.date"); //Date break; case 2: - res = _("lima.transaction.column.entrybook"); + res = _("lima.table.entrybook"); break; case 3: - res = _("lima.transaction.column.voucher"); // Voucher + res = _("lima.table.voucher"); // Voucher break; case 4: - res = _("lima.transaction.column.description"); //Description + res = _("lima.table.description"); //Description break; case 5: - res = _("lima.transaction.column.debit"); //Debit + res = _("lima.table.debit"); //Debit break; case 6: - res = _("lima.transaction.column.credit"); //Credit + res = _("lima.table.credit"); //Credit break; case 7: - res = _("lima.transaction.column.solde"); + res = _("lima.table.solde"); break; } return res; 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 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-06-23 16:26:43 UTC (rev 2946) @@ -168,6 +168,7 @@ lima.financialstatement.accounts= lima.financialstatement.creditaccounts= lima.financialstatement.debitaccounts= +lima.financialstatement.formula= lima.financialstatement.header= lima.financialstatement.header.add= lima.financialstatement.label= @@ -352,10 +353,30 @@ lima.tab.search.result=Search result lima.tab.subledgers= lima.tab.transaction=Transaction +lima.table.account= +lima.table.balance= +lima.table.closure= +lima.table.code= +lima.table.credit= +lima.table.date= +lima.table.debit= +lima.table.description= +lima.table.entrybook= +lima.table.fiscalperiod= lima.table.grossamount= lima.table.label= +lima.table.move.credit= +lima.table.move.debit= lima.table.netamount= +lima.table.number= +lima.table.period= +lima.table.position= lima.table.provisiondeprecationamount= +lima.table.solde= +lima.table.solde.credit= +lima.table.solde.debit= +lima.table.type= +lima.table.voucher= lima.title=Lutin Invoice Monitoring and Accounting lima.title.about=About Lima... lima.to=To 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 2010-06-22 11:34:43 UTC (rev 2945) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-06-23 16:26:43 UTC (rev 2946) @@ -13,9 +13,9 @@ calendarPanel\ TODO= lima.about.message=\u00C0 propos de Lima lima.account=Compte -lima.account.label=Libell\u00E9 +lima.account.label= lima.account.menu=Plan de comptes -lima.account.number=Num\u00E9ro du compte +lima.account.number= lima.account.parentnumber= lima.account.type=Type de compte lima.account.type1=Actif @@ -43,12 +43,6 @@ lima.amountcredit=Total Cr\u00E9dit lima.amountdebit=Total D\u00E9bit lima.any.criteria=Au moins un crit\u00E8re correspond -lima.balance.account.libelle=Libell\u00E9 -lima.balance.account.number=N\u00B0 de compte -lima.balance.move.credit=Mouvement au cr\u00E9dit -lima.balance.move.debit=Mouvement au d\u00E9bit -lima.balance.solde.credit=Solde cr\u00E9dit -lima.balance.solde.debit=Solde d\u00E9bit lima.balance.total=Total lima.bilan=Bilan lima.bilan.actif=Actif @@ -62,10 +56,9 @@ lima.charts.account=Plan comptable lima.charts.entrybook=Journaux lima.charts.financialperiod=P\u00E9riodes comptables -lima.charts.financialstatement= +lima.charts.financialstatement=Plan BCR lima.charts.fiscalyear=Exercices lima.close=Ferm\u00E9 -lima.closure=Cloture lima.closure.period.begin=P\u00E9riode de lima.closure.timespan.warning=Attention \: lorsque la p\u00E9riode est bloqu\u00E9e, il n'est plus possible d'ajouter, modifier et supprimer les entr\u00E9es comptables sur cette p\u00E9riode. lima.common.add=Ajout Compte G\u00E9n\u00E9ral @@ -111,9 +104,9 @@ lima.entries.searchunbalancedtransaction=Entr\u00E9es non \u00E9quilibr\u00E9es lima.entrybook=Journal lima.entrybook.add=Ajouter un journal -lima.entrybook.code=Code -lima.entrybook.label=Libelle -lima.entrybook.type=Type +lima.entrybook.code= +lima.entrybook.label= +lima.entrybook.type= lima.entrybook.type1=Achats lima.entrybook.type2=Ventes lima.entrybook.type3=Tr\u00E9sorerie @@ -163,17 +156,15 @@ lima.filter.starts.with=Commence par lima.financialperiod.block=Cloturer une p\u00E9riode lima.financialperiod.management= -lima.financialstatement.accounts= -lima.financialstatement.creditaccounts= -lima.financialstatement.debitaccounts= -lima.financialstatement.header= -lima.financialstatement.header.add=Regrouprement -lima.financialstatement.label= -lima.financialstatement.movement.add= -lima.financialstatement.provisiondeprecationaccounts= -lima.financialstatement.style= -lima.financialstatement.subamount= -lima.financialstatementreports= +lima.financialstatement.accounts=Liste de comptes au cr\u00E9dit et au d\u00E9bit +lima.financialstatement.creditaccounts=Liste de comptes au cr\u00E9dit +lima.financialstatement.debitaccounts=Liste de comptes au d\u00E9bit +lima.financialstatement.formula=Formule de compte, ex \: '7'-'6'+'510-520' +lima.financialstatement.header.add=Ajouter une cat\u00E9gorie +lima.financialstatement.label=Libell\u00E9 +lima.financialstatement.movement.add=Ajouter un regrouprement +lima.financialstatement.provisiondeprecationaccounts=Liste de comptes d'amortissement et provisions +lima.financialstatement.subamount=Calculer un sous-total lima.find.transaction=Rechercher transaction lima.fiscalperiod.addFiscalPeriod=Nouvel exercice lima.fiscalperiod.block=Cloturer un exercice @@ -292,7 +283,7 @@ lima.reports.accounts=Edition compte lima.reports.balance=Balance lima.reports.entrybooks=Edition journal -lima.reports.financialstatement= +lima.reports.financialstatement=Bilan et Compte de r\u00E9sultat lima.reports.ledger=Grand Livre lima.response.no=Non lima.response.yes=Oui @@ -321,28 +312,37 @@ lima.subledger.type= lima.success=Succ\u00E8s lima.tab.bilan= -lima.tab.fiscalperiod= +lima.tab.fiscalperiod=Exercice lima.tab.home=Accueil lima.tab.reports= lima.tab.result= -lima.table.grossamount= -lima.table.label= -lima.table.netamount= -lima.table.provisiondeprecationamount= +lima.table.account=Compte +lima.table.balance=Balance +lima.table.closure=Cloture +lima.table.code=Code +lima.table.credit=Cr\u00E9dit +lima.table.date=Date +lima.table.debit=D\u00E9bit +lima.table.description=Description +lima.table.entrybook=Journal +lima.table.fiscalperiod=Exercice +lima.table.grossamount=Brut +lima.table.label=Libell\u00E9 +lima.table.move.credit=Mouvement au cr\u00E9dit +lima.table.move.debit=Mouvement au d\u00E9bit +lima.table.netamount=Net +lima.table.number=Num\u00E9ro du compte +lima.table.period=P\u00E9riode +lima.table.position=Statut +lima.table.provisiondeprecationamount=Amortissements et provisions +lima.table.solde=Solde +lima.table.solde.credit=Solde cr\u00E9dit +lima.table.solde.debit=Solde d\u00E9bit +lima.table.type=Type +lima.table.voucher=Pi\u00E8ce comptable lima.title=Lutin Invoice Monitoring and Accounting lima.title.about=A propos de Lima... lima.to=A -lima.transaction.column.account=Compte -lima.transaction.column.balance=Balance -lima.transaction.column.credit=Cr\u00E9dit -lima.transaction.column.date=Date -lima.transaction.column.debit=D\u00E9bit -lima.transaction.column.description=Description -lima.transaction.column.entrybook=Journal -lima.transaction.column.period=P\u00E9riode -lima.transaction.column.position=Statut -lima.transaction.column.solde=Solde -lima.transaction.column.voucher=Pi\u00E8ce comptable lima.transaction.confirmdelete= lima.transaction.entrybook=Journal lima.transaction.period=P\u00E9riode