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

r3458 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org 19 Jun '12

19 Jun '12

Author: mallon Date: 2012-06-19 16:45:12 +0200 (Tue, 19 Jun 2012) New Revision: 3458 Url: http://chorem.org/repositories/revision/lima/3458 Log: Correction concernant la gestion des boutons de suppression et de cloture des exercices ('onMouseClicked' supprim?\195?\169, et d?\195?\169placement de la m?\195?\169thode de gestion des boutons dans le handler.). Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 14:15:41 UTC (rev 3457) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 14:45:12 UTC (rev 3458) @@ -34,30 +34,7 @@ <FiscalPeriodViewHandler id="handler" constructorParams="this"/> <Boolean id="selectedPeriod" javaBean="false"/> - <script><![CDATA[ - import static org.nuiton.i18n.I18n._; - - /** - * Manage the differents buttons for fiscal period - * */ - public void reloadEnablingButton() - { - int selectedRow = fiscalPeriodTable.getSelectedRow(); - - Object valueColumnClos = fiscalPeriodTableModel.getValueAt(selectedRow, 1 ); - - if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) )//Cloture - { - blockButton.setEnabled(false); - deleteButton.setEnabled(false); - } - else - { - blockButton.setEnabled(true); - deleteButton.setEnabled(true); - } - } - + <script><![CDATA[ void $afterCompleteSetup() { getHandler().init(); } @@ -72,11 +49,10 @@ constructorParams="getFiscalPeriodTableModel()" selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" columnControlVisible="true" - onMouseClicked="reloadEnablingButton()" /> <ListSelectionModel javaBean="getFiscalPeriodTable().getSelectionModel()" - onValueChanged="setSelectedPeriod(fiscalPeriodTable.getSelectedRow() != -1)"/> + onValueChanged="getHandler().reloadEnablingButton()"/> </JScrollPane> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 14:15:41 UTC (rev 3457) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 14:45:12 UTC (rev 3458) @@ -109,9 +109,20 @@ addPeriodDialog.setVisible(true); FiscalPeriod fiscalPeriod = addPeriodDialog.getPeriod(); - if (fiscalPeriod != null) { - int response = JOptionPane.YES_OPTION; - if (response == checkTimeFiscalPeriod(fiscalPeriod)) { + if (fiscalPeriod != null) { + + //check if fiscalperiod have 12 months, ask a confirmation + int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), + fiscalPeriod.getEndDate()); + int response = JOptionPane.YES_OPTION; + if (nbMonth != 12) { + response = JOptionPane.showConfirmDialog(view, + _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), + _("lima.ui.fiscalperiod.addfiscalperiodtitle"), + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + } + + if (response == JOptionPane.YES_OPTION) { fiscalPeriod = fiscalPeriodService.createFiscalPeriod(fiscalPeriod); model.addFiscalPeriod(fiscalPeriod); } @@ -280,19 +291,26 @@ } } - private int checkTimeFiscalPeriod(FiscalPeriod fiscalPeriod){ - //check if fiscalperiod have 12 months, ask a confirmation - int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), - fiscalPeriod.getEndDate()); - int response = JOptionPane.YES_OPTION; - if (nbMonth != 12) { - response = JOptionPane.showConfirmDialog(view, - _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), - _("lima.ui.fiscalperiod.addfiscalperiodtitle"), - JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - } + /** + * Manage the differents buttons for fiscal period + * */ + public void reloadEnablingButton(){ - return response; - } - + JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); + FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); + + int selectedRow = fiscalPeriodeTable.getSelectedRow(); + + Object valueColumnClos = model.getValueAt(selectedRow, 1 ); + + if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) ){ + view.blockButton.setEnabled(false); + view.deleteButton.setEnabled(false); + }else{ + view.blockButton.setEnabled(true); + view.deleteButton.setEnabled(true); + //TODO : si l'exercice est non-vide, suppression reste a false + } + } + }

1 0

r3457 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org 19 Jun '12

19 Jun '12

Author: mallon Date: 2012-06-19 16:15:41 +0200 (Tue, 19 Jun 2012) New Revision: 3457 Url: http://chorem.org/repositories/revision/lima/3457 Log: Gestion des boutons de suppression et de cloture d'exercice : les boutons n'appara?\195?\174ssent plus pour les exercices clots. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 12:14:39 UTC (rev 3456) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 14:15:41 UTC (rev 3457) @@ -28,13 +28,36 @@ <import> javax.swing.ListSelectionModel org.chorem.lima.entity.FiscalPeriod - org.chorem.lima.entity.FinancialPeriod + org.chorem.lima.entity.FinancialPeriod </import> <FiscalPeriodViewHandler id="handler" constructorParams="this"/> <Boolean id="selectedPeriod" javaBean="false"/> <script><![CDATA[ + import static org.nuiton.i18n.I18n._; + + /** + * Manage the differents buttons for fiscal period + * */ + public void reloadEnablingButton() + { + int selectedRow = fiscalPeriodTable.getSelectedRow(); + + Object valueColumnClos = fiscalPeriodTableModel.getValueAt(selectedRow, 1 ); + + if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) )//Cloture + { + blockButton.setEnabled(false); + deleteButton.setEnabled(false); + } + else + { + blockButton.setEnabled(true); + deleteButton.setEnabled(true); + } + } + void $afterCompleteSetup() { getHandler().init(); } @@ -49,6 +72,7 @@ constructorParams="getFiscalPeriodTableModel()" selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" columnControlVisible="true" + onMouseClicked="reloadEnablingButton()" /> <ListSelectionModel javaBean="getFiscalPeriodTable().getSelectionModel()" Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 12:14:39 UTC (rev 3456) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 14:15:41 UTC (rev 3457) @@ -280,32 +280,6 @@ } } - /** - * Manage the differents buttons for fiscal period - * */ - public void reloadEnablingButton() - { - System.out.println("reloadEnablingButton"); - - //get the fiscal period selected - JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); - FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); - FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(fiscalPeriodeTable.getSelectedRow()); - - if (selectedFiscalPeriod.getLocked()) - { - System.out.println("Fiscal period closed"); - view.getBlockButton().setEnabled(false); - view.getDeleteButton().setEnabled(false); - } - else - { - System.out.println("Fiscal period opened"); - view.getBlockButton().setEnabled(true); - view.getDeleteButton().setEnabled(true); - } - } - private int checkTimeFiscalPeriod(FiscalPeriod fiscalPeriod){ //check if fiscalperiod have 12 months, ask a confirmation int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(),

