Author: jpepin Date: 2010-06-24 19:18:43 +0200 (Thu, 24 Jun 2010) New Revision: 2947 Url: http://chorem.org/repositories/revision/lima/2947 Log: Cr?\195?\169ation de la vue d'accueil. Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.java trunk/lima-swing/src/main/resources/images/logo-codelutin.png Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/HomeView.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.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 Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/HomeView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/HomeView.jaxx 2010-06-23 16:26:43 UTC (rev 2946) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/HomeView.jaxx 2010-06-24 17:18:43 UTC (rev 2947) @@ -1,7 +0,0 @@ -<Table insets="0,0,0,0" fill="both"> - <row> - <cell> - <JLabel text="lima.home"/> - </cell> - </row> -</Table> \ No newline at end of file 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-06-23 16:26:43 UTC (rev 2946) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2010-06-24 17:18:43 UTC (rev 2947) @@ -46,6 +46,7 @@ import org.chorem.lima.ui.financialtransaction.FinancialTransactionView; import org.chorem.lima.ui.financialtransaction.LetteringView; import org.chorem.lima.ui.financialtransactionunbalanced.FinancialTransactionUnbalancedView; +import org.chorem.lima.ui.home.HomeView; import org.chorem.lima.ui.ledger.LedgerView; import org.chorem.lima.util.ErrorHelper; 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-06-23 16:26:43 UTC (rev 2946) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2010-06-24 17:18:43 UTC (rev 2947) @@ -100,7 +100,8 @@ //select the new line ListSelectionModel selectionModel = table.getSelectionModel(); - selectionModel.setSelectionInterval(indexSelectedRow+1, indexSelectedRow+1); + selectionModel.setSelectionInterval( + indexSelectedRow+1, indexSelectedRow+1); //focus on second column table.changeSelection(indexSelectedRow+1, 1, false, false); table.requestFocusInWindow(); @@ -151,7 +152,8 @@ //select the upper line ListSelectionModel selectionModel = table.getSelectionModel(); - selectionModel.setSelectionInterval(indexSelectedRow-1, indexSelectedRow-1); + selectionModel.setSelectionInterval( + indexSelectedRow-1, indexSelectedRow-1); } catch (LimaException eee) { if (log.isErrorEnabled()) { log.error("Can't remove transaction or entry", eee); Copied: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx (from rev 2944, trunk/lima-swing/src/main/java/org/chorem/lima/ui/HomeView.jaxx) =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx 2010-06-24 17:18:43 UTC (rev 2947) @@ -0,0 +1,83 @@ +<Table> + <HomeViewHandler id="handler" javaBean='new HomeViewHandler(this)' /> + <Dimension id="fixedSize" javaBean='new Dimension(600,150)' /> + + <script> + <![CDATA[ + import static org.nuiton.i18n.I18n._; + + void $afterCompleteSetup() { + getHandler().refresh(); + } + ]]> + </script> + <row weightx="1" weighty="1"> + <cell> + <JPanel id="limaHomeChartAccount" + border='{BorderFactory.createTitledBorder(_("lima.charts.account"))}' + minimumSize='{getFixedSize()}' + preferredSize='{getFixedSize()}' + layout='{new BoxLayout(limaHomeChartAccount,BoxLayout.X_AXIS)}'> + <VBox id="homeBoxAccount" + margin='0' + horizontalAlignment='center' + verticalAlignment='middle'> + <JLabel id="textHomeAccount"/> + </VBox> + </JPanel> + </cell> + </row> + <row> + <cell> + <JPanel id="limaHomeEntryBook" + border='{BorderFactory.createTitledBorder(_("lima.charts.entrybook"))}' + minimumSize='{getFixedSize()}' + preferredSize='{getFixedSize()}' + layout='{new BoxLayout(limaHomeEntryBook,BoxLayout.X_AXIS)}'> + <VBox id="homeBoxEntryBook" + margin='0' + horizontalAlignment='center' + verticalAlignment='middle'> + <JLabel id="textHomeEntryBook"/> + </VBox> + </JPanel> + </cell> + </row> + <row> + <cell> + <JPanel id="limaHomeFiscalYear" + border='{BorderFactory.createTitledBorder(_("lima.charts.fiscalyear"))}' + minimumSize='{getFixedSize()}' + preferredSize='{getFixedSize()}' + layout='{new BoxLayout(limaHomeFiscalYear,BoxLayout.X_AXIS)}'> + <VBox id="homeBoxFiscalYear" + margin='0' + horizontalAlignment='center' + verticalAlignment='middle'> + <JLabel id="textHomeFiscalYear"/> + </VBox> + </JPanel> + </cell> + </row> + <row> + <cell> + <JPanel id="limaHomeDaily" + border='{BorderFactory.createTitledBorder(_("lima.daily"))}' + minimumSize='{getFixedSize()}' + preferredSize='{getFixedSize()}' + layout='{new BoxLayout(limaHomeDaily,BoxLayout.X_AXIS)}'> + <VBox id="homeBoxDaily" + margin='0' + horizontalAlignment='center' + verticalAlignment='middle'> + <JLabel id="textHomeDaily"/> + </VBox> + </JPanel> + </cell> + </row> + <row insets="40" weightx="1" weighty="1" anchor="west"> + <cell> + <JLabel icon='{new ImageIcon(getClass().getResource("/images/logo-codelutin.png"))}'/> + </cell> + </row> +</Table> \ No newline at end of file Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.java 2010-06-24 17:18:43 UTC (rev 2947) @@ -0,0 +1,131 @@ +package org.chorem.lima.ui.home; + +import static org.nuiton.i18n.I18n._; +import java.awt.Color; +import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.AccountService; +import org.chorem.lima.business.EntryBookService; +import org.chorem.lima.business.FinancialTransactionService; +import org.chorem.lima.business.FiscalPeriodService; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.FinancialTransaction; +import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.service.LimaServiceFactory; + +public class HomeViewHandler { + + private static final Log log = LogFactory.getLog(HomeViewHandler.class); + + private HomeView view; + + protected AccountService accountService; + + protected EntryBookService entryBookService; + + protected FinancialTransactionService financialTransactionService; + + protected FiscalPeriodService fiscalPeriodService; + + + private Color greenBackground; + private Color redBackground; + + protected HomeViewHandler(HomeView view) { + this.view=view; + accountService = + LimaServiceFactory.getInstance().getAccountService(); + entryBookService = + LimaServiceFactory.getInstance().getEntryBookService(); + financialTransactionService = + LimaServiceFactory.getInstance().getTransactionService(); + fiscalPeriodService = + LimaServiceFactory.getInstance().getFiscalPeriodService(); + + greenBackground = new Color(153, 255, 153); + redBackground = new Color(255, 102, 102); + } + + + public void refresh(){ + + try { + List<Account> accounts = accountService.getAllAccounts(); + if (accounts.size()>0){ + view.homeBoxAccount.setBackground(greenBackground); + String accountsString = _("limahome.chartaccounts1") + " " + + accounts.size() + " " + _("limahome.chartaccounts2"); + view.textHomeAccount.setText(accountsString); + } + else { + view.homeBoxAccount.setBackground(redBackground); + String accountsString = "<html>"+_("limahome.fiscalperiodnoopen") + + "<br/>"+_("limahome.createchartaccounts")+"</html>"; + view.textHomeAccount.setText(accountsString); + } + + List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); + if (entryBooks.size()>0){ + view.homeBoxEntryBook.setBackground(greenBackground); + String entryBooksString = "<html>"+_("limahome.entrybooks1") + + " " + entryBooks.size() + " " + _("limahome.entrybooks2") + + "<br/><ul>"; + for (EntryBook entryBook : entryBooks) { + entryBooksString += "<li>"+entryBook.getCode() + + " - "+entryBook.getLabel()+"</li>"; + } + view.textHomeEntryBook.setText(entryBooksString+"</ul></html>"); + } + else { + view.homeBoxEntryBook.setBackground(redBackground); + view.textHomeEntryBook.setText(_("limahome.fiscalperiodnoopen")); + } + + List<FiscalPeriod> fiscalPeriods = + fiscalPeriodService.getAllFiscalPeriods(); + List<FiscalPeriod> unblockedFiscalPeriods = + fiscalPeriodService.getAllUnblockedFiscalPeriods(); + if (unblockedFiscalPeriods.size()>0){ + view.homeBoxFiscalYear.setBackground(greenBackground); + String fiscalString = "<html>"+unblockedFiscalPeriods.size() + + " " + _("limahome.fiscalperiodopened")+"<br/>" + + (fiscalPeriods.size()-unblockedFiscalPeriods.size()) + + " " + _("limahome.fiscalperiodclosed")+"</html>"; + view.textHomeFiscalYear.setText(fiscalString); + + List<FinancialTransaction> financialTransactions = + financialTransactionService. + getAllFinancialTransactionsUnbalanced(fiscalPeriods.get(0)); + if (financialTransactions.size()>0){ + view.homeBoxDaily.setBackground(redBackground); + String transactionsString = financialTransactions.size() + + _("limahome.transactionunbalanced"); + view.textHomeAccount.setText(transactionsString); + } + else { + view.homeBoxDaily.setBackground(greenBackground); + String transactionsString =_("limahome.transactionbalanced"); + view.textHomeDaily.setText(transactionsString); + } + + } + else { + view.homeBoxFiscalYear.setBackground(redBackground); + view.homeBoxDaily.setBackground(redBackground); + String fiscalString = "<html>"+_("limahome.fiscalperiodnoopen"); + if (fiscalPeriods.size()>0){ + fiscalString += fiscalPeriods.size() + + _("limahome.fiscalperiodclosed"); + } + view.textHomeFiscalYear.setText(fiscalString+"</html>"); + + } + } catch (LimaException eee) { + log.debug("Can't get datas home", eee); + } + } + +} Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-06-23 16:26:43 UTC (rev 2946) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-06-24 17:18:43 UTC (rev 2947) @@ -1,78 +1,33 @@ -Bloqu\u00E9e= -Can't\ add\ fiscal\ period= -Can't\ block\ financialperiod= -Can't\ delete\ all\ fiscal\ period= Confirmation= DEBUG\ delete\ all= Do\ you\ really\ want\ to\ delete\ entry\ book\ %s\ ?= -Exercice= Global\ lima\ exception= Loading\ accounting...= -TODO\ begincalendarPanel= -TODO\ endcalendarPanel= -calendarPanel\ TODO= lima.about.message= lima.account=Account lima.account.label=Label lima.account.number=Number -lima.account.type=Account type -lima.account.type1= -lima.account.type2= -lima.account.type3= -lima.account.type4= -lima.accountplan=Plan de comptes -lima.accounts=Accounts lima.accountsreports.accountfilter=Filter lima.accountsreports.begincalendar= lima.accountsreports.endcalendar= -lima.actif=Asset -lima.action.commandline.disable.main.ui=Do not launch main ui 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=Add lima.add.entry=Add an entry -lima.add.financialstatementheader= -lima.add.financialstatementmovement= -lima.add.lettering=Add a letter lima.add.transaction=Add a transaction -lima.all=All -lima.all.criteria=All criteria are met lima.amount=Amount lima.amountcredit= lima.amountdebit= -lima.any.criteria=Any criteria are met -lima.balance.account.libelle=Title -lima.balance.account.number=N\u00B0 account -lima.balance.move.credit=Credit -lima.balance.move.debit=Debit -lima.balance.solde.credit=Balance credit -lima.balance.solde.debit=Balance debit -lima.balance.total=Total -lima.bilan=Bilan -lima.bilan.actif=Actif -lima.bilan.brut=Brut -lima.bilan.depreciation=Depreciation -lima.bilan.net=Net -lima.bilan.passif=Passif -lima.bilan.total=Total -lima.block=block -lima.cancel=Cancel -lima.charge=Expense lima.charts.account=Accounts chart lima.charts.entrybook=EntryBooks chart lima.charts.financialperiod=Financial Periods lima.charts.financialstatement= lima.charts.fiscalyear=Fiscal Years lima.close=Closed -lima.closure=Closure -lima.closure.period.begin=Period from -lima.closure.timespan.warning=Warning\: when the period is blocked, it is possible to add, edit and delete entries on the accounting period. lima.common.add= lima.common.addSubLedger= -lima.common.all= lima.common.cancel= lima.common.ok= lima.common.print= @@ -86,27 +41,12 @@ lima.config.configFileName.description= lima.config.locale.description= lima.config.ui.flaunchui.description= -lima.config.ui.fullscreen= lima.config.ui.fullscreen.description= lima.credit=Credit lima.daily=Daily lima.date=Date -lima.date.april=April -lima.date.august=August -lima.date.december=December -lima.date.february=February -lima.date.january=January -lima.date.july=July -lima.date.june=June -lima.date.march=March -lima.date.may=May -lima.date.november=November -lima.date.october=October -lima.date.september=September lima.debit=Debit lima.description=Description -lima.edit=Edit -lima.edit.transaction=Edit transaction lima.entries=Entries lima.entries.addtransaction= lima.entries.lettering= @@ -121,110 +61,42 @@ lima.entrybook.type3= lima.entrybook.type4= lima.entrybook.type5= -lima.entrybooks=EntryBooks lima.error=Error -lima.error.account.double=It exists an account with a same number -lima.error.account.not.exist=This account doesn't exist -lima.error.account.not.master=This account has not an account master -lima.error.account.with.entries=This account has some entries -lima.error.entry.not.exist= -lima.error.entry.not.remove= lima.error.errorpane.htmlmessage=<html><body><b>An application error happened</b>\:<br/>%s</body></html> lima.error.errorpane.title=Lima error -lima.error.journal.double=A journal exist with this name -lima.error.journal.not.exist=This journal doesn't exist -lima.error.journal.with.transactions=This journal has some transactions -lima.error.period.all.timespan= -lima.error.period.create.timespan= -lima.error.period.next.not.blocked= -lima.error.period.not.exist= -lima.error.period.prec.not.blocked=It exists periods not blocked -lima.error.period.timespan.block= -lima.error.period.timespan.not.blocked= -lima.error.transaction.exist.not.balanced=It exists transactions not balanced -lima.error.transaction.not.create=This transaction has not been created -lima.error.transaction.not.exist=This transaction doesn't exist -lima.error.transaction.not.journal=This transaction has not a journal -lima.error.transaction.not.period=This transaction has not a period -lima.error.transaction.not.remove=This transaction has not been removed -lima.error.transaction.period.not.blocked=The period is blocked -lima.exception.number.format=Numeric format only accepted lima.export=Export -lima.export.CSV=CSV Export -lima.export.PDF=PDF Export lima.export.account=Export PCG lima.export.all=Export all datas (XML) lima.export.all.csv=Exporter all datas (CSV) -lima.filter.after=After -lima.filter.before=Before -lima.filter.contains=Contains -lima.filter.equals.to=Equals to -lima.filter.greater.than=Greater than -lima.filter.less.than=Less than -lima.filter.not.contains=Not contains -lima.filter.starts.with=Starts with lima.financialperiod.block= -lima.financialperiod.management= lima.financialstatement.accounts= lima.financialstatement.creditaccounts= lima.financialstatement.debitaccounts= lima.financialstatement.formula= -lima.financialstatement.header= lima.financialstatement.header.add= lima.financialstatement.label= lima.financialstatement.movement.add= lima.financialstatement.provisiondeprecationaccounts= -lima.financialstatement.style= lima.financialstatement.subamount= -lima.financialstatementreports= -lima.find.transaction=Find transaction lima.fiscalperiod.addFiscalPeriod= lima.fiscalperiod.block= -lima.fiscalperiod.periodFilterLabel= -lima.fiscalyear= -lima.fiscalyear.addperiod= -lima.fiscalyear.closefiscalyear= -lima.fiscalyear.closeperiod= -lima.fiscalyear.listclosed= -lima.fiscalyear.management= -lima.grand.livre=General Ledger -lima.home=Home - TODO -lima.identity.address= -lima.identity.adress= -lima.identity.city= lima.identity.contact= -lima.identity.country= -lima.identity.email= -lima.identity.fax= -lima.identity.name= -lima.identity.phone= -lima.identity.siret= -lima.identity.website= -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.error=Your datas had't not been loaded lima.import.journal=Import journal -lima.import.success=Your datas had been loaded lima.init.closed=Lima closed at %1$s -lima.init.context.done=Context was initialized in %1$s lima.init.errorclosing= -lima.init.ui.done=UI initialized -lima.lettered=Lettered -lima.lettering=Lettering lima.lettering.add= lima.lettering.entries= lima.lettering.from= lima.lettering.lettered= lima.lettering.letteredall= -lima.lettering.not.lettered= lima.lettering.notlettered= lima.lettering.remove= lima.lettering.to= -lima.loading=Loading lima.menu.file=File lima.menu.help=Help lima.menu.help.about=About @@ -233,78 +105,23 @@ lima.menu.help.i18n.fr=French lima.menu.help.i18n.uk=English lima.menu.help.site=WebSite -lima.menubar.closure=Closure -lima.menubar.closure.addPeriod=Add a period -lima.menubar.closure.listperiod=See all periods -lima.menubar.closure.period=close a period (annual) -lima.menubar.closure.timespan=close a period (monthly) -lima.message.config.loaded=Config was loaded -lima.message.error.empty.line=Please choose an account lima.message.help.usage= lima.misc.supportemail.description= -lima.model.account=Account -lima.model.balance=Balance -lima.model.credit=Credit -lima.model.date=Date -lima.model.debit=Debit -lima.model.description=Description -lima.model.etat=Etat -lima.model.journal=Journal -lima.model.lettering=Lettering -lima.model.name=Name -lima.model.period=Period -lima.model.prefix=Prefix -lima.model.status=Status -lima.model.voucher=Voucher -lima.name=Name -lima.non.valids.transactions=No valids transactions -lima.not.lettered=Not lettered -lima.number=Number -lima.ok=OK lima.open=Open lima.openejb.remotemode.description= -lima.passif=Liability -lima.period=Period -lima.period.addFiscalPeriod= lima.period.begindate= -lima.period.block= -lima.period.close=Close lima.period.enddate= -lima.period.filter= -lima.period.open=Open -lima.period.periodFilterLabel= lima.preferences=Preferences -lima.prefix=Prefix -lima.print=Print -lima.produit=Revenue -lima.progressBar.export.etape1=Create the file -lima.progressBar.export.etape2=Create informations -lima.progressBar.export.etape3=Create periods -lima.progressBar.export.etape4=Create journals -lima.progressBar.export.etape5=Create accounts -lima.progressBar.export.etape6=Create transactions -lima.progressBar.export.etape7=Save the file -lima.progressBar.export.title=Save -lima.progressBar.load.etape1=Loading journals -lima.progressBar.load.etape2=Loading accounts -lima.progressBar.load.etape3=Loading status -lima.progressBar.load.etape4=Loading periods -lima.progressBar.load.etape5=Loading transactions lima.question=Question -lima.question.confirmremove.account=This account have subaccounts, do you want remove this account ? 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.journal=Do you want to remove this journal ? lima.question.remove.transaction=Do you want to remove this transaction ? -lima.quit=Quit lima.refresh=\u21BB lima.remove=Remove -lima.remove.lettering=Remove a letter -lima.remove.transaction=Remove a transaction lima.reports=Reports lima.reports.accounts=Edit account lima.reports.balance=Balance @@ -313,46 +130,13 @@ lima.reports.ledger=Ledger lima.response.no=No lima.response.yes=Yes -lima.result=Result -lima.result.charge=CHARGES -lima.result.loss=Perte -lima.result.produit=PRODUITS -lima.result.profit=B\u00E9n\u00E9fice -lima.result.total.charge=TOTAL CHARGES -lima.result.total.produit=TOTAL PRODUITS -lima.search=Search -lima.search.items.where=Search items where -lima.search.title.criteria.box=Criteria -lima.since=Since lima.solde= lima.soldecredit= lima.soldedebit= -lima.status.tr.balanced=Balanced -lima.status.tr.finalized=Finalized -lima.status.tr.wip=Work in progress lima.structure=Structure -lima.style.1= -lima.subledger.accountnumber= lima.subledger.code=Code -lima.subledger.label= -lima.subledger.type= -lima.success=Success -lima.tab.account=Account -lima.tab.accounts= -lima.tab.balance=Balance -lima.tab.bilan=Results -lima.tab.closure=Closure -lima.tab.financialperiod= -lima.tab.fiscalperiod= lima.tab.home=Home -lima.tab.journal=Journal -lima.tab.lettering=Lettering -lima.tab.period=Period -lima.tab.reports=Reports lima.tab.result=Result -lima.tab.search.result=Search result -lima.tab.subledgers= -lima.tab.transaction=Transaction lima.table.account= lima.table.balance= lima.table.closure= @@ -379,34 +163,16 @@ lima.table.voucher= lima.title=Lutin Invoice Monitoring and Accounting lima.title.about=About Lima... -lima.to=To -lima.transaction.column.account=Account -lima.transaction.column.balance=Balance -lima.transaction.column.credit=Credit -lima.transaction.column.date=Date -lima.transaction.column.debit=Debit -lima.transaction.column.description=Description -lima.transaction.column.document=Voucher -lima.transaction.column.entrybook=Entrybook -lima.transaction.column.period=Period -lima.transaction.column.position= -lima.transaction.column.solde=Solde -lima.transaction.column.status=Status -lima.transaction.column.voucher= lima.transaction.confirmdelete= -lima.transaction.entrybook= lima.transaction.period=Period -lima.ui.add.account=Add account -lima.ui.add.journal=Add journal -lima.ui.block.timespan=Block period -lima.ui.unblock.timespan=Unblock period -lima.ui.update.account=Update account -lima.ui.update.journal=Update journal -lima.unblock=Unblock -lima.update=Update -lima.view=View -lima.view.flatten=Flatten view lima.voucher=Voucher -lima.warning.entrybookscloded=All EntryBook of this financial period are blocked lima.warning.nimbus.landf=Could not find Numbus Look&Feel -lima.warning.no.ui=No ui display detected +limahome.createchartaccounts= +limahome.createchartaccounts1= +limahome.createchartaccounts2= +limahome.entrybooks1= +limahome.fiscalperiodclosed= +limahome.fiscalperiodnoopen= +limahome.fiscalperiodopened= +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-06-23 16:26:43 UTC (rev 2946) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-06-24 17:18:43 UTC (rev 2947) @@ -1,66 +1,31 @@ -Bloqu\u00E9e= -Can't\ add\ fiscal\ period= -Can't\ block\ financialperiod= -Can't\ delete\ all\ fiscal\ period= Confirmation= DEBUG\ delete\ all= Do\ you\ really\ want\ to\ delete\ entry\ book\ %s\ ?= Global\ lima\ exception= Loading\ accounting...= -TODO\ begincalendarPanel= -TODO\ endcalendarPanel= -\\\\u21BB= -calendarPanel\ TODO= lima.about.message=\u00C0 propos de Lima lima.account=Compte lima.account.label= -lima.account.menu=Plan de comptes lima.account.number= -lima.account.parentnumber= -lima.account.type=Type de compte -lima.account.type1=Actif -lima.account.type2=Passif -lima.account.type3=Produit -lima.account.type4=Charge -lima.accounts=Comptes lima.accountsreports.accountfilter=Filtrer lima.accountsreports.begincalendar=Date d\u00E9but lima.accountsreports.endcalendar=Date fin -lima.actif=Actif -lima.action.commandline.disable.main.ui=Ne pas lancer l'ui 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.financialstatement.movement.add=Mouvement -lima.add.lettering= lima.add.transaction=Ajouter transaction -lima.all=Tous -lima.all.criteria=Tous les crit\u00E8res correspondent lima.amount=Montant lima.amountcredit=Total Cr\u00E9dit lima.amountdebit=Total D\u00E9bit -lima.any.criteria=Au moins un crit\u00E8re correspond -lima.balance.total=Total -lima.bilan=Bilan -lima.bilan.actif=Actif -lima.bilan.brut=Brut -lima.bilan.depreciation=Amort. et Prov. -lima.bilan.net=Net -lima.bilan.passif=Passif -lima.bilan.total=Total -lima.block=Bloquer -lima.charge=Charge lima.charts.account=Plan comptable lima.charts.entrybook=Journaux lima.charts.financialperiod=P\u00E9riodes comptables lima.charts.financialstatement=Plan BCR lima.charts.fiscalyear=Exercices lima.close=Ferm\u00E9 -lima.closure.period.begin=P\u00E9riode de -lima.closure.timespan.warning=Attention \: lorsque la p\u00E9riode est bloqu\u00E9e, il n'est plus possible d'ajouter, modifier et supprimer les entr\u00E9es comptables sur cette p\u00E9riode. lima.common.add=Ajout Compte G\u00E9n\u00E9ral lima.common.addSubLedger=Ajouter Compte Tiers lima.common.cancel=Annuler @@ -69,7 +34,6 @@ lima.common.quit=Quitter lima.common.remove=Supprimer lima.common.update=Modifier -lima.comon.print=Imprimer lima.config.category.directories=R\u00E9pertoires lima.config.category.directories.description=R\u00E9pertoires utilis\u00E9s par Lima lima.config.category.other=Autre @@ -77,27 +41,12 @@ lima.config.configFileName.description= lima.config.locale.description=Locale utilis\u00E9e par l'application lima.config.ui.flaunchui.description= -lima.config.ui.fullscreen=Drapeau pour utiliser le mode plein \u00E9cran lima.config.ui.fullscreen.description= lima.credit=Credit lima.daily=Quotidien lima.date=Date -lima.date.april=Avril -lima.date.august=Ao\u00FBt -lima.date.december=D\u00E9cembre -lima.date.february=F\u00E9vrier -lima.date.january=Janvier -lima.date.july=Juillet -lima.date.june=Juin -lima.date.march=Mars -lima.date.may=Mai -lima.date.november=Novembre -lima.date.october=Octobre -lima.date.september=Septembre lima.debit=Debit lima.description=Description -lima.edit=Editer -lima.edit.transaction=Editer une transaction lima.entries=Traitement lima.entries.addtransaction=Saisir des \u00E9critures lima.entries.lettering=Ajouter une lettre @@ -112,50 +61,14 @@ lima.entrybook.type3=Tr\u00E9sorerie lima.entrybook.type4=G\u00E9n\u00E9ral lima.entrybook.type5=Situation -lima.entrybooks=Journaux lima.error=Erreur -lima.error.account.double=Il existe un compte avec ce m\u00EAme num\u00E9ro de compte -lima.error.account.not.exist=Ce num\u00E9ro de compte n'existe pas -lima.error.account.not.master=Ce compte ne poss\u00E8de pas de compte principal -lima.error.account.with.entries=Ce compte poss\u00E8de des entr\u00E9es comptables -lima.error.entry.not.exist= -lima.error.entry.not.remove= lima.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> lima.error.errorpane.title=Lima erreur -lima.error.journal.double=Un journal poss\u00E8de d\u00E9j\u00E0 ce nom -lima.error.journal.not.exist=Ce journal n'existe pas -lima.error.journal.with.transactions=Ce journal poss\u00E8de des transactions comptables -lima.error.period.all.timespan= -lima.error.period.create.timespan= -lima.error.period.next.not.blocked= -lima.error.period.not.exist= -lima.error.period.prec.not.blocked=Il existe des p\u00E9riodes pr\u00E9c\u00E9dentes non bloqu\u00E9es -lima.error.period.timespan.block= -lima.error.period.timespan.not.blocked= -lima.error.transaction.exist.not.balanced=Il existe des transactions non \u00E9quilibr\u00E9es -lima.error.transaction.not.create=La transaction n'a pu \u00EAtre cr\u00E9\u00E9e -lima.error.transaction.not.exist=La transaction n'existe pas -lima.error.transaction.not.journal=La transaction doit \u00EAtre associ\u00E9e \u00E0 un journal -lima.error.transaction.not.period=La transaction doit \u00EAtre associ\u00E9e \u00E0 une p\u00E9riode -lima.error.transaction.not.remove=La transaction n'a pu \u00EAtre supprim\u00E9e. -lima.error.transaction.period.not.blocked=La p\u00E9riode de la transaction est bloqu\u00E9e. -lima.exception.number.format=Uniquement un format num\u00E9rique est accept\u00E9 lima.export=Export -lima.export.CSV=CSV -lima.export.PDF=PDF 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.filter.after=Apr\u00E8s -lima.filter.before=Avant -lima.filter.contains=Contient -lima.filter.equals.to=Egal \u00E0 -lima.filter.greater.than=Sup\u00E9rieur \u00E0 -lima.filter.less.than=Inf\u00E9rieur \u00E0 -lima.filter.not.contains=Ne contient pas -lima.filter.starts.with=Commence par lima.financialperiod.block=Cloturer une p\u00E9riode -lima.financialperiod.management= lima.financialstatement.accounts=Liste de comptes au cr\u00E9dit et au d\u00E9bit lima.financialstatement.creditaccounts=Liste de comptes au cr\u00E9dit lima.financialstatement.debitaccounts=Liste de comptes au d\u00E9bit @@ -165,42 +78,17 @@ lima.financialstatement.movement.add=Ajouter un regrouprement lima.financialstatement.provisiondeprecationaccounts=Liste de comptes d'amortissement et provisions lima.financialstatement.subamount=Calculer un sous-total -lima.find.transaction=Rechercher transaction lima.fiscalperiod.addFiscalPeriod=Nouvel exercice lima.fiscalperiod.block=Cloturer un exercice -lima.fiscalperiod.periodFilterLabel= -lima.fiscalyear.addperiod=Ajouter une p\u00E9riode -lima.fiscalyear.closefiscalyear=Cl\u00F4turer l'exercice -lima.fiscalyear.closeperiod=Cl\u00F4turer une p\u00E9riode -lima.fiscalyear.listclosed=Voir toutes les cl\u00F4tures -lima.fiscalyear.management= -lima.grand.livre=Grand-Livre -lima.home=Page d'accueil - TODO -lima.identity.address=Adresse -lima.identity.city=Ville lima.identity.contact=Contact -lima.identity.country=Pays -lima.identity.email=eMail -lima.identity.fax=Fax -lima.identity.name=Nom -lima.identity.phone=Tel -lima.identity.siret=Siret -lima.identity.website=Site Web -lima.identity.zipcode=Code Postal lima.import=Import lima.import.account=Importer le PCG lima.import.all=Importer une nouvelle base (XML) lima.import.all.csv=Importer une nouvelle base (CSV) lima.import.all.csv.ebp=Importer des donn\u00E9es de EBP -lima.import.error=Vos donn\u00E9es n'ont pu \u00EAtre charg\u00E9es lima.import.journal=Importer le journal -lima.import.success=Vos donn\u00E9es ont bien \u00E9t\u00E9 charg\u00E9es lima.init.closed=Lima ferm\u00E9 \u00E0 %1$s -lima.init.context.done=Initialisation du context termin\u00E9 en %1$s lima.init.errorclosing= -lima.init.ui.done=Initialisation des interface graphiques termin\u00E9e -lima.lettered=Lettr\u00E9 -lima.lettering=Lettrage lima.lettering.add=Ajouter une lettre lima.lettering.entries=Op\u00E9ration de saisie lima.lettering.from=De @@ -209,7 +97,6 @@ lima.lettering.notlettered=Non lettr\u00E9e lima.lettering.remove=Supprimer lima.lettering.to=\u00C0 -lima.loading=Chargement lima.menu.file=Fichier lima.menu.help=Aide lima.menu.help.about=\u00C0 Propos @@ -218,67 +105,23 @@ lima.menu.help.i18n.fr=Fran\u00E7ais lima.menu.help.i18n.uk=Anglais lima.menu.help.site=Acc\u00E9der au site de Lima -lima.menubar.closure.addPeriod= -lima.message.config.loaded= -lima.message.error.empty.line=Veuillez choisir un compte lima.message.help.usage= lima.misc.supportemail.description= -lima.model.account=Compte -lima.model.balance=Balance -lima.model.credit=Cr\u00E9dit -lima.model.date=Date -lima.model.debit=D\u00E9bit -lima.model.description=Description -lima.model.etat=Etat -lima.model.journal=Journal -lima.model.lettering=Lettrage -lima.model.name=Nom -lima.model.period=P\u00E9riode -lima.model.prefix=Pr\u00E9fixe -lima.model.status=Statut -lima.model.voucher=Document -lima.name=Nom -lima.non.valids.transactions=Ecritures non valides -lima.not.lettered=Non lettr\u00E9 -lima.number=Num\u00E9ro lima.open=Ouvert lima.openejb.remotemode.description= -lima.passif=Passif -lima.period= lima.period.begindate=D\u00E9but -lima.period.close= lima.period.enddate=Fin -lima.period.open= lima.preferences=Pr\u00E9f\u00E9rences -lima.prefix=Pr\u00E9fixe -lima.produit=Produit -lima.progressBar.export.etape1=Cr\u00E9ation base du fichier -lima.progressBar.export.etape2=Cr\u00E9ation informations -lima.progressBar.export.etape3=Cr\u00E9ation des p\u00E9riodes -lima.progressBar.export.etape4=Cr\u00E9ation des journaux -lima.progressBar.export.etape5=Cr\u00E9ation des comptes -lima.progressBar.export.etape6=Cr\u00E9ation des transactions -lima.progressBar.export.etape7=Enregistrement du fichier -lima.progressBar.export.title=Sauvegarde -lima.progressBar.load.etape1=Chargement des journaux -lima.progressBar.load.etape2=Chargement des comptes -lima.progressBar.load.etape3=Chargement des status -lima.progressBar.load.etape4=Chargement des p\u00E9riodes -lima.progressBar.load.etape5=Chargement des transactions lima.question=Question -lima.question.confirmremove.account=Ce compte poss\u00E8de des sous comptes, voulez-vous supprimer ce compte ? 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.journal=Voulez-vous supprimer ce journal? lima.question.remove.transaction=Voulez-vous supprimer cette transaction? lima.refresh=\u21BB lima.remove= -lima.remove.lettering=Supprimer la lettre -lima.remove.transaction=Supprimer une transaction lima.reports=Rapports lima.reports.accounts=Edition compte lima.reports.balance=Balance @@ -287,34 +130,12 @@ lima.reports.ledger=Grand Livre lima.response.no=Non lima.response.yes=Oui -lima.result=Compte de r\u00E9sultat -lima.result.charge=CHARGES -lima.result.loss=Perte -lima.result.produit=PRODUITS -lima.result.profit=B\u00E9n\u00E9fice -lima.result.total.charge=TOTAL CHARGES -lima.result.total.produit=TOTAL PRODUITS -lima.search=Rechercher -lima.search.items.where=Trouver les \u00E9critures o\u00F9 -lima.search.title.criteria.box=Crit\u00E8res -lima.since=Depuis lima.solde=Solde lima.soldecredit=Solde Cr\u00E9diteur lima.soldedebit=Solde D\u00E9biteur -lima.status.tr.balanced=Equilibr\u00E9e -lima.status.tr.finalized=Valid\u00E9e -lima.status.tr.wip=En cours lima.structure=Structure -lima.style.1= -lima.subledger.accountnumber= lima.subledger.code=Code -lima.subledger.label= -lima.subledger.type= -lima.success=Succ\u00E8s -lima.tab.bilan= -lima.tab.fiscalperiod=Exercice lima.tab.home=Accueil -lima.tab.reports= lima.tab.result= lima.table.account=Compte lima.table.balance=Balance @@ -342,21 +163,19 @@ lima.table.voucher=Pi\u00E8ce comptable lima.title=Lutin Invoice Monitoring and Accounting lima.title.about=A propos de Lima... -lima.to=A lima.transaction.confirmdelete= -lima.transaction.entrybook=Journal lima.transaction.period=P\u00E9riode -lima.ui.add.account=Ajouter un compte -lima.ui.add.journal=Ajouter un journal -lima.ui.block.timespan=Bloquer une p\u00E9riode mensuelle -lima.ui.unblock.timespan=D\u00E9bloquer une p\u00E9riode mensuelle -lima.ui.update.account=Mettre \u00E0 jour le compte -lima.ui.update.journal=Mettre \u00E0 jour le journal -lima.unblock=D\u00E9bloquer -lima.update= -lima.view=Vue -lima.view.flatten=Vue aplatie lima.voucher=Document -lima.warning.entrybookscloded=Impossible tous les journaux de cette p\u00E9riode sont ferm\u00E9s lima.warning.nimbus.landf=Le look and feel nymbus n'a pas \u00E9t\u00E9 trouv\u00E9 -lima.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9. +limahome.accountsnoopen=Aucun compte \! +limahome.chartaccounts1=Le plan comptable possede +limahome.chartaccounts2=comptes +limahome.createchartaccounts=Cr\u00E9er le plan comptable +limahome.entrybooknoopen=Aucun journal ouvert \! +limahome.entrybooks1=Les +limahome.entrybooks2=journaux sont \: +limahome.fiscalperiodclosed=exercices clotur\u00E9s +limahome.fiscalperiodnoopen=Aucun exercice ouvert \! +limahome.fiscalperiodopened=exercices ouverts +limahome.transactionbalanced=Toutes les entr\u00E9es sont \u00E9quilibr\u00E9es +limahome.transactionunbalanced=ne sont pas \u00E9quilibr\u00E9e \! Added: trunk/lima-swing/src/main/resources/images/logo-codelutin.png =================================================================== (Binary files differ) Property changes on: trunk/lima-swing/src/main/resources/images/logo-codelutin.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream