From jpepin@users.chorem.org Thu Jun 24 19:18:43 2010 From: jpepin@users.chorem.org To: lima-commits@list.chorem.org Subject: [Lima-commits] r2947 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui java/org/chorem/lima/ui/financialtransaction java/org/chorem/lima/ui/home resources/i18n resources/images Date: Thu, 24 Jun 2010 19:18:43 +0200 Message-ID: <20100624171843.47F8F15914@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4648042284842752707==" --===============4648042284842752707== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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/Fin= ancialTransactionViewHandler.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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/HomeView.jaxx 2010-06-2= 3 16:26:43 UTC (rev 2946) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/HomeView.jaxx 2010-06-2= 4 17:18:43 UTC (rev 2947) @@ -1,7 +0,0 @@ - - - - =20 - - -
\ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 20= 10-06-23 16:26:43 UTC (rev 2946) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 20= 10-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.FinancialTransactio= nUnbalancedView; +import org.chorem.lima.ui.home.HomeView; import org.chorem.lima.ui.ledger.LedgerView; import org.chorem.lima.util.ErrorHelper; =20 Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransact= ion/FinancialTransactionViewHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/Fi= nancialTransactionViewHandler.java 2010-06-23 16:26:43 UTC (rev 2946) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/Fi= nancialTransactionViewHandler.java 2010-06-24 17:18:43 UTC (rev 2947) @@ -100,7 +100,8 @@ //select the new line ListSelectionModel selectionModel =3D=20 table.getSelectionModel(); - selectionModel.setSelectionInterval(indexSelectedRow+1, index= SelectedRow+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 =3D=20 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.ja= xx) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ + + + + =20 + + =20 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.ja= va (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeViewHandler.ja= va 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 =3D LogFactory.getLog(HomeViewHandler.class= ); + =20 + private HomeView view; + + protected AccountService accountService; + =20 + protected EntryBookService entryBookService; + =20 + protected FinancialTransactionService financialTransactionService; + =20 + protected FiscalPeriodService fiscalPeriodService; + + =20 + private Color greenBackground; + private Color redBackground; + =20 + protected HomeViewHandler(HomeView view) { + this.view=3Dview; + accountService =3D + LimaServiceFactory.getInstance().getAccountService(); + entryBookService =3D + LimaServiceFactory.getInstance().getEntryBookService(); + financialTransactionService =3D + LimaServiceFactory.getInstance().getTransactionService(); + fiscalPeriodService =3D + LimaServiceFactory.getInstance().getFiscalPeriodService(); + + greenBackground =3D new Color(153, 255, 153); + redBackground =3D new Color(255, 102, 102); + } + =20 + =20 + public void refresh(){ + =09 + try { + List accounts =3D accountService.getAllAccounts(); + if (accounts.size()>0){ + view.homeBoxAccount.setBackground(greenBackground); + String accountsString =3D _("limahome.chartaccounts1") + " " + + accounts.size() + " " + _("limahome.chartaccounts2"); + view.textHomeAccount.setText(accountsString); + } + else { + view.homeBoxAccount.setBackground(redBackground); + String accountsString =3D ""+_("limahome.fiscalperiodnoopen") + + "
"+_("limahome.createchartaccounts")+""; + view.textHomeAccount.setText(accountsString); + } + =09 + List entryBooks =3D entryBookService.getAllEntryBooks(); + if (entryBooks.size()>0){ + view.homeBoxEntryBook.setBackground(greenBackground); + String entryBooksString =3D ""+_("limahome.entrybooks1") + + " " + entryBooks.size() + " " + _("limahome.entrybooks2") + + "
"); + } + else { + view.homeBoxEntryBook.setBackground(redBackground); + view.textHomeEntryBook.setText(_("limahome.fiscalperiodnoopen")); + } + =09 + List fiscalPeriods =3D + fiscalPeriodService.getAllFiscalPeriods(); + List unblockedFiscalPeriods =3D + fiscalPeriodService.getAllUnblockedFiscalPeriods(); + if (unblockedFiscalPeriods.size()>0){ + view.homeBoxFiscalYear.setBackground(greenBackground); + String fiscalString =3D ""+unblockedFiscalPeriods.size() + + " " + _("limahome.fiscalperiodopened")+"
" + + (fiscalPeriods.size()-unblockedFiscalPeriods.size()) + + " " + _("limahome.fiscalperiodclosed")+""; + view.textHomeFiscalYear.setText(fiscalString); + =09 + List financialTransactions =3D + financialTransactionService. + getAllFinancialTransactionsUnbalanced(fiscalPeriods.get(0)); + if (financialTransactions.size()>0){ + view.homeBoxDaily.setBackground(redBackground); + String transactionsString =3D financialTransactions.size() + + _("limahome.transactionunbalanced"); + view.textHomeAccount.setText(transactionsString); + } + else { + view.homeBoxDaily.setBackground(greenBackground); + String transactionsString =3D_("limahome.transactionbalanced"); + view.textHomeDaily.setText(transactionsString); + } + =09 + } + else { + view.homeBoxFiscalYear.setBackground(redBackground); + view.homeBoxDaily.setBackground(redBackground); + String fiscalString =3D ""+_("limahome.fiscalperiodnoopen"); + if (fiscalPeriods.size()>0){ + fiscalString +=3D fiscalPeriods.size() + + _("limahome.fiscalperiodclosed"); + } + view.textHomeFiscalYear.setText(fiscalString+""); + + } + } catch (LimaException eee) { + log.debug("Can't get datas home", eee); + } + } + =20 +} Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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=3D -Can't\ add\ fiscal\ period=3D -Can't\ block\ financialperiod=3D -Can't\ delete\ all\ fiscal\ period=3D Confirmation=3D DEBUG\ delete\ all=3D Do\ you\ really\ want\ to\ delete\ entry\ book\ %s\ ?=3D -Exercice=3D Global\ lima\ exception=3D Loading\ accounting...=3D -TODO\ begincalendarPanel=3D -TODO\ endcalendarPanel=3D -calendarPanel\ TODO=3D lima.about.message=3D lima.account=3DAccount lima.account.label=3DLabel lima.account.number=3DNumber -lima.account.type=3DAccount type -lima.account.type1=3D -lima.account.type2=3D -lima.account.type3=3D -lima.account.type4=3D -lima.accountplan=3DPlan de comptes -lima.accounts=3DAccounts lima.accountsreports.accountfilter=3DFilter lima.accountsreports.begincalendar=3D lima.accountsreports.endcalendar=3D -lima.actif=3DAsset -lima.action.commandline.disable.main.ui=3DDo not launch main ui lima.action.commandline.help=3DShow help in console lima.action.fullscreen=3DFull screen lima.action.fullscreen.tip=3DOpen ui in full screen lima.action.normalscreen=3DNormal screen lima.action.normalscreen.tip=3DOpen ui in normal screen -lima.add=3DAdd lima.add.entry=3DAdd an entry -lima.add.financialstatementheader=3D -lima.add.financialstatementmovement=3D -lima.add.lettering=3DAdd a letter lima.add.transaction=3DAdd a transaction -lima.all=3DAll -lima.all.criteria=3DAll criteria are met lima.amount=3DAmount lima.amountcredit=3D lima.amountdebit=3D -lima.any.criteria=3DAny criteria are met -lima.balance.account.libelle=3DTitle -lima.balance.account.number=3DN\u00B0 account -lima.balance.move.credit=3DCredit -lima.balance.move.debit=3DDebit -lima.balance.solde.credit=3DBalance credit -lima.balance.solde.debit=3DBalance debit -lima.balance.total=3DTotal -lima.bilan=3DBilan -lima.bilan.actif=3DActif -lima.bilan.brut=3DBrut -lima.bilan.depreciation=3DDepreciation -lima.bilan.net=3DNet -lima.bilan.passif=3DPassif -lima.bilan.total=3DTotal -lima.block=3Dblock -lima.cancel=3DCancel -lima.charge=3DExpense lima.charts.account=3DAccounts chart lima.charts.entrybook=3DEntryBooks chart lima.charts.financialperiod=3DFinancial Periods lima.charts.financialstatement=3D lima.charts.fiscalyear=3DFiscal Years lima.close=3DClosed -lima.closure=3DClosure -lima.closure.period.begin=3DPeriod from -lima.closure.timespan.warning=3DWarning\: when the period is blocked, it is = possible to add, edit and delete entries on the accounting period. lima.common.add=3D lima.common.addSubLedger=3D -lima.common.all=3D lima.common.cancel=3D lima.common.ok=3D lima.common.print=3D @@ -86,27 +41,12 @@ lima.config.configFileName.description=3D lima.config.locale.description=3D lima.config.ui.flaunchui.description=3D -lima.config.ui.fullscreen=3D lima.config.ui.fullscreen.description=3D lima.credit=3DCredit lima.daily=3DDaily lima.date=3DDate -lima.date.april=3DApril -lima.date.august=3DAugust -lima.date.december=3DDecember -lima.date.february=3DFebruary -lima.date.january=3DJanuary -lima.date.july=3DJuly -lima.date.june=3DJune -lima.date.march=3DMarch -lima.date.may=3DMay -lima.date.november=3DNovember -lima.date.october=3DOctober -lima.date.september=3DSeptember lima.debit=3DDebit lima.description=3DDescription -lima.edit=3DEdit -lima.edit.transaction=3DEdit transaction lima.entries=3DEntries lima.entries.addtransaction=3D lima.entries.lettering=3D @@ -121,110 +61,42 @@ lima.entrybook.type3=3D lima.entrybook.type4=3D lima.entrybook.type5=3D -lima.entrybooks=3DEntryBooks lima.error=3DError -lima.error.account.double=3DIt exists an account with a same number -lima.error.account.not.exist=3DThis account doesn't exist -lima.error.account.not.master=3DThis account has not an account master -lima.error.account.with.entries=3DThis account has some entries -lima.error.entry.not.exist=3D -lima.error.entry.not.remove=3D lima.error.errorpane.htmlmessage=3DAn application error happe= ned\:
%s lima.error.errorpane.title=3DLima error -lima.error.journal.double=3DA journal exist with this name -lima.error.journal.not.exist=3DThis journal doesn't exist -lima.error.journal.with.transactions=3DThis journal has some transactions -lima.error.period.all.timespan=3D -lima.error.period.create.timespan=3D -lima.error.period.next.not.blocked=3D -lima.error.period.not.exist=3D -lima.error.period.prec.not.blocked=3DIt exists periods not blocked -lima.error.period.timespan.block=3D -lima.error.period.timespan.not.blocked=3D -lima.error.transaction.exist.not.balanced=3DIt exists transactions not balan= ced -lima.error.transaction.not.create=3DThis transaction has not been created -lima.error.transaction.not.exist=3DThis transaction doesn't exist -lima.error.transaction.not.journal=3DThis transaction has not a journal -lima.error.transaction.not.period=3DThis transaction has not a period -lima.error.transaction.not.remove=3DThis transaction has not been removed -lima.error.transaction.period.not.blocked=3DThe period is blocked -lima.exception.number.format=3DNumeric format only accepted lima.export=3DExport -lima.export.CSV=3DCSV Export -lima.export.PDF=3DPDF Export lima.export.account=3DExport PCG lima.export.all=3DExport all datas (XML) lima.export.all.csv=3DExporter all datas (CSV) -lima.filter.after=3DAfter -lima.filter.before=3DBefore -lima.filter.contains=3DContains -lima.filter.equals.to=3DEquals to -lima.filter.greater.than=3DGreater than -lima.filter.less.than=3DLess than -lima.filter.not.contains=3DNot contains -lima.filter.starts.with=3DStarts with lima.financialperiod.block=3D -lima.financialperiod.management=3D lima.financialstatement.accounts=3D lima.financialstatement.creditaccounts=3D lima.financialstatement.debitaccounts=3D lima.financialstatement.formula=3D -lima.financialstatement.header=3D lima.financialstatement.header.add=3D lima.financialstatement.label=3D lima.financialstatement.movement.add=3D lima.financialstatement.provisiondeprecationaccounts=3D -lima.financialstatement.style=3D lima.financialstatement.subamount=3D -lima.financialstatementreports=3D -lima.find.transaction=3DFind transaction lima.fiscalperiod.addFiscalPeriod=3D lima.fiscalperiod.block=3D -lima.fiscalperiod.periodFilterLabel=3D -lima.fiscalyear=3D -lima.fiscalyear.addperiod=3D -lima.fiscalyear.closefiscalyear=3D -lima.fiscalyear.closeperiod=3D -lima.fiscalyear.listclosed=3D -lima.fiscalyear.management=3D -lima.grand.livre=3DGeneral Ledger -lima.home=3DHome - TODO -lima.identity.address=3D -lima.identity.adress=3D -lima.identity.city=3D lima.identity.contact=3D -lima.identity.country=3D -lima.identity.email=3D -lima.identity.fax=3D -lima.identity.name=3D -lima.identity.phone=3D -lima.identity.siret=3D -lima.identity.website=3D -lima.identity.zipcode=3D lima.import=3DImport lima.import.account=3DImport PCG lima.import.all=3DImport all datas lima.import.all.csv=3DImport all datas (CSV) lima.import.all.csv.ebp=3DImport all datas (EBP) -lima.import.error=3DYour datas had't not been loaded lima.import.journal=3DImport journal -lima.import.success=3DYour datas had been loaded lima.init.closed=3DLima closed at %1$s -lima.init.context.done=3DContext was initialized in %1$s lima.init.errorclosing=3D -lima.init.ui.done=3DUI initialized -lima.lettered=3DLettered -lima.lettering=3DLettering lima.lettering.add=3D lima.lettering.entries=3D lima.lettering.from=3D lima.lettering.lettered=3D lima.lettering.letteredall=3D -lima.lettering.not.lettered=3D lima.lettering.notlettered=3D lima.lettering.remove=3D lima.lettering.to=3D -lima.loading=3DLoading lima.menu.file=3DFile lima.menu.help=3DHelp lima.menu.help.about=3DAbout @@ -233,78 +105,23 @@ lima.menu.help.i18n.fr=3DFrench lima.menu.help.i18n.uk=3DEnglish lima.menu.help.site=3DWebSite -lima.menubar.closure=3DClosure -lima.menubar.closure.addPeriod=3DAdd a period -lima.menubar.closure.listperiod=3DSee all periods -lima.menubar.closure.period=3Dclose a period (annual) -lima.menubar.closure.timespan=3Dclose a period (monthly) -lima.message.config.loaded=3DConfig was loaded -lima.message.error.empty.line=3DPlease choose an account lima.message.help.usage=3D lima.misc.supportemail.description=3D -lima.model.account=3DAccount -lima.model.balance=3DBalance -lima.model.credit=3DCredit -lima.model.date=3DDate -lima.model.debit=3DDebit -lima.model.description=3DDescription -lima.model.etat=3DEtat -lima.model.journal=3DJournal -lima.model.lettering=3DLettering -lima.model.name=3DName -lima.model.period=3DPeriod -lima.model.prefix=3DPrefix -lima.model.status=3DStatus -lima.model.voucher=3DVoucher -lima.name=3DName -lima.non.valids.transactions=3DNo valids transactions -lima.not.lettered=3DNot lettered -lima.number=3DNumber -lima.ok=3DOK lima.open=3DOpen lima.openejb.remotemode.description=3D -lima.passif=3DLiability -lima.period=3DPeriod -lima.period.addFiscalPeriod=3D lima.period.begindate=3D -lima.period.block=3D -lima.period.close=3DClose lima.period.enddate=3D -lima.period.filter=3D -lima.period.open=3DOpen -lima.period.periodFilterLabel=3D lima.preferences=3DPreferences -lima.prefix=3DPrefix -lima.print=3DPrint -lima.produit=3DRevenue -lima.progressBar.export.etape1=3DCreate the file -lima.progressBar.export.etape2=3DCreate informations -lima.progressBar.export.etape3=3DCreate periods -lima.progressBar.export.etape4=3DCreate journals -lima.progressBar.export.etape5=3DCreate accounts -lima.progressBar.export.etape6=3DCreate transactions -lima.progressBar.export.etape7=3DSave the file -lima.progressBar.export.title=3DSave -lima.progressBar.load.etape1=3DLoading journals -lima.progressBar.load.etape2=3DLoading accounts -lima.progressBar.load.etape3=3DLoading status -lima.progressBar.load.etape4=3DLoading periods -lima.progressBar.load.etape5=3DLoading transactions lima.question=3DQuestion -lima.question.confirmremove.account=3DThis account have subaccounts, do you = want remove this account ? lima.question.financialperiod.blocked=3D lima.question.fiscalperiod.blocked=3D lima.question.fiscalperiod.morethan12=3D lima.question.load.accounts=3DThere is no existing accounts in Lima. Do you = want to load default accounts ? lima.question.remove.account=3DDo you want to remove this account ? lima.question.remove.entry=3DDo you want to remove this entry ? -lima.question.remove.journal=3DDo you want to remove this journal ? lima.question.remove.transaction=3DDo you want to remove this transaction ? -lima.quit=3DQuit lima.refresh=3D\u21BB lima.remove=3DRemove -lima.remove.lettering=3DRemove a letter -lima.remove.transaction=3DRemove a transaction lima.reports=3DReports lima.reports.accounts=3DEdit account lima.reports.balance=3DBalance @@ -313,46 +130,13 @@ lima.reports.ledger=3DLedger lima.response.no=3DNo lima.response.yes=3DYes -lima.result=3DResult -lima.result.charge=3DCHARGES -lima.result.loss=3DPerte -lima.result.produit=3DPRODUITS -lima.result.profit=3DB\u00E9n\u00E9fice -lima.result.total.charge=3DTOTAL CHARGES -lima.result.total.produit=3DTOTAL PRODUITS -lima.search=3DSearch -lima.search.items.where=3DSearch items where -lima.search.title.criteria.box=3DCriteria -lima.since=3DSince lima.solde=3D lima.soldecredit=3D lima.soldedebit=3D -lima.status.tr.balanced=3DBalanced -lima.status.tr.finalized=3DFinalized -lima.status.tr.wip=3DWork in progress lima.structure=3DStructure -lima.style.1=3D -lima.subledger.accountnumber=3D lima.subledger.code=3DCode -lima.subledger.label=3D -lima.subledger.type=3D -lima.success=3DSuccess -lima.tab.account=3DAccount -lima.tab.accounts=3D -lima.tab.balance=3DBalance -lima.tab.bilan=3DResults -lima.tab.closure=3DClosure -lima.tab.financialperiod=3D -lima.tab.fiscalperiod=3D lima.tab.home=3DHome -lima.tab.journal=3DJournal -lima.tab.lettering=3DLettering -lima.tab.period=3DPeriod -lima.tab.reports=3DReports lima.tab.result=3DResult -lima.tab.search.result=3DSearch result -lima.tab.subledgers=3D -lima.tab.transaction=3DTransaction lima.table.account=3D lima.table.balance=3D lima.table.closure=3D @@ -379,34 +163,16 @@ lima.table.voucher=3D lima.title=3DLutin Invoice Monitoring and Accounting lima.title.about=3DAbout Lima... -lima.to=3DTo -lima.transaction.column.account=3DAccount -lima.transaction.column.balance=3DBalance -lima.transaction.column.credit=3DCredit -lima.transaction.column.date=3DDate -lima.transaction.column.debit=3DDebit -lima.transaction.column.description=3DDescription -lima.transaction.column.document=3DVoucher -lima.transaction.column.entrybook=3DEntrybook -lima.transaction.column.period=3DPeriod -lima.transaction.column.position=3D -lima.transaction.column.solde=3DSolde -lima.transaction.column.status=3DStatus -lima.transaction.column.voucher=3D lima.transaction.confirmdelete=3D -lima.transaction.entrybook=3D lima.transaction.period=3DPeriod -lima.ui.add.account=3DAdd account -lima.ui.add.journal=3DAdd journal -lima.ui.block.timespan=3DBlock period -lima.ui.unblock.timespan=3DUnblock period -lima.ui.update.account=3DUpdate account -lima.ui.update.journal=3DUpdate journal -lima.unblock=3DUnblock -lima.update=3DUpdate -lima.view=3DView -lima.view.flatten=3DFlatten view lima.voucher=3DVoucher -lima.warning.entrybookscloded=3DAll EntryBook of this financial period are b= locked lima.warning.nimbus.landf=3DCould not find Numbus Look&Feel -lima.warning.no.ui=3DNo ui display detected +limahome.createchartaccounts=3D +limahome.createchartaccounts1=3D +limahome.createchartaccounts2=3D +limahome.entrybooks1=3D +limahome.fiscalperiodclosed=3D +limahome.fiscalperiodnoopen=3D +limahome.fiscalperiodopened=3D +limahome.transactionbalanced=3D +limahome.transactionunbalanced=3D Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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=3D -Can't\ add\ fiscal\ period=3D -Can't\ block\ financialperiod=3D -Can't\ delete\ all\ fiscal\ period=3D Confirmation=3D DEBUG\ delete\ all=3D Do\ you\ really\ want\ to\ delete\ entry\ book\ %s\ ?=3D Global\ lima\ exception=3D Loading\ accounting...=3D -TODO\ begincalendarPanel=3D -TODO\ endcalendarPanel=3D -\\\\u21BB=3D -calendarPanel\ TODO=3D lima.about.message=3D\u00C0 propos de Lima lima.account=3DCompte lima.account.label=3D -lima.account.menu=3DPlan de comptes lima.account.number=3D -lima.account.parentnumber=3D -lima.account.type=3DType de compte -lima.account.type1=3DActif -lima.account.type2=3DPassif -lima.account.type3=3DProduit -lima.account.type4=3DCharge -lima.accounts=3DComptes lima.accountsreports.accountfilter=3DFiltrer lima.accountsreports.begincalendar=3DDate d\u00E9but lima.accountsreports.endcalendar=3DDate fin -lima.actif=3DActif -lima.action.commandline.disable.main.ui=3DNe pas lancer l'ui lima.action.commandline.help=3DAfficher l'aide en console lima.action.fullscreen=3DPlein Ecran lima.action.fullscreen.tip=3DPasser en mode plein \u00E9cran lima.action.normalscreen=3DEcran normal lima.action.normalscreen.tip=3DRevenir en \u00E9cran normal lima.add.entry=3DAjouter entr\u00E9e -lima.add.financialstatement.movement.add=3DMouvement -lima.add.lettering=3D lima.add.transaction=3DAjouter transaction -lima.all=3DTous -lima.all.criteria=3DTous les crit\u00E8res correspondent lima.amount=3DMontant lima.amountcredit=3DTotal Cr\u00E9dit lima.amountdebit=3DTotal D\u00E9bit -lima.any.criteria=3DAu moins un crit\u00E8re correspond -lima.balance.total=3DTotal -lima.bilan=3DBilan -lima.bilan.actif=3DActif -lima.bilan.brut=3DBrut -lima.bilan.depreciation=3DAmort. et Prov. -lima.bilan.net=3DNet -lima.bilan.passif=3DPassif -lima.bilan.total=3DTotal -lima.block=3DBloquer -lima.charge=3DCharge lima.charts.account=3DPlan comptable lima.charts.entrybook=3DJournaux lima.charts.financialperiod=3DP\u00E9riodes comptables lima.charts.financialstatement=3DPlan BCR lima.charts.fiscalyear=3DExercices lima.close=3DFerm\u00E9 -lima.closure.period.begin=3DP\u00E9riode de -lima.closure.timespan.warning=3DAttention \: lorsque la p\u00E9riode est blo= qu\u00E9e, il n'est plus possible d'ajouter, modifier et supprimer les entr\u= 00E9es comptables sur cette p\u00E9riode. lima.common.add=3DAjout Compte G\u00E9n\u00E9ral lima.common.addSubLedger=3DAjouter Compte Tiers lima.common.cancel=3DAnnuler @@ -69,7 +34,6 @@ lima.common.quit=3DQuitter lima.common.remove=3DSupprimer lima.common.update=3DModifier -lima.comon.print=3DImprimer lima.config.category.directories=3DR\u00E9pertoires lima.config.category.directories.description=3DR\u00E9pertoires utilis\u00E9= s par Lima lima.config.category.other=3DAutre @@ -77,27 +41,12 @@ lima.config.configFileName.description=3D lima.config.locale.description=3DLocale utilis\u00E9e par l'application lima.config.ui.flaunchui.description=3D -lima.config.ui.fullscreen=3DDrapeau pour utiliser le mode plein \u00E9cran lima.config.ui.fullscreen.description=3D lima.credit=3DCredit lima.daily=3DQuotidien lima.date=3DDate -lima.date.april=3DAvril -lima.date.august=3DAo\u00FBt -lima.date.december=3DD\u00E9cembre -lima.date.february=3DF\u00E9vrier -lima.date.january=3DJanvier -lima.date.july=3DJuillet -lima.date.june=3DJuin -lima.date.march=3DMars -lima.date.may=3DMai -lima.date.november=3DNovembre -lima.date.october=3DOctobre -lima.date.september=3DSeptembre lima.debit=3DDebit lima.description=3DDescription -lima.edit=3DEditer -lima.edit.transaction=3DEditer une transaction lima.entries=3DTraitement lima.entries.addtransaction=3DSaisir des \u00E9critures lima.entries.lettering=3DAjouter une lettre @@ -112,50 +61,14 @@ lima.entrybook.type3=3DTr\u00E9sorerie lima.entrybook.type4=3DG\u00E9n\u00E9ral lima.entrybook.type5=3DSituation -lima.entrybooks=3DJournaux lima.error=3DErreur -lima.error.account.double=3DIl existe un compte avec ce m\u00EAme num\u00E9r= o de compte -lima.error.account.not.exist=3DCe num\u00E9ro de compte n'existe pas -lima.error.account.not.master=3DCe compte ne poss\u00E8de pas de compte prin= cipal -lima.error.account.with.entries=3DCe compte poss\u00E8de des entr\u00E9es co= mptables -lima.error.entry.not.exist=3D -lima.error.entry.not.remove=3D lima.error.errorpane.htmlmessage=3DUne erreur s'est produite<= /b>\:
%s lima.error.errorpane.title=3DLima erreur -lima.error.journal.double=3DUn journal poss\u00E8de d\u00E9j\u00E0 ce nom -lima.error.journal.not.exist=3DCe journal n'existe pas -lima.error.journal.with.transactions=3DCe journal poss\u00E8de des transacti= ons comptables -lima.error.period.all.timespan=3D -lima.error.period.create.timespan=3D -lima.error.period.next.not.blocked=3D -lima.error.period.not.exist=3D -lima.error.period.prec.not.blocked=3DIl existe des p\u00E9riodes pr\u00E9c\u= 00E9dentes non bloqu\u00E9es -lima.error.period.timespan.block=3D -lima.error.period.timespan.not.blocked=3D -lima.error.transaction.exist.not.balanced=3DIl existe des transactions non \= u00E9quilibr\u00E9es -lima.error.transaction.not.create=3DLa transaction n'a pu \u00EAtre cr\u00E9= \u00E9e -lima.error.transaction.not.exist=3DLa transaction n'existe pas -lima.error.transaction.not.journal=3DLa transaction doit \u00EAtre associ\u0= 0E9e \u00E0 un journal -lima.error.transaction.not.period=3DLa transaction doit \u00EAtre associ\u00= E9e \u00E0 une p\u00E9riode -lima.error.transaction.not.remove=3DLa transaction n'a pu \u00EAtre supprim\= u00E9e. -lima.error.transaction.period.not.blocked=3DLa p\u00E9riode de la transactio= n est bloqu\u00E9e. -lima.exception.number.format=3DUniquement un format num\u00E9rique est accep= t\u00E9 lima.export=3DExport -lima.export.CSV=3DCSV -lima.export.PDF=3DPDF lima.export.account=3DExporter le PCG lima.export.all=3DExporter toutes les donn\u00E9es (XML) lima.export.all.csv=3DExporter toutes les donn\u00E9es (CSV) -lima.filter.after=3DApr\u00E8s -lima.filter.before=3DAvant -lima.filter.contains=3DContient -lima.filter.equals.to=3DEgal \u00E0 -lima.filter.greater.than=3DSup\u00E9rieur \u00E0 -lima.filter.less.than=3DInf\u00E9rieur \u00E0 -lima.filter.not.contains=3DNe contient pas -lima.filter.starts.with=3DCommence par lima.financialperiod.block=3DCloturer une p\u00E9riode -lima.financialperiod.management=3D lima.financialstatement.accounts=3DListe de comptes au cr\u00E9dit et au d\u= 00E9bit lima.financialstatement.creditaccounts=3DListe de comptes au cr\u00E9dit lima.financialstatement.debitaccounts=3DListe de comptes au d\u00E9bit @@ -165,42 +78,17 @@ lima.financialstatement.movement.add=3DAjouter un regrouprement lima.financialstatement.provisiondeprecationaccounts=3DListe de comptes d'am= ortissement et provisions=20 lima.financialstatement.subamount=3DCalculer un sous-total -lima.find.transaction=3DRechercher transaction lima.fiscalperiod.addFiscalPeriod=3DNouvel exercice lima.fiscalperiod.block=3DCloturer un exercice -lima.fiscalperiod.periodFilterLabel=3D -lima.fiscalyear.addperiod=3DAjouter une p\u00E9riode -lima.fiscalyear.closefiscalyear=3DCl\u00F4turer l'exercice -lima.fiscalyear.closeperiod=3DCl\u00F4turer une p\u00E9riode -lima.fiscalyear.listclosed=3DVoir toutes les cl\u00F4tures -lima.fiscalyear.management=3D -lima.grand.livre=3DGrand-Livre -lima.home=3DPage d'accueil - TODO -lima.identity.address=3DAdresse -lima.identity.city=3DVille lima.identity.contact=3DContact -lima.identity.country=3DPays -lima.identity.email=3DeMail -lima.identity.fax=3DFax -lima.identity.name=3DNom -lima.identity.phone=3DTel -lima.identity.siret=3DSiret -lima.identity.website=3DSite Web -lima.identity.zipcode=3DCode Postal lima.import=3DImport lima.import.account=3DImporter le PCG lima.import.all=3DImporter une nouvelle base (XML) lima.import.all.csv=3DImporter une nouvelle base (CSV) lima.import.all.csv.ebp=3DImporter des donn\u00E9es de EBP -lima.import.error=3DVos donn\u00E9es n'ont pu \u00EAtre charg\u00E9es lima.import.journal=3DImporter le journal -lima.import.success=3DVos donn\u00E9es ont bien \u00E9t\u00E9 charg\u00E9es lima.init.closed=3DLima ferm\u00E9 \u00E0 %1$s -lima.init.context.done=3DInitialisation du context termin\u00E9 en %1$s lima.init.errorclosing=3D -lima.init.ui.done=3DInitialisation des interface graphiques termin\u00E9e -lima.lettered=3DLettr\u00E9 -lima.lettering=3DLettrage lima.lettering.add=3DAjouter une lettre lima.lettering.entries=3DOp\u00E9ration de saisie lima.lettering.from=3DDe @@ -209,7 +97,6 @@ lima.lettering.notlettered=3DNon lettr\u00E9e lima.lettering.remove=3DSupprimer lima.lettering.to=3D\u00C0 -lima.loading=3DChargement lima.menu.file=3DFichier lima.menu.help=3DAide lima.menu.help.about=3D\u00C0 Propos @@ -218,67 +105,23 @@ lima.menu.help.i18n.fr=3DFran\u00E7ais lima.menu.help.i18n.uk=3DAnglais lima.menu.help.site=3DAcc\u00E9der au site de Lima -lima.menubar.closure.addPeriod=3D -lima.message.config.loaded=3D -lima.message.error.empty.line=3DVeuillez choisir un compte lima.message.help.usage=3D lima.misc.supportemail.description=3D -lima.model.account=3DCompte -lima.model.balance=3DBalance -lima.model.credit=3DCr\u00E9dit -lima.model.date=3DDate -lima.model.debit=3DD\u00E9bit -lima.model.description=3DDescription -lima.model.etat=3DEtat -lima.model.journal=3DJournal -lima.model.lettering=3DLettrage -lima.model.name=3DNom -lima.model.period=3DP\u00E9riode -lima.model.prefix=3DPr\u00E9fixe -lima.model.status=3DStatut -lima.model.voucher=3DDocument -lima.name=3DNom -lima.non.valids.transactions=3DEcritures non valides -lima.not.lettered=3DNon lettr\u00E9 -lima.number=3DNum\u00E9ro lima.open=3DOuvert lima.openejb.remotemode.description=3D -lima.passif=3DPassif -lima.period=3D lima.period.begindate=3DD\u00E9but -lima.period.close=3D lima.period.enddate=3DFin -lima.period.open=3D lima.preferences=3DPr\u00E9f\u00E9rences -lima.prefix=3DPr\u00E9fixe -lima.produit=3DProduit -lima.progressBar.export.etape1=3DCr\u00E9ation base du fichier -lima.progressBar.export.etape2=3DCr\u00E9ation informations -lima.progressBar.export.etape3=3DCr\u00E9ation des p\u00E9riodes -lima.progressBar.export.etape4=3DCr\u00E9ation des journaux -lima.progressBar.export.etape5=3DCr\u00E9ation des comptes -lima.progressBar.export.etape6=3DCr\u00E9ation des transactions -lima.progressBar.export.etape7=3DEnregistrement du fichier -lima.progressBar.export.title=3DSauvegarde -lima.progressBar.load.etape1=3DChargement des journaux -lima.progressBar.load.etape2=3DChargement des comptes -lima.progressBar.load.etape3=3DChargement des status -lima.progressBar.load.etape4=3DChargement des p\u00E9riodes -lima.progressBar.load.etape5=3DChargement des transactions lima.question=3DQuestion -lima.question.confirmremove.account=3DCe compte poss\u00E8de des sous compte= s, voulez-vous supprimer ce compte ? lima.question.financialperiod.blocked=3D lima.question.fiscalperiod.blocked=3D\u00C8tes vous s\u00FBre de vouloir cl\= u00F4turer cette exercice ? Cette action est irr\u00E9versible \! lima.question.fiscalperiod.morethan12=3DLa p\u00E9riode s\u00E9lectionner n'= est pas de 12 mois, voulez-vous continuer ? lima.question.load.accounts=3DIl n'y a aucun plan comptable existant dans Li= ma. Voulez-vous en charger un par d\u00E9faut ? lima.question.remove.account=3DVoulez-vous supprimer ce compte? lima.question.remove.entry=3DVoulez-vous supprimer cette ligne de transactio= n? -lima.question.remove.journal=3DVoulez-vous supprimer ce journal? lima.question.remove.transaction=3DVoulez-vous supprimer cette transaction? lima.refresh=3D\u21BB lima.remove=3D -lima.remove.lettering=3DSupprimer la lettre -lima.remove.transaction=3DSupprimer une transaction lima.reports=3DRapports lima.reports.accounts=3DEdition compte lima.reports.balance=3DBalance @@ -287,34 +130,12 @@ lima.reports.ledger=3DGrand Livre lima.response.no=3DNon lima.response.yes=3DOui -lima.result=3DCompte de r\u00E9sultat -lima.result.charge=3DCHARGES -lima.result.loss=3DPerte -lima.result.produit=3DPRODUITS -lima.result.profit=3DB\u00E9n\u00E9fice -lima.result.total.charge=3DTOTAL CHARGES -lima.result.total.produit=3DTOTAL PRODUITS -lima.search=3DRechercher -lima.search.items.where=3DTrouver les \u00E9critures o\u00F9 -lima.search.title.criteria.box=3DCrit\u00E8res -lima.since=3DDepuis lima.solde=3DSolde lima.soldecredit=3DSolde Cr\u00E9diteur lima.soldedebit=3DSolde D\u00E9biteur -lima.status.tr.balanced=3DEquilibr\u00E9e -lima.status.tr.finalized=3DValid\u00E9e -lima.status.tr.wip=3DEn cours lima.structure=3DStructure -lima.style.1=3D -lima.subledger.accountnumber=3D lima.subledger.code=3DCode -lima.subledger.label=3D -lima.subledger.type=3D -lima.success=3DSucc\u00E8s -lima.tab.bilan=3D -lima.tab.fiscalperiod=3DExercice lima.tab.home=3DAccueil -lima.tab.reports=3D lima.tab.result=3D lima.table.account=3DCompte lima.table.balance=3DBalance @@ -342,21 +163,19 @@ lima.table.voucher=3DPi\u00E8ce comptable lima.title=3DLutin Invoice Monitoring and Accounting lima.title.about=3DA propos de Lima... -lima.to=3DA lima.transaction.confirmdelete=3D -lima.transaction.entrybook=3DJournal lima.transaction.period=3DP\u00E9riode -lima.ui.add.account=3DAjouter un compte -lima.ui.add.journal=3DAjouter un journal -lima.ui.block.timespan=3DBloquer une p\u00E9riode mensuelle -lima.ui.unblock.timespan=3DD\u00E9bloquer une p\u00E9riode mensuelle -lima.ui.update.account=3DMettre \u00E0 jour le compte -lima.ui.update.journal=3DMettre \u00E0 jour le journal -lima.unblock=3DD\u00E9bloquer -lima.update=3D -lima.view=3DVue -lima.view.flatten=3DVue aplatie lima.voucher=3DDocument -lima.warning.entrybookscloded=3DImpossible tous les journaux de cette p\u00E= 9riode sont ferm\u00E9s lima.warning.nimbus.landf=3DLe look and feel nymbus n'a pas \u00E9t\u00E9 tr= ouv\u00E9 -lima.warning.no.ui=3DAucun environnement graphique d\u00E9tect\u00E9. +limahome.accountsnoopen=3DAucun compte \! +limahome.chartaccounts1=3DLe plan comptable possede +limahome.chartaccounts2=3Dcomptes +limahome.createchartaccounts=3DCr\u00E9er le plan comptable +limahome.entrybooknoopen=3DAucun journal ouvert \! +limahome.entrybooks1=3DLes +limahome.entrybooks2=3Djournaux sont \: +limahome.fiscalperiodclosed=3Dexercices clotur\u00E9s +limahome.fiscalperiodnoopen=3DAucun exercice ouvert \! +limahome.fiscalperiodopened=3Dexercices ouverts +limahome.transactionbalanced=3DToutes les entr\u00E9es sont \u00E9quilibr\u0= 0E9es +limahome.transactionunbalanced=3Dne sont pas \u00E9quilibr\u00E9e \! Added: trunk/lima-swing/src/main/resources/images/logo-codelutin.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/lima-swing/src/main/resources/images/logo-codeluti= n.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream --===============4648042284842752707==--