Author: sbavencoff Date: 2014-07-31 17:04:52 +0200 (Thu, 31 Jul 2014) New Revision: 3882 Url: http://forge.chorem.org/projects/lima/repository/revisions/3882 Log: refs #875 #1043 : identity Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanelHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.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 Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx 2014-07-31 15:04:52 UTC (rev 3882) @@ -69,8 +69,8 @@ <row> <cell columns="2"> <JPanel layout='{new GridLayout(1,0)}'> - <JButton text="lima.common.cancel" onActionPerformed="dispose()"/> - <JButton id="ok" text="lima.common.ok" + <JButton text="lima.cancel" onActionPerformed="dispose()"/> + <JButton id="ok" text="lima.ok" onActionPerformed="handler.addAccount(this)"/> </JPanel> </cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2014-07-31 15:04:52 UTC (rev 3882) @@ -97,10 +97,10 @@ </row> <row> <cell fill="none"> - <JButton text="lima.common.cancel" onActionPerformed="performCancel()"/> + <JButton text="lima.cancel" onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="ok" text="lima.common.ok" onActionPerformed="dispose()"/> + <JButton id="ok" text="lima.ok" onActionPerformed="dispose()"/> </cell> </row> </Table> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx 2014-07-31 15:04:52 UTC (rev 3882) @@ -95,11 +95,11 @@ <Table> <row> <cell fill="none"> - <JButton text="lima.common.cancel" + <JButton text="lima.cancel" onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="ok" text="lima.common.ok" + <JButton id="ok" text="lima.ok" onActionPerformed="dispose()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx 2014-07-31 15:04:52 UTC (rev 3882) @@ -110,10 +110,10 @@ </row> <row> <cell fill="none"> - <JButton text="lima.common.cancel" onActionPerformed="performCancel()"/> + <JButton text="lima.cancel" onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="ok" text="lima.common.ok" onActionPerformed="dispose()"/> + <JButton id="ok" text="lima.ok" onActionPerformed="dispose()"/> </cell> </row> </Table> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2014-07-31 15:04:52 UTC (rev 3882) @@ -68,11 +68,11 @@ <Table fill="none" anchor="center" weighty="1"> <row> <cell> - <JButton id="cancelButton" text="lima.common.cancel" + <JButton id="cancelButton" text="lima.cancel" onActionPerformed="performCancel()"/> </cell> <cell> - <JButton id="okButton" text="lima.common.ok" + <JButton id="okButton" text="lima.ok" onActionPerformed="performOk()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx 2014-07-31 15:04:52 UTC (rev 3882) @@ -135,11 +135,11 @@ </row> <row> <cell> - <JButton id="cancelButton" text="lima.common.cancel" + <JButton id="cancelButton" text="lima.cancel" onActionPerformed="performCancel()"/> </cell> <cell> - <JButton id="okButton" text="lima.common.ok" + <JButton id="okButton" text="lima.ok" onActionPerformed="dispose()"/> </cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css 2014-07-31 15:04:52 UTC (rev 3882) @@ -92,9 +92,9 @@ } #cancel { - text : "lima.common.cancel"; + text : "lima.cancel"; } #ok { - text : "lima.common.ok"; + text : "lima.ok"; } \ No newline at end of file Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.css (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.css 2014-07-31 15:04:52 UTC (rev 3882) @@ -0,0 +1,87 @@ +#nameLabel { + text : "lima.identity.name"; +} + +#nameTextField { + text : {handler.getIdentity().getName()}; +} + +#descriptionLabel { + text : "lima.identity.description"; +} + +#descriptionTextField { + text : {handler.getIdentity().getDescription()}; +} + +#addressLabel { + text : "lima.identity.address"; +} + +#addressTextField { + text : {handler.getIdentity().getAddress()}; +} + +#address2Label { + text : "lima.identity.address2"; +} + +#address2TextField { + text : {handler.getIdentity().getAddress2()}; +} + +#zipCodeLabel { + text : "lima.identity.zipCode"; +} + +#zipCodeTextField { + text : {handler.getIdentity().getZipCode()}; +} + +#cityLabel { + text : "lima.identity.city"; +} + +#cityTextField { + text : {handler.getIdentity().getCity()}; +} + +#businessNumberLabel { + text : "lima.identity.businessNumber"; +} + +#businessNumberTextField { + text : {handler.getIdentity().getBusinessNumber()}; +} + +#vatNumberLabel { + text : "lima.identity.vatNumber"; +} + +#vatNumberTextField { + text : {handler.getIdentity().getVatNumber()}; +} + +#classificationCodeLabel { + text : "lima.identity.classificationCode"; +} + +#classificationCodeTextField { + text : {handler.getIdentity().getClassificationCode()}; +} + +#phoneNumberLabel { + text : "lima.identity.phoneNumber"; +} + +#phoneNumberTextField { + text : {handler.getIdentity().getPhoneNumber()}; +} + +#emailLabel { + text : "lima.identity.email"; +} + +#emailTextField { + text : {handler.getIdentity().getEmail()}; +} \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx 2014-07-31 15:04:52 UTC (rev 3882) @@ -24,130 +24,98 @@ --> <JPanel> <import> - javax.swing.text.Document - org.chorem.lima.entity.Identity - org.chorem.lima.ui.identity.IdentityHandler + org.chorem.lima.ui.opening.CreateIdentityPanelHandler </import> - <IdentityHandler id="handler" javaBean="new IdentityHandler()"/> - <Identity id="identity" javaBean='handler.getIdentity()'/> + <CreateIdentityPanelHandler id="handler" javaBean="new CreateIdentityPanelHandler(this)"/> <Table> <row> <cell fill="horizontal"> - <JLabel text="lima.identity.name"/> + <JLabel id="nameLabel" /> </cell> <cell fill="horizontal"> - <JTextField id="nameTextField" text="{getIdentity().getName()}"/> - <Document javaBean="getNameTextField().getDocument()" - onInsertUpdate='getIdentity().setName(getNameTextField().getText())' - onRemoveUpdate='getIdentity().setName(getNameTextField().getText())'/> + <JTextField id="nameTextField" /> </cell> + </row> + <row> <cell fill="horizontal"> - <JLabel text="lima.identity.description"/> + <JLabel id="descriptionLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="descriptionTextField" - text="{getIdentity().getDescription()}"/> - <Document javaBean="getDescriptionTextField().getDocument()" - onInsertUpdate='getIdentity().setDescription(getDescriptionTextField().getText())' - onRemoveUpdate='getIdentity().setDescription(getDescriptionTextField().getText())'/> + <JTextField id="descriptionTextField"/> </cell> </row> <row> <cell fill="horizontal"> - <JLabel text="lima.identity.address"/> + <JLabel id="addressLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="addressTextField" text="{getIdentity().getAddress()}"/> - <Document javaBean="getAddressTextField().getDocument()" - onInsertUpdate='getIdentity().setAddress(getAddressTextField().getText())' - onRemoveUpdate='getIdentity().setAddress(getAddressTextField().getText())'/> + <JTextField id="addressTextField" /> </cell> + </row> + <row> <cell fill="horizontal"> - <JLabel text="lima.identity.address2"/> + <JLabel id="address2Label"/> </cell> <cell fill="horizontal"> - <JTextField id="address2TextField" - text="{getIdentity().getAddress2()}"/> - <Document javaBean="getAddress2TextField().getDocument()" - onInsertUpdate='getIdentity().setAddress2(getAddress2TextField().getText())' - onRemoveUpdate='getIdentity().setAddress2(getAddress2TextField().getText())'/> + <JTextField id="address2TextField"/> </cell> </row> <row> <cell fill="horizontal"> - <JLabel text="lima.identity.zipCode"/> + <JLabel id="zipCodeLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="zipCodeTextField" text="{getIdentity().getZipCode()}"/> - <Document javaBean="getZipCodeTextField().getDocument()" - onInsertUpdate='getIdentity().setZipCode(getZipCodeTextField().getText())' - onRemoveUpdate='getIdentity().setZipCode(getZipCodeTextField().getText())'/> + <JTextField id="zipCodeTextField"/> </cell> + </row> + <row> <cell fill="horizontal"> <JLabel text="lima.identity.city"/> </cell> <cell fill="horizontal"> - <JTextField id="cityTextField" text="{getIdentity().getCity()}"/> - <Document javaBean="getCityTextField().getDocument()" - onInsertUpdate='getIdentity().setCity(getCityTextField().getText())' - onRemoveUpdate='getIdentity().setCity(getCityTextField().getText())'/> + <JTextField id="cityTextField" /> </cell> </row> <row> <cell fill="horizontal"> - <JLabel text="lima.identity.businessNumber"/> + <JLabel id="businessNumberLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="businessNumberTextField" - text="{getIdentity().getBusinessNumber()}"/> - <Document javaBean="getBusinessNumberTextField().getDocument()" - onInsertUpdate='getIdentity().setBusinessNumber(getBusinessNumberTextField().getText())' - onRemoveUpdate='getIdentity().setBusinessNumber(getBusinessNumberTextField().getText())'/> + <JTextField id="businessNumberTextField"/> </cell> + </row> + <row> <cell fill="horizontal"> - <JLabel text="lima.identity.vatNumber"/> + <JLabel id="vatNumberLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="vatNumberTextField" - text="{getIdentity().getVatNumber()}"/> - <Document javaBean="getVatNumberTextField().getDocument()" - onInsertUpdate='getIdentity().setVatNumber(getVatNumberTextField().getText())' - onRemoveUpdate='getIdentity().setVatNumber(getVatNumberTextField().getText())'/> + <JTextField id="vatNumberTextField"/> </cell> </row> <row> <cell fill="horizontal"> - <JLabel text="lima.identity.classificationCode"/> + <JLabel id="classificationCodeLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="classificationCodeTextField" - text="{getIdentity().getClassificationCode()}"/> - <Document javaBean="getClassificationCodeTextField().getDocument()" - onInsertUpdate='getIdentity().setClassificationCode(getClassificationCodeTextField().getText())' - onRemoveUpdate='getIdentity().setClassificationCode(getClassificationCodeTextField().getText())'/> + <JTextField id="classificationCodeTextField"/> </cell> </row> <row> <cell fill="horizontal"> - <JLabel text="lima.identity.phoneNumber"/> + <JLabel id="phoneNumberLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="phoneNumberTextField" - text="{getIdentity().getPhoneNumber()}"/> - <Document javaBean="getPhoneNumberTextField().getDocument()" - onInsertUpdate='getIdentity().setPhoneNumber(getPhoneNumberTextField().getText())' - onRemoveUpdate='getIdentity().setPhoneNumber(getPhoneNumberTextField().getText())'/> + <JTextField id="phoneNumberTextField"/> </cell> + </row> + <row> <cell fill="horizontal"> - <JLabel text="lima.identity.email"/> + <JLabel id="emailLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="emailTextField" text="{getIdentity().getEmail()}"/> - <Document javaBean="getEmailTextField().getDocument()" - onInsertUpdate='getIdentity().setEmail(getEmailTextField().getText())' - onRemoveUpdate='getIdentity().setEmail(getEmailTextField().getText())'/> + <JTextField id="emailTextField" /> </cell> </row> </Table> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanelHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanelHandler.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanelHandler.java 2014-07-31 15:04:52 UTC (rev 3882) @@ -0,0 +1,56 @@ +package org.chorem.lima.ui.opening; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.api.IdentityService; +import org.chorem.lima.entity.Identity; +import org.chorem.lima.entity.IdentityImpl; +import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.ui.identity.IdentityHandler; + +/** + * @author Sylvain Bavencoff <bavencoff@codelutin.com> + */ +public class CreateIdentityPanelHandler { + + protected IdentityService identityService; + + protected CreateIdentityPanel view; + + private static final Log log = LogFactory.getLog(IdentityHandler.class); + + + public CreateIdentityPanelHandler(CreateIdentityPanel view) { + this.view = view; + identityService = + LimaServiceFactory.getService( + IdentityService.class); + } + + public Identity getIdentity() { + Identity identity = identityService.getIdentity(); + if (identity == null) { + identity = new IdentityImpl(); + } + return identity; + } + + public void updateIdentity(){ + Identity identity = getIdentity(); + + identity.setName(view.getNameTextField().getText()); + identity.setDescription(view.getDescriptionTextField().getText()); + identity.setAddress(view.getAddressTextField().getText()); + identity.setAddress2(view.getAddress2TextField().getText()); + identity.setZipCode(view.getZipCodeTextField().getText()); + identity.setCity(view.getCityTextField().getText()); + identity.setBusinessNumber(view.getBusinessNumberTextField().getText()); + identity.setVatNumber(view.getVatNumberTextField().getText()); + identity.setClassificationCode(view.getClassificationCodeTextField().getText()); + identity.setPhoneNumber(view.getPhoneNumberTextField().getText()); + identity.setEmail(view.getEmailTextField().getText()); + + identityService.updateIdentity(identity); + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2014-07-31 15:04:52 UTC (rev 3882) @@ -37,13 +37,13 @@ import org.chorem.lima.enums.ImportExportEnum; import org.chorem.lima.enums.VatStatementsChartEnum; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.ui.identity.IdentityHandler; import org.chorem.lima.ui.importexport.ImportExport; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; -import java.awt.*; +import java.awt.Color; import static org.nuiton.i18n.I18n.t; @@ -98,8 +98,7 @@ step++; break; case 1: - IdentityHandler identityHandler = new IdentityHandler(); - identityHandler.updateIdentity(idPanel.getIdentity()); + idPanel.getHandler().updateIdentity(); //refresh UI view.getIdentityIcon().setBorder(noBorder); view.getAccountsIcon().setBorder(BorderFactory.createLineBorder(green, 2)); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx 2014-07-31 15:04:52 UTC (rev 3882) @@ -94,11 +94,11 @@ <Table> <row> <cell fill="none"> - <JButton text="lima.common.cancel" + <JButton text="lima.cancel" onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="ok" text="lima.common.ok" + <JButton id="ok" text="lima.ok" onActionPerformed="dispose()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx 2014-07-31 15:04:52 UTC (rev 3882) @@ -96,10 +96,10 @@ </row> <row> <cell fill="none"> - <JButton text="lima.common.cancel" onActionPerformed="performCancel()"/> + <JButton text="lima.cancel" onActionPerformed="performCancel()"/> </cell> <cell fill="none"> - <JButton id="ok" text="lima.common.ok" onActionPerformed="dispose()"/> + <JButton id="ok" text="lima.ok" onActionPerformed="dispose()"/> </cell> </row> </Table> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.jaxx 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.jaxx 2014-07-31 15:04:52 UTC (rev 3882) @@ -42,7 +42,7 @@ </row> <row anchor="east"> <cell> - <JButton id="okButton" text="lima.common.ok" + <JButton id="okButton" text="lima.ok" onActionPerformed="performOk()"/> </cell> </row> 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 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-07-31 15:04:52 UTC (rev 3882) @@ -20,6 +20,7 @@ lima.balance.documentcreationerror=Enable to create document lima.balance.documentcreationfiscalerror=Can't create document on an open fiscal year lima.balance.listerror=Can't get entries list +lima.cancel=Cancel lima.charts.account=Accounts chart lima.charts.account.base=Base accountchart lima.charts.account.developed=Developped accountchart @@ -57,7 +58,6 @@ lima.common.begindate=Begin lima.common.buttonback=← lima.common.buttonnext=→ -lima.common.cancel=Cancel lima.common.closed=Closed lima.common.code=Code lima.common.confirmation=Confirmation @@ -74,7 +74,6 @@ lima.common.label=Label lima.common.movmentedfilter=Accounts filtered lima.common.new=New -lima.common.ok=OK lima.common.open=Open lima.common.paste=Paste lima.common.quit=Exit @@ -369,6 +368,7 @@ lima.message.help.usage=Options (set with --option <key> <value>\: lima.misc.supportemail.description=Support email lima.misc.supportemail.label= +lima.ok=OK lima.openejb.remotemode.description= lima.openejb.remotemode.label= lima.opening.accounts=Import accounts from\: 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 2014-07-31 13:05:12 UTC (rev 3881) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-07-31 15:04:52 UTC (rev 3882) @@ -9,6 +9,7 @@ lima.balance.documentcreationerror=Erreur lors de la création du document lima.balance.documentcreationfiscalerror=Impossible de créer le document quand la période fiscale est ouverte lima.balance.listerror=Erreur lors de la récupération des données de la liste +lima.cancel=Annuler lima.charts.account=Plan comptable lima.charts.account.base=Plan comptable de base lima.charts.account.developed=Plan comptable développé @@ -46,7 +47,6 @@ lima.common.begindate=Début lima.common.buttonback=← lima.common.buttonnext=→ -lima.common.cancel=Annuler lima.common.closed=Fermé lima.common.code=Code lima.common.confirmation=Confirmation @@ -62,7 +62,6 @@ lima.common.label=Libellé lima.common.movmentedfilter=Comptes mouvementés lima.common.new=Nouveau -lima.common.ok=OK lima.common.open=Ouvert lima.common.paste=Coller lima.common.quit=Quitter @@ -320,6 +319,7 @@ lima.message.help.usage=Options (set with --option <key> <value>\: lima.misc.supportemail.description=Adresse email de support lima.misc.supportemail.label=support +lima.ok=OK lima.openejb.remotemode.description= lima.openejb.remotemode.label= lima.opening.accounts=Importer le plan de comptes depuis \: