From sbavencoff@users.chorem.org Fri Sep 12 15:43:27 2014 From: sbavencoff@users.chorem.org To: lima-commits@list.chorem.org Subject: [Lima-commits] r3917 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/fiscalperiod java/org/chorem/lima/ui/importexport resources/i18n Date: Fri, 12 Sep 2014 15:43:26 +0200 Message-ID: <20140912134326.CC4F6180FCC@goh.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7696672872506671058==" --===============7696672872506671058== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: sbavencoff Date: 2014-09-12 15:43:26 +0200 (Fri, 12 Sep 2014) New Revision: 3917 Url: http://forge.chorem.org/projects/lima/repository/revisions/3917 Log: refs #875 #1043 : FiscalPeriod Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.c= ss trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPerio= dView.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEar= ningsEntryBookForm.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEar= ningsWait.css Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.j= axx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPerio= dTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPerio= dView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPerio= dViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEar= ningsEntryBookForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEar= ningsWait.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExpor= tWaitView.jaxx trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeri= od.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/fiscalperiod/AddPeriod.= css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.= css 2014-09-12 13:43:26 UTC (rev 3917) @@ -0,0 +1,25 @@ +#periodFormDialog { + title : "lima.fiscalPeriod.form"; +} + +#beginDateLabel { + text : "lima.beginDate"; + labelFor : "{beginDatePicker}"; +} + +#beginDatePicker { + enabled : "{!isModifyPeriod()}"; +} + +#endDateLabel { + text : "lima.endDate"; + labelFor : "{endDatePicker}"; +} + +#cancelButton { + text : "lima.cancel"; +} + +#okButton { + text : "lima.ok"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddP= eriod.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/fiscalperiod/AddPeriod.= jaxx 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.= jaxx 2014-09-12 13:43:26 UTC (rev 3917) @@ -22,7 +22,8 @@ . #L% --> - =20 @@ -48,16 +49,15 @@ - + - + - + @@ -68,11 +68,11 @@
- - Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/Fisc= alPeriodTableModel.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/fiscalperiod/FiscalPeri= odTableModel.java 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeri= odTableModel.java 2014-09-12 13:43:26 UTC (rev 3917) @@ -58,7 +58,7 @@ =20 @Override protected void initColumn() { - addColumn(new AbstractColumn(Date.class, t("= lima.fiscalperiod.begin"), false) { + addColumn(new AbstractColumn(Date.class, t("= lima.fiscalPeriod.begin"), false) { @Override public Object getValueAt(int row) { FiscalPeriod fiscalPeriod =3D tableModel.get(row); @@ -66,7 +66,7 @@ } }); =20 - addColumn(new AbstractColumn(Date.class, t("= lima.fiscalperiod.end"), false) { + addColumn(new AbstractColumn(Date.class, t("= lima.fiscalPeriod.end"), false) { @Override public Object getValueAt(int row) { FiscalPeriod fiscalPeriod =3D tableModel.get(row); @@ -74,13 +74,13 @@ } }); =20 - addColumn(new AbstractColumn(String.class, t= ("lima.fiscalperiod.status"), false) { + addColumn(new AbstractColumn(String.class, t= ("lima.fiscalPeriod.status"), false) { @Override public Object getValueAt(int row) { FiscalPeriod fiscalPeriod =3D tableModel.get(row); - String status =3D t("lima.fiscalperiod.open"); + String status =3D t("lima.fiscalPeriod.open"); if (fiscalPeriod.isLocked()) { - status =3D t("lima.fiscalperiod.closed"); + status =3D t("lima.fiscalPeriod.closed"); } return status; } Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalP= eriodView.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/fiscalperiod/FiscalPeri= odView.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeri= odView.css 2014-09-12 13:43:26 UTC (rev 3917) @@ -0,0 +1,36 @@ +#toolBar { + floatable : false; +} + +#addButton { + toolTipText : "lima.fiscalPeriod.add"; + actionIcon : "fiscalPeriod-new"; +} + +#updateButton { + toolTipText : "lima.fiscalPeriod.update"; + actionIcon : "fiscalPeriod-edit"; + enabled : "{isDeleteEnabled()}"; +} + +#blockButton { + toolTipText : "lima.fiscalPeriod.block"; + actionIcon : "fiscalPeriod-close"; + enabled : "{isBlockEnabled()}"; +} + +#removeButton { + toolTipText : "lima.fiscalPeriod.delete"; + actionIcon : "fiscalPeriod-remove"; + enabled : "{isDeleteEnabled()}"; +} + +#fiscalPeriodTable { + sortable : false; + rowHeight : 24; + columnControlVisible : true; +} + +#selectionModel { + selectionMode : "{ListSelectionModel.SINGLE_SELECTION}"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/Fisc= alPeriodView.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/fiscalperiod/FiscalPeri= odView.jaxx 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeri= odView.jaxx 2014-09-12 13:43:26 UTC (rev 3917) @@ -23,7 +23,7 @@ #L% --> =20 -
+ =20 javax.swing.ListSelectionModel @@ -42,54 +42,32 @@ } ]]> =20 - - - =20 - + =20 - + =20 - + =20 - + =20 - - - + =20 - - - - - - + + + + + =20 - - - -
+ + Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/Fisc= alPeriodViewHandler.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/fiscalperiod/FiscalPeri= odViewHandler.java 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeri= odViewHandler.java 2014-09-12 13:43:26 UTC (rev 3917) @@ -183,7 +183,7 @@ =20 =20 AddPeriod addPeriodDialog =3D new AddPeriod(view); - addPeriodDialog.setTitle(t("lima.fiscalperiod.addfiscalperiodtitle")= ); + addPeriodDialog.setTitle(t("lima.fiscalPeriod.addfiscalperiodtitle")= ); addPeriodDialog.getBeginDatePicker().setDate(beginDate); addPeriodDialog.getEndDatePicker().setDate(endDate); addPeriodDialog.setLocationRelativeTo(view); @@ -229,7 +229,7 @@ int response =3D JOptionPane.YES_OPTION; if (nbMonth !=3D 12) { response =3D JOptionPane.showConfirmDialog(view, - t("lima.fiscalperiod.addfiscalperiod.morethan12"), + t("lima.fiscalPeriod.addfiscalperiod.morethan12"), title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESS= AGE); } @@ -258,7 +258,7 @@ if (!selectedFiscalPeriod.isLocked()) { =20 AddPeriod addPeriodDialog =3D new AddPeriod(view); - addPeriodDialog.setTitle(t("lima.fiscalperiod.modifyfiscalpe= riodtitle")); + addPeriodDialog.setTitle(t("lima.fiscalPeriod.modifyfiscalpe= riodtitle")); addPeriodDialog.getBeginDatePicker().setDate(selectedFiscalP= eriod.getBeginDate()); addPeriodDialog.getEndDatePicker().setDate(selectedFiscalPer= iod.getEndDate()); addPeriodDialog.setModifyPeriod(true); @@ -293,8 +293,8 @@ =20 //check if the user want to delete the fiscal year int response =3D JOptionPane.showConfirmDialog(view, - t("lima.fiscalperiod.delete.confirmation"), - t("lima.fiscalperiod.delete.title"), JOptionPane.YES= _NO_OPTION, + t("lima.fiscalPeriod.delete.confirmation"), + t("lima.fiscalPeriod.delete.title"), JOptionPane.YES= _NO_OPTION, JOptionPane.WARNING_MESSAGE); =20 if (response =3D=3D JOptionPane.YES_OPTION) { @@ -332,8 +332,8 @@ =20 //check if the user want to block the fiscal year int answerBlock =3D JOptionPane.showConfirmDialog(view, - t("lima.fiscalperiod.block.confirmation"), - t("lima.fiscalperiod.block.title"), JOptionPane.YES_= NO_OPTION, + t("lima.fiscalPeriod.block.confirmation"), + t("lima.fiscalPeriod.block.title"), JOptionPane.YES_= NO_OPTION, JOptionPane.WARNING_MESSAGE); =20 if (answerBlock =3D=3D JOptionPane.YES_OPTION) { @@ -347,8 +347,8 @@ =20 //check if the user wants to create a new fiscal= year int answerCreate =3D JOptionPane.showConfirmDial= og(view, - t("lima.fiscalperiod.block.newyear"), - t("lima.fiscalperiod.block.title"), JOpt= ionPane.YES_NO_OPTION, + t("lima.fiscalPeriod.block.newyear"), + t("lima.fiscalPeriod.block.title"), JOpt= ionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); =20 // create a new fiscal year @@ -363,16 +363,16 @@ if (selectedFiscalPeriod.equals(lastFiscalPeriod)) { =20 JOptionPane.showMessageDialog(view, - t("lima.fiscalperiod.block.cantBalanceIf= NextPeriodNotExist"), - t("lima.fiscalperiod.block.title"), + t("lima.fiscalPeriod.block.cantBalanceIf= NextPeriodNotExist"), + t("lima.fiscalPeriod.block.title"), JOptionPane.ERROR_MESSAGE); =20 } else { =20 //check if the user wants to report datas int answerRetainedEarnings =3D JOptionPane.showC= onfirmDialog(view, - t("lima.fiscalperiod.block.addretainedea= rnings"), - t("lima.fiscalperiod.block.title"), JOpt= ionPane.YES_NO_OPTION, + t("lima.fiscalPeriod.block.addretainedea= rnings"), + t("lima.fiscalPeriod.block.title"), JOpt= ionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); =20 if (answerRetainedEarnings =3D=3D JOptionPane.YE= S_OPTION) { @@ -414,16 +414,16 @@ } else { =20 JOptionPane.showMessageDialog(view, - t("lima.fiscalperiod.block.cantB= alanceNotBook"), - t("lima.fiscalperiod.block.title= "), + t("lima.fiscalPeriod.block.cantB= alanceNotBook"), + t("lima.fiscalPeriod.block.title= "), JOptionPane.ERROR_MESSAGE); } =20 } else { =20 JOptionPane.showMessageDialog(view, - t("lima.fiscalperiod.block.cantBlock= NotBalance"), - t("lima.fiscalperiod.block.title"), + t("lima.fiscalPeriod.block.cantBlock= NotBalance"), + t("lima.fiscalPeriod.block.title"), JOptionPane.ERROR_MESSAGE); } } Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/Retaine= dEarningsEntryBookForm.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/fiscalperiod/RetainedEa= rningsEntryBookForm.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEa= rningsEntryBookForm.css 2014-09-12 13:43:26 UTC (rev 3917) @@ -0,0 +1,49 @@ +#retainedEarningsEntryBookFormDialog { + title : "lima.fiscalPeriod.block.retainedEarnings"; +} + +#selectedEntryBook { + text : "lima.entryBook"; + selected : true; + buttonGroup : "EntryBookGroup"; + +} + +#entryBookSelectorLabel { + text : "lima.entryBook"; +} + +#entryBookComboBox { + editable : "false"; +} + +#newEntryBook { + text : "lima.fiscalPeriod.entryBooks.create"; + selected : false; + buttonGroup : "EntryBookGroup"; +} + +#codeLabel { + text : "lima.code"; +} + +#codeField { + text : "{getEntryBook().getCode()}"; +} + +#labelLabel { + text : "lima.label"; +} + +#LabelField { + editable : "{isAddState()}"; + text : "{getEntryBook().getLabel()}"; +} + +#cancelButton { + text : "lima.cancel"; +} + +#okButton { + text : "lima.ok"; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/Reta= inedEarningsEntryBookForm.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/fiscalperiod/RetainedEa= rningsEntryBookForm.jaxx 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEa= rningsEntryBookForm.jaxx 2014-09-12 13:43:26 UTC (rev 3917) @@ -22,7 +22,8 @@ . #L% --> - =20 @@ -53,8 +54,8 @@ protected void performNew() { if (selectedEntryBook.isSelected()) { entryBookComboBox.setEnabled(true); - entryBookLabelField.setEditable(false); - entryBookCodeField.setEditable(false); + labelField.setEditable(false); + codeField.setEditable(false); if (getEntryBookComboBox().getSelectedItem() !=3D null) { getEntryBook().setCode(((EntryBook)getEntryBookComboBox().ge= tSelectedItem()).getCode().trim()); getEntryBook().setLabel(((EntryBook)getEntryBookComboBox().g= etSelectedItem()).getLabel().trim()); @@ -63,10 +64,10 @@ } } else { entryBookComboBox.setEnabled(false); - entryBookLabelField.setEditable(true); - entryBookCodeField.setEditable(true); - getEntryBook().setCode(getEntryBookCodeField().getText()); - getEntryBook().setLabel(getEntryBookLabelField().getText()); + labelField.setEditable(true); + codeField.setEditable(true); + getEntryBook().setCode(getCodeField().getText()); + getEntryBook().setLabel(getLabelField().getText()); } } =20 @@ -79,67 +80,57 @@ - + - + - - + - - + + - + - - + + - - =20 Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/Retaine= dEarningsWait.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/fiscalperiod/RetainedEa= rningsWait.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEa= rningsWait.css 2014-09-12 13:43:26 UTC (rev 3917) @@ -0,0 +1,7 @@ +#waitDialog { + title : "lima.wait"; +} + +#waitLabel { + text : "lima.retainedEarnings.wait"; +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/Reta= inedEarningsWait.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/fiscalperiod/RetainedEa= rningsWait.jaxx 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEa= rningsWait.jaxx 2014-09-12 13:43:26 UTC (rev 3917) @@ -21,15 +21,18 @@ . #L% --> - +
- + - +
+
\ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/Impo= rtExportWaitView.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/importexport/ImportExpo= rtWaitView.jaxx 2014-09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExpo= rtWaitView.jaxx 2014-09-12 13:43:26 UTC (rev 3917) @@ -23,7 +23,7 @@ #L% --> =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 2014= -09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014= -09-12 13:43:26 UTC (rev 3917) @@ -367,56 +367,60 @@ lima.financialtransaction.titleremoveentry=3D lima.financialtransaction.titleremovetransaction=3D lima.financialtransaction.voucher=3D +lima.fiscalPeriod.add=3D lima.fiscalPeriod.add.beginAfterEndFiscalPeriod=3D lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod=3D lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod=3D lima.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod=3D lima.fiscalPeriod.add.moreOneUnlockFiscalPeriod=3D lima.fiscalPeriod.add.notBeginNextDayOfLastFiscalPeriod=3D +lima.fiscalPeriod.addfiscalperiod.addfiscalperiodtitle=3D +lima.fiscalPeriod.addfiscalperiod.endAfterBegin=3D +lima.fiscalPeriod.addfiscalperiod.morethan12=3D +lima.fiscalPeriod.addfiscalperiodtitle=3D +lima.fiscalPeriod.begin=3D +lima.fiscalPeriod.block=3D +lima.fiscalPeriod.block.addretainedearnings=3D +lima.fiscalPeriod.block.cantBalanceIfNextPeriodNotExist=3D +lima.fiscalPeriod.block.cantBalanceNotBook=3D +lima.fiscalPeriod.block.cantBlockNotBalance=3D +lima.fiscalPeriod.block.confirmation=3D lima.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod=3D lima.fiscalPeriod.block.error.lastUnlockedFiscalPeriod=3D lima.fiscalPeriod.block.error.lockedFinancialPeriod=3DFiscal period from %3$= te %3$tB %3$tY to %4$te %4$tB %4$tY is closed. lima.fiscalPeriod.block.error.lockedFiscalPeriod=3DFiscal period closed %s -lima.fiscalPeriod.buttonback=3D -lima.fiscalPeriod.buttonnext=3D +lima.fiscalPeriod.block.newyear=3D +lima.fiscalPeriod.block.retainedEarnings=3D +lima.fiscalPeriod.block.title=3D +lima.fiscalPeriod.buttonback=3D=E2=86=90 +lima.fiscalPeriod.buttonnext=3D=E2=86=92 +lima.fiscalPeriod.closed=3D +lima.fiscalPeriod.closure=3D lima.fiscalPeriod.defaultAccountingRules.beginAfterEndFiscalPeriodException= =3DFiscal period ending date must be after the begining one, begin\: %1$tm/%1= $te/%1$tY end\: %1$tm/%1$te/%1$tY.\n +lima.fiscalPeriod.delete=3D +lima.fiscalPeriod.delete.confirmation=3D lima.fiscalPeriod.delete.error.noEmptyFiscalPeriod=3D +lima.fiscalPeriod.delete.title=3D +lima.fiscalPeriod.end=3D +lima.fiscalPeriod.entryBooks.create=3D +lima.fiscalPeriod.fiscalperiod=3D +lima.fiscalPeriod.fiscalperiod.begin=3D +lima.fiscalPeriod.fiscalperiod.end=3D +lima.fiscalPeriod.fiscalperiod.status=3D +lima.fiscalPeriod.form=3D lima.fiscalPeriod.franceAccountingRules.invalidAccountNumberException=3DMast= er account is not a digit between 1 to 8 \: %s"\n lima.fiscalPeriod.franceAccountingRules.lastUnlockedFiscalPeriodException=3D= Current fiscal period must not be closed. lima.fiscalPeriod.franceAccountingRules.moreOneUnlockFiscalPeriodException= =3DThe ante fiscal period is not locked\: concerned fiscal period from %1$tm/= %1$te/%1$tY to %1$tm/%1$te/%1$tY.\n lima.fiscalPeriod.franceAccountingRules.noEmptyFiscalPeriodException=3DThe f= iscal period is not empty \! lima.fiscalPeriod.franceAccountingRules.notBeginNextDayOfLastFiscalPeriodExc= eption=3DThe new fiscal period must adjoining the last\: concerned fiscal per= iod from %1$tm/%1$te/%1$tY to %1$tm/%1$te/%1$tY.\n lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException=3DAc= count Number that doesn't start with 4 have to be numeric\: %s"\n +lima.fiscalPeriod.modifyfiscalperiodtitle=3D +lima.fiscalPeriod.open=3D +lima.fiscalPeriod.remove=3D +lima.fiscalPeriod.status=3D +lima.fiscalPeriod.unbalancedtransactions=3DFiscal Period has unbalanced tran= sactions +lima.fiscalPeriod.update=3D lima.fiscalYears=3D -lima.fiscalperiod.addfiscalperiod.addfiscalperiodtitle=3D -lima.fiscalperiod.addfiscalperiod.endAfterBegin=3D -lima.fiscalperiod.addfiscalperiod.morethan12=3D -lima.fiscalperiod.addfiscalperiodtitle=3D -lima.fiscalperiod.begin=3D -lima.fiscalperiod.block.addretainedearnings=3D -lima.fiscalperiod.block.cantBalanceIfNextPeriodNotExist=3D -lima.fiscalperiod.block.cantBalanceNotBook=3D -lima.fiscalperiod.block.cantBlockNotBalance=3D -lima.fiscalperiod.block.confirmation=3D -lima.fiscalperiod.block.newyear=3D -lima.fiscalperiod.block.retainedearningstitle=3D -lima.fiscalperiod.block.title=3D -lima.fiscalperiod.buttonback=3D=E2=86=90 -lima.fiscalperiod.buttonnext=3D=E2=86=92 -lima.fiscalperiod.closed=3D -lima.fiscalperiod.closure=3D -lima.fiscalperiod.delete.confirmation=3D -lima.fiscalperiod.delete.title=3D -lima.fiscalperiod.end=3D -lima.fiscalperiod.entrybooks.create=3D -lima.fiscalperiod.fiscalperiod=3D -lima.fiscalperiod.fiscalperiod.begin=3D -lima.fiscalperiod.fiscalperiod.end=3D -lima.fiscalperiod.fiscalperiod.status=3D -lima.fiscalperiod.modifyfiscalperiodtitle=3D -lima.fiscalperiod.open=3D -lima.fiscalperiod.status=3D -lima.fiscalperiod.unbalancedtransactions=3DFiscal Period has unbalanced tran= sactions lima.fullscreen=3D lima.generateHtml=3D lima.help=3D @@ -539,7 +543,6 @@ lima.importExport.vatStatement=3DVTA transactions import completed. lima.importExport.vatstatements=3DVAT chart lima.importExport.wait=3DJob in progress=E2=80=A6 -lima.importExport.waittitle=3D lima.info=3DInformation lima.init.closed=3DLima closed at %1$s lima.init.errorclosing=3DError during Lima close @@ -663,6 +666,7 @@ lima.vatstatement.label=3DLabel lima.vatstatement.mastervatstatement=3D lima.vatstatement.movement.add=3DAdd movement +lima.wait=3D lima.warning.nimbus.landf=3DCould not find Numbus Look&Feel limma.config.thousandseparator.description=3D limma.config.thousandseparator.label=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 2014= -09-12 10:26:43 UTC (rev 3916) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014= -09-12 13:43:26 UTC (rev 3917) @@ -53,11 +53,7 @@ lima.charts.financialstatement.shortened=3DPlan BCR abr=C3=A9g=C3=A9 lima.charts.financialtransaction.question.removeentry=3DVoulez-vous supprime= r cette ligne de transaction? lima.charts.financialtransaction.question.removetransaction=3DVoulez-vous su= pprimer cette transaction? -lima.charts.fiscalperiod.add=3DNouvel exercice -lima.charts.fiscalperiod.block=3DCloturer un exercice -lima.charts.fiscalperiod.create=3DChoisissez la date de d=C3=A9but et de fin= du nouvel exercice -lima.charts.fiscalperiod.delete=3DSupprimer un exercice -lima.charts.fiscalperiod.update=3DModifier la date de fin de l'exercice +lima.charts.fiscalperiod.create=3D lima.charts.fiscalyear=3DExercices lima.charts.vatpdf=3DImport du pdf lima.charts.vatstatement=3DPlan TVA @@ -342,48 +338,53 @@ lima.financialtransaction.titleremoveentry=3DSuppression lima.financialtransaction.titleremovetransaction=3DSuppression lima.financialtransaction.voucher=3DPi=C3=A8ce comptable +lima.fiscalPeriod.add=3DNouvel exercice (Ctrl+A) lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod=3DLe date de fin de l'= exercice (%2$te/%2$tm/%2$tY) doit =C3=AAtre post=C3=A9rieur =C3=A0 la date de= d=C3=A9but (%1$te/%1$tm/%1$tY) lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod=3DIl existe d=C3=A9j= =C3=A0 %1s exercices non cl=C3=B4tur=C3=A9s. lima.fiscalPeriod.add.error.notBeginNextDayOfLastFiscalPeriod=3DLa date de d= =C3=A9but de l'exercice doit suivre la date de fin de l'exercice pr=C3=A9c=C3= =A9dent le %1$te/%1$tm/%1$tY +lima.fiscalPeriod.addfiscalperiod.morethan12=3DLa p=C3=A9riode s=C3=A9lectio= nn=C3=A9e n'est pas de 12 mois, voulez-vous continuer ? +lima.fiscalPeriod.addfiscalperiodtitle=3DNouvel exercice +lima.fiscalPeriod.begin=3DD=C3=A9but +lima.fiscalPeriod.block=3DCloturer un exercice (Ctrl+C) +lima.fiscalPeriod.block.addretainedearnings=3DReporter =C3=A0 nouveau? +lima.fiscalPeriod.block.cantBalanceIfNextPeriodNotExist=3DImpossible de cr= =C3=A9er le report =C3=A0 nouveaux. L'exercice fiscal suivant n'existe pas +lima.fiscalPeriod.block.cantBalanceNotBook=3DImpossible de cr=C3=A9er le rep= ort =C3=A0 nouveaux. aucun journal n'est selection=C3=A9. +lima.fiscalPeriod.block.cantBlockNotBalance=3DImpossible de cl=C3=B4turer un= exercice non equilibr=C3=A9 +lima.fiscalPeriod.block.confirmation=3D=C3=88tes vous s=C3=BBre de vouloir c= l=C3=B4turer cette p=C3=A9riode ? Cette action est irr=C3=A9versible \! lima.fiscalPeriod.block.error.AlreadyLockedFiscalPeriod=3DL'exercice est d= =C3=A9j=C3=A0 cl=C3=B4tur=C3=A9s lima.fiscalPeriod.block.error.lastUnlockedFiscalPeriod=3DL'exercice pr=C3=A9= dent doit =C3=AAtre cl=C3=B4tur=C3=A9 lima.fiscalPeriod.block.error.lockedFinancialPeriod=3DLa p=C3=A9riode fiscal= e du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est clotur=C3=A9e. lima.fiscalPeriod.block.error.lockedFiscalPeriod=3DL'exercice =C3=A9st cl=C3= =B4tur=C3=A9 %s +lima.fiscalPeriod.block.newyear=3DVoulez vous cr=C3=A9er un nouvel exercice? +lima.fiscalPeriod.block.retainedEarnings=3DReport =C3=A0 nouveau +lima.fiscalPeriod.block.title=3DCloture de l'exercice lima.fiscalPeriod.buttonback=3D=E2=86=90 lima.fiscalPeriod.buttonnext=3D=E2=86=92 +lima.fiscalPeriod.closed=3DClotur=C3=A9 +lima.fiscalPeriod.closure=3DCloture +lima.fiscalPeriod.create=3DChoisissez la date de d=C3=A9but et de fin du nou= vel exercice lima.fiscalPeriod.defaultAccountingRules.beginAfterEndFiscalPeriodException= =3DLa date de d=C3=A9but doit =C3=AAtre avant la date de fin, debut\: %1$te/%= 1$tm/%1$tY fin\: %1$te/%1$tm/%1$tY.\n +lima.fiscalPeriod.delete=3DSupprimer un exercice (Suppr) +lima.fiscalPeriod.delete.confirmation=3D=C3=88tes vous s=C3=BBre de vouloir = supprimer cette p=C3=A9riode ? Cette action est irr=C3=A9versible \! lima.fiscalPeriod.delete.error.noEmptyFiscalPeriod=3DImpossible de supprimer= un exercice avec des transactions (%1$s). +lima.fiscalPeriod.delete.title=3DSuppression de l'exercice +lima.fiscalPeriod.end=3DFin +lima.fiscalPeriod.entryBooks.create=3DCr=C3=A9ation d'un nouveau journal +lima.fiscalPeriod.fiscalperiod=3DExercice +lima.fiscalPeriod.form=3DExercice lima.fiscalPeriod.franceAccountingRules.invalidAccountNumberException=3DLe n= um=C3=A9ro du compte g=C3=A9n=C3=A9ral n'est pas compris entre 1 et 8 \: %s\n lima.fiscalPeriod.franceAccountingRules.lastUnlockedFiscalPeriodException=3D= Impossible de clore la derni=C3=A8re p=C3=A9riode fiscale ouverte. lima.fiscalPeriod.franceAccountingRules.moreOneUnlockFiscalPeriodException= =3DLe nombre maximal d'exercices ouverts est d=C3=A9j=C3=A0 ateint\: periode = fiscale concern=C3=A9e du %1$te/%1$tm/%1$tY au %1$te/%1$tm/%1$tY.\n lima.fiscalPeriod.franceAccountingRules.noEmptyFiscalPeriodException=3DLa p= =C3=A9riode fiscale =C3=A0 supprimer n'est pas vide \! lima.fiscalPeriod.franceAccountingRules.notBeginNextDayOfLastFiscalPeriodExc= eption=3DLa nouvelle p=C3=A9riode fiscale doit suivre la pr=C3=A9c=C3=A9dente= \: periode fiscale concern=C3=A9e du %1$te/%1$tm/%1$tY au %1$te/%1$tm/%1$tY.\n lima.fiscalPeriod.franceAccountingRules.notNumberAccountNumberException=3DUn= num=C3=A9ro de compte ne commen=C3=A7ant pas par 4 doit =C3=AAtre num=C3=A9r= ique \: %s\n +lima.fiscalPeriod.modifyfiscalperiodtitle=3DModification de l'exercice +lima.fiscalPeriod.open=3DOuvert +lima.fiscalPeriod.remove=3D +lima.fiscalPeriod.status=3DStatut +lima.fiscalPeriod.unbalancedtransactions=3DLa p=C3=A9riode fiscale contient = des transactions non =C3=A9quilibr=C3=A9es +lima.fiscalPeriod.update=3DModifier la date de fin de l'exercice (Ctrl+M) lima.fiscalYears=3DExercices -lima.fiscalperiod.addfiscalperiod.morethan12=3DLa p=C3=A9riode s=C3=A9lectio= nn=C3=A9e n'est pas de 12 mois, voulez-vous continuer ? -lima.fiscalperiod.addfiscalperiodtitle=3DNouvel exercice -lima.fiscalperiod.begin=3DD=C3=A9but -lima.fiscalperiod.block.addretainedearnings=3DReporter =C3=A0 nouveau? -lima.fiscalperiod.block.cantBalanceIfNextPeriodNotExist=3DImpossible de cr= =C3=A9er le report =C3=A0 nouveaux. L'exercice fiscal suivant n'existe pas -lima.fiscalperiod.block.cantBalanceNotBook=3DImpossible de cr=C3=A9er le rep= ort =C3=A0 nouveaux. aucun journal n'est selection=C3=A9. -lima.fiscalperiod.block.cantBlockNotBalance=3DImpossible de cl=C3=B4turer un= exercice non equilibr=C3=A9 -lima.fiscalperiod.block.confirmation=3D=C3=88tes vous s=C3=BBre de vouloir c= l=C3=B4turer cette p=C3=A9riode ? Cette action est irr=C3=A9versible \! -lima.fiscalperiod.block.newyear=3DVoulez vous cr=C3=A9er un nouvel exercice? -lima.fiscalperiod.block.retainedearningstitle=3DReport =C3=A0 nouveau -lima.fiscalperiod.block.title=3DCloture de l'exercice -lima.fiscalperiod.buttonback=3D=E2=86=90 -lima.fiscalperiod.buttonnext=3D=E2=86=92 -lima.fiscalperiod.closed=3DClotur=C3=A9 -lima.fiscalperiod.closure=3DCloture -lima.fiscalperiod.delete.confirmation=3D=C3=88tes vous s=C3=BBre de vouloir = supprimer cette p=C3=A9riode ? Cette action est irr=C3=A9versible \! -lima.fiscalperiod.delete.title=3DSuppression de l'exercice -lima.fiscalperiod.end=3DFin -lima.fiscalperiod.entrybooks.create=3DCr=C3=A9ation d'un nouveau journal -lima.fiscalperiod.fiscalperiod=3DExercice -lima.fiscalperiod.modifyfiscalperiodtitle=3DModification de l'exercice -lima.fiscalperiod.open=3DOuvert -lima.fiscalperiod.status=3DStatut -lima.fiscalperiod.unbalancedtransactions=3DLa p=C3=A9riode fiscale contient = des transactions non =C3=A9quilibr=C3=A9es lima.generateHtml=3DHTML lima.help=3DAide lima.help.about=3D=C3=80 Propos @@ -475,7 +476,6 @@ lima.importExport.usevatpdf=3D=C3=8Ates-vous s=C3=BBr de vouloir utiliser ce= pdf pour la d=C3=A9claration de TVA ? lima.importExport.vatStatement=3Ddes transactions de tva termin=C3=A9. lima.importExport.wait=3DTraitement en cours=E2=80=A6 -lima.importExport.waittitle=3DTraitement en cours lima.info=3DInformation lima.init.closed=3DLima ferm=C3=A9 =C3=A0 %1$s lima.init.errorclosing=3DErreur lors de la fermeture @@ -585,6 +585,7 @@ lima.vatstatement.label=3DLibell=C3=A9 lima.vatstatement.mastervatstatement=3D lima.vatstatement.movement.add=3DAjouter un regrouprement +lima.wait=3DTraitement en cours lima.warning.nimbus.landf=3DLe look and feel nymbus n'a pas =C3=A9t=C3=A9 tr= ouv=C3=A9 limma.config.thousandseparator.description=3DCaract=C3=A8re de s=C3=A9parati= on entre les blocs de milliers limma.config.thousandseparator.label=3DS=C3=A9parateur de milliers --===============7696672872506671058==--