1 0

r3456 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org 19 Jun '12

19 Jun '12

Author: mallon Date: 2012-06-19 14:14:39 +0200 (Tue, 19 Jun 2012) New Revision: 3456 Url: http://chorem.org/repositories/revision/lima/3456 Log: Correction de la gestion des boutons des exercices (Modification, suppression) Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-19 08:57:25 UTC (rev 3455) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-19 12:14:39 UTC (rev 3456) @@ -131,6 +131,7 @@ addDays(dateLastFiscalPeriod, 1); dateLastFiscalPeriod = DateUtils.truncate(dateLastFiscalPeriod, Calendar.DATE); Date dateFiscalPeriod = fiscalPeriod.getBeginDate(); + if (dateLastFiscalPeriod.compareTo(dateFiscalPeriod) != 0) { throw new LimaBusinessException(_("lima-business.franceaccountingrules.newfiscalperiodadjoiningerror")); } @@ -216,6 +217,7 @@ } + /** * Check if old financialperiod for a an entrybook are closed before bock the asked closedperiodicentrybook * <p/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-19 08:57:25 UTC (rev 3455) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-19 12:14:39 UTC (rev 3456) @@ -134,7 +134,7 @@ fiscalPeriods.remove(fiscalPeriod); fireTableRowsDeleted(row, row); } - + public void updateFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { /*List<FinancialTransaction> financialTransactionsUnbal = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 08:57:25 UTC (rev 3455) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 12:14:39 UTC (rev 3456) @@ -47,9 +47,8 @@ <FiscalPeriodTable id="fiscalPeriodTable" sortable="false" rowHeight="24" constructorParams="getFiscalPeriodTableModel()" - selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" + selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" columnControlVisible="true" - onActionPerformed="getHandler().reloadEnablingButton()" /> <ListSelectionModel javaBean="getFiscalPeriodTable().getSelectionModel()" @@ -77,11 +76,4 @@ onActionPerformed="getHandler().deleteFiscalPeriod()"/> </cell> </row> - <row> - <cell fill="horizontal"> - <JButton id="modifyButton" text="lima.charts.fiscalperiod.delete" - enabled="{isSelectedPeriod()}" - onActionPerformed="getHandler().deleteFiscalPeriod()"/> - </cell> - </row> </Table> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 08:57:25 UTC (rev 3455) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 12:14:39 UTC (rev 3456) @@ -109,19 +109,9 @@ addPeriodDialog.setVisible(true); FiscalPeriod fiscalPeriod = addPeriodDialog.getPeriod(); - // null = cancel - if (fiscalPeriod != null) { - //check if fiscalperiod have 12 months, ask a confirmation - int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), - fiscalPeriod.getEndDate()); - int response = JOptionPane.YES_OPTION; - if (nbMonth != 12) { - response = JOptionPane.showConfirmDialog(view, - _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), - _("lima.ui.fiscalperiod.addfiscalperiodtitle"), - JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - } - if (response == JOptionPane.YES_OPTION) { + if (fiscalPeriod != null) { + int response = JOptionPane.YES_OPTION; + if (response == checkTimeFiscalPeriod(fiscalPeriod)) { fiscalPeriod = fiscalPeriodService.createFiscalPeriod(fiscalPeriod); model.addFiscalPeriod(fiscalPeriod); } @@ -151,7 +141,7 @@ model.deleteFiscalPeriod(selectedFiscalPeriod); } } - + /** * Init add period view. * @@ -291,9 +281,44 @@ } /** - * manage + * Manage the differents buttons for fiscal period * */ - public void reloadEnablingButton(){ - + public void reloadEnablingButton() + { + System.out.println("reloadEnablingButton"); + + //get the fiscal period selected + JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); + FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); + FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(fiscalPeriodeTable.getSelectedRow()); + + if (selectedFiscalPeriod.getLocked()) + { + System.out.println("Fiscal period closed"); + view.getBlockButton().setEnabled(false); + view.getDeleteButton().setEnabled(false); + } + else + { + System.out.println("Fiscal period opened"); + view.getBlockButton().setEnabled(true); + view.getDeleteButton().setEnabled(true); + } } + + private int checkTimeFiscalPeriod(FiscalPeriod fiscalPeriod){ + //check if fiscalperiod have 12 months, ask a confirmation + int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), + fiscalPeriod.getEndDate()); + int response = JOptionPane.YES_OPTION; + if (nbMonth != 12) { + response = JOptionPane.showConfirmDialog(view, + _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), + _("lima.ui.fiscalperiod.addfiscalperiodtitle"), + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + } + + return response; + } + }

1 0

r3455 - trunk/lima-callao/src/main/java/org/chorem/lima/entity
by mallon＠users.chorem.org 19 Jun '12

19 Jun '12

Author: mallon Date: 2012-06-19 10:57:25 +0200 (Tue, 19 Jun 2012) New Revision: 3455 Url: http://chorem.org/repositories/revision/lima/3455 Log: L'ajout de plus de deux exercices avec des dates correctes est d?\195?\169sormais possible. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-18 16:31:34 UTC (rev 3454) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-19 08:57:25 UTC (rev 3455) @@ -83,7 +83,7 @@ */ public FiscalPeriod getLastFiscalPeriod() throws TopiaException { String query = "FROM " + FiscalPeriod.class.getName() + - " ORDER BY endDate"; + " ORDER BY endDate desc"; List<FiscalPeriod> fiscalPeriods = context.find(query); FiscalPeriod result = null;

1 0

r3454 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/resources/i18n 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/fiscalperiod lima-swing/src/main/resources/i18n
by mallon＠users.chorem.org 18 Jun '12

18 Jun '12

Author: mallon Date: 2012-06-18 18:31:34 +0200 (Mon, 18 Jun 2012) New Revision: 3454 Url: http://chorem.org/repositories/revision/lima/3454 Log: La suppression des exercices(Ceux ouverts et vides) est d?\195?\169sormais possible, via un bouton de suppression, ajout?\195?\169 au panneau des gestion des exercices. Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.out.xml Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.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 Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -73,6 +73,8 @@ List<FinancialPeriod> createFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaException; void blockFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaException; + + void deleteFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaException; /** * Entry rules 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-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -116,6 +116,12 @@ } + /** Rules to check before delete fiscals periods */ + @Override + public void deleteFiscalPeriodRules(FiscalPeriod fiscalPeriod) + throws LimaException { + } + /** * Rules to check if an account and all his subaccount is not used * Recursive function @@ -401,4 +407,5 @@ throw new LimaException("Can't check financial transaction", ex); } } + } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -37,6 +37,7 @@ import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialPeriodImpl; +import org.chorem.lima.entity.FinancialTransactionDAO; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FiscalPeriodDAO; import org.nuiton.topia.TopiaException; @@ -194,6 +195,28 @@ } /** + * Règles de vérification de supression d'un exercice, appliquées à la comptabilité française. + * + * On ne peut supprimer qu'une periode comptable ouverte vide. + */ + @Override + public void deleteFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaBusinessException { + + try { + + FinancialTransactionDAO financialTransactionDAO = getDaoHelper().getFinancialTransactionDAO(); + + //Check if the fiscal period to delete is empty + if (financialTransactionDAO.findAllByDates(fiscalPeriod.getBeginDate(), fiscalPeriod.getEndDate()).size() != 0) { + throw new LimaBusinessException(_("lima-business.franceaccountingrules.fiscalperiodnotempty")); + } + } catch (TopiaException ex) { + throw new LimaException("Can't check rule", ex); + } + + } + + /** * Check if old financialperiod for a an entrybook are closed before bock the asked closedperiodicentrybook * <p/> * get all closedperiodicentrybook between the first financial period of fiscalperiod Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -58,6 +58,8 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountImpl; import org.chorem.lima.entity.ClosedPeriodicEntryBook; +import org.chorem.lima.entity.ClosedPeriodicEntryBookDAO; +import org.chorem.lima.entity.ClosedPeriodicEntryBookImpl; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryImpl; @@ -447,4 +449,49 @@ } } + @Override + /** + * to delete a fiscal period + * <p/> + * check localized rules before delete it + */ + public void deleteFiscalPeriod(FiscalPeriod fiscalPeriod) + throws LimaException { + + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + + try { + try { + //get entities with DAO + FiscalPeriodDAO fiscalPeriodDAO = getDaoHelper().getFiscalPeriodDAO(); + + // re-attach entities to current session + FiscalPeriod localFiscalPeriod = fiscalPeriodDAO.findByTopiaId(fiscalPeriod.getTopiaId()); + + //check rules + accountingRules.deleteFiscalPeriodRules(localFiscalPeriod); + + //all "ClosedPeriodicEntryBooks" for the fiscal period + ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = getDaoHelper().getClosedPeriodicEntryBookDAO(); + List<ClosedPeriodicEntryBook> closedPeriodicEntryBookDAOList = closedPeriodicEntryBookDAO.findAllClosedPeriodicEntryBooksFromFiscalPeriod(localFiscalPeriod); + + //delete closedPeriodicEntryBook before fiscal period + for (ClosedPeriodicEntryBook closedPeriodicEntryBook : closedPeriodicEntryBookDAOList) { + // fix : ObjectDeletedException: deleted object would be re-saved by cascade (Need to delete association between entryBook and financial period via closedPeriodEntityBook) + closedPeriodicEntryBook.getEntryBook().removeFinancialPeriodClosedPeriodicEntryBook(closedPeriodicEntryBook); + closedPeriodicEntryBookDAO.delete(closedPeriodicEntryBook); + } + + fiscalPeriodDAO.delete(localFiscalPeriod); + + } catch (TopiaException ex) { + throw new LimaException("Can't find fiscal period", ex); + } + + } catch (Exception ex) { + throw new LimaException("Can't delete period", ex); + } + + } + } Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-06-18 16:31:34 UTC (rev 3454) @@ -68,6 +68,7 @@ lima-business.franceaccountingrules.accountstartnumbererror=Master account is not a digit between 1 to 8 \: %d lima-business.franceaccountingrules.antefinancialperiodnotblockedentrybook=The previous financial periods for this entrybook must be blocked before this lima-business.franceaccountingrules.antefiscalperiodnotblocked=The ante fiscal period is not locked +lima-business.franceaccountingrules.fiscalperiodnotempty=The fiscal period is not empty \! lima-business.franceaccountingrules.newfiscalperiodadjoiningerror=The new fiscal period must adjoining the last lima-business.import.accountadded=SUCCES \: Account %s - %s added\n lima-business.import.accountalreadyexist=FAILED \: Account %s already exist \n Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-18 16:31:34 UTC (rev 3454) @@ -67,8 +67,9 @@ lima-business.franceaccountingrules.accountnumbernotnumeric=Le numéro de copte n'est pas numéric \: %s lima-business.franceaccountingrules.accountstartnumbererror=Le numéro du copte général n'est pas compris entre 1 et 8 \: %d lima-business.franceaccountingrules.antefinancialperiodnotblockedentrybook=Les périodes financières précédentes pour ce journal doivent être bloquées avant -lima-business.franceaccountingrules.antefiscalperiodnotblocked=La période fiscale précédante n'est pas bloquée -lima-business.franceaccountingrules.newfiscalperiodadjoiningerror=La nouvelle période fiscale doit suivre la précédante +lima-business.franceaccountingrules.antefiscalperiodnotblocked=La période fiscale précédente n'est pas bloquée +lima-business.franceaccountingrules.fiscalperiodnotempty=La période fiscale à supprimer n'est pas vide \! +lima-business.franceaccountingrules.newfiscalperiodadjoiningerror=La nouvelle période fiscale doit suivre la précédente lima-business.import.accountadded=Succès \: Compte %s - %s ajouté\n lima-business.import.accountalreadyexist=Échec \: Le compte %s existe déjà \n lima-business.import.closedperiodicentrybookupdated=Succès \: La période financière %s - %s - %s est ajoutée \! \n Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -53,6 +53,8 @@ FiscalPeriod createFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; FiscalPeriod blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; + + void deleteFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException; void addRetainedEarnings(FiscalPeriod fiscalPeriod, boolean newyear, Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -175,5 +175,23 @@ List<ClosedPeriodicEntryBook> result = context.find(query); return result; } + + /** + * Retourne les ClosedPeriodicEntryBook d'un exercice ouvert. + * + * @return les ClosedPeriodicEntryBook + * @throws TopiaException + */ + public List<ClosedPeriodicEntryBook> findAllClosedPeriodicEntryBooksFromFiscalPeriod(FiscalPeriod fiscalPeriod) throws TopiaException { + String query = "SELECT C FROM " + ClosedPeriodicEntryBook.class.getName() + " C" + + ", " + FiscalPeriod.class.getName() + " F" + + " WHERE C.financialPeriod IN ELEMENTS (F.financialPeriod)" + + " AND F = :fiscalPeriod" + + " ORDER BY C.financialPeriod.beginDate"; + + List<ClosedPeriodicEntryBook> result = context.find(query, "fiscalPeriod", fiscalPeriod); + return result; + } + } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -112,5 +112,5 @@ } return result; - } + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -129,6 +129,12 @@ fireTableRowsInserted(row, row); } + public void deleteFiscalPeriod(FiscalPeriod fiscalPeriod) { + int row = fiscalPeriods.indexOf(fiscalPeriod); + fiscalPeriods.remove(fiscalPeriod); + fireTableRowsDeleted(row, row); + } + public void updateFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { /*List<FinancialTransaction> financialTransactionsUnbal = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-18 16:31:34 UTC (rev 3454) @@ -48,7 +48,9 @@ id="fiscalPeriodTable" sortable="false" rowHeight="24" constructorParams="getFiscalPeriodTableModel()" selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" - columnControlVisible="true"/> + columnControlVisible="true" + onActionPerformed="getHandler().reloadEnablingButton()" + /> <ListSelectionModel javaBean="getFiscalPeriodTable().getSelectionModel()" onValueChanged="setSelectedPeriod(fiscalPeriodTable.getSelectedRow() != -1)"/> @@ -68,4 +70,18 @@ onActionPerformed="getHandler().blockFiscalPeriod()"/> </cell> </row> + <row> + <cell fill="horizontal"> + <JButton id="deleteButton" text="lima.charts.fiscalperiod.delete" + enabled="{isSelectedPeriod()}" + onActionPerformed="getHandler().deleteFiscalPeriod()"/> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JButton id="modifyButton" text="lima.charts.fiscalperiod.delete" + enabled="{isSelectedPeriod()}" + onActionPerformed="getHandler().deleteFiscalPeriod()"/> + </cell> + </row> </Table> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.out.xml =================================================================== Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-18 16:31:34 UTC (rev 3454) @@ -129,6 +129,30 @@ } /** + * Undisplay period and perform delete. + */ + public void deleteFiscalPeriod() { + + JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); + FiscalPeriodTableModel model = (FiscalPeriodTableModel) view.getFiscalPeriodTable().getModel(); + + //check if the user want to delete the fiscal year + int response = JOptionPane.showConfirmDialog(view, + _("lima.ui.fiscalperiod.delete.confirmation"), + _("lima.ui.fiscalperiod.delete.title"), JOptionPane.YES_NO_OPTION, + JOptionPane.WARNING_MESSAGE); + + int selectedRow = fiscalPeriodeTable.getSelectedRow(); + FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(selectedRow); + + if (response == JOptionPane.YES_OPTION) { + fiscalPeriodService.deleteFiscalPeriod(selectedFiscalPeriod); + + model.deleteFiscalPeriod(selectedFiscalPeriod); + } + } + + /** * Init add period view. * * @param addPeriod view to init @@ -265,4 +289,11 @@ loadAllFiscalPeriod(); } } + + /** + * manage + * */ + public void reloadEnablingButton(){ + + } } 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-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-06-18 16:31:34 UTC (rev 3454) @@ -25,6 +25,7 @@ lima.charts.fiscalperiod.add=Add fiscalperiod lima.charts.fiscalperiod.block=Block fiscalperiod lima.charts.fiscalperiod.create=Create fiscalperiod +lima.charts.fiscalperiod.delete=Delete fiscalperiod lima.charts.fiscalyear=Fiscal Years lima.charts.vatpdf=PDF structure lima.charts.vatstatement=VAT statement chart @@ -263,6 +264,8 @@ lima.ui.fiscalperiod.block.title= lima.ui.fiscalperiod.closed= lima.ui.fiscalperiod.closure= +lima.ui.fiscalperiod.delete.confirmation= +lima.ui.fiscalperiod.delete.title= lima.ui.fiscalperiod.fiscalperiod= lima.ui.fiscalperiod.open= lima.ui.home.account= 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-06-07 14:14:32 UTC (rev 3453) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-06-18 16:31:34 UTC (rev 3454) @@ -25,6 +25,7 @@ lima.charts.fiscalperiod.add=Nouvel exercice lima.charts.fiscalperiod.block=Cloturer un exercice lima.charts.fiscalperiod.create=Choisissez la date de début et de fin du nouvel exercice +lima.charts.fiscalperiod.delete=Supprimer un exercice lima.charts.fiscalyear=Exercices lima.charts.vatpdf=Structure du pdf lima.charts.vatstatement=Plan TVA @@ -263,6 +264,8 @@ lima.ui.fiscalperiod.block.title=Cloture de l'exercice lima.ui.fiscalperiod.closed=Cloturé lima.ui.fiscalperiod.closure=Cloture +lima.ui.fiscalperiod.delete.confirmation=Ètes vous sûre de vouloir supprimer cette période ? Cette action est irréversible \! +lima.ui.fiscalperiod.delete.title=Suppression de l'exercice lima.ui.fiscalperiod.fiscalperiod=Exercice lima.ui.fiscalperiod.open=Ouvert lima.ui.home.account=Plan comptable

