This is an automated email from the git hooks/post-receive script. New commit to branch feature/1241-account-report in repository lima. See http://git.chorem.org/lima.git commit cfd3f21f337b317721a4c5a783c1d7edfd0a4d82 Author: dcosse <cosse@codelutin.com> Date: Mon Jul 27 11:15:46 2015 +0200 refs #1241 correction sur le formulaire concernant le trésor public. Renommage du boutton OK en Valider --- .../org/chorem/lima/ui/identity/IdentityForm.css | 4 ++-- .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 4 ++-- .../chorem/lima/ui/identity/IdentityHandler.java | 2 +- .../resources/i18n/lima-swing_en_GB.properties | 25 +++++++++++----------- .../resources/i18n/lima-swing_fr_FR.properties | 1 + 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css index c46af39..ec1381b 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css @@ -226,7 +226,7 @@ actionIcon : cancel; } -#ok { - text : "lima.ok"; +#validate { + text : "lima.validate"; actionIcon : ok; } \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx index 031b887..936438d 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx @@ -35,7 +35,7 @@ <script> <![CDATA[ - getRootPane().setDefaultButton(ok); + getRootPane().setDefaultButton(validate); ]]> </script> @@ -224,7 +224,7 @@ layout='{new GridLayout(1,0)}'> <JButton id="cancel" onActionPerformed="dispose();"/> - <JButton id="ok" + <JButton id="validate" onActionPerformed="handler.updateIdentity(); dispose();"/> </JPanel> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java index c0d2e18..afda4ba 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java @@ -83,7 +83,7 @@ public class IdentityHandler { treasury.setCity(view.getTreasuryCityTextField().getText()); treasury.setKey(view.getTreasuryKeyTextField().getText()); treasury.setServiceCode(view.getTreasuryServiceCodeTextField().getText()); - treasury.setDossierNumber(view.getDossierNumberLabel().getText()); + treasury.setDossierNumber(view.getDossierNumberTextField().getText()); treasury.setSie(view.getTreasurySieTextField().getText()); treasury.setZipCode(view.getTreasuryZipCodeTextField().getText()); treasury.setSystemType(view.getTreasurySystemTypeTextField().getText()); diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index e0fa104..4f79843 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -490,7 +490,7 @@ lima.quit=Exit lima.refresh=Refresh lima.refresh.shortcut=Refresh (F5) lima.remove=Remove -lima.remove.shortcut= +lima.remove.shortcut=Edit (Ctrl+M) lima.report.accounts=Accounts\: lima.report.assets=Assets lima.report.balance=Balance @@ -526,19 +526,20 @@ lima.table.provisionDeprecation=Provision Deprecation lima.table.voucher=Voucher lima.title=Lutin Invoice Monitoring and Accounting lima.transaction=Transaction -lima.treasury.address= -lima.treasury.address2= -lima.treasury.cdi= -lima.treasury.city= -lima.treasury.dossierNumber= -lima.treasury.key= -lima.treasury.serviceCode= -lima.treasury.sie= -lima.treasury.systemType= -lima.treasury.vatNumber= -lima.treasury.zipCode= +lima.treasury.address=Address +lima.treasury.address2=Address (next) +lima.treasury.cdi=CDI +lima.treasury.city=City +lima.treasury.dossierNumber=File number +lima.treasury.key=key +lima.treasury.serviceCode=Service Code +lima.treasury.sie=SIE +lima.treasury.systemType=Sytem Type +lima.treasury.vatNumber=VAT number +lima.treasury.zipCode=Zip Code lima.update=Modify lima.update.shortcut=Update (Ctrl+M) +lima.validate=Validate lima.vatStatement=VAT statement chart lima.vatStatement.accounts=List of accounts lima.vatStatement.base=Base VAT statement chart diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index 094f9ad..ef47c97 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -545,6 +545,7 @@ lima.treasury.systemType=Régime lima.treasury.zipCode=Code Postal lima.update=Modifier lima.update.shortcut=Modifier (Ctrl+M) +lima.validate=Valider lima.vatStatement=Plan TVA lima.vatStatement.accounts=Liste des comptes lima.vatStatement.base=Standard -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.