August 2012 - Lima-commits - mailman.cloud.codelutin.com

r3572 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: celleditor financialtransaction
by mallon＠users.chorem.org 07 Aug '12

07 Aug '12

Author: mallon Date: 2012-08-07 18:58:51 +0200 (Tue, 07 Aug 2012) New Revision: 3572 Url: http://chorem.org/repositories/revision/lima/3572 Log: fixes #705 Avec cette correction sur l editeur, il est d?\195?\169sormais possible d entrer une valeur directement (Sans avoir, donc, a la taper deux fois.). Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-07 13:49:13 UTC (rev 3571) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-07 16:58:51 UTC (rev 3572) @@ -23,55 +23,91 @@ * #L% */ -import jaxx.runtime.swing.editor.cell.NumberCellEditor; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; -import javax.swing.JTable; +import javax.swing.DefaultCellEditor; import javax.swing.JTextField; -import java.awt.Component; +import javax.swing.SwingUtilities; +import javax.swing.event.AncestorEvent; +import javax.swing.event.AncestorListener; import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; import java.math.BigDecimal; import java.math.RoundingMode; /** * @author sletellier <letellier(a)codelutin.com> + * @author mallon <mallon(a)codelutin.com> */ -public class BigDecimalTableCellEditor extends NumberCellEditor<BigDecimal> { +public class BigDecimalTableCellEditor extends DefaultCellEditor { protected int row; + private static final Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); + public BigDecimalTableCellEditor() { - super(BigDecimal.class, false); - } + super(new JTextField()); + setClickCountToStart(1); + getComponent().addFocusListener(new FocusListener() { - @Override - public void focusGained(FocusEvent e) { - //super.getNumberEditor().getTextField().setText(super.getCellEditorValue().toString()); - runEdition(); + @Override + public void focusGained(FocusEvent event) { + runEdition(); + } + + @Override + public void focusLost(FocusEvent event) { + // nothing to do + } + }); + getComponent().addAncestorListener(new AncestorListener() { + + @Override + public void ancestorAdded(AncestorEvent event) { + runEdition(); + } + + @Override + public void ancestorRemoved(AncestorEvent event) { + // nothing to do + } + + @Override + public void ancestorMoved(AncestorEvent event) { + // nothing to do + } + }); } @Override - public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - this.row = row; - return super.getTableCellEditorComponent(table, value, isSelected, row, column); + public JTextField getComponent() { + return (JTextField) super.getComponent(); } public void runEdition() { String comportmentEditingCell = LimaConfig.getInstance().getComportmentEditingCell(); - JTextField numberEditorTextField = super.getNumberEditor().getTextField(); if (comportmentEditingCell.equals("ALL")) { - numberEditorTextField.selectAll(); + getComponent().selectAll(); } else { - int textFieldSize = numberEditorTextField.getText().length(); - numberEditorTextField.select(textFieldSize, textFieldSize); + int textFieldSize = getComponent().getText().length(); + getComponent().select(textFieldSize, textFieldSize); } } @Override public BigDecimal getCellEditorValue() { + String editorStringValue = super.getCellEditorValue().toString(); + if (StringUtils.isBlank(editorStringValue)) { + editorStringValue = "0"; + } + BigDecimal cellEditorValue = (BigDecimal.valueOf(Double.valueOf(editorStringValue))); if (super.getCellEditorValue() != BigDecimal.ZERO) { - return super.getCellEditorValue().setScale(2, RoundingMode.HALF_UP); + return cellEditorValue.setScale(2, RoundingMode.HALF_UP); } - return super.getCellEditorValue(); + return cellEditorValue; } + } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-07 13:49:13 UTC (rev 3571) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-07 16:58:51 UTC (rev 3572) @@ -42,6 +42,7 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; +import javax.swing.DefaultCellEditor; import javax.swing.SwingWorker; import java.awt.Color; import java.awt.Component; @@ -166,25 +167,8 @@ FinancialTransactionTable table = FinancialTransactionTable.this; - /* @Override - public void keyTyped(KeyEvent e) { - if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { - editCellAt(getSelectedRow(), getSelectedColumn()); - } - }*/ - - /*@Override - public void keyReleased(KeyEvent e) { - if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { - editCellAt(getSelectedRow(), getSelectedColumn()); - } - }*/ - @Override public void keyPressed(KeyEvent e) { - /*if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { - editCellAt(getSelectedRow(), getSelectedColumn()); - }*/ final FinancialTransactionViewHandler handler = getHandler(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-08-07 13:49:13 UTC (rev 3571) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-08-07 16:58:51 UTC (rev 3572) @@ -25,6 +25,8 @@ package org.chorem.lima.ui.financialtransaction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; @@ -50,6 +52,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = -7495388454688562991L; + private static final Log log = LogFactory.getLog(FinancialTransactionViewHandler.class); + /** Service (just to update setValueAt(). */ protected FinancialTransactionService financialTransactionService; @@ -290,8 +294,10 @@ financialTransactionService.updateFinancialTransaction(currentFinancialTransaction); } else if (currentRow instanceof Entry) { + /*To stay with one value in debit or credit*/ - if ( !value.equals(BigDecimal.ZERO) && !value.equals(BigDecimal.valueOf(Double.valueOf("00.00")))) { + if ( !value.equals(BigDecimal.ZERO) && !value.equals(new BigDecimal("0.00"))) { + Entry currentEntry = (Entry) currentRow; currentFinancialTransaction = currentEntry.getFinancialTransaction(); boolean updateTransaction = false; @@ -304,10 +310,10 @@ // let's update the voucher of all entries of // the transaction - for (Entry entry : currentFinancialTransaction.getEntry()) { entry.setVoucher(voucher); } + updateTransaction = true; } else {

1 0

r3571 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org 07 Aug '12

07 Aug '12

Author: mallon Date: 2012-08-07 15:49:13 +0200 (Tue, 07 Aug 2012) New Revision: 3571 Url: http://chorem.org/repositories/revision/lima/3571 Log: fixes #699 La touche tabulation fonctionne d?\195?\169sormais correctement en fin de tableau (Ajout d'une entr?\195?\169e ou d'une transaction). Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-07 13:33:19 UTC (rev 3570) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-07 13:49:13 UTC (rev 3571) @@ -166,25 +166,25 @@ FinancialTransactionTable table = FinancialTransactionTable.this; - @Override + /* @Override public void keyTyped(KeyEvent e) { if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { editCellAt(getSelectedRow(), getSelectedColumn()); } - } + }*/ - @Override + /*@Override public void keyReleased(KeyEvent e) { if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { editCellAt(getSelectedRow(), getSelectedColumn()); } - } + }*/ @Override public void keyPressed(KeyEvent e) { - if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { + /*if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { editCellAt(getSelectedRow(), getSelectedColumn()); - } + }*/ final FinancialTransactionViewHandler handler = getHandler(); @@ -252,6 +252,9 @@ * sinon rajoute une transaction */ if (e.getKeyChar() == KeyEvent.VK_TAB) { + if (log.isDebugEnabled()) { + log.debug("Key tab used"); + } int max_x = getColumnCount(); int max_y = getRowCount(); x_tab = getSelectedColumn();

1 0

r3570 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org 07 Aug '12

07 Aug '12

Author: mallon Date: 2012-08-07 15:33:19 +0200 (Tue, 07 Aug 2012) New Revision: 3570 Url: http://chorem.org/repositories/revision/lima/3570 Log: refs #699 Il existait aussi une erreur concernant l'utilisation de la touche entree en fin de tableau. Lors de l utilisation de celle-ci, la selection reste donc bien sur la derniere ligne, sans generer d erreur. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-07 12:57:47 UTC (rev 3569) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-07 13:33:19 UTC (rev 3570) @@ -68,6 +68,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; + private static final Log log = LogFactory.getLog(FinancialTransactionTable.class); + protected FinancialTransactionViewHandler handler; private int x_tab; @@ -190,8 +192,9 @@ * last row*/ if (e.getKeyCode() == KeyEvent.VK_ENTER){ int selectedRow = table.getSelectedRow(); - if(selectedRow != table.getRowCount()){ - table.setRowSelectionInterval(selectedRow+1, selectedRow+1); + if( selectedRow == table.getRowCount()-1){ + /*-2, cause we have a row count beginning at one and we want to back to the line before*/ + table.setRowSelectionInterval(table.getRowCount()-2, table.getRowCount()-2); } else { table.setRowSelectionInterval(selectedRow, selectedRow); }