1 0

r3453 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports
by echatellier＠users.chorem.org 07 Jun '12

07 Jun '12

Author: echatellier Date: 2012-06-07 16:14:32 +0200 (Thu, 07 Jun 2012) New Revision: 3453 Url: http://chorem.org/repositories/revision/lima/3453 Log: Uncomment code (just for testing) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2012-06-07 08:04:04 UTC (rev 3452) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2012-06-07 14:14:32 UTC (rev 3453) @@ -187,16 +187,13 @@ } //shows error message to user if the fiscalPeriod is unblocked - //FIXME echatellier 20120605 why ? - // ui is only filled with non blocked periods, else case - // can NEVER happen - /*if (error) { + if (error) { JOptionPane.showMessageDialog( view, _("lima.entrybooksreports.documentcreationfiscalerror"), _("lima.entrybooksreports.documentcreationfiscaltitle"), JOptionPane.ERROR_MESSAGE); - } else {*/ + } else { int port = LimaServiceFactory.getService(HttpServerService.class).getHttpPort(); FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem(); @@ -222,7 +219,7 @@ } catch (URISyntaxException e) { log.error("Can't create news URI", e); } - //} + } } }

1 0

r3452 - in trunk/lima-business/src/main: java/org/chorem/lima/business/ejb resources/i18n
by echatellier＠users.chorem.org 07 Jun '12

