Author: mallon Date: 2012-07-12 17:31:00 +0200 (Thu, 12 Jul 2012) New Revision: 3521 Url: http://chorem.org/repositories/revision/lima/3521 Log: Correction concernant le lettrage, quand aucune lettre n'est d?\195?\169j?\195?\160 pr?\195?\169sente en base. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-07-12 15:26:15 UTC (rev 3520) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-07-12 15:31:00 UTC (rev 3521) @@ -138,7 +138,7 @@ //TODO:permettre de lettrer avec plus de trois lettres - if (lastActualLetters != null){ + if (lastActualLetters != null && !lastActualLetters.isEmpty()){ if (lastActualLetters.length() > 2 && lastActualLetters.charAt(2) != 'Z'){ nextThirdLetter = incrementLetter(2, lastActualLetters); }else if (lastActualLetters.length() > 1 && lastActualLetters.charAt(1) != 'Z'){ Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-12 15:26:15 UTC (rev 3520) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-12 15:31:00 UTC (rev 3521) @@ -222,22 +222,10 @@ public void updateBalanceAndLetteringButton(){ - /**Update table and reset credit / debit / balance - * only when one of buttons lettering/unlettering - * is true and goes to false and only in the case - * of lettring (Not in case of balance equal to zero)*/ - /* if ( (view.lettered.isEnabled() != editModel.isLettred() || view.noLettered.isEnabled() != editModel.isUnLettred()) - && (view.lettered.isEnabled() || view.noLettered.isEnabled()) - && (!view.getSoldeTextField().getText().equals("0.00") && !view.getSoldeTextField().getText().equals("0"))){ - if (log.isInfoEnabled()) { - log.info("Changing state"); - } - updateAllEntries(); - }else{*/ - view.creditTextField.setText(editModel.getCredit().toString()); - view.debitTexttField.setText(editModel.getDebit().toString()); - view.soldeTextField.setText(editModel.getSolde().toString()); - //} + view.creditTextField.setText(editModel.getCredit().toString()); + view.debitTexttField.setText(editModel.getDebit().toString()); + view.soldeTextField.setText(editModel.getSolde().toString()); + view.lettered.setEnabled(editModel.isLettred()); view.noLettered.setEnabled(editModel.isUnLettred());