Author: jpepin Date: 2010-08-23 18:38:53 +0200 (Mon, 23 Aug 2010) New Revision: 3015 Url: http://chorem.org/repositories/revision/lima/3015 Log: Suppression de code inutile. Nettoyage des cl?\195?\169s i18n et traduction. Added: trunk/lima-swing/src/main/resources/images/puzzle_icon.png Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookTypeListModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CriteriaWidget.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/util/FileChooseView.jaxx trunk/lima-swing/src/main/resources/images/logo-codelutin.png trunk/lima-swing/src/main/resources/images/splash.png 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/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodService.java trunk/lima-business/src/main/resources/i18n/lima-business-en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business-fr_FR.properties trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java trunk/lima-callao/src/main/xmi/accounting.zargo trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java trunk/lima-swing/src/main/java/org/chorem/lima/actions/MiscAction.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalancePeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.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/FinancialTransactionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.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-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -85,7 +85,7 @@ accountDAO.findByAccountNumber(account.getAccountNumber()); if (existAccount != null) { throw new LimaBusinessException(_( - "An account already exists with this number : %s", + "lima-business.account.accountalreardyexist", account.getAccountNumber())); } @@ -153,7 +153,7 @@ accountDAO.findByAccountNumber(account.getAccountNumber()); if (existAccount != null) { throw new LimaBusinessException(_( - "An account already exists with this number : %s", + "lima-business.account.accountalreardyexist", account.getAccountNumber())); } @@ -432,109 +432,6 @@ } - /* - * Convert string of extends number to list of accounts - * Example '22, 45..48, 67' -> [22, 45, 46, 47, 48, 67] - * SubAccountsMode return list of existing subaccounts ex 6 return : 61, 62, .., 69, 610, .., 619 etc - * - @Override - public List<Account> stringToListAccountsWithTransaction(String selectedAccounts, Boolean subAccountsMode, TopiaContext topiaContext) throws LimaException{ - List<Account> accounts = new ArrayList<Account>(); - if (selectedAccounts != null){ - try { - AccountDAO accountDAO = - LimaCallaoDAOHelper.getAccountDAO(topiaContext); - //Remove Spaces - selectedAccounts = StringUtils.deleteWhitespace(selectedAccounts); - //use hashset for delete duplicate numbers - HashSet<String> accountNumbers = new HashSet<String>(); - HashSet<String> accountNumbersToRemove = new HashSet<String>(); - Boolean first = true; - StringTokenizer stStar = new StringTokenizer(selectedAccounts, "-"); - while (stStar.hasMoreTokens()) { - String subString = stStar.nextToken(); - - //Split comma - StringTokenizer stComma = new StringTokenizer(subString, ","); - while (stComma.hasMoreTokens()) { - String s = stComma.nextToken(); - if (s.contains("..")){ - //Split .. - String stringDoubleDot[] = s.split("\\.\\."); - int lowAccount=Integer.parseInt(stringDoubleDot[0]); - int highAccount=Integer.parseInt(stringDoubleDot[1]); - for (int i=lowAccount; i <= highAccount; i++) { - //if first add accounts, else remove - if (first){ - accountNumbers.add(String.valueOf(i)); - } - else { - accountNumbersToRemove.add(String.valueOf(i)); - } - } - } - else{ - //if first - if (first){ - accountNumbers.add(s); - } - else { - accountNumbersToRemove.add(s); - } - } - } - first=false; - } - //add all accounts - for (String accountNumber : accountNumbers) { - Account account = null; - if (subAccountsMode){ - account = accountDAO.findSubAccountByNumber(accountNumber); - } - else { - account = accountDAO.findByAccountNumber(accountNumber); - - } - //add account if exist - if (account != null){ - accounts.add(account); - } - //search all account start with accountnumber - else { - TopiaQuery query = accountDAO.createQuery(); - String subAccountsProperty = TopiaQuery.getProperty(Account.SUB_ACCOUNTS); - //String subLedgersProperty = TopiaQuery.getProperty(Account.SUB_LEDGERS); - query.addWhere("not exists elements ("+subAccountsProperty+")") - //.addWhere("not exists elements ("+subLedgersProperty+")") - .addWhere(Account.ACCOUNT_NUMBER, Op.LIKE, accountNumber+"%"); - List<Account> accountsResult = accountDAO.findAllByQuery(query); - if (accountsResult != null){ - accounts.addAll(accountsResult); - } - } - } - //remove all accounts - for (String accountNumber : accountNumbersToRemove) { - Account account = null; - if (subAccountsMode){ - account = accountDAO.findSubAccountByNumber(accountNumber); - } - else { - account = accountDAO.findByAccountNumber(accountNumber); - } - if (account != null) { - accounts.remove(account); - } - } - } - catch (TopiaException ex) { - doCatch(topiaContext, ex, log); - } - } - - return accounts; - }*/ - protected TopiaContext beginTransaction() throws TopiaException { // basic check done, make check in database // TODO move it into JTA @@ -554,6 +451,5 @@ throw eee; } } - } \ No newline at end of file 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 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -272,7 +272,6 @@ //create pages for (List<FinancialStatementAmounts> list : listList) { String title = list.get(0).getLabel(); - //list = list.subList(1, list.size()); int i = 0; int n = list.size(); int max = n; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -85,7 +85,7 @@ entryBookDAO.findByLabel(entryBook.getCode()); if (existingEntryBook != null) { throw new LimaBusinessException( - _("An EntryBook already exists with this label : %s", + _("lima-business.entrybook.entrybookalreadyexist", entryBook.getLabel())); } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -209,7 +209,7 @@ doCatch(topiaContext, eeeTE, log); } catch (IOException eeeIO) { - log.debug("Can't create new CSV Writer",eeeIO); + log.error("Can't create new CSV Writer",eeeIO); } finally { doFinally(topiaContext, log); @@ -249,7 +249,7 @@ doCatch(topiaContext, eeeTE, log); } catch (IOException eeeIO) { - log.debug("Can't create new CSV Writer",eeeIO); + log.error("Can't create new CSV Writer",eeeIO); } finally { doFinally(topiaContext, log); @@ -279,7 +279,7 @@ doCatch(topiaContext, eeeTE, log); } catch (IOException eeeIO) { - log.debug("Can't create new CSV Writer",eeeIO); + log.error("Can't create new CSV Writer",eeeIO); } finally { doFinally(topiaContext, log); @@ -366,7 +366,7 @@ doCatch(topiaContext, eeeTE, log); } catch (IOException eeeIO) { - log.debug("Can't create new CSV Writer",eeeIO); + log.error("Can't create new CSV Writer",eeeIO); } finally { doFinally(topiaContext, log); @@ -381,7 +381,7 @@ */ public void exportEntryBookChartAsCSV(CSVWriter csvWriter, TopiaContext topiaContext) throws LimaException { try { - String[] nextLine = new String[4]; + String[] nextLine = new String[3]; // Get all entrybook EntryBookDAO entryBookDAO = LimaCallaoDAOHelper.getEntryBookDAO(topiaContext); @@ -391,7 +391,6 @@ nextLine[0] = ImportExportEntityEnum.ENTRYBOOK.getLabel(); nextLine[1] = entryBook.getCode(); nextLine[2] = entryBook.getLabel(); - nextLine[3] = entryBook.getType(); // Ajoute la ligne au fichier csvWriter.writeNext(nextLine); } @@ -423,7 +422,7 @@ doCatch(topiaContext, eeeTE, log); } catch (IOException eeeIO) { - log.debug("Can't create new CSV Writer",eeeIO); + log.error("Can't create new CSV Writer",eeeIO); } finally { doFinally(topiaContext, log); 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-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -90,19 +90,6 @@ FinancialStatementDAO financialStatementDAO = LimaCallaoDAOHelper.getFinancialStatementDAO(topiaContext); - /* check if FinancialStatementHeader label already exist - * too much strict check, many financialstatement can have the same name - * - * FinancialStatement existFinancialStatementHeader = - financialStatementDAO.findByLabel(financialStatement.getLabel()); - - - if (existFinancialStatementHeader != null) { - throw new LimaBusinessException(_( - "An financialStatement already exists with this label : %s", - financialStatement.getLabel())); - }*/ - financialStatementDAO.create(financialStatement); FinancialStatement masterfinancialStatementUpdate = null; @@ -560,8 +547,8 @@ for (Account account : accountsList) { - result.append(_("lima-business.financialstatement.check.nothing") - + " : "+account.getAccountNumber()+" - "+account.getLabel()+"\n"); + result.append(_("lima-business.financialstatement.check.nothing", + account.getAccountNumber(), account.getLabel())); } } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -678,9 +678,7 @@ break; } } - log.debug(query); financialTransactions = financialTransactionDAO.findAllByQuery(query); - log.debug(financialTransactions); EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext); for (FinancialTransaction financialTransaction : financialTransactions) { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -35,7 +35,6 @@ import org.chorem.lima.business.ejbinterface.FiscalPeriodService; import org.chorem.lima.business.ejbinterface.FiscalPeriodServiceLocal; import org.chorem.lima.entity.FinancialPeriod; -import org.chorem.lima.entity.FinancialPeriodDAO; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FiscalPeriodDAO; import org.chorem.lima.entity.LimaCallaoDAOHelper; @@ -253,35 +252,6 @@ } } - /** - * just for debug, this method must delete - * Unauthorized action for user !!! - */ - public void removeAllFiscalPeriods() throws LimaException{ - TopiaContext transaction = null; - try { - transaction = beginTransaction(); - - FiscalPeriodDAO fiscalPeriodDAO = - LimaCallaoDAOHelper.getFiscalPeriodDAO(transaction); - FinancialPeriodDAO financialPeriodDAO = - LimaCallaoDAOHelper.getFinancialPeriodDAO(transaction); - for (FiscalPeriod fiscalPeriod : fiscalPeriodDAO.findAll()) { - for (FinancialPeriod financialPeriod : fiscalPeriod.getFinancialPeriod()){ - financialPeriodDAO.delete(financialPeriod); - } - fiscalPeriodDAO.delete(fiscalPeriod); - } - - commitTransaction(transaction); - - } catch (TopiaException ex) { - doCatch(transaction, ex, log); - } - finally { - doFinally(transaction, log); - } - } protected TopiaContext beginTransaction() throws TopiaException { // basic check done, make check in database Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -19,6 +19,7 @@ package org.chorem.lima.business.ejb; +import static org.nuiton.i18n.I18n._; import java.io.IOException; import java.io.StringReader; import java.math.BigDecimal; @@ -36,7 +37,6 @@ import java.util.TreeMap; 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; @@ -187,7 +187,7 @@ if (!Arrays.asList(strat.getColumnMapping()).containsAll( headAccount)) { throw new LimaBusinessException( - "ERROR : This file contains no entries"); + _("lima-business.import.ebpnoentry")); } CsvToBean<EntryEBPImpl> csv = new CsvToBean<EntryEBPImpl>(); @@ -207,7 +207,7 @@ if (nbFiscalPeriods == 0) { throw new LimaBusinessException( - "Can't import entries, no fiscalperiod is open"); + _("lima-business.import.nofiscalperiodopen")); } FinancialTransaction financialTransaction = null; @@ -224,17 +224,13 @@ // if account not exist not export if (account == null) { throw new LimaBusinessException( - "FAILED : Account " - + entryEBP.getCompte() - + " not exist !\n" - + "Import aborted ! Create all accounts before import entries"); + _("lima-business.import.ebpmissingaccount", + entryEBP.getCompte())); } else if (date.compareTo(beginDate) < 0 || date.compareTo(endDate) > 0){ - result.append("WARNING : " + date + " entries is out of range of" + - " opened fiscal periods. " - + "Entry was skip !\n"); + result.append(_("lima-business.import.entriesoutofdatesrange",date)); } else { entry.setAccount(account); @@ -260,8 +256,7 @@ entryBook.setCode(entryBookCode); // create it entryBookService.createEntryBook(entryBook); - result.append("WARNING : Entrybook " + entryBook - + "not exist was created !\n"); + result.append(_("lima-business.import.entrybooknotexist",entryBook)); } if (financialTransaction == null @@ -287,15 +282,13 @@ financialTransactionService .createFinancialTransactionWithTransaction( financialTransaction, topiaContext); - result.append("SUCCES : FinancialTransaction" + date + " " - + entryBook.getCode() + " added\n"); + result.append(_("lima-business.import.transactionadded", date, entryBook.getCode())); } financialTransaction.addEntry(entry); financialTransactionService.createEntryWithTransaction( entry, topiaContext); - result.append("SUCCES : Entry" + entry.getDescription() + " " - + entry.getAmount() + " added\n"); + result.append(_("lima-business.import.entryadded", entry.getDescription(), entry.getAmount())); } } // update last financial transaction @@ -310,13 +303,9 @@ } catch (TopiaException eeeTE) { doCatch(topiaContext, eeeTE, log); } catch (IOException eeeIO) { - if (log.isDebugEnabled()) { - log.debug("Can't read string", eeeIO); - } + log.error("Can't read string", eeeIO); } catch (ParseException eeePE) { - if (log.isDebugEnabled()) { - log.debug("Can't parse date", eeePE); - } + log.error("Can't parse date", eeePE); } finally { doFinally(topiaContext, log); } @@ -343,7 +332,7 @@ if (!Arrays.asList(strat.getColumnMapping()).containsAll( headAccount)) { throw new LimaBusinessException( - "ERROR : This file contains no account"); + _("lima-business.import.noaccount")); } CsvToBean<AccountEBPImpl> csv = new CsvToBean<AccountEBPImpl>(); @@ -355,8 +344,7 @@ for (AccountEBP accountEBP : list) { String accountNumber = accountEBP.getNumero(); if (accountDAO.findByAccountNumber(accountNumber) != null) { - result.append("FAILED : Account" + accountNumber - + " already exist \n"); + result.append(_("lima-business.import.accountalreadyexist", accountNumber)); } else { String label = accountEBP.getIntitule(); Account account = new AccountImpl(); @@ -376,8 +364,7 @@ } accountService.createSubLedgerWithTransaction( masterAccount, account, topiaContext); - result.append("SUCCES : Account" + accountNumber + " " - + label + " added\n"); + result.append(_("lima-business.import.accountadded", accountNumber, label)); } // else is account else { @@ -386,8 +373,7 @@ if (nbCharAccountNumber == 1) { accountService.createAccountWithTransaction(null, account, topiaContext); - result.append("SUCCES : Account" + accountNumber + " " - + label + " added\n"); + result.append(_("lima-business.import.accountadded", accountNumber, label)); } else { Account masterAccount = null; @@ -401,8 +387,7 @@ } accountService.createAccountWithTransaction( masterAccount, account, topiaContext); - result.append("SUCCES : Account" + accountNumber + " " - + label + " added\n"); + result.append(_("lima-business.import.accountadded", accountNumber, label)); } } } @@ -410,9 +395,7 @@ } catch (TopiaException eeeTE) { doCatch(topiaContext, eeeTE, log); } catch (IOException eeeIO) { - if (log.isDebugEnabled()) { - log.debug("Can't read string", eeeIO); - } + log.error("Can't read string", eeeIO); } finally { doFinally(topiaContext, log); } @@ -523,7 +506,7 @@ } catch (TopiaException eeeTE) { doCatch(topiaContext, eeeTE, log); } catch (IOException eeeIO) { - log.debug("Can't create new CSV Reader", eeeIO); + log.error("Can't create new CSV Reader", eeeIO); } finally { doFinally(topiaContext, log); } @@ -593,7 +576,7 @@ } catch (TopiaException eeeTE) { doCatch(topiaContext, eeeTE, log); } catch (IOException eeeIO) { - log.debug("Can't create new CSV Reader", eeeIO); + log.error("Can't create new CSV Reader", eeeIO); } finally { doFinally(topiaContext, log); } @@ -633,8 +616,7 @@ // put it in hashset accounts.put(accountNumber, accountImport); } else { - result.append("FAILED : The account " + accountNumber - + " already exists !\n"); + result.append(_("lima-business.import.accountalreadyexist", accountNumber)); } } catch (TopiaException eeeTE) { doCatch(topiaContext, eeeTE, log); @@ -665,13 +647,10 @@ if (fiscalPeriodDAO.findByNaturalId(beginDate, endDate) == null) { fiscalPeriods.add(fiscalPeriod); } else { - result.append("FAILED : The fiscalperiod " + beginDate + "-" - + endDate + " already exists !\n"); + result.append(_("lima-business.import.fiscalperiodalreadyexist", beginDate , endDate)); } } catch (ParseException eeePE) { - if (log.isDebugEnabled()) { - log.debug("Can't parse date", eeePE); - } + log.error("Can't parse date", eeePE); } catch (TopiaException eeeTE) { doCatch(topiaContext, eeeTE, log); } @@ -692,17 +671,14 @@ EntryBook entryBook = new EntryBookImpl(); entryBook.setCode(nextLine[1]); entryBook.setLabel(nextLine[2]); - entryBook.setType(nextLine[3]); // if exist, skip if (entryBookDAO.findByCode(entryBook.getCode()) != null) { - result.append("FAILED : The entrybook " + entryBook.getLabel() - + " already exists !\n"); + result.append(_("lima-business.import.entrybookalreadyexist", entryBook.getLabel())); } else { // create it entryBookService.createEntryBook(entryBook); - result.append("SUCCESS : The financialStatement " - + entryBook.getLabel() + " is created ! \n"); + result.append(_("lima-business.import.financialstatementadded", entryBook.getLabel())); } } catch (TopiaException eeeTE) { doCatch(topiaContext, eeeTE, log); @@ -788,8 +764,7 @@ financialStatements.put(label, (ArrayList<FinancialStatementImport>) list); } } else { - result.append("FAILED : The financialstatement " + label - + " already exists !\n"); + result.append(_("lima-business.import.financialstatementalreadyexist", label)); } } catch (TopiaException eeeTE) { doCatch(topiaContext, eeeTE, log); @@ -911,18 +886,15 @@ masterFinancialStatement, financialStatement, topiaContext); - result.append("SUCCESS : The financialStatement " - + financialStatementImport.getLabel() - + " is created ! \n"); + result.append(_("lima-business.import.financialstatementadded", + financialStatementImport.getLabel())); itr2.remove(); } else if (!financialStatements .containsKey(masterFinancialStatementLabel)) { - result.append("FAILED : The financialStatement " - + financialStatementImport.getLabel() - + " have masterFinancialStatement : " - + masterFinancialStatementLabel - + "which not exist \n"); + result.append(_("lima-business.import.financialstatementalnomaster", + financialStatementImport.getLabel(), + masterFinancialStatementLabel)); itr2.remove(); } } @@ -945,11 +917,11 @@ try { fiscalPeriodService.createFiscalPeriodWithTransaction( fiscalPeriod, topiaContext); - result.append("SUCCESS : The fiscalPeriod " - + fiscalPeriod.getBeginDate() + "-" - + fiscalPeriod.getEndDate() + " is created ! \n"); + result.append(_("lima-business.import.fiscalperiodadded", + fiscalPeriod.getBeginDate(), + fiscalPeriod.getEndDate())); } catch (LimaException eee) { - result.append("FAILED : " + eee + " \n"); + result.append(_("lima-business.common.failed", eee.getMessage())); } } return result.toString(); @@ -993,16 +965,15 @@ accountService.createAccountWithTransaction( masterAccount, account, topiaContext); } - result.append("SUCCESS : The account " - + accountImport.getAccountNumber() - + " is created ! \n"); + result.append(_("lima-business.import.accountadded", + accountImport.getAccountNumber(), + accountImport.getLabel())); itr.remove(); } else if (!accounts.containsKey(masterAccountNumber) && !accounts.containsKey(generalLedgerNumber)) { - result.append("FAILED : The account " - + accountImport.getAccountNumber() - + " have masterAccount : " - + masterAccountNumber + "which not exist \n"); + result.append(_("lima-business.import.accountnomaster", + accountImport.getAccountNumber(), + masterAccountNumber)); itr.remove(); } } @@ -1046,20 +1017,16 @@ financialPeriodService .blockClosedPeriodicEntryBookWithTransaction( closedPeriodicEntryBook, topiaContext); - result.append("SUCCESS : The blockClosedPeriodicEntryBook " - + beginDateFinancialPeriod + "-" - + endDateFinancialPeriod + ", " + codeEntryBook - + " is updated ! \n"); + result.append(_("lima-business.import.closedperiodicentrybookupdated", + beginDateFinancialPeriod, endDateFinancialPeriod, codeEntryBook)); } catch (LimaException eee) { - result.append("FAILED : " + eee + " \n"); + result.append(_("lima-business.common.failed", eee)); } } } catch (TopiaException eeeTE) { doCatch(topiaContext, eeeTE, log); } catch (ParseException eeePE) { - if (log.isDebugEnabled()) { - log.debug("Can't parse date", eeePE); - } + log.error("Can't parse date", eeePE); } return result.toString(); } @@ -1124,9 +1091,7 @@ } catch (TopiaException eeeTE) { doCatch(topiaContext, eeeTE, log); } catch (ParseException eeePE) { - if (log.isDebugEnabled()) { - log.debug("Can't parse date", eeePE); - } + log.error("Can't parse date", eeePE); } return result.toString(); } @@ -1151,8 +1116,7 @@ identityService.updateIdentityWithTransaction(identity, topiaContext); // create it - result.append("SUCCESS : The identity " + identity.getName() - + " is created ! \n"); + result.append(_("lima-business.import.identityadded", identity.getName())); return result.toString(); } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodService.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodService.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -44,7 +44,5 @@ void createFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; - void blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; - - void removeAllFiscalPeriods() throws LimaException; + void blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; } Modified: trunk/lima-business/src/main/resources/i18n/lima-business-en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business-en_GB.properties 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-business/src/main/resources/i18n/lima-business-en_GB.properties 2010-08-23 16:38:53 UTC (rev 3015) @@ -1,56 +1,62 @@ -An\ EntryBook\ already\ exists\ with\ this\ label\ \:\ %s= -An\ account\ already\ exists\ with\ this\ number\ \:\ %s= -An\ financialStatement\ already\ exists\ with\ this\ label\ \:\ %s= -business.document.financialstatement= -lima-business.config.configFileName.description= -lima-business.config.rulesnationality= -lima-business.document.accountnubmer= -lima-business.document.accountnumber= -lima-business.document.amount=Amout -lima-business.document.amounts= -lima-business.document.balance= -lima-business.document.businessnumber= +lima-business.account.accountalreardyexist=An account already exists with this number \: %s +lima-business.common.failed=FAILED \: %s \n +lima-business.document.accountnumber=Account N\u00B0 +lima-business.document.amounts=Amounts +lima-business.document.balance=Balance +lima-business.document.businessnumber=Business N\u00B0 lima-business.document.carryback=Carry Back lima-business.document.carryforward=reporter\u00C0 -lima-business.document.classificationcode= -lima-business.document.classificationcode\ \:= -lima-business.document.createdate1= -lima-business.document.createdate2= +lima-business.document.classificationcode=Classification Code +lima-business.document.createdate1=Editing Date +lima-business.document.createdate2=to lima-business.document.credit=Credit lima-business.document.date=Date -lima-business.document.date.begin= -lima-business.document.date.end= +lima-business.document.date.begin=Begin date +lima-business.document.date.end=End date lima-business.document.debit=Debit lima-business.document.description=Description lima-business.document.entrybook=EntryBook -lima-business.document.financialstatement= -lima-business.document.generalentrybook= +lima-business.document.financialstatement=FinancialStatement +lima-business.document.generalentrybook=General EntryBook lima-business.document.grossamount=Gross Amount lima-business.document.label=Label -lima-business.document.ledger= -lima-business.document.movementcredit= -lima-business.document.movementdebit= +lima-business.document.ledger=Ledger +lima-business.document.movementcredit=Credit movement +lima-business.document.movementdebit=Debit movement lima-business.document.netamount=Net Amount -lima-business.document.pagenumber= -lima-business.document.period1= -lima-business.document.period2= +lima-business.document.pagenumber=Page N\u00B0 +lima-business.document.period1=Periode from +lima-business.document.period2=to lima-business.document.provisiondeprecationamount=Provision Deprecation Amount lima-business.document.solde=Solde -lima-business.document.soldecredit= -lima-business.document.soldedebit= -lima-business.document.vatnumber= +lima-business.document.soldecredit=Credit solde +lima-business.document.soldedebit=Debit solde +lima-business.document.vatnumber=VAT N\u00B0 lima-business.document.voucher=Voucher -lima-business.financialstatement.check.nothing= -lima-business.financialstatement.check.warn= -lima.business.document.date=Date +lima-business.entrybook.entrybookalreadyexist=An EntryBook already exists with this label \: %s +lima-business.financialstatement.check.nothing=Not found \: %s - %s \n +lima-business.financialstatement.check.warn=Warning this function is just an help.\n Many accounts must no calculate on Financialstatement.\n Some account marked not found is normally.\n\n +lima-business.import.accountadded=SUCCES \: Account %s - %s added\n +lima-business.import.accountalreadyexist=FAILED \: Account %s already exist \n +lima-business.import.accountnomaster=FAILED \: The account %s have master \: %s which not exist \n +lima-business.import.closedperiodicentrybookupdated=SUCCESS \: The blockClosedPeriodicEntryBook %s - %s - %s is updated \! \n +lima-business.import.ebpmissingaccount=FAILED \: Account %s already exist, import aborted. \nCreate all accounts before import entries. +lima-business.import.ebpnoentry=FAILED \: This file contains no entries. +lima-business.import.entriesoutofdatesrange=WARNING \: %s entries is out of range of opened fiscal periods. Entry was skip \!\n +lima-business.import.entryadded=SUCCES \: Entry %s %s added\n" +lima-business.import.entrybookalreadyexist=FAILED \: The entrybook %s already exists \!\n +lima-business.import.entrybooknotexist=WARNING \: Entrybook %s not exist was created \!\n +lima-business.import.financialstatementadded=SUCCESS \: The financialStatement %s is created \n +lima-business.import.financialstatementalnomaster=FAILED \: The financialStatement %s have master \: %s which not exist \n +lima-business.import.financialstatementalreadyexist=FAILED \: The financialstatement %s already exists \!\n +lima-business.import.fiscalperiodadded=SUCCESS \: The fiscalPeriod %s - %s is created \! \n +lima-business.import.fiscalperiodalreadyexist=FAILED \: The fiscalperiod %s - %s already exists \!\n +lima-business.import.identityadded=SUCCESS \: The identity %s is created \! \n +lima-business.import.noaccount=ERROR \: This file contains no account +lima-business.import.nofiscalperiodopen=FAILED \: No Fiscal period open \! \n +lima-business.import.transactionadded=SUCCES \: FinancialTransaction, %s - %s, added\n lima.config.configFileName.description= -lima.config.http-port= -lima.config.httpport= -lima.config.reports-dir= -lima.config.reportsdir= -lima.config.rulesnationality= -lima.config.serveraddress= -lima.table.grossamount= -lima.table.label=Test -lima.table.netamount= -lima.table.provisiondeprecationamount= +lima.config.httpport=HTTP Port +lima.config.reportsdir=Reports directories +lima.config.rulesnationality=Rules Nationality +lima.config.serveraddress=Server Address Modified: trunk/lima-business/src/main/resources/i18n/lima-business-fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business-fr_FR.properties 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-business/src/main/resources/i18n/lima-business-fr_FR.properties 2010-08-23 16:38:53 UTC (rev 3015) @@ -1,11 +1,8 @@ -An\ EntryBook\ already\ exists\ with\ this\ label\ \:\ %s= -An\ account\ already\ exists\ with\ this\ number\ \:\ %s= -An\ financialStatement\ already\ exists\ with\ this\ label\ \:\ %s= -business.document.financialstatement= +lima-business.account.accountalreardyexist=Un compte existe d\u00E9j\u00E0 avec ce num\u00E9ro \: %s +lima-business.common.failed=\u00C9chec \: %s \n lima-business.document.accountnumber=N\u00B0 Compte lima-business.document.amounts=Totaux lima-business.document.balance=Balance -lima-business.document.beginDate=Date de d\u00E9but \: lima-business.document.businessnumber=N\u00B0 Siret lima-business.document.carryback=Report lima-business.document.carryforward=\u00C0 reporter @@ -18,7 +15,6 @@ lima-business.document.date.end=Date de fin \: lima-business.document.debit=D\u00E9bit lima-business.document.description=Description -lima-business.document.endDate=Date de fin \: lima-business.document.entrybook=Journal lima-business.document.financialstatement=Bilan et compte de r\u00E9sultat lima-business.document.generalentrybook=Journal G\u00E9n\u00E9ral @@ -37,12 +33,30 @@ lima-business.document.soldedebit=Solde D\u00E9biteur lima-business.document.vatnumber=N\u00B0 TVA lima-business.document.voucher=Pi\u00E8ce comptable -lima-business.financialstatement.check.nothing=Introuvable +lima-business.entrybook.entrybookalreadyexist=Un journal existe d\u00E9j\u00E0 avec ce libell\u00E9 \: %s +lima-business.financialstatement.check.nothing=Introuvable \: %s - %s \n lima-business.financialstatement.check.warn=Attention cette fonctionnalit\u00E9 n'est qu'une aide utilisateur.\n Certains comptes ne doivent pas \u00EAtre pr\u00E9sent au bilan et compte de r\u00E9sultat.\n Il est donc normal que des comptes sont marqu\u00E9s comme introuvable.\n\n +lima-business.import.accountadded=Succ\u00E8s \: Compte %s - %s ajout\u00E9\n +lima-business.import.accountalreadyexist=\u00C9chec \: Le compte %s existe d\u00E9j\u00E0 \n +lima-business.import.accountnomaster=\u00C9chec \: Le compte %s poss\u00E8de le master \: %s inexistant \n +lima-business.import.closedperiodicentrybookupdated=Succ\u00E8s \: La p\u00E9riode financi\u00E8re %s - %s - %s est ajout\u00E9e \! \n +lima-business.import.ebpmissingaccount=\u00C9chec \: Compte %s inexistant. \nImportation annul\u00E9e. \nCr\u00E9er tous les comptes avant d'importer les \u00E9critures. +lima-business.import.ebpnoentry=\u00C9chec \: Ce fichier ne contient aucune entr\u00E9e. +lima-business.import.entriesoutofdatesrange=Attention \: Cette entr\u00E9e %s ne fait partie d'aucune p\u00E9riode ouverte. Entr\u00E9e non import\u00E9e \!\n +lima-business.import.entryadded=Succ\u00E8s \: Entr\u00E9e %s %s ajout\u00E9e \n +lima-business.import.entrybookalreadyexist=\u00C9chec \: Le journal %s exist d\u00E9j\u00E0 \!\n +lima-business.import.entrybooknotexist=Attention \: Le journal %s inexistant a \u00E9t\u00E9 cr\u00E9\u00E9 \!\n +lima-business.import.financialstatementadded=Succ\u00E8s \: Mouvement %s ajout\u00E9e \n +lima-business.import.financialstatementalnomaster=u00C9chec \: Le mouvement %s poss\u00E8de le master \: %s inexistant \n +lima-business.import.financialstatementalreadyexist=u00C9chec \: Le mouvement %s exist d\u00E9j\u00E0 \!\n +lima-business.import.fiscalperiodadded=Succ\u00E8s \: Exercice %s - %s ajout\u00E9e \! \n +lima-business.import.fiscalperiodalreadyexist=u00C9chec \: L'exerice %s - %s existe d\u00E9j\u00E0 \!\n +lima-business.import.identityadded=Succ\u00E8s \: Identit\u00E9 %s ajout\u00E9e \! \n +lima-business.import.noaccount=Erreur \: Ce fichier ne contient aucun compte. +lima-business.import.nofiscalperiodopen=u00C9chec \: Aucun exercice ouvert \! \n +lima-business.import.transactionadded=Succ\u00E8s \: Transaction, %s, %s, ajout\u00E9e\n lima.config.configFileName.description= -lima.config.http-port= -lima.config.httpport= -lima.config.reports-dir= -lima.config.reportsdir= -lima.config.rulesnationality= -lima.config.serveraddress= +lima.config.httpport=Port HTTP +lima.config.reportsdir=Dossier des rapports +lima.config.rulesnationality=R\u00E8gles nationales +lima.config.serveraddress=Addresse serveur Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -75,7 +75,6 @@ StringTokenizer stStar = new StringTokenizer(result, "-"); while (stStar.hasMoreTokens()) { String subString = stStar.nextToken(); - log.debug(subString); //Split comma StringTokenizer stComma = new StringTokenizer(subString, ","); Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -80,9 +80,9 @@ } } catch (Exception ex) { if (log.isErrorEnabled()) { - log.error(_("Global lima exception"), ex); + log.error(_("lima.common.globalexception"), ex); } - ErrorHelper.showErrorDialog(_("Global lima exception"), ex); + ErrorHelper.showErrorDialog(_("lima.common.globalexception"), ex); System.exit(1); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -98,10 +98,10 @@ splashGraphics.setComposite(AlphaComposite.Clear); splashGraphics.fillRect(65, 238, 300, 15); splashGraphics.setPaintMode(); - splashGraphics.setColor(new Color(255, 210, 55)); + splashGraphics.setColor(Color.DARK_GRAY); Font font = new Font("Lucida Sans", Font.BOLD, 14); splashGraphics.setFont(font); - splashGraphics.drawString(message + "...", 65, 248); + splashGraphics.drawString(message + "...", 65, 249); } splash.update(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/actions/MiscAction.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/actions/MiscAction.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/actions/MiscAction.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -43,7 +43,6 @@ public void help() { System.out.println(_("lima.message.help.usage")); - System.out.println("Options (set with --option <key> <value>:"); for (LimaConfig.Option o : LimaConfig.Option.values()) { System.out.println("\t" + o.key + "(" + o.defaultValue + "):" + o.description); } 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-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -105,13 +105,13 @@ <JMenu text="lima.importexport.import" actionIcon='import-element'> <JMenuItem text="lima.importexport.all" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ALL_IMPORT)'/> <JMenuItem text="lima.importexport.accountcharts" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ACCOUNTCHARTS_IMPORT)'/> - <JMenuItem text="lima.importexport.entrybooks" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRYBOOKS_IMPORT)'/> + <JMenuItem text="lima.common.entrybooks" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRYBOOKS_IMPORT)'/> <JMenuItem text="lima.importexport.financialstatements" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_FINANCIALSTATEMENTS_IMPORT)'/> </JMenu> <JMenu text="lima.importexport.export" actionIcon='export-element'> <JMenuItem text="lima.importexport.all" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ALL_EXPORT)'/> <JMenuItem text="lima.importexport.accountcharts" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ACCOUNTCHARTS_EXPORT)'/> - <JMenuItem text="lima.importexport.entrybooks" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRYBOOKS_EXPORT)'/> + <JMenuItem text="lima.common.entrybooks" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRYBOOKS_EXPORT)'/> <JMenuItem text="lima.importexport.financialstatements" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_FINANCIALSTATEMENTS_EXPORT)'/> </JMenu> </JMenu> @@ -142,7 +142,7 @@ <JMenu text="lima.structure" mnemonic="{'S'}"> <JMenuItem text="lima.charts.account" onActionPerformed='getHandler().showAccountView(this)' actionIcon='charts-accounts'/> - <JMenuItem text="lima.charts.entrybook" onActionPerformed='getHandler().showEntryBookView(this)' + <JMenuItem text="lima.common.entrybooks" onActionPerformed='getHandler().showEntryBookView(this)' actionIcon='charts-entrybooks'/> <JMenuItem text="lima.charts.fiscalyear" onActionPerformed='getHandler().showFiscalPeriodView(this)' actionIcon='charts-fiscalperiod'/> @@ -153,7 +153,7 @@ </JMenu> <JMenu text="lima.entries" mnemonic="{'E'}"> - <JMenuItem text="lima.entries.addtransaction" onActionPerformed='getHandler().showTransactionView(this)' + <JMenuItem text="lima.entries.writetransaction" onActionPerformed='getHandler().showTransactionView(this)' actionIcon='entries-balanced'/> <JMenuItem text="lima.entries.searchunbalancedtransaction" onActionPerformed='getHandler().showTransactionUnbalancedView(this)' actionIcon='entries-unbalanced'/> 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 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -201,7 +201,7 @@ } }*/; about.setTitle(_("lima.title.about")); - about.setAboutText(_("lima.about.message")); + about.setAboutText(_("lima.title.about.description")); about.setBottomText(ui.getConfig().getCopyrightText()); about.setIconPath("/icons/lima.png"); about.setLicenseFile("META-INF/lima-main-LICENSE.txt"); @@ -298,7 +298,7 @@ public void showEntryBookView(JAXXContext rootContext) { MainView mainView = getUI(rootContext); EntryBookView entryBookView= new EntryBookView(mainView); - mainView.showTab(_("lima.charts.entrybook"), entryBookView); + mainView.showTab(_("lima.common.entrybooks"), entryBookView); } /** @@ -362,7 +362,7 @@ public void showTransactionView(JAXXContext rootContext) { MainView mainView = getUI(rootContext); FinancialTransactionView transactionView = new FinancialTransactionView(mainView); - mainView.showTab(_("lima.entries.addtransaction"), transactionView); + mainView.showTab(_("lima.entries.writetransaction"), transactionView); } public void showTransactionUnbalancedView(JAXXContext rootContext) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -33,7 +33,7 @@ <Table> <row> <cell fill="horizontal"> - <JLabel text="lima.account.number"/> + <JLabel text="lima.charts.account.number"/> </cell> <cell fill="horizontal"> <JTextField id="numberTextField" editable='{isAddState()}' text="{getAccount().getAccountNumber()}"/> @@ -44,7 +44,7 @@ </row> <row> <cell fill="horizontal"> - <JLabel text="lima.account.label"/> + <JLabel text="lima.common.label"/> </cell> <cell fill="horizontal"> <JTextField id="descriptionTextField" text="{getAccount().getLabel()}"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -39,13 +39,13 @@ </JScrollPane> </cell> <cell fill="horizontal"> - <JButton id="addButton" text="lima.common.add" + <JButton id="addButton" text="lima.charts.account.addAccount" onActionPerformed="getHandler().addAccount()"/> </cell> </row> <row> <cell fill="horizontal"> - <JButton id="addSubLedger" text="lima.common.addSubLedger" + <JButton id="addSubLedger" text="lima.charts.account.addSubLedger" onActionPerformed="getHandler().addSubLedger()" enabled="{isSelectedRow()}"/> </cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -226,8 +226,8 @@ int selectedRow = view.getAccountsTreeTable().getSelectedRow(); if ( selectedRow != -1) { int n = JOptionPane.showConfirmDialog(view, - _("lima.question.remove.account"), - _("lima.question"), + _("lima.charts.account.question.remove"), + _("lima.common.question"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (n == JOptionPane.YES_OPTION) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -34,7 +34,7 @@ <Table> <row> <cell fill="horizontal"> - <JLabel text="lima.subledger.code"/> + <JLabel text="lima.common.code"/> </cell> <cell fill="horizontal"> <JTextField id="numberTextField" editable='{isAddState()}' @@ -46,7 +46,7 @@ </row> <row> <cell fill="horizontal"> - <JLabel text="lima.account.label"/> + <JLabel text="lima.common.label"/> </cell> <cell fill="horizontal"> <JTextField id="descriptionTextField" text="{getAccount().getLabel()}"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsPeriodSearchPanel.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsPeriodSearchPanel.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -69,7 +69,7 @@ Calendar calendarEnd = Calendar.getInstance(); Date endDate = calendarEnd.getTime(); //handler().setEndDate(endDate); - JLabel beginDateLabel = new JLabel(_("lima.period.begindate")); + JLabel beginDateLabel = new JLabel(_("lima.common.begindate")); final JXDatePicker beginDatePicker = new JXDatePicker(beginDate); ActionListener beginDateActionListener = new ActionListener() { @Override @@ -81,7 +81,7 @@ handler.setBeginDate(beginDatePicker.getDate()); beginDatePicker.addActionListener(beginDateActionListener); - JLabel endDateLabel = new JLabel(_("lima.period.enddate")); + JLabel endDateLabel = new JLabel(_("lima.common.enddate")); final JXDatePicker endDatePicker = new JXDatePicker(endDate); ActionListener endDateActionListener = new ActionListener() { @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -38,7 +38,7 @@ <cell><AccountsReportsPeriodSearchPanel javaBean="periodSearchPanel"/></cell> </row></Table></cell> <cell anchor="east"> - <JLabel id="accountSelectorLabel" text="lima.account"/> + <JLabel id="accountSelectorLabel" text="lima.common.account"/> </cell> <cell anchor="west"> <JComboBox javaBean='new org.chorem.lima.ui.accountsreports.AccountComboBox(getHandler())' /> @@ -58,19 +58,19 @@ </row> <row fill="horizontal" anchor="center"> <cell> - <JLabel text="lima.amountdebit" /> + <JLabel text="lima.common.amountdebit" /> </cell> <cell> <JLabel id="amountDebitLabel" /> </cell> <cell> - <JLabel text="lima.amountcredit"/> + <JLabel text="lima.common.amountcredit"/> </cell> <cell> <JLabel id="amountCreditLabel" /> </cell> <cell> - <JLabel id="soldeLabel" text="lima.solde"/> + <JLabel id="soldeLabel" text="lima.common.solde"/> </cell> <cell> <JLabel id="amountSoldeLabel"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -129,15 +129,15 @@ if (amountSolde.doubleValue() == 0){ - view.soldeLabel.setText(_("lima.solde")); + view.soldeLabel.setText(_("lima.common.solde")); } else { // set label solde: credit or debit if (datasList.getSoldeDebit()) { - view.soldeLabel.setText(_("lima.soldedebit")); + view.soldeLabel.setText(_("lima.common.soldedebit")); } else { - view.soldeLabel.setText(_("lima.soldecredit")); + view.soldeLabel.setText(_("lima.common.soldecredit")); } } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalancePeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalancePeriodSearchPanel.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalancePeriodSearchPanel.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -70,7 +70,7 @@ Calendar calendarEnd = Calendar.getInstance(); Date endDate = calendarEnd.getTime(); //handler().setEndDate(endDate); - JLabel beginDateLabel = new JLabel(_("lima.period.begindate")); + JLabel beginDateLabel = new JLabel(_("lima.common.begindate")); final JXDatePicker beginDatePicker = new JXDatePicker(beginDate); ActionListener beginDateActionListener = new ActionListener() { @Override @@ -82,7 +82,7 @@ handler.setBeginDate(beginDatePicker.getDate()); beginDatePicker.addActionListener(beginDateActionListener); - JLabel endDateLabel = new JLabel(_("lima.period.enddate")); + JLabel endDateLabel = new JLabel(_("lima.common.enddate")); final JXDatePicker endDatePicker = new JXDatePicker(endDate); ActionListener endDateActionListener = new ActionListener() { @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -71,19 +71,19 @@ </row> <row fill="horizontal" anchor="center"> <cell> - <JLabel text="lima.amountdebit" /> + <JLabel text="lima.common.amountdebit" /> </cell> <cell> <JLabel id="amountDebitLabel" /> </cell> <cell> - <JLabel text="lima.amountcredit"/> + <JLabel text="lima.common.amountcredit"/> </cell> <cell> <JLabel id="amountCreditLabel" /> </cell> <cell> - <JLabel id="soldeLabel" text="lima.solde"/> + <JLabel id="soldeLabel" text="lima.common.solde"/> </cell> <cell> <JLabel id="amountSoldeLabel"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -140,15 +140,15 @@ if (amountSolde.doubleValue() == 0){ - view.soldeLabel.setText(_("lima.solde")); + view.soldeLabel.setText(_("lima.common.solde")); } else { // set label solde: credit or debit if (datasList.getSoldeDebit()) { - view.soldeLabel.setText(_("lima.soldedebit")); + view.soldeLabel.setText(_("lima.common.soldedebit")); } else { - view.soldeLabel.setText(_("lima.soldecredit")); + view.soldeLabel.setText(_("lima.common.soldecredit")); } } } Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookTypeListModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookTypeListModel.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookTypeListModel.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -1,76 +0,0 @@ -/* *##% Lima Swing - * Copyright (C) 2008 - 2010 CodeLutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ##%*/ - -package org.chorem.lima.ui.combobox; - -import static org.nuiton.i18n.I18n._; -import javax.swing.AbstractListModel; -import javax.swing.ComboBoxModel; - -/** - * Combo box model with entrybook types. - * (achats, ventes, trésorerie, général, situation). - * - */ -public class EntryBookTypeListModel extends AbstractListModel implements ComboBoxModel { - - private static final long serialVersionUID = 1L; - - protected Object selectedObject; - - /** Data. TODO put string in another place, don't use hard coded string. */ - protected Object[] data = new Object[]{ _("lima.entrybook.type1"), - _("lima.entrybook.type2"), _("lima.entrybook.type3"), - _("lima.entrybook.type4"), _("lima.entrybook.type5")}; - - public EntryBookTypeListModel() { - super(); - } - - /* - * @see javax.swing.ComboBoxModel#setSelectedItem(java.lang.Object) - */ - @Override - public void setSelectedItem(Object anItem) { - selectedObject = anItem; - } - - /* - * @see javax.swing.ComboBoxModel#getSelectedItem() - */ - @Override - public Object getSelectedItem() { - return selectedObject; - } - - /* - * @see javax.swing.ListModel#getSize() - */ - @Override - public int getSize() { - return data.length; - } - - /* - * @see javax.swing.ListModel#getElementAt(int) - */ - @Override - public Object getElementAt(int index) { - return data[index]; - } -} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -33,7 +33,7 @@ <Table> <row> <cell> - <JLabel text="lima.entrybook.code"/> + <JLabel text="lima.common.code"/> </cell> <cell> <JTextField id="entryBookCodeField" text="{getEntryBook().getCode()}"/> @@ -44,7 +44,7 @@ </row> <row> <cell> - <JLabel text="lima.entrybook.label"/> + <JLabel text="lima.common.label"/> </cell> <cell> <JTextField id="entryBookLabelField" editable='{isAddState()}' text="{getEntryBook().getLabel()}"/> @@ -55,16 +55,6 @@ </row> <row> <cell> - <JLabel text="lima.entrybook.type"/> - </cell> - <cell> - <JComboBox id="typeComboBox" model='{new org.chorem.lima.ui.combobox.EntryBookTypeListModel()}' - selectedItem="{getEntryBook().getType()}" - onActionPerformed="getEntryBook().setType((String)getTypeComboBox().getSelectedItem())"/> - </cell> - </row> - <row> - <cell> <JButton id="cancelButton" text="lima.common.cancel" onActionPerformed="performCancel()"/> </cell> <cell> 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-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -68,8 +68,9 @@ try { result = entryBookService.getAllEntryBooks().size(); } catch (LimaException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + if (log.isDebugEnabled()){ + log.debug("Can't get all entrybooks",e); + } } return result; @@ -77,7 +78,7 @@ @Override public int getColumnCount() { - return 3; + return 2; } @Override @@ -90,9 +91,6 @@ case 1: res = _("lima.table.label"); break; - case 2: - res = _("lima.table.type"); - break; } return res; } @@ -118,9 +116,6 @@ case 1: result = entryBook.getLabel(); break; - case 2: - result = entryBook.getType(); - break; } } catch (LimaException eee) { if (log.isDebugEnabled()){ @@ -176,7 +171,9 @@ public void notifyMethod(String serviceName, String methodeName) { //refresh on import datas - if (methodeName.contains("importEntryBooks") || methodeName.contains("importAll") || methodeName.contains("importAs")){ + if (methodeName.contains("importEntryBooks") + || methodeName.contains("importAll") + || methodeName.contains("importAs")){ fireTableDataChanged(); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -42,7 +42,7 @@ </row> <row> <cell fill="horizontal"> - <JButton id="addButton" text="lima.entrybook.add" + <JButton id="addButton" text="lima.charts.entrybook.add" onActionPerformed="getHandler().addEntryBook()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -130,9 +130,9 @@ int response = JOptionPane.showConfirmDialog(view, - _("Do you really want to delete entry book %s ?", + _("lima.charts.entrybook.confirmation", selectedEntryBook.getLabel()), - _("Confirmation"), JOptionPane.YES_NO_OPTION, + _("lima.common.confirmation"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsPeriodSearchPanel.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsPeriodSearchPanel.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -69,7 +69,7 @@ Calendar calendarEnd = Calendar.getInstance(); Date endDate = calendarEnd.getTime(); //handler().setEndDate(endDate); - JLabel beginDateLabel = new JLabel(_("lima.period.begindate")); + JLabel beginDateLabel = new JLabel(_("lima.common.begindate")); final JXDatePicker beginDatePicker = new JXDatePicker(beginDate); ActionListener beginDateActionListener = new ActionListener() { @Override @@ -81,7 +81,7 @@ handler.setBeginDate(beginDatePicker.getDate()); beginDatePicker.addActionListener(beginDateActionListener); - JLabel endDateLabel = new JLabel(_("lima.period.enddate")); + JLabel endDateLabel = new JLabel(_("lima.common.enddate")); final JXDatePicker endDatePicker = new JXDatePicker(endDate); ActionListener endDateActionListener = new ActionListener() { @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -39,7 +39,7 @@ <cell><EntryBooksReportsPeriodSearchPanel javaBean="periodSearchPanel"/></cell> </row></Table></cell> <cell anchor="east"> - <JLabel id="entryBookSelectorLabel" text="lima.entrybook"/> + <JLabel id="entryBookSelectorLabel" text="lima.common.entrybook"/> </cell> <cell anchor="west"> <JComboBox javaBean='new org.chorem.lima.ui.entrybooksreports.EntryBookComboBox(getHandler())' /> @@ -63,19 +63,19 @@ </row> <row fill="horizontal" anchor="center"> <cell> - <JLabel text="lima.amountdebit" /> + <JLabel text="lima.common.amountdebit" /> </cell> <cell> <JLabel id="amountDebitLabel" /> </cell> <cell> - <JLabel text="lima.amountcredit"/> + <JLabel text="lima.common.amountcredit"/> </cell> <cell> <JLabel id="amountCreditLabel" /> </cell> <cell> - <JLabel id="soldeLabel" text="lima.solde"/> + <JLabel id="soldeLabel" text="lima.common.solde"/> </cell> <cell> <JLabel id="amountSoldeLabel"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -149,15 +149,15 @@ view.amountSoldeLabel.setText(String.valueOf(amountSolde)); if (amountSolde.doubleValue() == 0){ - view.soldeLabel.setText(_("lima.solde")); + view.soldeLabel.setText(_("lima.common.solde")); } else { // set label solde: credit or debit if (datasList.getSoldeDebit()) { - view.soldeLabel.setText(_("lima.soldedebit")); + view.soldeLabel.setText(_("lima.common.soldedebit")); } else { - view.soldeLabel.setText(_("lima.soldecredit")); + view.soldeLabel.setText(_("lima.common.soldecredit")); } } } 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-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -151,10 +151,10 @@ break; case 2: if(closedPeriodicEntryBook.getLocked()){ - result = _("lima.close"); + result = _("lima.common.closed"); } else{ - result = _("lima.open"); + result = _("lima.common.open"); } break; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -42,7 +42,7 @@ <Table> <row> <cell> - <JButton id="blockButton" text="lima.financialperiod.block" enabled="{isSelectedPeriod()}" + <JButton id="blockButton" text="lima.charts.financialperiod.block" enabled="{isSelectedPeriod()}" onActionPerformed="getHandler().blockFinancialPeriod();" /> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -56,8 +56,8 @@ // blocked it try { ClosedPeriodicEntryBook closedPeriodicEntryBook = model.getFinancialPeriodAtRow(selectedRow); - int response = JOptionPane.showConfirmDialog(view, _("lima.question.financialperiod.blocked"), - _("lima.question"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + int response = JOptionPane.showConfirmDialog(view, _("lima.charts.financialperiod.question.blocked"), + _("lima.common.question"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { model.blockFinancialPeriod(closedPeriodicEntryBook); 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-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -236,8 +236,8 @@ int selectedRow = view.treeTable.getSelectedRow(); if ( selectedRow != -1) { int n = JOptionPane.showConfirmDialog(view, - _("lima.question.remove.account"), - _("lima.question"), + _("lima.charts.account.question.remove"), + _("lima.common.confirmation"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (n == JOptionPane.YES_OPTION) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -69,7 +69,7 @@ Calendar calendarEnd = Calendar.getInstance(); Date endDate = calendarEnd.getTime(); //handler().setEndDate(endDate); - JLabel beginDateLabel = new JLabel(_("lima.period.begindate")); + JLabel beginDateLabel = new JLabel(_("lima.common.begindate")); final JXDatePicker beginDatePicker = new JXDatePicker(beginDate); ActionListener beginDateActionListener = new ActionListener() { @Override @@ -81,7 +81,7 @@ handler.model.setBeginDate(beginDatePicker.getDate()); beginDatePicker.addActionListener(beginDateActionListener); - JLabel endDateLabel = new JLabel(_("lima.period.enddate")); + JLabel endDateLabel = new JLabel(_("lima.common.enddate")); final JXDatePicker endDatePicker = new JXDatePicker(endDate); ActionListener endDateActionListener = new ActionListener() { @Override 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-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -50,7 +50,7 @@ </script> <row weightx="1" weighty="0" anchor="center"> <cell anchor="east"> - <JLabel id="beginCalendarPanelLabel" text="lima.accountsreports.begincalendar"/> + <JLabel id="beginCalendarPanelLabel" text="lima.common.begindate"/> </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="beginDatePicker" @@ -58,7 +58,7 @@ getHandler().refresh()" /> </cell> <cell anchor="east"> - <JLabel id="endCalendarPanelLabel" text="lima.accountsreports.endcalendar"/> + <JLabel id="endCalendarPanelLabel" text="lima.common.enddate"/> </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="endDatePicker" Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CriteriaWidget.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CriteriaWidget.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CriteriaWidget.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -1,41 +0,0 @@ -<!-- ##% Lima Swing - Copyright (C) 2008 - 2010 CodeLutin - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - ##% --> - -<Table insets='5,5,5,5'> - <script> - protected void removeCriteriaWidget(){} - </script> - <row> - <cell> - <JAXXComboBox id="criteriaComboBox" width="200"> - <item value='date' label='{_("lima.date")}' selected="true"/> - <item value='voucher' label='{_("lima.voucher")}'/> - <item value='account' label='{_("lima.account")}'/> - <item value='description' label='{_("lima.description")}'/> - <item value='debit' label='{_("lima.debit")}'/> - <item value='credit' label='{_("lima.credit")}'/> - <item value='amount' label='{_("lima.amount")}'/> - </JAXXComboBox> - </cell> - <cell weightx="0"> - <JPanel id="criteriaPanel"/> - </cell> - <cell> - <JButton id="removeButton" text="lima.remove" onActionPerformed="removeCriteriaWidget()"/> - </cell> - </row> -</Table> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -54,7 +54,7 @@ editable="false"/> </cell> <cell anchor="east"> - <JLabel id="financialPeriodLabel" text="lima.transaction.period" + <JLabel id="financialPeriodLabel" text="lima.common.period" /> </cell> <cell anchor="west"> @@ -75,11 +75,11 @@ onActionPerformed="getHandler().pasteRow()" enabled="{isSelectedRow()}"/> </cell> <cell> - <JButton text="lima.add.transaction" + <JButton text="lima.entries.addTransaction" onActionPerformed="getHandler().addFinancialTransaction()"/> </cell> <cell> - <JButton text="lima.add.entry" onActionPerformed="getHandler().addEmptyEntry()" enabled="{isSelectedRow()}"/> + <JButton text="lima.entries.addEntry" onActionPerformed="getHandler().addEmptyEntry()" enabled="{isSelectedRow()}"/> </cell> <cell> <JButton text="lima.common.remove" Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -179,14 +179,14 @@ Object selectedValue = tableModel.getElementAt(indexSelectedRow); String message = null; if (selectedValue instanceof FinancialTransaction) { - message = _("lima.question.remove.transaction"); + message = _("lima.charts.financialtransaction.question.removetransaction"); } else { - message = _("lima.question.remove.entry"); + message = _("lima.charts.financialtransaction.question.removeentry"); } int response = JOptionPane.showConfirmDialog(view, message, - _("lima.transaction.confirmdelete"), JOptionPane.YES_NO_OPTION); + _("lima.common.confirmation"), JOptionPane.YES_NO_OPTION); if (response == JOptionPane.YES_OPTION) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -90,7 +90,7 @@ Calendar calendarEnd = Calendar.getInstance(); Date endDate = calendarEnd.getTime(); //handler().setEndDate(endDate); - JLabel beginDateLabel = new JLabel(_("lima.period.begindate")); + JLabel beginDateLabel = new JLabel(_("lima.common.begindate")); final JXDatePicker beginDatePicker = new JXDatePicker(beginDate); ActionListener beginDateActionListener = new ActionListener() { @Override @@ -102,7 +102,7 @@ handler.setBeginDate(beginDatePicker.getDate()); beginDatePicker.addActionListener(beginDateActionListener); - JLabel endDateLabel = new JLabel(_("lima.period.enddate")); + JLabel endDateLabel = new JLabel(_("lima.common.enddate")); final JXDatePicker endDatePicker = new JXDatePicker(endDate); ActionListener endDateActionListener = new ActionListener() { @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -86,7 +86,7 @@ </row> <row> <cell fill='both'><Table><row> - <cell><JLabel text="lima.amount"/></cell> + <cell><JLabel text="lima.common.amount"/></cell> <cell><JComboBox id="amountComboBox" javaBean="new JComboBox(FinancialStatementWayEnum.descriptions())" onActionPerformed="handler.setAmountWayEnum(FinancialStatementWayEnum.valueOfDescription((String)amountComboBox.getSelectedItem())); handler.refresh()"/></cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -56,7 +56,7 @@ editable="false"/> </cell> <cell> - <JButton text="lima.add.entry" + <JButton text="lima.entries.addEntry" onActionPerformed="getHandler().addEmptyEntry()" enabled="{isSelectedRow()}"/> </cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -109,14 +109,14 @@ Object selectedValue = tableModel.getElementAt(indexSelectedRow); String message = null; if (selectedValue instanceof FinancialTransaction) { - message = _("lima.question.remove.transaction"); + message = _("lima.charts.financialtransaction.question.removetransaction"); } else { - message = _("lima.question.remove.entry"); + message = _("lima.charts.financialtransaction.question.removeentry"); } int response = JOptionPane.showConfirmDialog(view, message, - _("lima.transaction.confirmdelete"), JOptionPane.YES_NO_OPTION); + _("lima.common.confirmation"), JOptionPane.YES_NO_OPTION); if (response == JOptionPane.YES_OPTION) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -80,7 +80,7 @@ <Table fill="both"> <row> <cell> - <JLabel text="lima.period.begindate"/> + <JLabel text="lima.common.begindate"/> </cell> <cell> <org.jdesktop.swingx.JXDatePicker id="beginDatePicker"/> @@ -88,7 +88,7 @@ </row> <row> <cell> - <JLabel text="lima.period.enddate"/> + <JLabel text="lima.common.enddate"/> </cell> <cell> <org.jdesktop.swingx.JXDatePicker id="endDatePicker"/> 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-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -143,10 +143,10 @@ break; case 1: if(fiscalPeriod.getLocked()){ - result = _("lima.close"); + result = _("lima.common.closed"); } else{ - result = _("lima.open"); + result = _("lima.common.open"); } break; } @@ -181,11 +181,6 @@ fireTableRowsInserted(currentRowCount, currentRowCount); } - public void removeAllFiscalPeriods() throws LimaException { - fiscalPeriodService.removeAllFiscalPeriods(); - fireTableDataChanged(); - } - public void blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { fiscalPeriodService.blockFiscalPeriod(fiscalPeriod); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -41,20 +41,14 @@ </row> <row> <cell fill="horizontal"> - <JButton id="addButton" text="lima.fiscalperiod.addFiscalPeriod" + <JButton id="addButton" text="lima.charts.fiscalperiod.add" onActionPerformed="getHandler().addFiscalPeriod()"/> </cell> </row> <row> <cell> - <JButton id="blockButton" text="lima.fiscalperiod.block" enabled="{isSelectedPeriod()}" + <JButton id="blockButton" text="lima.charts.fiscalperiod.block" enabled="{isSelectedPeriod()}" onActionPerformed="getHandler().blockFiscalPeriod()" /> </cell> </row> - <row> - <cell> - <JButton id="deleteButton" text="DEBUG delete all" - onActionPerformed="getHandler().removeAllFiscalPeriods()" /> - </cell> - </row> </Table> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -69,8 +69,8 @@ int n = 0; if(nbMonth !=12){ n = JOptionPane.showConfirmDialog(getView(), - _("lima.question.fiscalperiod.morethan12"), - _("lima.question"), + _("lima.charts.fiscalperiod.question.morethan12"), + _("lima.common.question"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); } @@ -99,8 +99,8 @@ model.getFiscalPeriodAtRow(selectedRow); int response = JOptionPane.showConfirmDialog(getView(), - _("lima.question.fiscalperiod.blocked"), - _("lima.question"), JOptionPane.YES_NO_OPTION, + _("lima.charts.fiscalperiod.question.blocked"), + _("lima.common.question"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { @@ -114,20 +114,6 @@ } } - /** just for debug, no release version */ - public void removeAllFiscalPeriods(){ - FiscalPeriodTableModel model = - (FiscalPeriodTableModel)getView().getFiscalPeriodTable().getModel(); - try { - model.removeAllFiscalPeriods(); - } catch (LimaException eee) { - if (log.isErrorEnabled()) { - log.error("Can't delete all fiscal period", eee); - } - DialogHelper.showMessageDialog(eee.getMessage()); - } - } - public FiscalPeriodView getView() { return view; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -92,18 +92,18 @@ List<Account> accounts = accountService.getAllAccounts(); if (accounts.size()>0){ setBackground(greenBackground); - String accountsString = _("limahome.chartaccounts.state1_2") + " " - + accounts.size() + " " + _("limahome.chartaccounts.state2_2") + String accountsString = _("lima.home.chartaccounts.state1_2") + " " + + accounts.size() + " " + _("lima.home.chartaccounts.state2_2") + "<br/><br/><a href='#accountschart'>" - + _("limahome.chartaccounts.modify") + "</a>"; + + _("lima.home.chartaccounts.modify") + "</a>"; //set Text setText(htmlBegin + accountsString + htmlEnd); } else { setBackground(redBackground); - String accountsString = _("limahome.chartaccounts.nothing") + String accountsString = _("lima.home.chartaccounts.nothing") + "<br/><br/><a href='#accountschart'>" - + _("limahome.chartaccounts.create") + "</a>"; + + _("lima.home.chartaccounts.create") + "</a>"; //set Text setText(htmlBegin + accountsString + htmlEnd); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -94,23 +94,23 @@ setBackground(greenBackground); String entryBooksString=""; if (ebSize == 1){ - entryBooksString = _("limahome.entrybooks.state.single") + entryBooksString = _("lima.home.entrybooks.state.single") + "<br/>" + entryBooks.get(0) + "<br/><br/><a href='#entrybookschart'>" - + _("limahome.entrybooks.modify") + "</a>"; + + _("lima.home.entrybooks.modify") + "</a>"; } else { - entryBooksString = _("limahome.entrybooks.state1_2.plural") + entryBooksString = _("lima.home.entrybooks.state1_2.plural") + " " + entryBooks.size() + " " - + _("limahome.entrybooks.state2_2.plural") + "<ul>"; + + _("lima.home.entrybooks.state2_2.plural") + "<ul>"; for (EntryBook entryBook : entryBooks) { entryBooksString += "<li>"+entryBook.getCode() + " - "+entryBook.getLabel()+"</li>"; } entryBooksString += "</ul></p><p horizontal-align:'center'>" + "<a href='#entrybookschart'>" - + _("limahome.entrybooks.modify") + "</a>"; + + _("lima.home.entrybooks.modify") + "</a>"; } //set Text setText(htmlBegin + entryBooksString + htmlEnd); @@ -119,9 +119,9 @@ setBackground(redBackground); //set Text setText(htmlBegin - + _("limahome.entrybooks.nothing") + + _("lima.home.entrybooks.nothing") + "<br/><br/><a href='#entrybookschart'>" - + _("limahome.entrybooks.create") +"</a>" + htmlEnd); + + _("lima.home.entrybooks.create") +"</a>" + htmlEnd); } } catch (LimaException eee) { 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 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -105,9 +105,9 @@ if (financialTransactionsUnbal.size()>0){ setBackground(redBackground); String transactionsString = financialTransactionsUnbal.size() - + " " + _("limahome.transaction.unbalanced") + + " " + _("lima.home.transaction.unbalanced") + "<br/><br/><a href='#financialtransactionunbalanced'>" - + _("limahome.transaction.modifiy.unbalanced") + "</a>"; + + _("lima.home.transaction.modifiy.unbalanced") + "</a>"; //set Text setText(htmlBegin + transactionsString + htmlEnd); } @@ -118,17 +118,17 @@ if (financialTransactionsBal.size()>0){ setBackground(greenBackground); String transactionsString = financialTransactionsBal.size() - + " " + _("limahome.transaction.balanced") + + " " + _("lima.home.transaction.balanced") + "<br/><br/><a href='#financialtransactionbalanced'>" - + _("limahome.transaction.modifiy.balanced") + "</a>"; + + _("lima.home.transaction.modifiy.balanced") + "</a>"; //set Text setText(htmlBegin + transactionsString + htmlEnd); } else { setBackground(redBackground); - String transactionsString = _("limahome.transaction.nothing") + String transactionsString = _("lima.home.transaction.nothing") + "<br/><br/><a href='#financialtransactionbalanced'>" - + _("limahome.transaction.create") + "</a>"; + + _("lima.home.transaction.create") + "</a>"; //set Text setText(htmlBegin + transactionsString + htmlEnd); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -93,11 +93,11 @@ if (unblockedFiscalPeriods.size()>0){ setBackground(greenBackground); String fiscalString = unblockedFiscalPeriods.size() + " " - + _("limahome.fiscalperiod.opened") + "<br/>" + + _("lima.home.fiscalperiod.opened") + "<br/>" + (fiscalPeriods.size()-unblockedFiscalPeriods.size()) - + " " + _("limahome.fiscalperiod.closed") + + " " + _("lima.home.fiscalperiod.closed") + "<br/><br/><a href='#fiscalperiodschart'>" - + _("limahome.fiscalperiod.modify") + "</a>"; + + _("lima.home.fiscalperiod.modify") + "</a>"; //set Text setText(htmlBegin + fiscalString + htmlEnd); @@ -105,13 +105,13 @@ } else { setBackground(redBackground); - String fiscalString = _("limahome.fiscalperiod.noopen"); + String fiscalString = _("lima.home.fiscalperiod.noopen"); if (fiscalPeriods.size()>0){ fiscalString += "<br/>" + fiscalPeriods.size() + " " - + _("limahome.fiscalperiod.closed"); + + _("lima.home.fiscalperiod.closed"); } fiscalString += "<br/><br/><a href='#fiscalperiodschart'>" - + _("limahome.fiscalperiod.create") + "</a>"; + + _("lima.home.fiscalperiod.create") + "</a>"; //set Text setText(htmlBegin + fiscalString + htmlEnd); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -32,7 +32,7 @@ <row> <cell anchor="southeast"> <JPanel - id = 'accountPanel' + id='accountPanel' border='{BorderFactory.createEtchedBorder(EtchedBorder.LOWERED)}' minimumSize='{getMiniSize()}' preferredSize='{getFixedSize()}' @@ -60,7 +60,7 @@ <Table> <row> <cell weightx="0" weighty="0.1" anchor="northwest"><JLabel icon='{new ImageIcon(getClass().getResource("/images/entrybooks.png"))}'/></cell> - <cell weightx="1" weighty="0.1" anchor="center"><JLabel foreground='{Color.DARK_GRAY}' font='{new Font("sans-serif", Font.BOLD, 16)}' text='lima.charts.entrybook'/></cell> + <cell weightx="1" weighty="0.1" anchor="center"><JLabel foreground='{Color.DARK_GRAY}' font='{new Font("sans-serif", Font.BOLD, 16)}' text='lima.common.entrybooks'/></cell> </row> <row fill="both"> <cell columns="2" weightx="1" weighty="0.9"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -49,7 +49,6 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.account.AccountViewHandler; import org.chorem.lima.util.DialogHelper; -import org.chorem.lima.util.FileChooseView; import org.jdesktop.swingx.painter.BusyPainter; public class ImportExport { @@ -97,95 +96,97 @@ encodingEnum = EncodingEnum.UTF8; if (file.equals("")){ file = chooseFile(importExportMethode.getImportMode(), importExportMethode); - log.debug(encodingEnum.getEncoding()); } - final EncodingEnum charset = encodingEnum; - final String filePath = file; - final Boolean verboseMode = verbose; - new SwingWorker<String,Void>() { - @Override protected String doInBackground() throws LimaException { - String datas = ""; - String result = ""; - switch (importExportMethodeF) { - case CSV_ALL_EXPORT: - datas = exportService.exportAsCSV(); - createFile(filePath, charset.getEncoding(), datas); - break; - case CSV_ACCOUNTCHARTS_EXPORT: - datas = exportService.exportAccountsChartAsCSV(); - createFile(filePath, charset.getEncoding(), datas); - break; - case CSV_ENTRYBOOKS_EXPORT: - datas = exportService.exportEntryBookChartAsCSV(); - createFile(filePath, charset.getEncoding(), datas); - break; - case CSV_FINANCIALSTATEMENTS_EXPORT: - datas = exportService.exportFinancialStatementChartAsCSV(); - createFile(filePath, charset.getEncoding(), datas); - break; - case EBP_ACCOUNTCHARTS_EXPORT: - //For windows ebp - datas = exportService.exportAccountsAsEBP(); - createFile(filePath, EncodingEnum.ISOLATIN1.getEncoding(), datas); - break; - case EBP_ENTRIES_EXPORT: - //For windows ebp - datas = exportService.exportEntriesAsEBP(); - createFile(filePath, EncodingEnum.ISOLATIN1.getEncoding(), datas); - break; - case CSV_ALL_IMPORT: - datas = extractFile(filePath, charset.getEncoding()); - result = importService.importAllAsCSV(datas); - break; - case CSV_ACCOUNTCHARTS_IMPORT: - datas = extractFile(filePath, charset.getEncoding()); - result = importService.importAsCSV(datas, ImportExportEntityEnum.ACCOUNT); - break; - case CSV_ENTRYBOOKS_IMPORT: - datas = extractFile(filePath, charset.getEncoding()); - result = importService.importAsCSV(datas, ImportExportEntityEnum.ENTRYBOOK); - break; - case CSV_FINANCIALSTATEMENTS_IMPORT: - datas = extractFile(filePath, charset.getEncoding()); - result = importService.importAsCSV(datas, ImportExportEntityEnum.FINANCIALSTATEMENT); - break; - case EBP_ACCOUNTCHARTS_IMPORT: - //For windows ebp - datas = extractFile(filePath, EncodingEnum.ISOLATIN1.getEncoding()); - result = importService.importAccountsChartFromEbp(datas); - break; - case EBP_ENTRIES_IMPORT: - //For windows ebp - datas = extractFile(filePath, EncodingEnum.ISOLATIN1.getEncoding()); - result = importService.importEntriesFromEbp(datas); - break; + //if export cancel + if (!file.equals("")){ + final EncodingEnum charset = encodingEnum; + final String filePath = file; + final Boolean verboseMode = verbose; + new SwingWorker<String,Void>() { + @Override protected String doInBackground() throws LimaException { + String datas = ""; + String result = ""; + switch (importExportMethodeF) { + case CSV_ALL_EXPORT: + datas = exportService.exportAsCSV(); + createFile(filePath, charset.getEncoding(), datas); + break; + case CSV_ACCOUNTCHARTS_EXPORT: + datas = exportService.exportAccountsChartAsCSV(); + createFile(filePath, charset.getEncoding(), datas); + break; + case CSV_ENTRYBOOKS_EXPORT: + datas = exportService.exportEntryBookChartAsCSV(); + createFile(filePath, charset.getEncoding(), datas); + break; + case CSV_FINANCIALSTATEMENTS_EXPORT: + datas = exportService.exportFinancialStatementChartAsCSV(); + createFile(filePath, charset.getEncoding(), datas); + break; + case EBP_ACCOUNTCHARTS_EXPORT: + //For windows ebp + datas = exportService.exportAccountsAsEBP(); + createFile(filePath, EncodingEnum.ISOLATIN1.getEncoding(), datas); + break; + case EBP_ENTRIES_EXPORT: + //For windows ebp + datas = exportService.exportEntriesAsEBP(); + createFile(filePath, EncodingEnum.ISOLATIN1.getEncoding(), datas); + break; + case CSV_ALL_IMPORT: + datas = extractFile(filePath, charset.getEncoding()); + result = importService.importAllAsCSV(datas); + break; + case CSV_ACCOUNTCHARTS_IMPORT: + datas = extractFile(filePath, charset.getEncoding()); + result = importService.importAsCSV(datas, ImportExportEntityEnum.ACCOUNT); + break; + case CSV_ENTRYBOOKS_IMPORT: + datas = extractFile(filePath, charset.getEncoding()); + result = importService.importAsCSV(datas, ImportExportEntityEnum.ENTRYBOOK); + break; + case CSV_FINANCIALSTATEMENTS_IMPORT: + datas = extractFile(filePath, charset.getEncoding()); + result = importService.importAsCSV(datas, ImportExportEntityEnum.FINANCIALSTATEMENT); + break; + case EBP_ACCOUNTCHARTS_IMPORT: + //For windows ebp + datas = extractFile(filePath, EncodingEnum.ISOLATIN1.getEncoding()); + result = importService.importAccountsChartFromEbp(datas); + break; + case EBP_ENTRIES_IMPORT: + //For windows ebp + datas = extractFile(filePath, EncodingEnum.ISOLATIN1.getEncoding()); + result = importService.importEntriesFromEbp(datas); + break; + } + return result; + } + @Override protected void done() { + try { + //hidde wait dialog panel + waitView.setVisible(false); + // display result dialog + if (verboseMode){ + String result = get(); + if (!result.equals("")){ + DialogHelper.showReportDialog(result, _("lima.importexport.import"), viewComponent); + } + else { + DialogHelper.showMessageDialog(_("lima.importexport.import.terminated")); + } + } + } catch (InterruptedException eeeIE) { + if (log.isDebugEnabled()){ + log.debug("Can't get result message", eeeIE); + } + } catch (ExecutionException eeeEE) { + DialogHelper.showMessageDialog(eeeEE.getMessage()); } - return result; - } - @Override protected void done() { - try { - //hidde wait dialog panel - waitView.setVisible(false); - // display result dialog - if (verboseMode){ - String result = get(); - if (!result.equals("")){ - DialogHelper.showReportDialog(result, _("lima.importexport.import"), viewComponent); - } - else { - DialogHelper.showMessageDialog(_("lima.importexport.import.terminated")); - } - } - } catch (InterruptedException eeeIE) { - if (log.isDebugEnabled()){ - log.debug("Can't get result message", eeeIE); - } - } catch (ExecutionException eeeEE) { - DialogHelper.showMessageDialog(eeeEE.getMessage()); - } - } - }.execute(); - waitView.setVisible(true); + } + }.execute(); + waitView.setVisible(true); + } } @@ -197,8 +198,7 @@ */ public String chooseFile(Boolean importMode, ImportExportEnum importExportMethode){ String filePath = ""; - FileChooseView fileChooseView = new FileChooseView(); - JFileChooser chooser = fileChooseView.getChooser(); + JFileChooser chooser = new JFileChooser(); //Encoding option JComboBox comboBox = new JComboBox(EncodingEnum.descriptions()); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerPeriodSearchPanel.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerPeriodSearchPanel.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -69,7 +69,7 @@ Calendar calendarEnd = Calendar.getInstance(); Date endDate = calendarEnd.getTime(); //handler().setEndDate(endDate); - JLabel beginDateLabel = new JLabel(_("lima.period.begindate")); + JLabel beginDateLabel = new JLabel(_("lima.common.begindate")); final JXDatePicker beginDatePicker = new JXDatePicker(beginDate); ActionListener beginDateActionListener = new ActionListener() { @Override @@ -81,7 +81,7 @@ handler.setBeginDate(beginDatePicker.getDate()); beginDatePicker.addActionListener(beginDateActionListener); - JLabel endDateLabel = new JLabel(_("lima.period.enddate")); + JLabel endDateLabel = new JLabel(_("lima.common.enddate")); final JXDatePicker endDatePicker = new JXDatePicker(endDate); ActionListener endDateActionListener = new ActionListener() { @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -69,19 +69,19 @@ </row> <row fill="horizontal" anchor="center"> <cell> - <JLabel text="lima.amountdebit" /> + <JLabel text="lima.common.amountdebit" /> </cell> <cell> <JLabel id="amountDebitLabel" /> </cell> <cell> - <JLabel text="lima.amountcredit"/> + <JLabel text="lima.common.amountcredit"/> </cell> <cell> <JLabel id="amountCreditLabel" /> </cell> <cell> - <JLabel id="soldeLabel" text="lima.solde"/> + <JLabel id="soldeLabel" text="lima.common.solde"/> </cell> <cell> <JLabel id="amountSoldeLabel"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -170,15 +170,15 @@ String.valueOf(amountSolde)); if (amountSolde.doubleValue() == 0){ - view.soldeLabel.setText(_("lima.solde")); + view.soldeLabel.setText(_("lima.common.solde")); } else { // set label solde: credit or debit if (balanceTrialCache.getSoldeDebit()) { - view.soldeLabel.setText(_("lima.soldedebit")); + view.soldeLabel.setText(_("lima.common.soldedebit")); } else { - view.soldeLabel.setText(_("lima.soldecredit")); + view.soldeLabel.setText(_("lima.common.soldecredit")); } } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -26,7 +26,7 @@ </row> <row> <cell> - <JCheckBox id='importEntryBook' text='lima.import.journal' selected='false'/> + <JCheckBox id='importEntryBook' text='lima.importexport.defaultentrybooks' selected='false'/> </cell> </row> </Table> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -59,18 +59,18 @@ <Table fill="both"> <row> <cell columns ="3"> - <JLabel text="lima.period.create"/> + <JLabel text="lima.charts.fiscalperiod.create"/> </cell> </row> <row> <cell> - <JLabel text="lima.period.begindate"/> + <JLabel text="lima.common.begindate"/> </cell> <cell> <org.jdesktop.swingx.JXDatePicker id="beginDatePicker"/> </cell> <cell> - <JLabel text="lima.period.enddate"/> + <JLabel text="lima.common.enddate"/> </cell> <cell> <org.jdesktop.swingx.JXDatePicker id="endDatePicker"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -35,7 +35,7 @@ String[] response = {_("lima.response.yes"), _("lima.response.no")}; return JOptionPane.showOptionDialog(null, message, - _("lima.question"), + _("lima.common.question"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, //do not use a custom Icon @@ -49,7 +49,7 @@ JOptionPane.showMessageDialog( f, message, - _("lima.error"), + _("lima.common.error"), JOptionPane.ERROR_MESSAGE); f.dispose(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/util/ErrorHelper.java 2010-08-23 16:38:53 UTC (rev 3015) @@ -67,7 +67,7 @@ public static void showErrorDialog(Component parent, String message, Throwable cause) { JXErrorPane pane = new JXErrorPane(); - ErrorInfo info = new ErrorInfo(_("lima.error.errorpane.title"), + ErrorInfo info = new ErrorInfo(_("lima.common.error"), _("lima.error.errorpane.htmlmessage", message), null, null, cause, null, null); pane.setErrorInfo(info); Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/util/FileChooseView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/util/FileChooseView.jaxx 2010-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/java/org/chorem/lima/util/FileChooseView.jaxx 2010-08-23 16:38:53 UTC (rev 3015) @@ -1,3 +0,0 @@ -<JFrame title="lima.export"> - <JFileChooser id="chooser" width="620" height="400"/> -</JFrame> \ No newline at end of file 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-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-08-23 16:38:53 UTC (rev 3015) @@ -1,182 +1,165 @@ -Confirmation= -DEBUG\ delete\ all= -Do\ you\ really\ want\ to\ delete\ entry\ book\ %s\ ?= -Global\ lima\ exception= -lima.about.message= -lima.account=Account -lima.account.label=Label -lima.account.number=Number -lima.accountsreports.accountfilter=Filter -lima.accountsreports.begincalendar= -lima.accountsreports.endcalendar= -lima.accountsreports.movmentedfilter= lima.action.commandline.help=Show help in console lima.action.fullscreen=Full screen lima.action.fullscreen.tip=Open ui in full screen lima.action.normalscreen=Normal screen lima.action.normalscreen.tip=Open ui in normal screen -lima.add.entry=Add an entry -lima.add.transaction=Add a transaction -lima.amount=Amount -lima.amountcredit= -lima.amountdebit= lima.charts.account=Accounts chart -lima.charts.account.base= -lima.charts.account.developed= -lima.charts.account.nothing= -lima.charts.account.shortened= -lima.charts.entrybook=EntryBooks chart -lima.charts.entrybook.default= -lima.charts.entrybook.import= +lima.charts.account.addAccount=Add account +lima.charts.account.addSubLedger=Add thirdpart account +lima.charts.account.base=Base accountchart +lima.charts.account.developed=Developped accountchart +lima.charts.account.number=Account Number +lima.charts.account.question.remove=Do you really remove this account ? +lima.charts.account.shortened=Shorthened accountchart +lima.charts.entrybook.add=Add entrybook +lima.charts.entrybook.confirmation=Do you really remove this entrybook ? +lima.charts.entrybook.default=Defaults entrybooks +lima.charts.entrybook.import=Import entrybooks lima.charts.financialperiod=Financial Periods -lima.charts.financialstatement= -lima.charts.financialstatement.base= -lima.charts.financialstatement.developed= -lima.charts.financialstatement.nothing= -lima.charts.financialstatement.shortened= +lima.charts.financialperiod.block=Block financialperiod +lima.charts.financialperiod.question.blocked=Do you really block this financialperiod ? This action is irreversible \! +lima.charts.financialstatement=Financialstatement chart +lima.charts.financialstatement.base=Base financialstatement chart +lima.charts.financialstatement.developed=Developped financialstatement chart +lima.charts.financialstatement.nothing=NO financialstatement chart +lima.charts.financialstatement.shortened=Shortened financialstatement chart +lima.charts.financialtransaction.question.removeentry=Do you really remove this entry ? +lima.charts.financialtransaction.question.removetransaction=Do you really remove this transaction ? +lima.charts.fiscalperiod.add=Add fiscalperiod +lima.charts.fiscalperiod.block=Block fiscalperiod +lima.charts.fiscalperiod.create=Create fiscalperiod +lima.charts.fiscalperiod.question.blocked=Block financialperiod +lima.charts.fiscalperiod.question.morethan12=This period is longer than 12 months. Do you really create this ? lima.charts.fiscalyear=Fiscal Years -lima.close=Closed -lima.common.add= -lima.common.addSubLedger= -lima.common.cancel= -lima.common.close= -lima.common.copy= -lima.common.filter= -lima.common.fin= -lima.common.import= -lima.common.importexport=Import/Export -lima.common.movmentedfilter= -lima.common.next= -lima.common.ok= -lima.common.paste= -lima.common.print= -lima.common.quit= -lima.common.remove= -lima.common.search= -lima.common.update= -lima.config.category.directories= -lima.config.category.directories.description= -lima.config.category.other= -lima.config.category.other.description= +lima.common.account=Account +lima.common.amount=Amount +lima.common.amountcredit=Credit amount +lima.common.amountdebit=Debit amount +lima.common.begindate=Begin +lima.common.cancel=Cancel +lima.common.close=Close +lima.common.closed=Closed +lima.common.code=Code +lima.common.confirmation=Confirmation +lima.common.copy=Copy +lima.common.enddate=End +lima.common.entrybook=EntryBook +lima.common.entrybooks=EntryBooks +lima.common.error=Error +lima.common.filter=Filter +lima.common.fin=Terminated +lima.common.globalexception=Global lima exception +lima.common.label=Label +lima.common.movmentedfilter=Accounts filtered +lima.common.next=Next +lima.common.ok=OK +lima.common.open=Open +lima.common.paste=Paste +lima.common.period=Period +lima.common.question=Question +lima.common.quit=Exit +lima.common.remove=Remove +lima.common.search=Search +lima.common.solde=Solde +lima.common.soldecredit=Credit solde +lima.common.soldedebit=Debit solde +lima.common.update=Modify +lima.config.category.directories=Directories +lima.config.category.directories.description=Directories used by LIMA +lima.config.category.other=Other +lima.config.category.other.description=Other configuration properties lima.config.configFileName.description= -lima.config.host.adress= -lima.config.host.httpport= -lima.config.locale.description= +lima.config.host.adress=Host adress +lima.config.locale.description=Localization used by LIMA lima.config.ui.flaunchui.description= -lima.config.ui.fullscreen.description= -lima.createPDF= -lima.credit=Credit +lima.config.ui.fullscreen.description=FullScreen lima.daily=Daily -lima.date=Date -lima.debit=Debit -lima.description=Description -lima.dialogreport= -lima.documents= -lima.documents.html= +lima.documents=Documents... lima.entries=Entries -lima.entries.addtransaction= -lima.entries.lettering= -lima.entries.searchtransaction= -lima.entries.searchunbalancedtransaction= -lima.entrybook=Entry Book -lima.entrybook.add=Add Entry Book -lima.entrybook.code= -lima.entrybook.label= -lima.entrybook.type= -lima.entrybook.type1= -lima.entrybook.type2= -lima.entrybook.type3= -lima.entrybook.type4= -lima.entrybook.type5= -lima.enum.comboboxaccount.account= -lima.enum.comboboxaccount.accountlist= -lima.enum.comboboxaccount.allaccount= -lima.enum.comboboxamount.both= -lima.enum.comboboxamount.credit= -lima.enum.comboboxamount.debit= -lima.enum.comboboxentrybook.all= -lima.enum.comboboxentrybook.select_one= -lima.enum.comboboxoperator.equal= -lima.enum.comboboxoperator.inferior= -lima.enum.comboboxoperator.inferiororequal= -lima.enum.comboboxoperator.interval= -lima.enum.comboboxoperator.intervalle= -lima.enum.comboboxoperator.notequal= -lima.enum.comboboxoperator.superior= -lima.enum.comboboxoperator.superiororequal= -lima.enum.comboboxperiod.date= -lima.enum.comboboxperiod.financialperiod= -lima.enum.comboboxperiod.fiscalperiod= -lima.enum.comboboxperiod.period= -lima.error=Error +lima.entries.addEntry=Add entry +lima.entries.addTransaction=Add transaction +lima.entries.searchtransaction=Search transaction +lima.entries.searchunbalancedtransaction=Incorrect transactions +lima.entries.writetransaction=Write entries +lima.enum.comboboxaccount.account=Account +lima.enum.comboboxaccount.accountlist=Account list +lima.enum.comboboxaccount.allaccount=All accounts +lima.enum.comboboxentrybook.all=All entrybooks +lima.enum.comboboxentrybook.select_one=EntryBook +lima.enum.comboboxoperator.equal=Equal +lima.enum.comboboxoperator.inferior=Inferior +lima.enum.comboboxoperator.inferiororequal=Inferior or equal +lima.enum.comboboxoperator.interval=Inteval +lima.enum.comboboxoperator.notequal=Not equal +lima.enum.comboboxoperator.superior=Superior +lima.enum.comboboxoperator.superiororequal=Superior or equal +lima.enum.comboboxperiod.date=Date +lima.enum.comboboxperiod.financialperiod=Financial period +lima.enum.comboboxperiod.fiscalperiod=Fiscal period +lima.enum.comboboxperiod.period=Period lima.error.errorpane.htmlmessage=<html><body><b>An application error happened</b>\:<br/>%s</body></html> -lima.error.errorpane.title=Lima error -lima.export=Export -lima.export.account=Export PCG -lima.export.all=Export all datas (XML) -lima.export.all.csv=Exporter all datas (CSV) -lima.financialperiod.block= -lima.financialstament.check= -lima.financialstatement.accounts= -lima.financialstatement.check= -lima.financialstatement.credit= -lima.financialstatement.creditaccounts= -lima.financialstatement.debit= -lima.financialstatement.debitaccounts= -lima.financialstatement.delete= -lima.financialstatement.formula= -lima.financialstatement.header.add= -lima.financialstatement.headeramount= -lima.financialstatement.label= -lima.financialstatement.movement.add= -lima.financialstatement.provisiondeprecationaccounts= -lima.financialstatement.subamount= -lima.fiscalperiod.addFiscalPeriod= -lima.fiscalperiod.block= -lima.identity= -lima.identity.address= -lima.identity.address2= -lima.identity.businessNumber= -lima.identity.city= -lima.identity.classificationCode= -lima.identity.contact= -lima.identity.description= -lima.identity.email= -lima.identity.name= -lima.identity.phoneNumber= -lima.identity.vatNumber= -lima.identity.zipCode= -lima.import=Import -lima.import.account=Import PCG -lima.import.all=Import all datas -lima.import.all.csv=Import all datas (CSV) -lima.import.all.csv.ebp=Import all datas (EBP) -lima.import.journal=Import journal -lima.importexport.accountcharts= -lima.importexport.all= -lima.importexport.choiceencoding= -lima.importexport.csv= -lima.importexport.ebp= -lima.importexport.entries= -lima.importexport.entrybooks= +lima.financialstatement.accounts=Account list on debit and on credit +lima.financialstatement.check=Check accounts passing to movement +lima.financialstatement.creditaccounts=Account credit list +lima.financialstatement.debitaccounts=Account debit list +lima.financialstatement.delete=Delete actual financialstatement chart before import new +lima.financialstatement.header.add=Add category +lima.financialstatement.headeramount=Calculate amount on header +lima.financialstatement.label=Label +lima.financialstatement.movement.add=Add movement +lima.financialstatement.provisiondeprecationaccounts=Provisions and deprecations accounts list +lima.financialstatement.subamount=Calculate a subamount +lima.home.chartaccounts.create=Create accountschart +lima.home.chartaccounts.modify=Modify accountschart +lima.home.chartaccounts.nothing=No accountschart +lima.home.chartaccounts.state1_2=The chart have +lima.home.chartaccounts.state2_2=accounts +lima.home.entrybooks.create=Create entrybook +lima.home.entrybooks.modify=Modifiy entrybook +lima.home.entrybooks.nothing=No entrybook +lima.home.entrybooks.state.single=Entrybook is +lima.home.entrybooks.state1_2.plural=The +lima.home.entrybooks.state2_2.plural=entrybooks are +lima.home.fiscalperiod.closed=fiscalperiods closed +lima.home.fiscalperiod.create=Create fiscalperiod +lima.home.fiscalperiod.modify=Modify fiscalperiod +lima.home.fiscalperiod.noopen=No fiscalperiod +lima.home.fiscalperiod.opened=fiscalperiods open +lima.home.transaction.balanced=transactions are balanced +lima.home.transaction.create=Create entries +lima.home.transaction.modifiy.balanced=Modify entries +lima.home.transaction.modifiy.unbalanced=Modify incorrect entries +lima.home.transaction.nothing=No transaction +lima.home.transaction.unbalanced=transactions are not balanced +lima.identity=Identity +lima.identity.address=Address +lima.identity.address2=Address (next) +lima.identity.businessNumber=Business number +lima.identity.city=City +lima.identity.classificationCode=Classification code +lima.identity.contact=Contact +lima.identity.description=Description +lima.identity.email=Email +lima.identity.name=Name +lima.identity.phoneNumber=Phone number +lima.identity.vatNumber=VAT number +lima.identity.zipCode=Zip code +lima.importexport.accountcharts=Accounts chart +lima.importexport.all=All +lima.importexport.choiceencoding=Choice encoding +lima.importexport.csv=Import/Export CSV +lima.importexport.defaultentrybooks=Defaults entrybooks +lima.importexport.ebp=Import/Export EBP +lima.importexport.entries=Entries lima.importexport.export=Export -lima.importexport.financialstatements= +lima.importexport.financialstatements=FinancialStatements chart lima.importexport.import=Import -lima.importexport.import.terminated= -lima.importexport.importcsv= -lima.importexport.importebp= -lima.importexport.lima= -lima.importexport.wait= +lima.importexport.import.terminated=Import terminated +lima.importexport.importcsv=Import CSV +lima.importexport.importebp=Import EBP +lima.importexport.wait=Job in progress\u2026 lima.init.closed=Lima closed at %1$s -lima.init.errorclosing= -lima.lettering.add= -lima.lettering.entries= -lima.lettering.from= -lima.lettering.lettered= -lima.lettering.letteredall= -lima.lettering.notlettered= -lima.lettering.remove= -lima.lettering.to= +lima.init.errorclosing=Error during Lima close lima.menu.file=File lima.menu.help=Help lima.menu.help.about=About @@ -185,115 +168,54 @@ lima.menu.help.i18n.fr=French lima.menu.help.i18n.uk=English lima.menu.help.site=WebSite -lima.menu.window= -lima.message.help.usage= -lima.misc.supportemail.description= -lima.open=Open +lima.menu.window=Window +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.entrybook= -lima.opening.import= -lima.opening.welcome= -lima.pdf= -lima.period.begindate= -lima.period.create= -lima.period.enddate= +lima.opening.accounts=<html><center>No account chart is load<br/>Select a default, <br/>import your personnal<br/> or cancel to create your own account chart.</center></html> +lima.opening.entrybook=<html>Tick box to import default accounts chart\:<br/> Achats, Ventes, Tr\u00E9sorerie, Op\u00E9ration diverses</html> +lima.opening.import=Import a CSV Save +lima.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.preferences=Preferences -lima.question=Question -lima.question.financialperiod.blocked= -lima.question.fiscalperiod.blocked= -lima.question.fiscalperiod.morethan12= -lima.question.load.accounts=There is no existing accounts in Lima. Do you want to load default accounts ? -lima.question.remove.account=Do you want to remove this account ? -lima.question.remove.entry=Do you want to remove this entry ? -lima.question.remove.transaction=Do you want to remove this transaction ? lima.refresh=\u21BB -lima.remove=Remove lima.reports=Reports lima.reports.accounts=Edit account lima.reports.balance=Balance lima.reports.entrybooks=Edit entrybook -lima.reports.financialstatement= +lima.reports.financialstatement=Financialstatements lima.reports.ledger=Ledger lima.response.no=No lima.response.yes=Yes -lima.solde= -lima.soldecredit= -lima.soldedebit= lima.splash.1=Loading services... lima.splash.2="Loading accounting... lima.splash.3=Ready \! lima.structure=Structure -lima.subledger.code=Code lima.tab.home=Home -lima.tab.result=Result -lima.table.account= -lima.table.balance= -lima.table.closure= -lima.table.code= -lima.table.credit= -lima.table.date= -lima.table.debit= -lima.table.debitcredit= -lima.table.description= -lima.table.entrybook= -lima.table.fiscalperiod= -lima.table.grossamount= -lima.table.label= -lima.table.letter= -lima.table.lettering= -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.table.account=Account +lima.table.balance=Balance +lima.table.closure=Closed +lima.table.code=Code +lima.table.credit=Credit +lima.table.date=Date +lima.table.debit=Debit +lima.table.debitcredit=Debit and credit +lima.table.description=Description +lima.table.entrybook=EntryBook +lima.table.fiscalperiod=Fiscalperiod +lima.table.grossamount=Gross amount +lima.table.label=Label +lima.table.letter=Letter +lima.table.move.credit=Movmented Credit +lima.table.move.debit=Movemented Debit +lima.table.netamount=Net amount +lima.table.number=Account Number +lima.table.period=Period +lima.table.provisiondeprecationamount=Provision & Deprecation +lima.table.solde=Solder +lima.table.solde.credit=Credit solde +lima.table.solde.debit=Debit solde +lima.table.voucher=Voucher lima.title=Lutin Invoice Monitoring and Accounting lima.title.about=About Lima... -lima.transaction.confirmdelete= -lima.transaction.period=Period -lima.voucher=Voucher +lima.title.about.description=Open sources accounting software lima.warning.nimbus.landf=Could not find Numbus Look&Feel -lima.welcome= -limahome.chartaccounts.create= -limahome.chartaccounts.modify= -limahome.chartaccounts.nothing= -limahome.chartaccounts.state1_2= -limahome.chartaccounts.state2_2= -limahome.chartaccounts1= -limahome.chartaccounts2= -limahome.createchartaccounts= -limahome.createchartaccounts1= -limahome.createchartaccounts2= -limahome.entrybooknoopen= -limahome.entrybooks.create= -limahome.entrybooks.modify= -limahome.entrybooks.nothing= -limahome.entrybooks.state.single= -limahome.entrybooks.state1_2.plural= -limahome.entrybooks.state2_2.plural= -limahome.entrybooks1= -limahome.entrybooks2= -limahome.fiscalperiod.closed= -limahome.fiscalperiod.create= -limahome.fiscalperiod.modify= -limahome.fiscalperiod.noopen= -limahome.fiscalperiod.opened= -limahome.fiscalperiodclosed= -limahome.fiscalperiodnoopen= -limahome.fiscalperiodopened= -limahome.transaction.balanced= -limahome.transaction.create= -limahome.transaction.modifiy= -limahome.transaction.modifiy.balanced= -limahome.transaction.modifiy.unbalanced= -limahome.transaction.nothing= -limahome.transaction.unbalanced= -limahome.transactionbalanced= -limahome.transactionunbalanced= 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-08-23 09:35:53 UTC (rev 3014) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-08-23 16:38:53 UTC (rev 3015) @@ -1,94 +1,89 @@ -Confirmation= -DEBUG\ delete\ all= -Do\ you\ really\ want\ to\ delete\ entry\ book\ %s\ ?= -Global\ lima\ exception= -lima.about.message=\u00C0 propos de Lima -lima.account=Compte -lima.account.label= -lima.account.number= -lima.accountsreports.begincalendar= -lima.accountsreports.endcalendar= lima.action.commandline.help=Afficher l'aide en console lima.action.fullscreen=Plein Ecran lima.action.fullscreen.tip=Passer en mode plein \u00E9cran lima.action.normalscreen=Ecran normal lima.action.normalscreen.tip=Revenir en \u00E9cran normal -lima.add.entry=Ajouter entr\u00E9e -lima.add.transaction=Ajouter transaction -lima.amount=Montant -lima.amountcredit=Total Cr\u00E9dit -lima.amountdebit=Total D\u00E9bit lima.charts.account=Plan comptable +lima.charts.account.addAccount=Ajout Compte G\u00E9n\u00E9ral +lima.charts.account.addSubLedger=Ajouter Compte Tiers lima.charts.account.base=Plan comptable de base lima.charts.account.developed=Plan comptable d\u00E9velopp\u00E9 +lima.charts.account.number=Num\u00E9ro de compte +lima.charts.account.question.remove=Voulez-vous supprimer ce compte? lima.charts.account.shortened=Plan comptable abr\u00E9g\u00E9 -lima.charts.entrybook=Journaux +lima.charts.entrybook.add=Ajouter un journal +lima.charts.entrybook.confirmation=Do you really want to delete entry book %s ? lima.charts.entrybook.default=Journaux par d\u00E9fault lima.charts.entrybook.import=Importer des journaux lima.charts.financialperiod=P\u00E9riodes comptables +lima.charts.financialperiod.block=Cloturer une p\u00E9riode +lima.charts.financialperiod.question.blocked=\u00C8tes vous s\u00FBre de vouloir cl\u00F4turer cette p\u00E9riode ? Cette action est irr\u00E9versible \! lima.charts.financialstatement=Plan BCR lima.charts.financialstatement.base=Plan BCR de base lima.charts.financialstatement.developed=Plan BCR d\u00E9velopp\u00E9 lima.charts.financialstatement.nothing=<html><center>Aucun plan BCR charg\u00E9<br/>Veuillez s\u00E9lectionner un plan par d\u00E9fault, <br/>importer un plan personnalis\u00E9<br/> ou annuler pour cr\u00E9er votre propre plan.</center></html> lima.charts.financialstatement.shortened=Plan BCR abr\u00E9g\u00E9 +lima.charts.financialtransaction.question.removeentry=Voulez-vous supprimer cette ligne de transaction? +lima.charts.financialtransaction.question.removetransaction=Voulez-vous supprimer cette transaction? +lima.charts.fiscalperiod.add=Nouvel exercice +lima.charts.fiscalperiod.block=Cloturer un exercice +lima.charts.fiscalperiod.create=Choisissez la date de d\u00E9but et de fin du nouvel exercice +lima.charts.fiscalperiod.question.blocked=\u00C8tes vous s\u00FBre de vouloir cl\u00F4turer cette exercice ? Cette action est irr\u00E9versible \! +lima.charts.fiscalperiod.question.morethan12=La p\u00E9riode s\u00E9lectionn\u00E9e n'est pas de 12 mois, voulez-vous continuer ? lima.charts.fiscalyear=Exercices -lima.close=Ferm\u00E9 -lima.common.add=Ajout Compte G\u00E9n\u00E9ral -lima.common.addSubLedger=Ajouter Compte Tiers +lima.common.account=Compte +lima.common.amount=Montant +lima.common.amountcredit=Total Cr\u00E9dit +lima.common.amountdebit=Total D\u00E9bit +lima.common.begindate=D\u00E9but lima.common.cancel=Annuler lima.common.close=Fermer +lima.common.closed=Ferm\u00E9 +lima.common.code=Code +lima.common.confirmation=Confirmation lima.common.copy=Copier +lima.common.enddate=Fin +lima.common.entrybook=Journal +lima.common.entrybooks=Journaux +lima.common.error=Erreur lima.common.filter=Filtrer lima.common.fin=Termin\u00E9 -lima.common.importexport=Importer/Exporter +lima.common.globalexception=Global lima exception +lima.common.label=Libell\u00E9 lima.common.movmentedfilter=Comptes mouvement\u00E9s lima.common.next=Suivant lima.common.ok=OK +lima.common.open=Ouvert lima.common.paste=Coller -lima.common.print= +lima.common.period=P\u00E9riode +lima.common.question=Question lima.common.quit=Quitter lima.common.remove=Supprimer lima.common.search=Rechercher +lima.common.solde=Solde +lima.common.soldecredit=Solde Cr\u00E9diteur +lima.common.soldedebit=Solde D\u00E9biteur lima.common.update=Modifier lima.config.category.directories=R\u00E9pertoires lima.config.category.directories.description=R\u00E9pertoires utilis\u00E9s par Lima lima.config.category.other=Autre lima.config.category.other.description=Autre propri\u00E9t\u00E9s de configuration lima.config.configFileName.description= -lima.config.host.adress= -lima.config.host.httpport= +lima.config.host.adress=Adresse du serveur distant lima.config.locale.description=Locale utilis\u00E9e par l'application lima.config.ui.flaunchui.description= -lima.config.ui.fullscreen.description= -lima.createPDF= -lima.credit=Credit +lima.config.ui.fullscreen.description=Plein \u00E9cran lima.daily=Quotidien -lima.date=Date -lima.debit=Debit -lima.description=Description -lima.dialogreport= lima.documents=Documents\u0085 lima.entries=Traitement -lima.entries.addtransaction=Saisir des \u00E9critures -lima.entries.lettering=Ajouter une lettre +lima.entries.addEntry=Ajouter entr\u00E9e +lima.entries.addTransaction=Ajouter transaction lima.entries.searchtransaction=Rechercher des \u00E9critures lima.entries.searchunbalancedtransaction=Entr\u00E9es incorrect -lima.entrybook=Journal -lima.entrybook.add=Ajouter un journal -lima.entrybook.code= -lima.entrybook.label= -lima.entrybook.type= -lima.entrybook.type1=Achats -lima.entrybook.type2=Ventes -lima.entrybook.type3=Tr\u00E9sorerie -lima.entrybook.type4=G\u00E9n\u00E9ral -lima.entrybook.type5=Situation +lima.entries.writetransaction=Saisir des \u00E9critures lima.enum.comboboxaccount.account=Compte lima.enum.comboboxaccount.accountlist=Liste de comptes lima.enum.comboboxaccount.allaccount=Tous les comptes -lima.enum.comboboxamount.both=Les deux -lima.enum.comboboxamount.credit=Cr\u00E9dit -lima.enum.comboboxamount.debit=D\u00E9bit lima.enum.comboboxentrybook.all=Tous les journaux lima.enum.comboboxentrybook.select_one=Journal lima.enum.comboboxoperator.equal=\u00C9gal @@ -102,29 +97,40 @@ lima.enum.comboboxperiod.financialperiod=P\u00E9riode Financi\u00E8re lima.enum.comboboxperiod.fiscalperiod=Exercice lima.enum.comboboxperiod.period=P\u00E9riode -lima.error=Erreur lima.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> -lima.error.errorpane.title=Lima erreur -lima.export=Export -lima.export.account=Exporter le PCG -lima.export.all=Exporter toutes les donn\u00E9es (XML) -lima.export.all.csv=Exporter toutes les donn\u00E9es (CSV) -lima.financialperiod.block=Cloturer une p\u00E9riode lima.financialstatement.accounts=Liste de comptes au cr\u00E9dit et au d\u00E9bit lima.financialstatement.check=V\u00E9rification des comptes aux postes -lima.financialstatement.credit=Sens du poste \: d\u00E9bit lima.financialstatement.creditaccounts=Liste de comptes au cr\u00E9dit lima.financialstatement.debitaccounts=Liste de comptes au d\u00E9bit lima.financialstatement.delete=Supprimer le plan BCR actuel avant d'importer -lima.financialstatement.formula=Formule de compte, ex \: '7'-'6'+'510-520' lima.financialstatement.header.add=Ajouter une cat\u00E9gorie lima.financialstatement.headeramount=Calculer le total en en-tete 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.fiscalperiod.addFiscalPeriod=Nouvel exercice -lima.fiscalperiod.block=Cloturer un exercice +lima.home.chartaccounts.create=Cr\u00E9er le plan des comptes +lima.home.chartaccounts.modify=Modifier le plan des comptes +lima.home.chartaccounts.nothing=Aucun compte \! +lima.home.chartaccounts.state1_2=Le plan comptable possede +lima.home.chartaccounts.state2_2=comptes +lima.home.entrybooks.create=Cr\u00E9er les journaux +lima.home.entrybooks.modify=Modifier les journaux +lima.home.entrybooks.nothing=Aucun journal ouvert \! +lima.home.entrybooks.state.single=Le journal est \: +lima.home.entrybooks.state1_2.plural=Les +lima.home.entrybooks.state2_2.plural=journaux sont \: +lima.home.fiscalperiod.closed=exercices clotur\u00E9s +lima.home.fiscalperiod.create=Cr\u00E9er un exercice +lima.home.fiscalperiod.modify=Modifier les exercices +lima.home.fiscalperiod.noopen=Aucun exercice ouvert \! +lima.home.fiscalperiod.opened=exercices ouverts +lima.home.transaction.balanced=transactions, toutes sont \u00E9quilibr\u00E9es +lima.home.transaction.create=Ajouter des \u00E9critures +lima.home.transaction.modifiy.balanced=Modifier les \u00E9critures +lima.home.transaction.modifiy.unbalanced=Modifier les \u00E9critures incorrect +lima.home.transaction.nothing=Aucune \u00E9criture +lima.home.transaction.unbalanced=transactions ne sont pas \u00E9quilibr\u00E9es \! lima.identity=Identit\u00E9 lima.identity.address=Adresse lima.identity.address2=Adresse (suite) @@ -138,14 +144,13 @@ lima.identity.phoneNumber=n\u00B0 Tel lima.identity.vatNumber=n\u00B0 TVA lima.identity.zipCode=Code Postal -lima.import.journal=Journaux par d\u00E9faut lima.importexport.accountcharts=Plan des comptes lima.importexport.all=Tout lima.importexport.choiceencoding=Choisir encodage \: lima.importexport.csv=Import/Export CSV +lima.importexport.defaultentrybooks=Journaux par d\u00E9faut lima.importexport.ebp=Import/Export EBP lima.importexport.entries=\u00C9critures -lima.importexport.entrybooks=Journaux lima.importexport.export=Export lima.importexport.financialstatements=Plan BCR lima.importexport.import=Import @@ -154,15 +159,7 @@ lima.importexport.importebp=Import EBP lima.importexport.wait=Traitement en cours \u2026 lima.init.closed=Lima ferm\u00E9 \u00E0 %1$s -lima.init.errorclosing= -lima.lettering.add=Ajouter une lettre -lima.lettering.entries=Op\u00E9ration de saisie -lima.lettering.from=De -lima.lettering.lettered=Lettr\u00E9e -lima.lettering.letteredall=Toutes -lima.lettering.notlettered=Non lettr\u00E9e -lima.lettering.remove=Supprimer -lima.lettering.to=\u00C0 +lima.init.errorclosing=Erreur lors de la fermeture lima.menu.file=Fichier lima.menu.help=Aide lima.menu.help.about=\u00C0 Propos @@ -172,29 +169,15 @@ lima.menu.help.i18n.uk=Anglais lima.menu.help.site=Acc\u00E9der au site de Lima lima.menu.window=Fen\u00EAtre -lima.message.help.usage= -lima.misc.supportemail.description= -lima.open=Ouvert +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=<html><center>Aucun plan comptable charg\u00E9<br/>Veuillez s\u00E9lectionner un plan par d\u00E9fault, <br/>importer un plan personnalis\u00E9<br/> ou annuler pour cr\u00E9er votre propre plan.</center></html> lima.opening.entrybook=<html>Cochez la case pour importer les journaux par d\u00E9faut \:<br/> Achats, Ventes, Tr\u00E9sorerie, Op\u00E9ration diverses</html> lima.opening.import=Importer une sauvegarde CSV lima.opening.welcome=<html><center>Bienvenue dans Lima<br/>Laissez vous guider par cet assistant pour d\u00E9marrer votre comptabilit\u00E9 en quelques instants\u0085<br/>Ou bien importer directement une ancienne sauvegarde de LIMA au format CSV<br/><br/><br/><br/></center></html> -lima.pdf= -lima.period.begindate=D\u00E9but -lima.period.create=Choisissez la date de d\u00E9but et de fin du nouvel exercice -lima.period.enddate=Fin lima.preferences=Pr\u00E9f\u00E9rences -lima.question=Question -lima.question.financialperiod.blocked= -lima.question.fiscalperiod.blocked=\u00C8tes vous s\u00FBre de vouloir cl\u00F4turer cette exercice ? Cette action est irr\u00E9versible \! -lima.question.fiscalperiod.morethan12=La p\u00E9riode s\u00E9lectionner n'est pas de 12 mois, voulez-vous continuer ? -lima.question.load.accounts=Il n'y a aucun plan comptable existant dans Lima. Voulez-vous en charger un par d\u00E9faut ? -lima.question.remove.account=Voulez-vous supprimer ce compte? -lima.question.remove.entry=Voulez-vous supprimer cette ligne de transaction? -lima.question.remove.transaction=Voulez-vous supprimer cette transaction? lima.refresh=\u21BB -lima.remove= lima.reports=Rapports lima.reports.accounts=Edition compte lima.reports.balance=Balance @@ -203,16 +186,11 @@ lima.reports.ledger=Grand Livre lima.response.no=Non lima.response.yes=Oui -lima.solde=Solde -lima.soldecredit=Solde Cr\u00E9diteur -lima.soldedebit=Solde D\u00E9biteur lima.splash.1=Chargement des services... lima.splash.2=Chargement de la comptabilit\u00E9 lima.splash.3=Application pr\u00EAte \! lima.structure=Structure -lima.subledger.code=Code lima.tab.home=Accueil -lima.tab.result= lima.table.account=Compte lima.table.balance=Balance lima.table.closure=Cloture @@ -227,44 +205,17 @@ lima.table.grossamount=Brut lima.table.label=Libell\u00E9 lima.table.letter=Lettre -lima.table.lettering= 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.number=Num\u00E9ro de 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.transaction.confirmdelete= -lima.transaction.period=P\u00E9riode -lima.voucher=Document +lima.title.about=\u00C0 propos de Lima... +lima.title.about.description=Logiciel de comptabilit\u00E9 Libre lima.warning.nimbus.landf=Le look and feel nymbus n'a pas \u00E9t\u00E9 trouv\u00E9 -limahome.chartaccounts.create=Cr\u00E9er le plan des comptes -limahome.chartaccounts.modify=Modifier le plan des comptes -limahome.chartaccounts.nothing=Aucun compte \! -limahome.chartaccounts.state1_2=Le plan comptable possede -limahome.chartaccounts.state2_2=comptes -limahome.entrybooks.create=Cr\u00E9er les journaux -limahome.entrybooks.modify=Modifier les journaux -limahome.entrybooks.nothing=Aucun journal ouvert \! -limahome.entrybooks.state.single=Le journal est \: -limahome.entrybooks.state1_2.plural=Les -limahome.entrybooks.state2_2.plural=journaux sont \: -limahome.fiscalperiod.closed=exercices clotur\u00E9s -limahome.fiscalperiod.create=Cr\u00E9er un exercice -limahome.fiscalperiod.modify=Modifier les exercices -limahome.fiscalperiod.noopen=Aucun exercice ouvert \! -limahome.fiscalperiod.opened=exercices ouverts -limahome.transaction.balanced=transactions, toutes sont \u00E9quilibr\u00E9es -limahome.transaction.create=Ajouter des \u00E9critures -limahome.transaction.modifiy.balanced=Modifier les \u00E9critures -limahome.transaction.modifiy.unbalanced=Modifier les \u00E9critures incorrect -limahome.transaction.nothing=Aucune \u00E9criture -limahome.transaction.unbalanced=\u00E9critures ne sont pas \u00E9quilibr\u00E9es \! Deleted: trunk/lima-swing/src/main/resources/images/logo-codelutin.png =================================================================== (Binary files differ) Added: trunk/lima-swing/src/main/resources/images/puzzle_icon.png =================================================================== (Binary files differ) Property changes on: trunk/lima-swing/src/main/resources/images/puzzle_icon.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/lima-swing/src/main/resources/images/splash.png =================================================================== (Binary files differ)