07 Jun '12

Author: echatellier Date: 2012-06-07 10:04:04 +0200 (Thu, 07 Jun 2012) New Revision: 3452 Url: http://chorem.org/repositories/revision/lima/3452 Log: Amelioration du rapport journal general Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 15:32:14 UTC (rev 3451) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-07 08:04:04 UTC (rev 3452) @@ -715,9 +715,6 @@ return t; } - //############## EntryBooks ############## - - @Override public void createEntryBooksDocuments(Date beginDate, Date endDate, @@ -779,39 +776,24 @@ String title = _("lima-business.document.entrybooktitle", closedPeriodicEntryBook.getEntryBook().getLabel(), closedPeriodicEntryBook.getFinancialPeriod().getBeginDate()); - //list = list.subList(1, list.size()); - int i = 0; - int n = entries.size(); - int max = n; - // alloc nb rows max for pdf documents on one page - if (format == FormatsEnum.PDF) { - max = 35; - } - while (i < n) { - int j = i + max; - if (j > n) { - j = n; - } - List<Entry> subEntries = - entries.subList(i, j); - //create page - Table table = createEntryBooksTable(subEntries, debit, credit); - //new page - Chapter chapter = new Chapter(0); - //headerPage - chapter.add(createHeaderPage(title, identity, - beginDate, endDate)); - //n° page - chapter.add(createNumberPage(nbpages, newDate)); - //table - Paragraph paragraphTable = new Paragraph(); - paragraphTable.add(table); - chapter.add(paragraphTable); - //add page - document.add(chapter); - i = i + max; - nbpages++; - } + + //create page + Table table = createEntryBooksTable(entries, debit, credit); + //new page + Chapter chapter = new Chapter(0); + //headerPage + chapter.add(createHeaderPage(title, identity, + beginDate, endDate)); + //n° page + chapter.add(createNumberPage(nbpages, newDate)); + //table + Paragraph paragraphTable = new Paragraph(); + paragraphTable.add(table); + chapter.add(paragraphTable); + //add page + document.add(chapter); + + nbpages++; } document.close(); @@ -1203,45 +1185,28 @@ //create pages - int i = 0; - int n = list.size(); - int max = n; - // alloc nb rows max for pdf documents on one page - if (format == FormatsEnum.PDF) { - max = 35; - } - while (i < n) { - int j = i + max; - if (j > n) { - j = n; - } - List<GeneralEntryBooksDatas> subList = - list.subList(i, j); - //create page : header + table + footer - Table headerTable = createGeneralEntryBooksHeaderTable(); - Table table = createGeneralEntryBooksTable(subList); - //new page - Chapter chapter = new Chapter(0); - //headerPage - chapter.add(createHeaderPage( - DocumentsEnum.GENERAL_ENTRYBOOK.getDescription(), - identity, beginDate, - endDate)); - //n° page - chapter.add(createNumberPage(nbpages, newDate)); - //headerTable - Paragraph paragraphHeaderTable = new Paragraph(); - paragraphHeaderTable.add(headerTable); - chapter.add(paragraphHeaderTable); - //table - Paragraph paragraphTable = new Paragraph(); - paragraphTable.add(table); - chapter.add(paragraphTable); - //add page - document.add(chapter); - i = i + max; - nbpages++; - } + Table headerTable = createGeneralEntryBooksHeaderTable(); + Table table = createGeneralEntryBooksTable(list); + //new page + Chapter chapter = new Chapter(0); + //headerPage + chapter.add(createHeaderPage( + DocumentsEnum.GENERAL_ENTRYBOOK.getDescription(), + identity, beginDate, + endDate)); + //n° page + chapter.add(createNumberPage(nbpages, newDate)); + //headerTable + Paragraph paragraphHeaderTable = new Paragraph(); + paragraphHeaderTable.add(headerTable); + chapter.add(paragraphHeaderTable); + //table + Paragraph paragraphTable = new Paragraph(); + paragraphTable.add(table); + chapter.add(paragraphTable); + //add page + document.add(chapter); + nbpages++; document.close(); @@ -1250,7 +1215,7 @@ } } - public Table createGeneralEntryBooksHeaderTable() { + protected Table createGeneralEntryBooksHeaderTable() { Table t = null; try { t = new Table(5, 1); @@ -1314,8 +1279,7 @@ phrase = new Phrase(_("lima-business.document.amounts"), boldFont); } else { - phrase = new Phrase(_("lima-business.document.amounts") - + " " + generalEntryBooksDatas.getPeriod(), + phrase = new Phrase(_("lima-business.document.amountsperiod", generalEntryBooksDatas.getPeriod()), boldFont); } Cell cell2 = new Cell(phrase); Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-06-06 15:32:14 UTC (rev 3451) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-06-07 08:04:04 UTC (rev 3452) @@ -19,6 +19,7 @@ lima-business.defaultaccountingrules.missingentrybook=Can't block financialperiod / missing EntryBook in transactions lima-business.document.accountnumber=Account N° lima-business.document.amounts=Amounts +lima-business.document.amountsperiod=Amounts %1$tB %1$tY lima-business.document.balance=Balance lima-business.document.businessnumber=Business N° lima-business.document.carryback=Carry Back Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-06 15:32:14 UTC (rev 3451) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-07 08:04:04 UTC (rev 3452) @@ -19,6 +19,7 @@ lima-business.defaultaccountingrules.missingentrybook=Impossible de bloquer la période financière / il manque un journal dans une transaction (%1$te/%1$tm/%1$tY) lima-business.document.accountnumber=N° Compte lima-business.document.amounts=Totaux +lima-business.document.amountsperiod=Totaux %1$tB %1$tY lima-business.document.balance=Balance lima-business.document.businessnumber=N° Siret lima-business.document.carryback=Report

1 0

r3451 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org 06 Jun '12

06 Jun '12

Author: echatellier Date: 2012-06-06 17:32:14 +0200 (Wed, 06 Jun 2012) New Revision: 3451 Url: http://chorem.org/repositories/revision/lima/3451 Log: Correction des 3 trois tableaux diff?\195?\169rents qui causait un probl?\195?\168me d'alignement des colonnes. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 14:08:42 UTC (rev 3450) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 15:32:14 UTC (rev 3451) @@ -75,6 +75,7 @@ import com.lowagie.text.BadElementException; import com.lowagie.text.Cell; import com.lowagie.text.Chapter; +import com.lowagie.text.DocWriter; import com.lowagie.text.Document; import com.lowagie.text.DocumentException; import com.lowagie.text.Element; @@ -728,12 +729,13 @@ String filePath = path + File.separator + DocumentsEnum.ENTRYBOOKS.getFileName(); FileOutputStream fileOut = new FileOutputStream(filePath + format.getExtension()); + DocWriter writer = null; switch (format) { case HTML: - HtmlWriter htmlWriter = HtmlWriter.getInstance(document, fileOut); + writer = HtmlWriter.getInstance(document, fileOut); break; case PDF: - PdfWriter pdfWriter = PdfWriter.getInstance(document, fileOut); + writer = PdfWriter.getInstance(document, fileOut); break; } document.open(); @@ -758,8 +760,8 @@ List<Object[]> results = entryDAO.getDebitCreditOfTransaction(closedPeriodicEntryBook.getEntryBook(), closedPeriodicEntryBook.getFinancialPeriod().getBeginDate(), closedPeriodicEntryBook.getFinancialPeriod().getEndDate()); - BigDecimal debit = null; - BigDecimal credit = null; + BigDecimal debit = BigDecimal.ZERO; + BigDecimal credit = BigDecimal.ZERO; int nbAmount = results.size(); if (nbAmount == 2) { debit = (BigDecimal) results.get(0)[1]; @@ -792,9 +794,8 @@ } List<Entry> subEntries = entries.subList(i, j); - //create page : header + table + footer - Table headerTable = createEntryBooksHeaderTable(); - Table table = createEntryBooksTable(subEntries); + //create page + Table table = createEntryBooksTable(subEntries, debit, credit); //new page Chapter chapter = new Chapter(0); //headerPage @@ -802,21 +803,10 @@ beginDate, endDate)); //n° page chapter.add(createNumberPage(nbpages, newDate)); - //headerTable - Paragraph paragraphHeaderTable = new Paragraph(); - paragraphHeaderTable.add(headerTable); - chapter.add(paragraphHeaderTable); //table Paragraph paragraphTable = new Paragraph(); paragraphTable.add(table); chapter.add(paragraphTable); - //final amounts - if (i >= n - max) { - Paragraph finalAmountParagraph = new Paragraph(); - finalAmountParagraph.add(createEntryBooksAmountTable( - _("lima-business.document.amounts"), debit, credit)); - chapter.add(finalAmountParagraph); - } //add page document.add(chapter); i = i + max; @@ -825,52 +815,45 @@ } document.close(); - + writer.close(); } catch (Exception ex) { throw new LimaException("Can't create document", ex); } } - - protected Table createEntryBooksHeaderTable() { - Table t = null; - try { - t = new Table(6, 1); - float[] widths = {0.1f, 0.1f, 0.1f, 0.4f, 0.15f, 0.15f}; - t.setWidths(widths); - t.setWidth(100f); - t.setPadding(3f); - //defaut cell - Cell cell = new Cell(); - cell.setBorder(Rectangle.LEFT); - cell.setHorizontalAlignment(Element.ALIGN_CENTER); - t.setDefaultCell(cell); - t.setOffset(8); - t.addCell(new Phrase(_("lima-business.document.date"), boldFont)); - t.addCell(new Phrase(_("lima-business.document.accountnumber"), boldFont)); - t.addCell(new Phrase(_("lima-business.document.voucher"), boldFont)); - t.addCell(new Phrase(_("lima-business.document.description"), boldFont)); - t.addCell(new Phrase(_("lima-business.document.debit"), boldFont)); - t.addCell(new Phrase(_("lima-business.document.credit"), boldFont)); - - } catch (BadElementException eeBEE) { - log.error("Can't create table", eeBEE); - } - return t; - - } - - protected Table createEntryBooksTable(List<Entry> entries) { + + protected Table createEntryBooksTable(List<Entry> entries, BigDecimal debit, BigDecimal credit) { int nbrow = entries.size(); Table t = null; try { //define table - t = new Table(6, nbrow); + t = new Table(6, nbrow + 1); t.setWidth(100f); float[] widths = {0.1f, 0.1f, 0.1f, 0.4f, 0.15f, 0.15f}; t.setWidths(widths); t.setPadding(1.5f); t.setBorderWidth(1); t.setOffset(0); + + Cell cell1 = new Cell(_("lima-business.document.date")); + cell1.setHeader(true); + t.addCell(cell1); + Cell cell2 = new Cell(_("lima-business.document.accountnumber")); + cell2.setHeader(true); + t.addCell(cell2); + Cell cell3 = new Cell(_("lima-business.document.voucher")); + cell3.setHeader(true); + t.addCell(cell3); + Cell cell4 = new Cell(_("lima-business.document.description")); + cell4.setHeader(true); + t.addCell(cell4); + Cell cell5 = new Cell(_("lima-business.document.debit")); + cell5.setHeader(true); + t.addCell(cell5); + Cell cell6 = new Cell(_("lima-business.document.credit")); + cell6.setHeader(true); + t.addCell(cell6); + t.endHeaders(); + //define default cell Cell cell = new Cell(); cell.setBorder(Rectangle.LEFT); @@ -892,33 +875,15 @@ t.addCell(new Phrase(String.valueOf( !entry.getDebit() ? entry.getAmount() : 0), normalFont)); } - - } catch (BadElementException eeBEE) { - log.error("Can't create table", eeBEE); - } - return t; - } - - protected Table createEntryBooksAmountTable(String title, - BigDecimal credit, - BigDecimal debit) { - Table t = null; - try { - t = new Table(3, 1); - float[] widths = {0.7f, 0.15f, 0.15f}; - t.setWidths(widths); - t.setWidth(100f); - t.setPadding(3f); - t.setOffset(0); - //defaut cell - Cell cell = new Cell(); - cell.setBorder(Rectangle.RIGHT); - cell.setHorizontalAlignment(Element.ALIGN_RIGHT); - t.setDefaultCell(cell); - - t.addCell(new Phrase(title, boldFont)); + + // total + Cell cellTotal = new Cell(new Phrase(_("lima-business.document.amounts"), boldFont)); + cellTotal.setColspan(4); + cellTotal.setHorizontalAlignment(Element.ALIGN_RIGHT); + t.addCell(cellTotal); t.addCell(new Phrase(debit.toString(), boldFont)); t.addCell(new Phrase(credit.toString(), boldFont)); + } catch (BadElementException eeBEE) { log.error("Can't create table", eeBEE); } @@ -1187,8 +1152,8 @@ BigDecimal subAmountCredit = new BigDecimal(0); for (ClosedPeriodicEntryBook closedPeriodicEntryBook : closedPeriodicEntryBookList) { - BigDecimal debit = null; - BigDecimal credit = null; + BigDecimal debit = BigDecimal.ZERO; + BigDecimal credit = BigDecimal.ZERO; List<Object[]> results = entryDAO.getDebitCreditOfTransaction(closedPeriodicEntryBook.getEntryBook(), closedPeriodicEntryBook.getFinancialPeriod().getBeginDate(),