1 0

r3569 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction lima-swing/src/main/resources
by mallon＠users.chorem.org 07 Aug '12

07 Aug '12

Author: mallon Date: 2012-08-07 14:57:47 +0200 (Tue, 07 Aug 2012) New Revision: 3569 Url: http://chorem.org/repositories/revision/lima/3569 Log: fixes #741 Desormais, lors de l ajout d une entree, celle-ci porte les memes descriptions et pieces comptables que la derniere ajoutee (Soit, la precedente), et les lignes ajoutees ne sont donc plus vides. La demande 741 est li?\195?\169e aussi a la #730 et a la #699. Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-08-07 12:57:47 UTC (rev 3569) @@ -258,11 +258,6 @@ try { - if (log.isDebugEnabled()) { - log.debug("entry : " + entry); - log.debug("entryOld : " + entryOld); - } - FinancialPeriodDAO financialPeriodDAO = getDaoHelper().getFinancialPeriodDAO(); FinancialPeriod financialPeriod = financialPeriodDAO.findByDate(entry.getFinancialTransaction().getTransactionDate()); 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-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-08-07 12:57:47 UTC (rev 3569) @@ -451,6 +451,21 @@ return entries; } + @Override + public Entry getLastEntry(FinancialTransaction financialTransaction) throws LimaException { + Entry lastEntry; + + try { + EntryDAO entryDAO = getDaoHelper().getEntryDAO(); + lastEntry = entryDAO.getLastEntry(financialTransaction); + + } catch (Exception ex) { + throw new LimaException("Can't get entries", ex); + } + + return lastEntry; + } + /** * Method used by update entry and remove entry for update amounts. */ Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-08-07 12:57:47 UTC (rev 3569) @@ -95,4 +95,10 @@ * @throws LimaException * */ List<Entry> getAllEntrieByDatesAndAccountAndLettering(LetteringFilter filter) throws LimaException; + + /** + * Retourne la dernière entrée d'une transaction + * @param financialTransaction transaction sur laquelle la derniere entree est selectionnee + * */ + Entry getLastEntry(FinancialTransaction financialTransaction) throws LimaException; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-08-07 12:57:47 UTC (rev 3569) @@ -25,6 +25,8 @@ package org.chorem.lima.entity; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.LetteringFilter; import org.nuiton.topia.TopiaException; @@ -34,6 +36,8 @@ public class EntryDAOImpl<E extends Entry> extends EntryDAOAbstract<Entry> { + private static final Log log = LogFactory.getLog(EntryDAOImpl.class); + /** * Requete generique qui recupere les entrees equilibrées portant entre * deux dates. @@ -203,6 +207,26 @@ } /** + * Retourne la dernière entrée d'une transaction + * @param financialTransaction transaction sur laquelle la derniere entree est selectionnee + * */ + public Entry getLastEntry(FinancialTransaction financialTransaction) throws TopiaException { + List<Entry> entries; + String query = "Select E from " + Entry.class.getName() + " E" + + " where E.financialTransaction.transactionDate = :financialTransactionDate " + + " and E.financialTransaction = :financialTransaction" + + " order by E.topiaCreateDate desc"; + + entries = context.findAll(query, "financialTransactionDate", financialTransaction.getTransactionDate(), "financialTransaction", financialTransaction); + + Entry lastEntry = entries.get(0); + if (log.isDebugEnabled()) { + log.debug("Last entry description : " + lastEntry.getDescription() ); + } + return lastEntry; + } + + /** * Retourne la somme des entrées des transaction entre * deux dates pour un journal donné. * Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-08-07 12:57:47 UTC (rev 3569) @@ -263,23 +263,6 @@ return result; } - /**Get the precedent entry of the entry passed in parameter*/ - public Entry getPrecedentEntry(Entry entry) { - for (Object transactionOrEntry : transactionAndEntries) { - if(transactionOrEntry instanceof Entry) { - if (transactionOrEntry.equals(entry)) { - Object objectAt = getObjectAt(transactionAndEntries.indexOf(transactionOrEntry) - 1); - if (objectAt instanceof Entry){ - return (Entry) objectAt; - } else { - return null; - } - } - } - } - return null; - } - public Object getObjectAt(int row) { if (row == -1) { return null; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-08-07 12:57:47 UTC (rev 3569) @@ -265,12 +265,11 @@ financialTransactionRow = tableModel.indexOf(((Entry) currentRow). getFinancialTransaction()); } + //create it entry.setFinancialTransaction(currentTransaction); Entry newEntry = financialTransactionService.createEntry(entry); currentTransaction.addEntry(entry); - //FIXME echatellier 20120413 what is fired here ? - //fireTableRowsUpdated(financialTransactionRow, financialTransactionRow + currentTransaction.getEntry().size() - 1); // on met a jour l'ui int newRow = financialTransactionRow + currentTransaction.getEntry().size() /*+ 1*/; @@ -350,27 +349,35 @@ // real selected row or selected transaction row ? int indexSelectedRow = table.getSelectedRow(); if (indexSelectedRow != -1) { - //int firstentryBookrow = tableModel.getFirstEntry(indexSelectedRow); - Entry precedentEntry = null; - if (tableModel.getObjectAt(indexSelectedRow) instanceof Entry) { - precedentEntry = tableModel.getPrecedentEntry((Entry)tableModel.getObjectAt(indexSelectedRow)); + Entry lastEntryOfTransaction; + + //First case, where line selected is an entry : take its transaction + //to select the last entry of the transaction + Object entryOrTransaction = tableModel.getObjectAt(indexSelectedRow); + if (entryOrTransaction instanceof Entry) { + lastEntryOfTransaction = financialTransactionService.getLastEntry(((Entry) entryOrTransaction).getFinancialTransaction()); + } else { //Second case, we have an instance of transaction, so select the last entry of it + lastEntryOfTransaction = financialTransactionService.getLastEntry((FinancialTransaction)entryOrTransaction); } - if (log.isInfoEnabled()) { - log.info("Selected row : " + indexSelectedRow); + if (log.isDebugEnabled()) { + log.debug("Selected row : " + indexSelectedRow); } String defaultVoucher = null; String defaultDescription = null; - if (precedentEntry != null) { - defaultVoucher = precedentEntry.getVoucher(); - defaultDescription = precedentEntry.getDescription(); + if (lastEntryOfTransaction != null) { + defaultVoucher = lastEntryOfTransaction.getVoucher(); + defaultDescription = lastEntryOfTransaction.getDescription(); } // creates the new entry Entry entry = new EntryImpl(); entry.setVoucher(defaultVoucher); + if (log.isDebugEnabled()) { + log.debug("Description of precedent entry : " + defaultDescription); + } entry.setDescription(defaultDescription); String defaultAccount; @@ -379,10 +386,10 @@ BigDecimal tvaTax = null; //Calculation of tva tax only if first entry is a sale - if (precedentEntry != null && precedentEntry.getAccount()!= null){ - defaultAccount = precedentEntry.getAccount().getAccountNumber(); + if (lastEntryOfTransaction != null && lastEntryOfTransaction.getAccount()!= null){ + defaultAccount = lastEntryOfTransaction.getAccount().getAccountNumber(); if (defaultAccount.equals("410") || defaultAccount.equals("418")){ - tvaTax = (precedentEntry.getAmount()).multiply(tvaPercentAdd); + tvaTax = (lastEntryOfTransaction.getAmount()).multiply(tvaPercentAdd); } } @@ -406,6 +413,7 @@ //get back the parent transaction of the entry currentTransaction = currentEntry.getFinancialTransaction(); } + // create it in service entry.setFinancialTransaction(currentTransaction); Entry newEntry = financialTransactionService.createEntry(entry); Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-06 16:03:49 UTC (rev 3568) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-07 12:57:47 UTC (rev 3569) @@ -46,4 +46,7 @@ log4j.logger.org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor=DEBUG log4j.logger.org.chorem.lima.business.accountingrules.DefaultAccountingRules=DEBUG log4j.logger.org.chorem.lima.business.ejb.FinancialTransactionServiceImpl=DEBUG -log4j.logger.org.chorem.lima.business.ui.celleditor.BigDecimalTableCellEditor=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.business.ui.celleditor.BigDecimalTableCellEditor=DEBUG +log4j.logger.org.chorem.lima.business.ui.financialtransaction.FinancialTransactionTableModel=DEBUG +log4j.logger.org.chorem.lima.entity.EntryDAOImpl=DEBUG +log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionViewHandler=DEBUG \ No newline at end of file

1 0

r3568 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/celleditor java/org/chorem/lima/ui/financialtransaction resources
by mallon＠users.chorem.org 06 Aug '12

06 Aug '12

Author: mallon Date: 2012-08-06 18:03:49 +0200 (Mon, 06 Aug 2012) New Revision: 3568 Url: http://chorem.org/repositories/revision/lima/3568 Log: fixes #705 Desormais, la limitation du nombre de decimales portent tant sur l affichage que sur l edition elle-meme (Arrondis superieur, sur deux decimales, apres edition.). L entree dans l edition de la cellule se fait des selection de celle-ci (Il n est donc plus necessaire de saisir deux fois un chiffre pour declencher l edition.). Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-06 10:46:10 UTC (rev 3567) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-06 16:03:49 UTC (rev 3568) @@ -24,8 +24,6 @@ */ import jaxx.runtime.swing.editor.cell.NumberCellEditor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; import javax.swing.JTable; @@ -33,42 +31,47 @@ import java.awt.Component; import java.awt.event.FocusEvent; import java.math.BigDecimal; +import java.math.RoundingMode; /** * @author sletellier <letellier(a)codelutin.com> */ -public class BigDecimalTableCellEditor extends NumberCellEditor<BigDecimal>{ +public class BigDecimalTableCellEditor extends NumberCellEditor<BigDecimal> { protected int row; - static private Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); - public BigDecimalTableCellEditor() { super(BigDecimal.class, false); } @Override public void focusGained(FocusEvent e) { + //super.getNumberEditor().getTextField().setText(super.getCellEditorValue().toString()); + runEdition(); + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { + this.row = row; + return super.getTableCellEditorComponent(table, value, isSelected, row, column); + } + + public void runEdition() { String comportmentEditingCell = LimaConfig.getInstance().getComportmentEditingCell(); - if (log.isDebugEnabled()) { - log.debug("comportmentEditingCell : " + comportmentEditingCell); - } JTextField numberEditorTextField = super.getNumberEditor().getTextField(); if (comportmentEditingCell.equals("ALL")) { numberEditorTextField.selectAll(); } else { int textFieldSize = numberEditorTextField.getText().length(); - if (log.isDebugEnabled()) { - log.debug("textFieldSize : " + textFieldSize); - } numberEditorTextField.select(textFieldSize, textFieldSize); } } @Override - public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - this.row = row; - return super.getTableCellEditorComponent(table, value, isSelected, row, column); + public BigDecimal getCellEditorValue() { + if (super.getCellEditorValue() != BigDecimal.ZERO) { + return super.getCellEditorValue().setScale(2, RoundingMode.HALF_UP); + } + return super.getCellEditorValue(); } - } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-06 10:46:10 UTC (rev 3567) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-06 16:03:49 UTC (rev 3568) @@ -26,6 +26,8 @@ package org.chorem.lima.ui.financialtransaction; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FinancialTransaction; @@ -79,6 +81,8 @@ addMouseListener(new MyMouseAdapter()); + //addListSelectionListener(); + //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor()); @@ -161,7 +165,24 @@ FinancialTransactionTable table = FinancialTransactionTable.this; @Override + public void keyTyped(KeyEvent e) { + if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { + editCellAt(getSelectedRow(), getSelectedColumn()); + } + } + + @Override + public void keyReleased(KeyEvent e) { + if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { + editCellAt(getSelectedRow(), getSelectedColumn()); + } + } + + @Override public void keyPressed(KeyEvent e) { + if ( (getSelectedColumn() == 4 || getSelectedColumn() == 5) ) { + editCellAt(getSelectedRow(), getSelectedColumn()); + } final FinancialTransactionViewHandler handler = getHandler(); Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-06 10:46:10 UTC (rev 3567) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-06 16:03:49 UTC (rev 3568) @@ -45,4 +45,5 @@ log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionTableModel=DEBUG log4j.logger.org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor=DEBUG log4j.logger.org.chorem.lima.business.accountingrules.DefaultAccountingRules=DEBUG -log4j.logger.org.chorem.lima.business.ejb.FinancialTransactionServiceImpl=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.business.ejb.FinancialTransactionServiceImpl=DEBUG +log4j.logger.org.chorem.lima.business.ui.celleditor.BigDecimalTableCellEditor=DEBUG \ No newline at end of file

1 0

r3567 - in trunk: . lima-business/src/main/java/org/chorem/lima/business/utils lima-business/src/test/java/org/chorem/lima/business lima-callao lima-swing lima-swing/src/main/java/org/chorem/lima/ui/lettering
by echatellier＠users.chorem.org 06 Aug '12

06 Aug '12

Author: echatellier Date: 2012-08-06 12:46:10 +0200 (Mon, 06 Aug 2012) New Revision: 3567 Url: http://chorem.org/repositories/revision/lima/3567 Log: Udpate libs. Fix build. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java trunk/pom.xml Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java 2012-08-03 16:05:58 UTC (rev 3566) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java 2012-08-06 10:46:10 UTC (rev 3567) @@ -1,4 +1,27 @@ package org.chorem.lima.business.utils; +/* + * #%L + * Lima :: business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ import java.io.Serializable; import java.util.Comparator; Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java 2012-08-03 16:05:58 UTC (rev 3566) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java 2012-08-06 10:46:10 UTC (rev 3567) @@ -1,4 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ import org.chorem.lima.business.utils.LetteringComparator; import org.junit.Assert; Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-08-03 16:05:58 UTC (rev 3566) +++ trunk/lima-callao/pom.xml 2012-08-06 10:46:10 UTC (rev 3567) @@ -28,10 +28,6 @@ <artifactId>commons-collections</artifactId> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-08-03 16:05:58 UTC (rev 3566) +++ trunk/lima-swing/pom.xml 2012-08-06 10:46:10 UTC (rev 3567) @@ -71,9 +71,17 @@ </dependency> <dependency> - <groupId>org.swinglabs</groupId> + <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-painters</artifactId> + </dependency> <dependency> <groupId>org.apache.commons</groupId> 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-08-03 16:05:58 UTC (rev 3566) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-08-06 10:46:10 UTC (rev 3567) @@ -9,15 +9,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-03 16:05:58 UTC (rev 3566) +++ trunk/pom.xml 2012-08-06 10:46:10 UTC (rev 3567) @@ -109,7 +109,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.167</version> + <version>1.3.168</version> <scope>runtime</scope> </dependency> @@ -162,13 +162,27 @@  <dependency> - <groupId>org.swinglabs</groupId> + <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> - <version>1.6.2-2</version> + <version>${swingxVersion}</version> <scope>compile</scope> </dependency> <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-autocomplete</artifactId> + <version>${swingxVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-painters</artifactId> + <version>${swingxVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> @@ -214,26 +228,26 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>8.1.4.v20120524</version> + <version>8.1.5.v20120716</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>8.1.4.v20120524</version> + <version>8.1.5.v20120716</version> </dependency>  <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> - <version>1.7.0</version> + <version>1.7.1</version> </dependency> <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox-examples</artifactId> - <version>1.7.0</version> + <version>1.7.1</version> </dependency> <dependency> @@ -342,13 +356,14 @@ <projectId>lima</projectId>  - <nuitonUtilsVersion>2.5.2-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5.3-SNAPSHOT</nuitonUtilsVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.11</topiaVersion> - <jaxxVersion>2.5.4-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.3</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>4.0.0</openEjbVersion> <slf4jVersion>1.6.6</slf4jVersion> + <swingxVersion>1.6.4</swingxVersion>  <license.licenseName>gpl_v3</license.licenseName>

1 0

r3566 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org 03 Aug '12

03 Aug '12

Author: mallon Date: 2012-08-03 18:05:58 +0200 (Fri, 03 Aug 2012) New Revision: 3566 Url: http://chorem.org/repositories/revision/lima/3566 Log: fixes #729 Pour plus de visibilite, modification de la couleur surlignant une transaction lorsque celle-ci possede un solde different de 0. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-03 15:55:10 UTC (rev 3565) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-03 16:05:58 UTC (rev 3566) @@ -130,7 +130,7 @@ //To color in red entry with debit and credit equals to zero colorTransaction = - new ColorHighlighter(predicate, new Color(255, 198, 209), null); + new ColorHighlighter(predicate, new Color(255, 0, 0), null); addHighlighter(colorTransaction); HighlightPredicate debitCreditZero = new HighlightPredicate() {

1 0

r3565 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 03 Aug '12

03 Aug '12

Author: mallon Date: 2012-08-03 17:55:10 +0200 (Fri, 03 Aug 2012) New Revision: 3565 Url: http://chorem.org/repositories/revision/lima/3565 Log: fixes #726 Deplacement de code du handler du lettrage dans le service adequat Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.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-08-03 15:02:44 UTC (rev 3564) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-08-03 15:55:10 UTC (rev 3565) @@ -32,6 +32,7 @@ import org.chorem.lima.business.AccountingRules; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.business.api.FinancialTransactionService; @@ -43,6 +44,7 @@ import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryDAO; +import org.chorem.lima.entity.EntryImpl; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FinancialTransactionDAO; @@ -59,6 +61,8 @@ import java.util.Date; import java.util.List; +import static org.nuiton.i18n.I18n._; + /** * Cette classe permet la création d'une transaction comptable dans l'application. * Toute action sur une transaction entraîne automatiquement une création de log. @@ -83,6 +87,9 @@ protected EntryBookService entryBookService; @EJB + protected AccountService accountService; + + @EJB protected OptionsService optionsService; protected static final Log log = LogFactory.getLog(FinancialTransactionServiceImpl.class); @@ -186,6 +193,117 @@ return nextLetters; } + @Override + public Entry[] getEntriesFromEqualizing(Entry FirstEntrySelected, Entry SecondEntrySelected) throws LimaException{ + + Entry newSameAccountEntry = null; + Entry newCostOrProductEntry = null; + BigDecimal firstSelectedEntryAmount = FirstEntrySelected.getAmount(); + BigDecimal secondSelectedEntryAmount = SecondEntrySelected.getAmount(); + + if ( (firstSelectedEntryAmount.compareTo(BigDecimal.ZERO) != 0 && secondSelectedEntryAmount.compareTo(BigDecimal.ZERO) != 0) + && !firstSelectedEntryAmount.equals(secondSelectedEntryAmount)) { + + /*Calculation of result with it + * Tab : 0 : debit + * 1 : credit*/ + BigDecimal[] firstEntryDebitCredit = debitCreditCalculation(FirstEntrySelected); + BigDecimal[] secondEntryDebitCredit = debitCreditCalculation(SecondEntrySelected); + + /*Subtraction between debit and credit of first and second selected line*/ + BigDecimal firstEntryDebitSubtract = firstEntryDebitCredit[0].subtract(secondEntryDebitCredit[1]); + BigDecimal secondEntryDebitSubtract = secondEntryDebitCredit[0].subtract(firstEntryDebitCredit[1]); + + /*Create handles of new futures entries*/ + Entry sameAccountEntry; + Entry costOrProductEntry; + + /*Set result in the amount of the new entries*/ + if (firstEntryDebitSubtract.compareTo(BigDecimal.ZERO) != 0) { + sameAccountEntry = copyEntryWithoutAmount(FirstEntrySelected); + costOrProductEntry = copyEntryWithoutAmount(FirstEntrySelected); + amountsCalculation(firstEntryDebitSubtract, sameAccountEntry, costOrProductEntry); + } else { + sameAccountEntry = copyEntryWithoutAmount(SecondEntrySelected); + costOrProductEntry = copyEntryWithoutAmount(SecondEntrySelected); + amountsCalculation(secondEntryDebitSubtract, sameAccountEntry, costOrProductEntry); + } + + String accountRegularization = _("lima.ui.lettering.accountRegularization"); + + if (log.isDebugEnabled()) { + log.debug("accountRegularization : " + accountRegularization); + } + + sameAccountEntry.setDescription(accountRegularization); + costOrProductEntry.setDescription(accountRegularization); + + /*Save in the DB the new entries*/ + newSameAccountEntry = createEntry(sameAccountEntry); + newCostOrProductEntry = createEntry(costOrProductEntry); + + } + + Entry [] entries = {newSameAccountEntry, newCostOrProductEntry}; + return entries; + } + + /**Debit and credit calculation for one entry, with its amount + * @param entry Entry for calculation + * @return table of two big decimal, representing respectively debit and credit + * */ + protected BigDecimal[] debitCreditCalculation(Entry entry) { + + boolean firstEntryDebit = entry.getDebit(); + BigDecimal firstEntryAmount = entry.getAmount(); + + BigDecimal debitVal = firstEntryDebit ? firstEntryAmount : BigDecimal.ZERO; + BigDecimal creditVal = firstEntryDebit ? BigDecimal.ZERO : firstEntryAmount; + + BigDecimal[] debitCredit = {debitVal, creditVal}; + + return debitCredit; + } + + /**Copy parametrised entry, without amount*/ + protected Entry copyEntryWithoutAmount(Entry entryToCopy) { + Entry copiedEntry = new EntryImpl(); + + copiedEntry.setAccount(entryToCopy.getAccount()); + copiedEntry.setDescription(entryToCopy.getDescription()); + copiedEntry.setDetail(entryToCopy.getDetail()); + copiedEntry.setFinancialTransaction(entryToCopy.getFinancialTransaction()); + copiedEntry.setVoucher(entryToCopy.getVoucher()); + + return copiedEntry; + } + + /** + *Calculation of amount for the new entries created + * and determine for the second if account is in costs (658) + * or products (758) + * @param resultOfFirstSecondEntrySubtraction difference between the two old entries + * @param sameAccountEntry first new entry created with the same account + * @param costOrProductEntry second new entry created with account 658 or 758 + * */ + protected void amountsCalculation( BigDecimal resultOfFirstSecondEntrySubtraction, Entry sameAccountEntry, Entry costOrProductEntry) { + sameAccountEntry.setAmount(resultOfFirstSecondEntrySubtraction.abs()); + costOrProductEntry.setAmount(resultOfFirstSecondEntrySubtraction.abs()); + Account costOrProductAccount; + + /*-1 for less than 0 : credit*/ + if (resultOfFirstSecondEntrySubtraction.compareTo(BigDecimal.ZERO) == -1) { + sameAccountEntry.setDebit(true); + costOrProductEntry.setDebit(false); + costOrProductAccount = accountService.getAccountByNumber("758"); + } else { /*Greater than 0 : debit*/ + sameAccountEntry.setDebit(false); + costOrProductEntry.setDebit(true); + costOrProductAccount = accountService.getAccountByNumber("658"); + } + costOrProductEntry.setAccount(costOrProductAccount); + } + protected String getCharsA(int numberOfA) { String charsA=""; for (int j = 0; j < numberOfA; j++) { @@ -353,13 +471,6 @@ Date financialTransactionOldDate = financialTransactionOld.getTransactionDate(); Date financialTransactionDate = financialTransaction.getTransactionDate(); - if (log.isDebugEnabled()) { - log.debug("Date de la transaction (Old) : " + financialTransactionOldDate); - } - if (log.isDebugEnabled()) { - log.debug("Date de la transaction (New) : " + financialTransactionDate); - } - financialTransactionOld.setEntryBook(financialTransaction.getEntryBook()); financialTransactionOld.setTransactionDate(financialTransactionDate); Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-08-03 15:02:44 UTC (rev 3564) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-08-03 15:55:10 UTC (rev 3565) @@ -79,10 +79,20 @@ String getNextLetters() throws LimaException; /** - * Retourne toutes les entrées d'une transaction - * pour un compte et la présence d'un lettrage ou (xor) non - * @param filter filtre sur les entrees, selon le compte, les dates de debut et de fin, et le lettrage - * @throws org.nuiton.topia.TopiaException - * */ + * From to selected entries, create one with same account and + * difference between the amounts, and another one with + * account 658 or 758 and an amount conversely of the first created + * @param FirstEntrySelected first entry selected + * @param SecondEntrySelected second entry selected + * @return table of the two new entries + * */ + Entry[] getEntriesFromEqualizing(Entry FirstEntrySelected, Entry SecondEntrySelected) throws LimaException; + + /** + * Retourne toutes les entrées d'une transaction + * pour un compte et la présence d'un lettrage ou (xor) non + * @param filter filtre sur les entrees, selon le compte, les dates de debut et de fin, et le lettrage + * @throws LimaException + * */ List<Entry> getAllEntrieByDatesAndAccountAndLettering(LetteringFilter filter) throws LimaException; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-08-03 15:02:44 UTC (rev 3564) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-08-03 15:55:10 UTC (rev 3565) @@ -27,8 +27,6 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; -import org.chorem.lima.entity.EntryImpl; - import javax.swing.table.AbstractTableModel; import java.math.BigDecimal; import java.util.Date; @@ -243,7 +241,7 @@ } /**Copy parametrised entry, without amount*/ - public Entry copyEntryWithoutAmount(Entry entryToCopy) { + /*public Entry copyEntryWithoutAmount(Entry entryToCopy) { Entry copiedEntry = new EntryImpl(); copiedEntry.setAccount(entryToCopy.getAccount()); @@ -253,5 +251,5 @@ copiedEntry.setVoucher(entryToCopy.getVoucher()); return copiedEntry; - } + }*/ } 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-08-03 15:02:44 UTC (rev 3564) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-08-03 15:55:10 UTC (rev 3565) @@ -201,23 +201,6 @@ editModel.setUnLettred(false); editModel.setEqualized(false); } - - /*if (mode.equals(buttonMode.DELETTRED)) { - editModel.setLettred(false); - editModel.setUnLettred(true); - } else if (mode.equals("lettrer")) { - if (log.isDebugEnabled()) { - log.debug("Lettred entry"); - } - editModel.setUnLettred(false); - editModel.setLettred(true); - }else if (mode.equals("equalized")) { - editModel.setEqualized(true); - } else { - editModel.setLettred(false); - editModel.setUnLettred(false); - editModel.setEqualized(false); - }*/ } public void setValuesForSelectedEntries() { @@ -340,112 +323,25 @@ int[] selectedRows = view.getTable().getSelectedRows(); if (selectedRows.length == 2) { - /*Treatment only if one of values contains decimals*/ Entry firstSelectedEntry = tableModel.getEntryAt(selectedRows[0]); Entry secondSelectedEntry = tableModel.getEntryAt(selectedRows[1]); - BigDecimal firstSelectedEntryAmount = firstSelectedEntry.getAmount(); - BigDecimal secondSelectedEntryAmount = secondSelectedEntry.getAmount(); + Entry[] newEntriesFormEqualizing = financialTransactionService.getEntriesFromEqualizing(firstSelectedEntry, secondSelectedEntry); + /*Add new entries to the model and the table*/ + Entry newSameAccountEntry = newEntriesFormEqualizing[0]; + Entry newCostOrProductEntry = newEntriesFormEqualizing[1]; + tableModel.addEntry(newSameAccountEntry, newSameAccountEntry.getFinancialTransaction().getTransactionDate()); + tableModel.addEntry(newCostOrProductEntry, newCostOrProductEntry.getFinancialTransaction().getTransactionDate()); - - if ( (firstSelectedEntryAmount.compareTo(BigDecimal.ZERO) != 0 && secondSelectedEntryAmount.compareTo(BigDecimal.ZERO) != 0) - && !firstSelectedEntryAmount.equals(secondSelectedEntryAmount)) { - - /*Calculation of result with it - * Tab : 0 : debit - * 1 : credit*/ - BigDecimal[] firstEntryDebitCredit = debitCreditCalculation(firstSelectedEntry); - BigDecimal[] secondEntryDebitCredit = debitCreditCalculation(secondSelectedEntry); - - /*Subtraction between debit and credit of first and second selected line*/ - BigDecimal firstEntryDebitSubtract = firstEntryDebitCredit[0].subtract(secondEntryDebitCredit[1]); - BigDecimal secondEntryDebitSubtract = secondEntryDebitCredit[0].subtract(firstEntryDebitCredit[1]); - - /*Create handles of new futures entries*/ - Entry sameAccountEntry; - Entry costOrProductEntry; - - /*Set result in the amount of the new entries*/ - if (firstEntryDebitSubtract.compareTo(BigDecimal.ZERO) != 0) { - sameAccountEntry = tableModel.copyEntryWithoutAmount(firstSelectedEntry); - costOrProductEntry = tableModel.copyEntryWithoutAmount(firstSelectedEntry); - amountsCalculation(firstEntryDebitSubtract, sameAccountEntry, costOrProductEntry); - } else { //firstEntryDebitSubtract == 0 - sameAccountEntry = tableModel.copyEntryWithoutAmount(secondSelectedEntry); - costOrProductEntry = tableModel.copyEntryWithoutAmount(secondSelectedEntry); - amountsCalculation(secondEntryDebitSubtract, sameAccountEntry, costOrProductEntry); - } - - String accountRegularization = _("lima.ui.lettering.accountRegularization"); - - if (log.isDebugEnabled()) { - log.debug("accountRegularization : " + accountRegularization); - } - - sameAccountEntry.setDescription(accountRegularization); - costOrProductEntry.setDescription(accountRegularization); - - /*Save in the DB the new entries*/ - Entry newSameAccountEntry = financialTransactionService.createEntry(sameAccountEntry); - Entry newCostOrProductEntry = financialTransactionService.createEntry(costOrProductEntry); - - /*Add new entries to the model and the table*/ - tableModel.addEntry(newSameAccountEntry, newSameAccountEntry.getFinancialTransaction().getTransactionDate()); - tableModel.addEntry(newCostOrProductEntry, newCostOrProductEntry.getFinancialTransaction().getTransactionDate()); - - /*Re-select the two entries (firstSelectedEntry and secondSelectedEntry) - * and the new sameAccountEntry - * */ - view.getLettringSelectionModel().selectRoundedAndNewEntries(selectedRows[0], selectedRows[1], newSameAccountEntry); - } + /*Re-select the two entries (firstSelectedEntry and secondSelectedEntry) + * and the new sameAccountEntry + * */ + view.getLettringSelectionModel().selectRoundedAndNewEntries(selectedRows[0], selectedRows[1], newSameAccountEntry); } } - /**Debit and credit calculation for one entry, with its amount - * @param entry Entry for calculation - * @return table of two big decimal, representing respectively debit and credit - * */ - protected BigDecimal[] debitCreditCalculation(Entry entry) { - - boolean firstEntryDebit = entry.getDebit(); - BigDecimal firstEntryAmount = entry.getAmount(); - - BigDecimal debitVal = firstEntryDebit ? firstEntryAmount : BigDecimal.ZERO; - BigDecimal creditVal = firstEntryDebit ? BigDecimal.ZERO : firstEntryAmount; - - BigDecimal[] debitCredit = {debitVal, creditVal}; - - return debitCredit; - } - - /** - *Calculation of amount for the new entries created - * and determine for the second if account is in costs (658) - * or products (758) - * @param resultOfFirstSecondEntrySubtraction difference between the two old entries - * @param sameAccountEntry first new entry created with the same account - * @param costOrProductEntry second new entry created with account 658 or 758 - * */ - protected void amountsCalculation( BigDecimal resultOfFirstSecondEntrySubtraction, Entry sameAccountEntry, Entry costOrProductEntry) { - sameAccountEntry.setAmount(resultOfFirstSecondEntrySubtraction.abs()); - costOrProductEntry.setAmount(resultOfFirstSecondEntrySubtraction.abs()); - Account costOrProductAccount; - - /*-1 for less than 0 : credit*/ - if (resultOfFirstSecondEntrySubtraction.compareTo(BigDecimal.ZERO) == -1) { - sameAccountEntry.setDebit(true); - costOrProductEntry.setDebit(false); - costOrProductAccount = accountService.getAccountByNumber("758"); - } else { /*Greater than 0 : debit*/ - sameAccountEntry.setDebit(false); - costOrProductEntry.setDebit(true); - costOrProductAccount = accountService.getAccountByNumber("658"); - } - costOrProductEntry.setAccount(costOrProductAccount); - } - /**To test if the filter contain an account and a period * @return true if filter is valid * */

1 0

r3564 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/java/org/chorem/lima/business/utils lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 03 Aug '12

03 Aug '12

Author: mallon Date: 2012-08-03 17:02:44 +0200 (Fri, 03 Aug 2012) New Revision: 3564 Url: http://chorem.org/repositories/revision/lima/3564 Log: fixes #735 Correction permettant une meilleure incr?\195?\169mentation du lettrage. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.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-08-02 17:06:11 UTC (rev 3563) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-08-03 15:02:44 UTC (rev 3564) @@ -25,6 +25,8 @@ package org.chorem.lima.business.ejb; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.FinancialTransactionSearch; import org.chorem.lima.beans.LetteringFilter; import org.chorem.lima.business.AccountingRules; @@ -83,6 +85,8 @@ @EJB protected OptionsService optionsService; + protected static final Log log = LogFactory.getLog(FinancialTransactionServiceImpl.class); + @Override public FinancialTransaction createFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException { @@ -126,6 +130,7 @@ @Override public String getNextLetters() throws LimaException { String lastActualLetters; + String nextLetters = ""; try { EntryDAO entryDAO = getDaoHelper().getEntryDAO(); @@ -137,14 +142,58 @@ } /**Increment letter alphabetically*/ - if (lastActualLetters.charAt(0) != 'Z') { - String finLastActualLetters = lastActualLetters.substring(1, lastActualLetters.length()); - return String.valueOf( (char) (lastActualLetters.charAt(0) + 1)) + finLastActualLetters; + int indexCharToIncrement = 0; + int lastActualLettersLength = lastActualLetters.length(); + String findLastLetters; + String findFirstLetters =""; + int numberOfA; + + /*Searching which letter is 'Z', and so must be incremented*/ + for (int i = 0; i < lastActualLettersLength; i++) { + if (lastActualLetters.charAt(i) != 'Z') { + indexCharToIncrement = i; + } + } + + /*When no letter, just set 'A'*/ + if (lastActualLettersLength != 0) { + + /*Get first letter(s), only if we have more of one letter (One letter = letter to increment)*/ + String firstPartActualLetters = lastActualLetters.substring(0, indexCharToIncrement); + if (firstPartActualLetters.length() > 1) { + findFirstLetters = firstPartActualLetters; + } + + /*Get the letters after the correct letter to increment and + *increment it (Using 'indexCharToIncrement') + * */ + findLastLetters = lastActualLetters.substring(indexCharToIncrement+1, lastActualLettersLength); + if (lastActualLetters.charAt(indexCharToIncrement) != 'Z') { + /*Last letters transform to x 'A' (x = Number of 'Z'), if they are 'Z'*/ + if (findLastLetters.length() > 0) { + if (findLastLetters.charAt(0) == 'Z') { + numberOfA = findLastLetters.length(); + findLastLetters=getCharsA(numberOfA); + } + } + nextLetters = findFirstLetters + String.valueOf( (char) (lastActualLetters.charAt(indexCharToIncrement) + 1)) + findLastLetters; + } + } else { - return "A" + lastActualLetters; + numberOfA = lastActualLettersLength +1; + nextLetters = getCharsA(numberOfA); } + return nextLetters; } + protected String getCharsA(int numberOfA) { + String charsA=""; + for (int j = 0; j < numberOfA; j++) { + charsA = charsA+"A"; + } + return charsA; + } + public String findLastLetter(List<String> letters) { String result; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java 2012-08-02 17:06:11 UTC (rev 3563) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java 2012-08-03 15:02:44 UTC (rev 3564) @@ -3,13 +3,6 @@ import java.io.Serializable; import java.util.Comparator; -/** - * Created with IntelliJ IDEA. - * User: mallon - * Date: 24/07/12 - * Time: 15:39 - * To change this template use File | Settings | File Templates. - */ public class LetteringComparator implements Serializable , Comparator<String> { private static final long serialVersionUID = 1L; 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-08-02 17:06:11 UTC (rev 3563) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-08-03 15:02:44 UTC (rev 3564) @@ -134,21 +134,13 @@ Entry firstSelectedEntry = tableModel.getEntryAt(selectedRows[0]); Entry secondSelectedEntry = tableModel.getEntryAt(selectedRows[1]); - BigDecimal [] amountFirstEntry = debitCreditCalculation(firstSelectedEntry); - BigDecimal amountFirst = amountFirstEntry[0].equals(BigDecimal.ZERO)?amountFirstEntry[1]:amountFirstEntry[0]; - BigDecimal [] amountSecondEntry = debitCreditCalculation(secondSelectedEntry); - BigDecimal amountSecond = amountSecondEntry[0].equals(BigDecimal.ZERO)?amountSecondEntry[1]:amountSecondEntry[0]; + /*Get decimals*/ + BigDecimal firstSelectedEntryAmount = firstSelectedEntry.getAmount(); + BigDecimal secondSelectedEntryAmount = secondSelectedEntry.getAmount(); - if (log.isDebugEnabled()) { - log.debug(amountFirst + " - " + amountSecond); - } - - /*String decimalFirstEntrySelected = (firstSelectedEntry.getAmount().toString().split("\\."))[1]; - String decimalSecondSelectedEntry = (secondSelectedEntry.getAmount().toString().split("\\."))[1];*/ - if ( /*(!decimalFirstEntrySelected.equals("00") || !decimalSecondSelectedEntry.equals("00"))*/ - !amountFirst.equals(BigDecimal.ZERO) && !amountSecond.equals(BigDecimal.ZERO) - && secondSelectedEntry.getDebit() != firstSelectedEntry.getDebit() - && !amountFirst.equals(amountSecond)) { + if ( secondSelectedEntry.getDebit() != firstSelectedEntry.getDebit() + && firstSelectedEntryAmount.subtract(secondSelectedEntryAmount).abs().compareTo(BigDecimal.ZERO) >=0 + && firstSelectedEntryAmount.subtract(secondSelectedEntryAmount).abs().compareTo(BigDecimal.ONE) <=0) { onButtonModeChanged(buttonMode.EQUALIZED); } }else { @@ -353,9 +345,14 @@ Entry firstSelectedEntry = tableModel.getEntryAt(selectedRows[0]); Entry secondSelectedEntry = tableModel.getEntryAt(selectedRows[1]); - if ( (firstSelectedEntry.getAmount().compareTo(BigDecimal.ZERO) != 0 && secondSelectedEntry.getAmount().compareTo(BigDecimal.ZERO) != 0) - && !firstSelectedEntry.getAmount().equals(secondSelectedEntry.getAmount())) { + BigDecimal firstSelectedEntryAmount = firstSelectedEntry.getAmount(); + BigDecimal secondSelectedEntryAmount = secondSelectedEntry.getAmount(); + + + if ( (firstSelectedEntryAmount.compareTo(BigDecimal.ZERO) != 0 && secondSelectedEntryAmount.compareTo(BigDecimal.ZERO) != 0) + && !firstSelectedEntryAmount.equals(secondSelectedEntryAmount)) { + /*Calculation of result with it * Tab : 0 : debit * 1 : credit*/

1 0

r3563 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui/lettering lima-swing/src/main/resources lima-swing/src/main/resources/i18n
by mallon＠users.chorem.org 02 Aug '12

02 Aug '12

Author: mallon Date: 2012-08-02 19:06:11 +0200 (Thu, 02 Aug 2012) New Revision: 3563 Url: http://chorem.org/repositories/revision/lima/3563 Log: refs #726 Correction permettant d ajouter une entree avec la difference entre les deux selectionnees, et portant le meme numero de compte que ces deux dernieres. Une autre entree est aussi ajoutee, en credit / debit, en 658 / 758. Un enum a aussi ete ajoute pour les modes correspondant aux boutons, pour plus de clarte - Reste a repartir le code ne devant pas etre dans le handler dans un service. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.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 trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-08-02 09:45:20 UTC (rev 3562) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-08-02 17:06:11 UTC (rev 3563) @@ -258,17 +258,24 @@ try { + if (log.isDebugEnabled()) { + log.debug("entry : " + entry); + log.debug("entryOld : " + entryOld); + } + FinancialPeriodDAO financialPeriodDAO = getDaoHelper().getFinancialPeriodDAO(); FinancialPeriod financialPeriod = financialPeriodDAO.findByDate(entry.getFinancialTransaction().getTransactionDate()); ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = getDaoHelper().getClosedPeriodicEntryBookDAO(); - //second case - ClosedPeriodicEntryBook closedPeriodicEntryBook = - closedPeriodicEntryBookDAO.findByEntryBookAndFinancialPeriod( - entryOld.getFinancialTransaction().getEntryBook(), financialPeriod); - if (closedPeriodicEntryBook.getLocked()) { - throw new LimaBusinessException(_("lima-Business.defaultaccountingrules.updateentryerror")); + if (entryOld != null) { + //second case + ClosedPeriodicEntryBook closedPeriodicEntryBook = + closedPeriodicEntryBookDAO.findByEntryBookAndFinancialPeriod( + entryOld.getFinancialTransaction().getEntryBook(), financialPeriod); + if (closedPeriodicEntryBook.getLocked()) { + throw new LimaBusinessException(_("lima-Business.defaultaccountingrules.updateentryerror")); + } } //third case 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-08-02 09:45:20 UTC (rev 3562) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-08-02 17:06:11 UTC (rev 3563) @@ -370,7 +370,6 @@ AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); try { - EntryDAO entryDAO = getDaoHelper().getEntryDAO(); Entry entryOld = entryDAO.findByTopiaId(entry.getTopiaId()); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-08-02 09:45:20 UTC (rev 3562) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-08-02 17:06:11 UTC (rev 3563) @@ -237,13 +237,15 @@ public void updateLettersSelectedEntries(int[] entries, String letters) { for (int rowEntry : entries){ getEntryAt(rowEntry).setLettering(letters); + fireTableRowsUpdated(rowEntry, rowEntry); } - fireTableDataChanged(); +// fireTableDataChanged(); } /**Copy parametrised entry, without amount*/ public Entry copyEntryWithoutAmount(Entry entryToCopy) { Entry copiedEntry = new EntryImpl(); + copiedEntry.setAccount(entryToCopy.getAccount()); copiedEntry.setDescription(entryToCopy.getDescription()); copiedEntry.setDetail(entryToCopy.getDetail()); 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-08-02 09:45:20 UTC (rev 3562) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-08-02 17:06:11 UTC (rev 3563) @@ -34,6 +34,7 @@ import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.api.FiscalPeriodService; +import org.chorem.lima.business.ejb.FinancialTransactionServiceImpl; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FiscalPeriod; @@ -48,6 +49,8 @@ import java.util.Date; import java.util.List; +import static org.nuiton.i18n.I18n._; + /** * Handler associated with financial transaction view. * @@ -76,6 +79,7 @@ protected BigDecimal solde = BigDecimal.ZERO; protected LettringSelectionModel lettringSelectionModel; protected LetteringEditModel editModel; + protected enum buttonMode {DELETTRED, LETTRED, EQUALIZED, ALL} private static final Log log = LogFactory.getLog(LetteringViewHandler.class); public LetteringViewHandler(LetteringView view) { @@ -107,7 +111,7 @@ public void balanceAndActions() { if (view.getTable().getSelectedRows().length == 0) { - onButtonModeChanged("all"); + onButtonModeChanged(buttonMode.ALL); } else if (!letteringNotExist(view.getTable().getSelectedRow())) { //lettred entries @@ -115,7 +119,7 @@ setValuesForSelectedEntries(); //For U.I. buttons (Lettering and unlettering) - onButtonModeChanged("delettrer"); + onButtonModeChanged(buttonMode.DELETTRED); } else { if (log.isDebugEnabled()) { log.debug("unlettred entries"); @@ -145,13 +149,13 @@ !amountFirst.equals(BigDecimal.ZERO) && !amountSecond.equals(BigDecimal.ZERO) && secondSelectedEntry.getDebit() != firstSelectedEntry.getDebit() && !amountFirst.equals(amountSecond)) { - onButtonModeChanged("equalized"); + onButtonModeChanged(buttonMode.EQUALIZED); } }else { if (log.isDebugEnabled()) { log.debug("!2 rows selected"); } - onButtonModeChanged("all"); + onButtonModeChanged(buttonMode.ALL); } //Unlettred entries @@ -162,12 +166,12 @@ log.debug("Rows selected"); } setValuesForSelectedEntries(); - onButtonModeChanged("lettrer"); + onButtonModeChanged(buttonMode.LETTRED); } else { if (log.isDebugEnabled()) { log.debug("No Rows selected"); } - onButtonModeChanged("all"); + onButtonModeChanged(buttonMode.ALL); } } } @@ -186,8 +190,27 @@ return emptyOrNull; } - public void onButtonModeChanged(String mode) { - if (mode.equals("delettrer")) { + public void onButtonModeChanged(buttonMode buttonMode) { + + switch (buttonMode) { + case DELETTRED : + editModel.setLettred(false); + editModel.setUnLettred(true); + break; + case LETTRED: + editModel.setUnLettred(false); + editModel.setLettred(true); + break; + case EQUALIZED: + editModel.setEqualized(true); + break; + default: + editModel.setLettred(false); + editModel.setUnLettred(false); + editModel.setEqualized(false); + } + + /*if (mode.equals(buttonMode.DELETTRED)) { editModel.setLettred(false); editModel.setUnLettred(true); } else if (mode.equals("lettrer")) { @@ -202,7 +225,7 @@ editModel.setLettred(false); editModel.setUnLettred(false); editModel.setEqualized(false); - } + }*/ } public void setValuesForSelectedEntries() { @@ -313,7 +336,6 @@ view.getTableModel().updateEntries(entries, datesEntree, journalEntrees); } onBalanceChanged(null); - //view.getLettringSelectionModel().clearSelection(); } /**To make the difference between two selected entries and @@ -344,28 +366,42 @@ BigDecimal firstEntryDebitSubtract = firstEntryDebitCredit[0].subtract(secondEntryDebitCredit[1]); BigDecimal secondEntryDebitSubtract = secondEntryDebitCredit[0].subtract(firstEntryDebitCredit[1]); - /*Create handle of new future entry*/ - Entry entry; + /*Create handles of new futures entries*/ + Entry sameAccountEntry; + Entry costOrProductEntry; - /*Set result in the amount of the new entry*/ + /*Set result in the amount of the new entries*/ if (firstEntryDebitSubtract.compareTo(BigDecimal.ZERO) != 0) { - entry = tableModel.copyEntryWithoutAmount(firstSelectedEntry); - amountsCalculation(firstSelectedEntry, secondSelectedEntry, firstEntryDebitSubtract, entry); + sameAccountEntry = tableModel.copyEntryWithoutAmount(firstSelectedEntry); + costOrProductEntry = tableModel.copyEntryWithoutAmount(firstSelectedEntry); + amountsCalculation(firstEntryDebitSubtract, sameAccountEntry, costOrProductEntry); } else { //firstEntryDebitSubtract == 0 - entry = tableModel.copyEntryWithoutAmount(secondSelectedEntry); - amountsCalculation(firstSelectedEntry, secondSelectedEntry, secondEntryDebitSubtract, entry); + sameAccountEntry = tableModel.copyEntryWithoutAmount(secondSelectedEntry); + costOrProductEntry = tableModel.copyEntryWithoutAmount(secondSelectedEntry); + amountsCalculation(secondEntryDebitSubtract, sameAccountEntry, costOrProductEntry); } - /*Add new entry to the model and the table*/ - tableModel.addEntry(entry, entry.getFinancialTransaction().getTransactionDate()); + String accountRegularization = _("lima.ui.lettering.accountRegularization"); - /*Save in DB the new entry*/ - financialTransactionService.createEntry(entry); + if (log.isDebugEnabled()) { + log.debug("accountRegularization : " + accountRegularization); + } + sameAccountEntry.setDescription(accountRegularization); + costOrProductEntry.setDescription(accountRegularization); + + /*Save in the DB the new entries*/ + Entry newSameAccountEntry = financialTransactionService.createEntry(sameAccountEntry); + Entry newCostOrProductEntry = financialTransactionService.createEntry(costOrProductEntry); + + /*Add new entries to the model and the table*/ + tableModel.addEntry(newSameAccountEntry, newSameAccountEntry.getFinancialTransaction().getTransactionDate()); + tableModel.addEntry(newCostOrProductEntry, newCostOrProductEntry.getFinancialTransaction().getTransactionDate()); + /*Re-select the two entries (firstSelectedEntry and secondSelectedEntry) - * and the new entry + * and the new sameAccountEntry * */ - view.getLettringSelectionModel().selectRoundedAndNewEntries(selectedRows[0], selectedRows[1], entry); + view.getLettringSelectionModel().selectRoundedAndNewEntries(selectedRows[0], selectedRows[1], newSameAccountEntry); } } } @@ -388,31 +424,29 @@ } /** - *Calculation of amount for the new entry created and one of the two old entries - * @param firstSelectedEntry first selected entry - * @param secondSelectedEntry second selected entry + *Calculation of amount for the new entries created + * and determine for the second if account is in costs (658) + * or products (758) * @param resultOfFirstSecondEntrySubtraction difference between the two old entries - * @param newEntry new entry created + * @param sameAccountEntry first new entry created with the same account + * @param costOrProductEntry second new entry created with account 658 or 758 * */ - protected void amountsCalculation(Entry firstSelectedEntry, Entry secondSelectedEntry, BigDecimal resultOfFirstSecondEntrySubtraction, Entry newEntry) { - BigDecimal newDebitOrCredit; - if (secondSelectedEntry.getAmount().compareTo(firstSelectedEntry.getAmount())>0) { - newDebitOrCredit = secondSelectedEntry.getAmount().subtract(resultOfFirstSecondEntrySubtraction.abs()); - secondSelectedEntry.setAmount(newDebitOrCredit); - financialTransactionService.updateEntry(secondSelectedEntry); - } else { - newDebitOrCredit = firstSelectedEntry.getAmount().subtract(resultOfFirstSecondEntrySubtraction.abs()); - firstSelectedEntry.setAmount(newDebitOrCredit); - financialTransactionService.updateEntry(firstSelectedEntry); - } - newEntry.setAmount(resultOfFirstSecondEntrySubtraction.abs()); + protected void amountsCalculation( BigDecimal resultOfFirstSecondEntrySubtraction, Entry sameAccountEntry, Entry costOrProductEntry) { + sameAccountEntry.setAmount(resultOfFirstSecondEntrySubtraction.abs()); + costOrProductEntry.setAmount(resultOfFirstSecondEntrySubtraction.abs()); + Account costOrProductAccount; /*-1 for less than 0 : credit*/ if (resultOfFirstSecondEntrySubtraction.compareTo(BigDecimal.ZERO) == -1) { - newEntry.setDebit(false); + sameAccountEntry.setDebit(true); + costOrProductEntry.setDebit(false); + costOrProductAccount = accountService.getAccountByNumber("758"); } else { /*Greater than 0 : debit*/ - newEntry.setDebit(true); + sameAccountEntry.setDebit(false); + costOrProductEntry.setDebit(true); + costOrProductAccount = accountService.getAccountByNumber("658"); } + costOrProductEntry.setAccount(costOrProductAccount); } /**To test if the filter contain an account and a period @@ -461,22 +495,24 @@ public void addLetter() { String newLetters = financialTransactionService.getNextLetters(); changeLetter(newLetters); + onButtonModeChanged(buttonMode.DELETTRED); } /**Remove a group of three letters to n entries*/ public void removeLetter() { changeLetter(null); + onButtonModeChanged(buttonMode.LETTRED); } /**Add or remove a group of three letters to n entries*/ protected void changeLetter(String newLetters) { + int[] entrieSelected = view.getTable().getSelectedRows(); view.getTableModel().updateLettersSelectedEntries(entrieSelected, newLetters); for (int indexEntry : entrieSelected){ financialTransactionService.updateEntry(view.getTableModel().getEntryAt(indexEntry)); - view.getTable().addRowSelectionInterval(indexEntry, indexEntry); } } 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 2012-08-02 09:45:20 UTC (rev 3562) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-08-02 17:06:11 UTC (rev 3563) @@ -326,6 +326,7 @@ lima.ui.importexport.wait=Job in progress… lima.ui.importexport.waittitle= lima.ui.lettering.account=Accounts +lima.ui.lettering.accountRegularization=Lettering regularization lima.ui.lettering.actions=Actions lima.ui.lettering.beginFinancialPeriod=From lima.ui.lettering.buttonAuto=Auto 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 2012-08-02 09:45:20 UTC (rev 3562) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-08-02 17:06:11 UTC (rev 3563) @@ -326,6 +326,7 @@ lima.ui.importexport.wait=Traitement en cours… lima.ui.importexport.waittitle=Traitement en cours lima.ui.lettering.account=Comptes +lima.ui.lettering.accountRegularization=Régularisation lettrage lima.ui.lettering.actions=Actions lima.ui.lettering.beginFinancialPeriod=De lima.ui.lettering.buttonAuto=Auto Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-02 09:45:20 UTC (rev 3562) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-02 17:06:11 UTC (rev 3563) @@ -43,4 +43,6 @@ log4j.logger.org.chorem.lima.ui.lettering.LettringSelectionModel=DEBUG log4j.logger.org.chorem.lima.ui.lettering.LetteringEditModel=DEBUG log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionTableModel=DEBUG -log4j.logger.org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor=DEBUG +log4j.logger.org.chorem.lima.business.accountingrules.DefaultAccountingRules=DEBUG +log4j.logger.org.chorem.lima.business.ejb.FinancialTransactionServiceImpl=DEBUG \ No newline at end of file

1 0