1 0

r3450 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org 06 Jun '12

06 Jun '12

Author: echatellier Date: 2012-06-06 16:08:42 +0200 (Wed, 06 Jun 2012) New Revision: 3450 Url: http://chorem.org/repositories/revision/lima/3450 Log: Fix debit/credit affich?\195?\169 a chaque fois Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 14:06:43 UTC (rev 3449) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 14:08:42 UTC (rev 3450) @@ -890,7 +890,7 @@ t.addCell(new Phrase(String.valueOf( entry.getDebit() ? entry.getAmount() : 0), normalFont)); t.addCell(new Phrase(String.valueOf( - entry.getDebit() ? entry.getAmount() : 0), normalFont)); + !entry.getDebit() ? entry.getAmount() : 0), normalFont)); } } catch (BadElementException eeBEE) {

1 0

r3449 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org 06 Jun '12

06 Jun '12

Author: echatellier Date: 2012-06-06 16:06:43 +0200 (Wed, 06 Jun 2012) New Revision: 3449 Url: http://chorem.org/repositories/revision/lima/3449 Log: Add doc Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 13:36:35 UTC (rev 3448) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-06-06 14:06:43 UTC (rev 3449) @@ -34,7 +34,6 @@ import java.io.FileOutputStream; import java.io.InputStream; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -321,7 +320,7 @@ } } - public Table createFinancialStatementsHeaderTable() { + protected Table createFinancialStatementsHeaderTable() { Table t = null; try { t = new Table(4, 1); @@ -351,7 +350,7 @@ } - public Table createFinancialStatementsTable(List<FinancialStatementAmounts> financialStatementAmounts) { + protected Table createFinancialStatementsTable(List<FinancialStatementAmounts> financialStatementAmounts) { int nbrow = financialStatementAmounts.size(); Table t = null; try { @@ -576,7 +575,7 @@ } } - public Table createLedgerHeaderTable() { + protected Table createLedgerHeaderTable() { Table t = null; try { t = new Table(7, 1); @@ -605,7 +604,7 @@ } - public Table createLedgerTable(List<Object> subList) { + protected Table createLedgerTable(List<Object> subList) { int nbrow = subList.size(); Table t = null; try { @@ -683,7 +682,7 @@ return t; } - public Table createLedgerAmountTable(String account, + protected Table createLedgerAmountTable(String account, String title, BigDecimal debit, BigDecimal credit) { @@ -832,7 +831,7 @@ } } - public Table createEntryBooksHeaderTable() { + protected Table createEntryBooksHeaderTable() { Table t = null; try { t = new Table(6, 1); @@ -900,7 +899,7 @@ return t; } - public Table createEntryBooksAmountTable(String title, + protected Table createEntryBooksAmountTable(String title, BigDecimal credit, BigDecimal debit) { Table t = null; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-06-06 13:36:35 UTC (rev 3448) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-06-06 14:06:43 UTC (rev 3449) @@ -107,14 +107,14 @@ } } - @Override public int getHttpPort() { return port; } - - /** this servlet send a static html page */ + /** + * This servlet send a static html page. + */ public class MainServlet extends HttpServlet { private static final long serialVersionUID = 1L; @@ -145,8 +145,7 @@ //if doc pdf or html else if (model != null && format != null && beginDate != null && endDate != null) { FormatsEnum formatsEnum = FormatsEnum.valueOfExtension(format); - URL doc = new URL("file:" + path + File.separator - + model + formatsEnum.getExtension()); + //create docs try { Date beginDateFormat = DATEFORMAT.parse(beginDate); @@ -184,6 +183,12 @@ } catch (ParseException eeePE) { log.error("Can't parse date", eeePE); } + + // FIXME echatellier 20120606 on connait le fichier + // ou sera généré le rapport, et on peut donc le relire + // après génération + // fonctionne pour le moment, mais a modifier + URL doc = new URL("file:" + path + File.separator + model + formatsEnum.getExtension()); resp.setContentType(formatsEnum.getMimeType()); InputStream in = doc.openStream(); OutputStream out = resp.getOutputStream(); @@ -276,8 +281,6 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { doGet(req, resp); - } } - }

1 0