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

r3749 - in trunk: 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/xmi lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod lima-swing/src/main/resources/i18n lima-swing/src/main/resources/icons
by sbavencoff＠users.chorem.org 28 Feb '14

28 Feb '14

Author: sbavencoff Date: 2014-02-28 11:04:45 +0100 (Fri, 28 Feb 2014) New Revision: 3749 Url: http://chorem.org/projects/lima/repository/revisions/3749 Log: fixes #667 : P?\195?\169riode d'exercice trop contraignante Added: trunk/lima-swing/src/main/resources/icons/action-fiscalPeriod-edit.png 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/ejb/FiscalPeriodServiceImpl.java trunk/lima-callao/src/main/xmi/accounting.properties trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 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/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-02-19 09:14:15 UTC (rev 3748) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-02-28 10:04:45 UTC (rev 3749) @@ -25,22 +25,6 @@ package org.chorem.lima.business.ejb; -import static org.nuiton.i18n.I18n._; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -import javax.ejb.EJB; -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.ejb.TransactionAttribute; - import org.apache.commons.lang3.time.DateUtils; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.ReportsDatas; @@ -69,6 +53,21 @@ import org.chorem.lima.entity.FiscalPeriodDAO; import org.nuiton.topia.TopiaException; +import javax.ejb.EJB; +import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.Iterator; +import java.util.List; + +import static org.nuiton.i18n.I18n._; + /** * Gestion des exercices. * Un exercice ne peut être supprimé et débloqué après cloture. @@ -277,6 +276,29 @@ } @Override + public FiscalPeriod updateEndDate(FiscalPeriod fiscalPeriod) throws LimaException { + + FiscalPeriod result; + + try { + FiscalPeriodDAO fiscalPeriodDAO = getDaoHelper().getFiscalPeriodDAO(); + + String topiaId = fiscalPeriod.getTopiaId(); + FiscalPeriod fiscalPeriodOld = fiscalPeriodDAO.findByTopiaId(topiaId); + + Date endDate = fiscalPeriod.getEndDate(); + fiscalPeriodOld.setEndDate(endDate); + + result = fiscalPeriodDAO.update(fiscalPeriodOld); + + } catch (TopiaException e) { + throw new LimaException("Can't update period", e); + } + + return result; + } + + @Override public FiscalPeriod retainedEarningsAndBlockFiscalPeriod(FiscalPeriod fiscalPeriod, EntryBook entryBook, boolean retainedEarnings) throws LimaException { 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 2014-02-19 09:14:15 UTC (rev 3748) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java 2014-02-28 10:04:45 UTC (rev 3749) @@ -25,12 +25,12 @@ package org.chorem.lima.business.api; -import java.util.List; - import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FiscalPeriod; +import java.util.List; + /** * Fiscal period service. * @@ -73,4 +73,6 @@ * @return true if retained earnings are possible * */ boolean isRetainedEarnings(FiscalPeriod fiscalPeriod) throws LimaException; + + FiscalPeriod updateEndDate(FiscalPeriod fiscalPeriod) throws LimaException; } Modified: trunk/lima-callao/src/main/xmi/accounting.properties =================================================================== --- trunk/lima-callao/src/main/xmi/accounting.properties 2014-02-19 09:14:15 UTC (rev 3748) +++ trunk/lima-callao/src/main/xmi/accounting.properties 2014-02-28 10:04:45 UTC (rev 3749) @@ -40,7 +40,7 @@ org.chorem.lima.entity.FinancialPeriod.attribute.endDate.tagvalue.naturalId=true org.chorem.lima.entity.FinancialPeriod.attribute.endDate.tagvalue.notNull=true -org.chorem.lima.entity.FiscalPeriod.class.tagvalue.naturalIdMutable=false +org.chorem.lima.entity.FiscalPeriod.class.tagvalue.naturalIdMutable=true org.chorem.lima.entity.FiscalPeriod.attribute.beginDate.tagvalue.naturalId=true org.chorem.lima.entity.FiscalPeriod.attribute.beginDate.tagvalue.notNull=true org.chorem.lima.entity.FiscalPeriod.attribute.endDate.tagvalue.naturalId=true Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2014-02-19 09:14:15 UTC (rev 3748) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2014-02-28 10:04:45 UTC (rev 3749) @@ -22,31 +22,25 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog title="lima.ui.fiscalperiod.addfiscalperiodtitle" modal="true" +<JDialog modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" onWindowClosing="performCancel();"> - <import> - org.chorem.lima.entity.FiscalPeriod - </import> - <FiscalPeriodViewHandler id='handler' initializer='getContextValue(FiscalPeriodView.class,JAXXUtil.PARENT).getHandler()'/> + <Boolean id="modifyPeriod" javaBean="false"/> - <FiscalPeriod id="period" javaBean="new org.chorem.lima.entity.FiscalPeriodImpl()"/> + <Boolean id="validate" javaBean="false"/> <script> <![CDATA[ - public void $afterCompleteSetup() { - getHandler().init(this); - } + getRootPane().setDefaultButton(okButton); protected void performOk() { - getPeriod().setBeginDate(beginDatePicker.getDate()); - getPeriod().setEndDate(endDatePicker.getDate()); + setValidate(true); dispose(); } protected void performCancel() { - setPeriod(null); + setValidate(false); dispose(); } ]]></script> @@ -57,7 +51,8 @@ <JLabel text="lima.common.begindate"/> </cell> <cell> - <org.jdesktop.swingx.JXDatePicker id="beginDatePicker"/> + <org.jdesktop.swingx.JXDatePicker id="beginDatePicker" + enabled="{!isModifyPeriod()}"/> </cell> </row> <row> @@ -65,7 +60,7 @@ <JLabel text="lima.common.enddate"/> </cell> <cell> - <org.jdesktop.swingx.JXDatePicker id="endDatePicker"/> + <org.jdesktop.swingx.JXDatePicker id="endDatePicker" /> </cell> </row> <row> 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 2014-02-19 09:14:15 UTC (rev 3748) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2014-02-28 10:04:45 UTC (rev 3749) @@ -51,6 +51,12 @@ actionIcon='fiscalPeriod-new' onActionPerformed="handler.addFiscalPeriod()"/> + <JButton id="updateButton" + toolTipText="{ _("lima.charts.fiscalperiod.update") + " (Ctrl+M)"}" + actionIcon='fiscalPeriod-edit' + onActionPerformed="handler.updateFiscalPeriod()" + enabled="{isDeleteEnabled()}" /> + <JButton id="blockButton" toolTipText="{ _("lima.charts.fiscalperiod.block") + " (Ctrl+B)"}" actionIcon='fiscalPeriod-close' 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 2014-02-19 09:14:15 UTC (rev 3748) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2014-02-28 10:04:45 UTC (rev 3749) @@ -36,6 +36,7 @@ import org.chorem.lima.entity.EntryBookImpl; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.entity.FiscalPeriodImpl; import org.chorem.lima.service.LimaServiceFactory; import org.nuiton.util.DateUtil; @@ -98,6 +99,16 @@ } }); + // add action on Ctrl + M + binding = "update-FiscalPeriod"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + updateFiscalPeriod(); + } + }); + // add action on Delete binding = "remove-FiscalPeriod"; inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), binding); @@ -137,30 +148,112 @@ */ public void addFiscalPeriod() { - FiscalPeriodTable table = view.getFiscalPeriodTable(); FiscalPeriodTableModel tableModel = view.getFiscalPeriodTableModel(); + // set begin date picker + Date beginDate = null; + Date endDate; + try { + FiscalPeriod result = fiscalPeriodService.getLastFiscalPeriod(); + if (result != null){ + beginDate = DateUtils.addDays(result.getEndDate(), 1); + } + } + catch (LimaException eee){ + if(log.isDebugEnabled()){ + log.debug("Can't get last fiscal period", eee); + } + + } + if (beginDate == null) { + Calendar calendarBegin = Calendar.getInstance(); + // set begindate to JAN 1 - 0:00.000 of this years + beginDate = calendarBegin.getTime(); + beginDate = DateUtils.truncate(beginDate, Calendar.YEAR); + } + + // get end date + endDate = DateUtils.addYears(beginDate, 1); + endDate = DateUtils.addDays(endDate, -1); + + AddPeriod addPeriodDialog = new AddPeriod(view); + addPeriodDialog.setTitle(_("lima.ui.fiscalperiod.addfiscalperiodtitle")); + addPeriodDialog.getBeginDatePicker().setDate(beginDate); + addPeriodDialog.getEndDatePicker().setDate(endDate); addPeriodDialog.setLocationRelativeTo(view); addPeriodDialog.setVisible(true); - FiscalPeriod fiscalPeriod = addPeriodDialog.getPeriod(); - if (fiscalPeriod != null) { - + if (checkFiscalPeriod(addPeriodDialog)) { + FiscalPeriod fiscalPeriod = new FiscalPeriodImpl(); + fiscalPeriod.setBeginDate(addPeriodDialog.getBeginDatePicker().getDate()); + fiscalPeriod.setEndDate(addPeriodDialog.getEndDatePicker().getDate()); + fiscalPeriod = fiscalPeriodService.createFiscalPeriod(fiscalPeriod); + tableModel.addValue(fiscalPeriod); + } + } + + protected boolean checkFiscalPeriod(AddPeriod addPeriodDialog) { + Date beginDate = addPeriodDialog.getBeginDatePicker().getDate(); + Date endDate = addPeriodDialog.getEndDatePicker().getDate(); + + String title = addPeriodDialog.getTitle(); + + if (!addPeriodDialog.isValidate()) { + return false; + } else if (endDate.before(beginDate)) { + JOptionPane.showMessageDialog(view, + _("lima.ui.fiscalperiod.addfiscalperiod.endAfterBegin"), + title, + JOptionPane.ERROR_MESSAGE); + return false; + } else { //check if fiscalperiod have 12 months, ask a confirmation - int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), - fiscalPeriod.getEndDate()); + int nbMonth = DateUtil.getDifferenceInMonths(beginDate, endDate); 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); + _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), + title, + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); } + return (response == JOptionPane.YES_OPTION); - if (response == JOptionPane.YES_OPTION) { - fiscalPeriod = fiscalPeriodService.createFiscalPeriod(fiscalPeriod); - tableModel.addValue(fiscalPeriod); + + } + + + } + + /** + * Display add period form and perform add. + */ + public void updateFiscalPeriod() { + + FiscalPeriodTable table = view.getFiscalPeriodTable(); + FiscalPeriodTableModel tableModel = view.getFiscalPeriodTableModel(); + + int selectedRow = table.getSelectedRow(); + + if (selectedRow >=0 ) { + + FiscalPeriod selectedFiscalPeriod = tableModel.get(selectedRow); + + if (!selectedFiscalPeriod.isLocked()) { + + AddPeriod addPeriodDialog = new AddPeriod(view); + addPeriodDialog.setTitle(_("lima.ui.fiscalperiod.modifyfiscalperiodtitle")); + addPeriodDialog.getBeginDatePicker().setDate(selectedFiscalPeriod.getBeginDate()); + addPeriodDialog.getEndDatePicker().setDate(selectedFiscalPeriod.getEndDate()); + addPeriodDialog.setModifyPeriod(true); + addPeriodDialog.setLocationRelativeTo(view); + addPeriodDialog.setVisible(true); + + if (checkFiscalPeriod(addPeriodDialog)) { + selectedFiscalPeriod.setEndDate(addPeriodDialog.getEndDatePicker().getDate()); + fiscalPeriodService.updateEndDate(selectedFiscalPeriod); + tableModel.fireTableRowsUpdated(selectedRow, selectedRow); + } } } } @@ -200,40 +293,6 @@ } /** - * Init add period view. - * - * @param addPeriod view to init - */ - public void init(AddPeriod addPeriod) { - addPeriod.getRootPane().setDefaultButton(addPeriod.getOkButton()); - - // set begin date picker - Date endDate = null; - Calendar calendarBegin = Calendar.getInstance(); - // set begindate to JAN 1 - 0:00.000 of this years - Date beginDate = calendarBegin.getTime(); - beginDate = DateUtils.truncate(beginDate, Calendar.DATE); - try { - FiscalPeriod result = fiscalPeriodService.getLastFiscalPeriod(); - if (result != null){ - beginDate = result.getEndDate(); - } - } - catch (LimaException eee){ - if(log.isDebugEnabled()){ - log.debug("Can't get last fiscal period", eee); - } - } - beginDate = DateUtils.addDays(beginDate, 1); - addPeriod.getBeginDatePicker().setDate(beginDate); - - // get end date - endDate = DateUtils.addYears(beginDate, 1); - endDate = DateUtils.addDays(endDate, -1); - addPeriod.getEndDatePicker().setDate(endDate); - } - - /** * Block selected fiscal period, * and make new fiscal period and retained earnings * after user confirmations Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-02-19 09:14:15 UTC (rev 3748) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-02-28 10:04:45 UTC (rev 3749) @@ -40,6 +40,7 @@ lima.charts.fiscalperiod.block=Block fiscalperiod lima.charts.fiscalperiod.create=Create fiscalperiod lima.charts.fiscalperiod.delete=Delete fiscalperiod +lima.charts.fiscalperiod.update= lima.charts.fiscalyear=Fiscal Years lima.charts.vatpdf=PDF structure lima.charts.vatstatement=VAT statement chart @@ -346,6 +347,8 @@ lima.ui.financialtransaction.voucher= lima.ui.fiscalPeriod.buttonback= lima.ui.fiscalPeriod.buttonnext= +lima.ui.fiscalperiod.addfiscalperiod.addfiscalperiodtitle= +lima.ui.fiscalperiod.addfiscalperiod.endAfterBegin= lima.ui.fiscalperiod.addfiscalperiod.morethan12= lima.ui.fiscalperiod.addfiscalperiodtitle= lima.ui.fiscalperiod.begin= @@ -366,6 +369,7 @@ lima.ui.fiscalperiod.fiscalperiod.begin= lima.ui.fiscalperiod.fiscalperiod.end= lima.ui.fiscalperiod.fiscalperiod.status= +lima.ui.fiscalperiod.modifyfiscalperiodtitle= lima.ui.fiscalperiod.open= lima.ui.fiscalperiod.status= lima.ui.fullscreen= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-02-19 09:14:15 UTC (rev 3748) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-02-28 10:04:45 UTC (rev 3749) @@ -30,6 +30,7 @@ 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.fiscalperiod.update=Modifier la date de fin de l'exercice lima.charts.fiscalyear=Exercices lima.charts.vatpdf=Import du pdf lima.charts.vatstatement=Plan TVA @@ -329,6 +330,7 @@ lima.ui.financialtransaction.voucher=Pièce comptable lima.ui.fiscalPeriod.buttonback= lima.ui.fiscalPeriod.buttonnext= +lima.ui.fiscalperiod.addfiscalperiod.endAfterBegin=Le date de fin de l'exercice doit être postérieur à la date de début lima.ui.fiscalperiod.addfiscalperiod.morethan12=La période sélectionnée n'est pas de 12 mois, voulez-vous continuer ? lima.ui.fiscalperiod.addfiscalperiodtitle=Nouvel exercice lima.ui.fiscalperiod.begin=Début @@ -346,6 +348,7 @@ lima.ui.fiscalperiod.end=Fin lima.ui.fiscalperiod.entrybooks.create=Création d'un nouveau journal lima.ui.fiscalperiod.fiscalperiod=Exercice +lima.ui.fiscalperiod.modifyfiscalperiodtitle=Modification de l'exercice lima.ui.fiscalperiod.open=Ouvert lima.ui.fiscalperiod.status=Statut lima.ui.home.account=Plan comptable Copied: trunk/lima-swing/src/main/resources/icons/action-fiscalPeriod-edit.png (from rev 3744, trunk/lima-swing/src/main/resources/icons/action-entryBook-edit.png) =================================================================== (Binary files differ)

1 0

Jenkins build is unstable: lima-ci #1
by admin+ci-chorem.org＠codelutin.com 25 Feb '14

25 Feb '14

See <http://ci.chorem.org/jenkins/job/lima-ci/1/>

1 3

Jenkins build is unstable: lima-ci » Lima :: business #1
by admin+ci-chorem.org＠codelutin.com 25 Feb '14

25 Feb '14

See <http://ci.chorem.org/jenkins/job/lima-ci/org.chorem.lima$lima-business/1/>

1 3

Build failed in Jenkins: lima-nightly » Lima :: business #2
by admin+ci-chorem.org＠codelutin.com 19 Feb '14

19 Feb '14

See <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…> ------------------------------------------ [...truncated 1776 lines...] INFO - Jndi(name="java:global/lima/OptionsServiceImpl") INFO - Jndi(name="java:global/lima/FinancialStatementServiceImpl!org.chorem.lima.business.api.FinancialStatementService") INFO - Jndi(name="java:global/lima/FinancialStatementServiceImpl") INFO - Jndi(name="java:global/lima/HttpServerServiceImpl!org.chorem.lima.business.api.HttpServerService") INFO - Jndi(name="java:global/lima/HttpServerServiceImpl") INFO - Jndi(name="java:global/lima/ClosedPeriodicEntryBookServiceImpl!org.chorem.lima.business.api.ClosedPeriodicEntryBookService") INFO - Jndi(name="java:global/lima/ClosedPeriodicEntryBookServiceImpl") INFO - Jndi(name="java:global/lima/IdentityServiceImpl!org.chorem.lima.business.api.IdentityService") INFO - Jndi(name="java:global/lima/IdentityServiceImpl") INFO - Jndi(name="java:global/lima/FinancialTransactionServiceImpl!org.chorem.lima.business.api.FinancialTransactionService") INFO - Jndi(name="java:global/lima/FinancialTransactionServiceImpl") INFO - Jndi(name="java:global/lima/EntryBookServiceImpl!org.chorem.lima.business.api.EntryBookService") INFO - Jndi(name="java:global/lima/EntryBookServiceImpl") INFO - Jndi(name="java:global/lima/DocumentServiceImpl!org.chorem.lima.business.api.DocumentService") INFO - Jndi(name="java:global/lima/DocumentServiceImpl") INFO - Jndi(name="java:global/lima/FiscalPeriodServiceImpl!org.chorem.lima.business.api.FiscalPeriodService") INFO - Jndi(name="java:global/lima/FiscalPeriodServiceImpl") INFO - Jndi(name="java:global/lima/EntryServiceImpl!org.chorem.lima.business.api.EntryService") INFO - Jndi(name="java:global/lima/EntryServiceImpl") INFO - Jndi(name="java:global/lima/VatStatementServiceImpl!org.chorem.lima.business.api.VatStatementService") INFO - Jndi(name="java:global/lima/VatStatementServiceImpl") INFO - Jndi(name="java:global/lima/FinancialPeriodServiceImpl!org.chorem.lima.business.api.FinancialPeriodService") INFO - Jndi(name="java:global/lima/FinancialPeriodServiceImpl") INFO - Jndi(name="java:global/lima/ReportServiceImpl!org.chorem.lima.business.api.ReportService") INFO - Jndi(name="java:global/lima/ReportServiceImpl") INFO - Jndi(name="java:global/lima/ClearServiceImpl!org.chorem.lima.business.ejb.ClearService") INFO - Jndi(name="java:global/lima/ClearServiceImpl") INFO - Existing thread singleton service in SystemInstance(): org.apache.openejb.cdi.ThreadSingletonServiceImpl@396168f INFO - OpenWebBeans Container is starting... INFO - Adding OpenWebBeansPlugin : [CdiPlugin] INFO - All injection points are validated successfully. INFO - OpenWebBeans Container has started, it took 84 ms. INFO - Created Ejb(deployment-id=EntryServiceImpl, ejb-name=EntryServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=IdentityServiceImpl, ejb-name=IdentityServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=LimaInterceptor, ejb-name=LimaInterceptor, container=Default Stateless Container) INFO - Created Ejb(deployment-id=VatStatementServiceImpl, ejb-name=VatStatementServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=ExportServiceImpl, ejb-name=ExportServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=HttpServerServiceImpl, ejb-name=HttpServerServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=DocumentServiceImpl, ejb-name=DocumentServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=FiscalPeriodServiceImpl, ejb-name=FiscalPeriodServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=ReportServiceImpl, ejb-name=ReportServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=FinancialStatementServiceImpl, ejb-name=FinancialStatementServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=ImportServiceImpl, ejb-name=ImportServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=AccountServiceImpl, ejb-name=AccountServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=OptionsServiceImpl, ejb-name=OptionsServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=FinancialTransactionServiceImpl, ejb-name=FinancialTransactionServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=EntryBookServiceImpl, ejb-name=EntryBookServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=FinancialPeriodServiceImpl, ejb-name=FinancialPeriodServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=ClosedPeriodicEntryBookServiceImpl, ejb-name=ClosedPeriodicEntryBookServiceImpl, container=Default Stateless Container) INFO - Created Ejb(deployment-id=ClearServiceImpl, ejb-name=ClearServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=EntryServiceImpl, ejb-name=EntryServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=IdentityServiceImpl, ejb-name=IdentityServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=LimaInterceptor, ejb-name=LimaInterceptor, container=Default Stateless Container) INFO - Started Ejb(deployment-id=VatStatementServiceImpl, ejb-name=VatStatementServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=ExportServiceImpl, ejb-name=ExportServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=HttpServerServiceImpl, ejb-name=HttpServerServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=DocumentServiceImpl, ejb-name=DocumentServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=FiscalPeriodServiceImpl, ejb-name=FiscalPeriodServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=ReportServiceImpl, ejb-name=ReportServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=FinancialStatementServiceImpl, ejb-name=FinancialStatementServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=ImportServiceImpl, ejb-name=ImportServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=AccountServiceImpl, ejb-name=AccountServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=OptionsServiceImpl, ejb-name=OptionsServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=FinancialTransactionServiceImpl, ejb-name=FinancialTransactionServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=EntryBookServiceImpl, ejb-name=EntryBookServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=FinancialPeriodServiceImpl, ejb-name=FinancialPeriodServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=ClosedPeriodicEntryBookServiceImpl, ejb-name=ClosedPeriodicEntryBookServiceImpl, container=Default Stateless Container) INFO - Started Ejb(deployment-id=ClearServiceImpl, ejb-name=ClearServiceImpl, container=Default Stateless Container) INFO - Deployed Application(path=<http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…)> INFO [main] (LimaInterceptor.java:129) createShemaIfNeeded - Creating to schema in database Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.318 sec - in org.chorem.lima.business.EntryBookServiceImplTest Running org.chorem.lima.business.FinancialTransactionServiceImplTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.059 sec - in org.chorem.lima.business.FinancialTransactionServiceImplTest Running org.chorem.lima.business.FiscalPeriodServiceImplTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.006 sec - in org.chorem.lima.business.FiscalPeriodServiceImplTest Running org.chorem.lima.business.ImportServiceImplTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization INFO [main] (ImportServiceImpl.java:382) importAccountsChartFromEbp - Imported form EBP : 571 accounts in 860 ms INFO [main] (ImportServiceImpl.java:433) importEntryBookFromEbp - Imported form EBP : 9 accounts in 56 ms INFO [main] (ImportServiceImpl.java:326) importEntriesFromEbp - Imported form EBP : 19 entries in 21 ms INFO [main] (ImportServiceImpl.java:382) importAccountsChartFromEbp - Imported form EBP : 571 accounts in 603 ms INFO [main] (ImportServiceImpl.java:433) importEntryBookFromEbp - Imported form EBP : 9 accounts in 43 ms INFO [main] (ImportServiceImpl.java:326) importEntriesFromEbp - Imported form EBP : 19 entries in 12 ms INFO [main] (ImportServiceImpl.java:382) importAccountsChartFromEbp - Imported form EBP : 571 accounts in 478 ms INFO [main] (ImportServiceImpl.java:433) importEntryBookFromEbp - Imported form EBP : 9 accounts in 40 ms INFO [main] (ImportServiceImpl.java:326) importEntriesFromEbp - Imported form EBP : 19 entries in 12 ms Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.311 sec - in org.chorem.lima.business.ImportServiceImplTest Running org.chorem.lima.business.ReportServiceImplTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in org.chorem.lima.business.ReportServiceImplTest Running org.chorem.lima.business.accountingrules.AccountServiceRuleFrTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization WARN [main] (FranceAccountingRules.java:72) createAccountRules - Account Number is not numeric : 10TEST Tests run: 13, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 1.203 sec <<< FAILURE! - in org.chorem.lima.business.accountingrules.AccountServiceRuleFrTest testCreateAccountWrongStart(org.chorem.lima.business.accountingrules.AccountServiceRuleFrTest) Time elapsed: 0.227 sec <<< FAILURE! java.lang.AssertionError: Expected exception: org.chorem.lima.business.LimaException at org.junit.internal.runners.statements.ExpectException.evaluate(ExpectException.java:32) at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229) at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) at org.junit.runners.ParentRunner.run(ParentRunner.java:309) at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:264) at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:153) at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:124) at org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:200) at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:153) at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:103) Running org.chorem.lima.business.accountingrules.ReportServiceRuleFrTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.001 sec - in org.chorem.lima.business.accountingrules.ReportServiceRuleFrTest Running org.chorem.lima.business.accountingrules.FiscalPeriodServiceRuleFrTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.662 sec - in org.chorem.lima.business.accountingrules.FiscalPeriodServiceRuleFrTest Running org.chorem.lima.business.accountingrules.FinancialPeriodServiceRuleFrTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.449 sec - in org.chorem.lima.business.accountingrules.FinancialPeriodServiceRuleFrTest Running org.chorem.lima.business.accountingrules.ImportServiceRuleFrTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization INFO [main] (ImportServiceImpl.java:382) importAccountsChartFromEbp - Imported form EBP : 571 accounts in 568 ms INFO [main] (ImportServiceImpl.java:433) importEntryBookFromEbp - Imported form EBP : 9 accounts in 41 ms INFO [main] (ImportServiceImpl.java:326) importEntriesFromEbp - Imported form EBP : 19 entries in 13 ms INFO [main] (ImportServiceImpl.java:382) importAccountsChartFromEbp - Imported form EBP : 571 accounts in 667 ms INFO [main] (ImportServiceImpl.java:433) importEntryBookFromEbp - Imported form EBP : 9 accounts in 47 ms INFO [main] (ImportServiceImpl.java:326) importEntriesFromEbp - Imported form EBP : 19 entries in 12 ms INFO [main] (ImportServiceImpl.java:382) importAccountsChartFromEbp - Imported form EBP : 571 accounts in 532 ms INFO [main] (ImportServiceImpl.java:433) importEntryBookFromEbp - Imported form EBP : 9 accounts in 49 ms INFO [main] (ImportServiceImpl.java:326) importEntriesFromEbp - Imported form EBP : 19 entries in 11 ms Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.949 sec - in org.chorem.lima.business.accountingrules.ImportServiceRuleFrTest Running org.chorem.lima.business.accountingrules.FinancialTransactionServiceRuleFrTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.646 sec - in org.chorem.lima.business.accountingrules.FinancialTransactionServiceRuleFrTest Running org.chorem.lima.business.accountingrules.EntryBookServiceRuleFrTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.432 sec - in org.chorem.lima.business.accountingrules.EntryBookServiceRuleFrTest Running org.chorem.lima.business.LimaMiscTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.045 sec - in org.chorem.lima.business.LimaMiscTest Running org.chorem.lima.business.FinancialPeriodServiceImplTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.203 sec - in org.chorem.lima.business.FinancialPeriodServiceImplTest Running org.chorem.lima.business.LetteringComparatorTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in org.chorem.lima.business.LetteringComparatorTest Running org.chorem.lima.business.AccountServiceImplTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.622 sec - in org.chorem.lima.business.AccountServiceImplTest Running org.chorem.lima.entity.AccountDAOTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.105 sec - in org.chorem.lima.entity.AccountDAOTest Running org.chorem.lima.entity.FinancialTransactionDAOTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.138 sec - in org.chorem.lima.entity.FinancialTransactionDAOTest Results : Failed tests: AccountServiceRuleFrTest.testCreateAccountWrongStart Expected exception: org.chorem.lima.business.LimaException Tests run: 79, Failures: 1, Errors: 0, Skipped: 2 [ERROR] There are test failures. Please refer to <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…> for the individual test results. [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ lima-business --- [INFO] Building jar: <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ lima-business >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ lima-business --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ lima-business --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ lima-business --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ lima-business <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ lima-business --- [INFO] Building jar: <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ lima-business --- [INFO] 7 warnings [WARNING] Javadoc Warnings [WARNING] <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…>:221: warning - @return tag has no arguments. [WARNING] <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…>:331: warning - @return tag has no arguments. [WARNING] <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…>:769: warning - @return tag has no arguments. [WARNING] <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…>:799: warning - @return tag has no arguments. [WARNING] <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…>:857: warning - @return tag has no arguments. [WARNING] <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…>:915: warning - @return tag has no arguments. [WARNING] <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…>:140: warning - @return tag has no arguments. [INFO] Building jar: <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ lima-business --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ lima-business --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ lima-business --- [INFO] Loaded /var/local/forge/data/chorem.org/jenkins/workspace/lima-nightly/trunk/target/collect-artifacts.txt [INFO] Copying lima-business-0.8-SNAPSHOT.jar to /var/local/forge/data/chorem.org/jenkins/workspace/lima-nightly/trunk/target/collect/org.chorem.lima--lima-business/lima-business-0.8-SNAPSHOT.jar [INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/chorem.org/jenkins/workspace/lima-nightly/trunk/target/collect/org.chorem.lima--lima-business/THIRD-PARTY.properties [INFO] Copying lima-business-0.8-SNAPSHOT-sources.jar to /var/local/forge/data/chorem.org/jenkins/workspace/lima-nightly/trunk/target/collect/org.chorem.lima--lima-business/lima-business-0.8-SNAPSHOT-sources.jar [INFO] Copying lima-business-0.8-SNAPSHOT-javadoc.jar to /var/local/forge/data/chorem.org/jenkins/workspace/lima-nightly/trunk/target/collect/org.chorem.lima--lima-business/lima-business-0.8-SNAPSHOT-javadoc.jar [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ lima-business --- [WARNING] skip unexisting file <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…> (adding user file : ) [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.4:sign (sign-artifacts) @ lima-business --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ lima-business --- [INFO] Used declared dependencies found: [INFO] org.apache.openejb:javaee-api:jar:6.0-5:provided [INFO] org.chorem.lima:lima-callao:jar:0.8-SNAPSHOT:compile [INFO] org.chorem.lima:lima-business-api:jar:0.8-SNAPSHOT:compile [INFO] net.sf.opencsv:opencsv:jar:2.3:compile [INFO] org.apache.pdfbox:pdfbox:jar:1.8.2:compile [INFO] org.apache.pdfbox:pdfbox-examples:jar:1.8.2:compile [INFO] org.eclipse.jetty:jetty-servlet:jar:8.1.12.v20130726:compile [INFO] org.eclipse.jetty:jetty-server:jar:8.1.12.v20130726:compile [INFO] junit:junit:jar:4.11:test [INFO] org.nuiton:nuiton-utils:jar:2.6.12:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:2.5.1:compile [INFO] org.nuiton.topia:topia-persistence:jar:2.7.1:compile [INFO] org.nuiton.topia:topia-service-migration:jar:2.7.1:compile [INFO] org.nuiton:nuiton-config:jar:3.0-alpha-1:compile [INFO] org.hibernate:hibernate-core:jar:3.6.10.Final:compile [INFO] org.apache.commons:commons-lang3:jar:3.1:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] commons-lang:commons-lang:jar:2.6:compile [INFO] commons-io:commons-io:jar:2.4:compile [INFO] org.apache.openejb:openejb-core:jar:4.5.2:compile [INFO] com.google.guava:guava:jar:14.0.1:compile [WARNING] Unused declared dependencies found: [WARNING] com.lowagie:itext:jar:4.2.1:compile [JENKINS] Archiving disabled

1 3

r3748 - in trunk: lima-business lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing
by dcosse＠users.chorem.org 19 Feb '14

19 Feb '14

Author: dcosse Date: 2014-02-19 10:14:15 +0100 (Wed, 19 Feb 2014) New Revision: 3748 Url: http://chorem.org/projects/lima/repository/revisions/3748 Log: fix missing dependency Modified: trunk/lima-business/pom.xml trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-swing/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2014-02-17 08:41:35 UTC (rev 3747) +++ trunk/lima-business/pom.xml 2014-02-19 09:14:15 UTC (rev 3748) @@ -43,10 +43,6 @@ <artifactId>opencsv</artifactId> </dependency> <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> - </dependency> - <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> </dependency> 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 2014-02-17 08:41:35 UTC (rev 3747) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-02-19 09:14:15 UTC (rev 3748) @@ -26,7 +26,6 @@ package org.chorem.lima.business.ejb; import com.google.common.base.Strings; -import com.lowagie.text.Font; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2014-02-17 08:41:35 UTC (rev 3747) +++ trunk/lima-swing/pom.xml 2014-02-19 09:14:15 UTC (rev 3748) @@ -61,8 +61,11 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> - <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> <exclusions>

1 0

r3747 - trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules
by dcosse＠users.chorem.org 17 Feb '14

17 Feb '14

Author: dcosse Date: 2014-02-17 09:41:35 +0100 (Mon, 17 Feb 2014) New Revision: 3747 Url: http://chorem.org/projects/lima/repository/revisions/3747 Log: fix test Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2014-02-14 18:06:21 UTC (rev 3746) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2014-02-17 08:41:35 UTC (rev 3747) @@ -30,6 +30,7 @@ import org.chorem.lima.entity.AccountImpl; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; /** @@ -66,8 +67,11 @@ * * @throws LimaException */ + @Ignore @Test(expected=LimaException.class) public void testCreateAccountWrongStart() throws LimaException { + // TODO DCossé 17/02/14 this test is no more valid as count with account number with letters are now accepted + // there is just a warning about it Account myAccount = new AccountImpl(); myAccount.setAccountNumber("10TEST"); accountService.createAccount(myAccount);

1 0

Build failed in Jenkins: lima-nightly » Lima #1
by admin+ci-chorem.org＠codelutin.com 16 Feb '14

16 Feb '14

See <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem$lima/1/> ------------------------------------------ <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem$lima/ws/pom.xml> -s /var/local/forge/data/chorem.org/maven/settings.xml -e -U clean verify -DperformRelease [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] [INFO] Lima [INFO] Lima :: callao [INFO] Lima :: business API [INFO] Lima :: business [INFO] Lima :: Swing [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Lima 0.8-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ lima --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ lima --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ lima --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ lima --- [INFO] Exporting server [redmine-chorem.org] username in ${redmine.username} [INFO] Exporting server [redmine-chorem.org] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ lima --- [INFO] Will create or update license file [gpl_v3] to <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem$lima/ws/LICENSE.txt> [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ lima --- [WARNING] The goal is skip due to packaging 'pom' [INFO] [INFO] --- license-maven-plugin:1.5:update-file-header (update-file-header) @ lima --- [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem$lima/ws/src> [INFO] Scan 25 files header done in 87.542ms. [INFO] All files are up-to-date. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.9:check (default) @ lima --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1 [INFO] [INFO] --- jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) @ lima --- [JENKINS] Archiving disabled

1 1

r3746 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui/importexport
by dcosse＠users.chorem.org 14 Feb '14

14 Feb '14

Author: dcosse Date: 2014-02-14 19:06:21 +0100 (Fri, 14 Feb 2014) New Revision: 3746 Url: http://chorem.org/projects/lima/repository/revisions/3746 Log: refs #970 work in progress Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.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 2014-02-14 14:59:24 UTC (rev 3745) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-02-14 18:06:21 UTC (rev 3746) @@ -25,6 +25,7 @@ package org.chorem.lima.business.ejb; +import com.google.common.base.Strings; import com.lowagie.text.Font; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -45,6 +46,7 @@ import org.chorem.lima.business.api.VatStatementService; import org.chorem.lima.business.utils.DocumentsEnum; import org.chorem.lima.business.utils.EntryComparator; +import org.chorem.lima.business.utils.FormatsEnum; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountDAO; import org.chorem.lima.entity.ClosedPeriodicEntryBook; @@ -145,112 +147,108 @@ //create pages for (List<FinancialStatementAmounts> list : listList) { - String title = list.get(0).getLabel(); - int i = 0; - int n = list.size(); - printedType ++; - while (i < n) { - int j = i + n; - if (j > n) { - j = n; - } - List<FinancialStatementAmounts> subFinancialStatementAmounts = - list.subList(i, j); + if (!list.isEmpty()){ + String title = list.get(0).getLabel(); + int i = 0; + int n = list.size(); + printedType ++; + while (i < n) { - financialReport += constructHeaderTitle(title, beginDate, endDate); + financialReport += constructHeaderTitle(title, beginDate, endDate); - String boldBegin = "<b>"; - String boldEnd = "</b>"; - financialReport += "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" + - "<tr align=\"center\">\n"; + String boldBegin = "<b>"; + String boldEnd = "</b>"; + financialReport += "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" + + "<tr align=\"center\">\n"; - if (printedType == 0) { - String[] columnHeaderTable = {boldBegin+_("lima-business.document.label")+boldEnd, boldBegin+_("lima-business.document.grossamount")+boldEnd, - boldBegin+_("lima-business.document.provisiondeprecationamount")+boldEnd, boldBegin+_("lima-business.document.netamount")+boldEnd}; - financialReport += constructTableLine(columnHeaderTable); - } else if (printedType == 1) { - String[] columnHeaderTable = {boldBegin+_("lima-business.document.label")+boldEnd, boldBegin+_("lima-business.document.amount")+boldEnd}; - financialReport += constructTableLine(columnHeaderTable); - } else { - String[] columnHeaderTable = {boldBegin+_("lima-business.document.label")+boldEnd, boldBegin+_("lima-business.document.amount")+boldEnd}; - financialReport += constructTableLine(columnHeaderTable); - } - - for (FinancialStatementAmounts financialStatementAmount : subFinancialStatementAmounts) { - - String label = financialStatementAmount.getLabel(); - int level = financialStatementAmount.getLevel(); - BigDecimal grossAmount = - financialStatementAmount.getGrossAmount(); - if (grossAmount == null) { - grossAmount = new BigDecimal(0); - } - BigDecimal provisionDeprecationAmount = - financialStatementAmount.getProvisionDeprecationAmount(); - if (provisionDeprecationAmount == null) { - provisionDeprecationAmount = new BigDecimal(0); - } - - String fontColor = ""; - if (financialStatementAmount.getSubAmount() && level == 1) { - fontColor = "#CCCCCC"; - } else if (financialStatementAmount.getSubAmount()) { - fontColor = "#C0C0C0"; + if (printedType == 0) { + String[] columnHeaderTable = {boldBegin+_("lima-business.document.label")+boldEnd, boldBegin+_("lima-business.document.grossamount")+boldEnd, + boldBegin+_("lima-business.document.provisiondeprecationamount")+boldEnd, boldBegin+_("lima-business.document.netamount")+boldEnd}; + financialReport += constructTableLine(columnHeaderTable); + } else if (printedType == 1) { + String[] columnHeaderTable = {boldBegin+_("lima-business.document.label")+boldEnd, boldBegin+_("lima-business.document.amount")+boldEnd}; + financialReport += constructTableLine(columnHeaderTable); } else { - fontColor = "#999999"; + String[] columnHeaderTable = {boldBegin+_("lima-business.document.label")+boldEnd, boldBegin+_("lima-business.document.amount")+boldEnd}; + financialReport += constructTableLine(columnHeaderTable); } - if (label == null) { - if (printedType == 0) { - String [] emptyColumn = {"","","",""}; - financialReport += constructTableLine(emptyColumn); - } else { - String [] emptyColumn = {"", ""}; - financialReport += constructTableLine(emptyColumn); + + for (FinancialStatementAmounts financialStatementAmount : list) { + + String label = financialStatementAmount.getLabel(); + int level = financialStatementAmount.getLevel(); + BigDecimal grossAmount = + financialStatementAmount.getGrossAmount(); + if (grossAmount == null) { + grossAmount = new BigDecimal(0); } - } else { - //cell1 - StringBuilder tab = new StringBuilder(); - for (int k = 0; k < level; k++) { - tab.append("\t"); + BigDecimal provisionDeprecationAmount = + financialStatementAmount.getProvisionDeprecationAmount(); + if (provisionDeprecationAmount == null) { + provisionDeprecationAmount = new BigDecimal(0); } - //Phrase phrase; - String tabLabel = ""; - if (financialStatementAmount.getHeader()) { - tabLabel = boldBegin + tab + label + boldEnd; + + String fontColor = ""; + if (financialStatementAmount.getSubAmount() && level == 1) { + fontColor = "#CCCCCC"; + } else if (financialStatementAmount.getSubAmount()) { + fontColor = "#C0C0C0"; } else { - tabLabel = tab + label; + fontColor = "#999999"; } - //cell2 - String grossAmountStr = ""; - if (!grossAmount.equals(BigDecimal.ZERO)) { - grossAmountStr = grossAmount.toString(); - } + if (label == null) { + if (printedType == 0) { + String [] emptyColumn = {"","","",""}; + financialReport += constructTableLine(emptyColumn); + } else { + String [] emptyColumn = {"", ""}; + financialReport += constructTableLine(emptyColumn); + } + } else { + //cell1 + StringBuilder tab = new StringBuilder(); + for (int k = 0; k < level; k++) { + tab.append("\t"); + } + //Phrase phrase; + String tabLabel = ""; + if (financialStatementAmount.getHeader()) { + tabLabel = boldBegin + tab + label + boldEnd; + } else { + tabLabel = tab + label; + } + //cell2 + String grossAmountStr = ""; + if (!grossAmount.equals(BigDecimal.ZERO)) { + grossAmountStr = grossAmount.toString(); + } - //cell 3 - String provisionDeprecationAmountStr = ""; - if (!provisionDeprecationAmount.equals(BigDecimal.ZERO)) { - provisionDeprecationAmountStr = provisionDeprecationAmount.toString(); - } + //cell 3 + String provisionDeprecationAmountStr = ""; + if (!provisionDeprecationAmount.equals(BigDecimal.ZERO)) { + provisionDeprecationAmountStr = provisionDeprecationAmount.toString(); + } - //cell 4 - BigDecimal solde = grossAmount; - solde = solde.subtract(provisionDeprecationAmount); - String soldeStr = ""; - if (!solde.equals(BigDecimal.ZERO)) { - soldeStr = solde.toString(); - } + //cell 4 + BigDecimal solde = grossAmount; + solde = solde.subtract(provisionDeprecationAmount); + String soldeStr = ""; + if (!solde.equals(BigDecimal.ZERO)) { + soldeStr = solde.toString(); + } - if (printedType == 0) { - String [] columns = {tabLabel, grossAmountStr, provisionDeprecationAmountStr, soldeStr}; - financialReport += constructTableLine(columns); - } else /*if (printedType == 1)*/ { - String [] columns = {tabLabel, soldeStr}; - financialReport += constructTableLine(columns); + if (printedType == 0) { + String [] columns = {tabLabel, grossAmountStr, provisionDeprecationAmountStr, soldeStr}; + financialReport += constructTableLine(columns); + } else /*if (printedType == 1)*/ { + String [] columns = {tabLabel, soldeStr}; + financialReport += constructTableLine(columns); + } } } + i = i + n; + financialReport += "</table>"; } - i = i + n; - financialReport += "</table>"; } } financialReport += "</body>" + @@ -263,8 +261,6 @@ } //############## Ledger ############## - - @Override public String createLedgerDocuments(Date beginDate, Date endDate) throws LimaException { @@ -292,31 +288,15 @@ //create pages int i = 0; int n = list.size(); - int max = n; + boolean even = true; + BigDecimal currentAmountDebit = new BigDecimal(0); + BigDecimal currentAmountCredit = new BigDecimal(0); + while (i < n) { - int j = i + max; - if (j > n) { - j = n; - } ledgerReport += constructHeaderTitle(_("lima-business.document.ledger"), beginDate, endDate); - BigDecimal currentAmountDebit = new BigDecimal(0); - BigDecimal currentAmountCredit = new BigDecimal(0); - String accountcarry = ""; - - List<Object> subList = list.subList(i, j); - - - //backward amounts - if (n > max ) { - String [] columnsCarryBack = {boldBegin + accountcarry + boldEnd, boldBegin + _("lima-business.document.carryback") + boldEnd, - boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, - boldBegin + currentAmountDebit.subtract(currentAmountCredit).toString() + boldEnd}; - ledgerReport += constructTableLine(columnsCarryBack); - } - ledgerReport += "<table align=\"left\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\" style=\"font-size:13px;\" >\n"; String [] columnsNames = {_("lima-business.document.account"), _("lima-business.document.debit"), @@ -325,8 +305,8 @@ ledgerReport += "<tbody>\n"; int indexEntry = -1; - boolean even = true; - for (Object object : subList) { + + for (Object object : list) { if (object instanceof ReportsDatas) { if (indexEntry != -1) { indexEntry = -1; @@ -385,43 +365,30 @@ } } - for (Object objectList : subList) { - if (objectList instanceof Entry) { - Entry entry = (Entry) objectList; - if (entry.getDebit()) { - currentAmountDebit = currentAmountDebit.add(entry.getAmount()); - } else { - currentAmountCredit = currentAmountCredit.add(entry.getAmount()); - } + for (Object objectList : list) { + if (objectList instanceof Entry) { + Entry entry = (Entry) objectList; + if (entry.getDebit()) { + currentAmountDebit = currentAmountDebit.add(entry.getAmount()); } else { - ReportsDatas reportsDatas = (ReportsDatas) objectList; - Account account = reportsDatas.getAccount(); - if (account != null) { - accountcarry = account.getAccountNumber() - + " " + account.getLabel() + " "; - } + currentAmountCredit = currentAmountCredit.add(entry.getAmount()); } + } else { + ReportsDatas reportsDatas = (ReportsDatas) objectList; } - //forward amounts - if (n > max && i <= n - max) { - String [] columnsTable = {"", boldBegin + _("lima-business.document.carryforward") + boldEnd, - boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, - boldBegin + currentAmountDebit.subtract(currentAmountCredit).toString() + boldEnd}; - ledgerReport += constructTableLine(columnsTable, even); - even = !even; - } - //final amounts - if (i >= n - max) { - String [] columnsTable = { boldBegin + _("lima-business.document.amounts") + boldEnd, - boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, - boldBegin + currentAmountDebit.subtract(currentAmountCredit).toString() + boldEnd}; - ledgerReport += constructTableLine(columnsTable, even); - even = !even; - } - i = i + max; + } + + i = i + n; } + //final amounts + String [] columnsTable = { boldBegin + _("lima-business.document.amounts") + boldEnd, + boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, + boldBegin + currentAmountDebit.subtract(currentAmountCredit).toString() + boldEnd}; + ledgerReport += constructTableLine(columnsTable, even); + + ledgerReport += "</tbody></table></body>\n</html>"; - }catch (Exception ex) { + } catch (Exception ex) { log.error("Can't create document", ex); } } @@ -476,13 +443,16 @@ String subTitleSecPart = _("lima-business.document.date") + " : " + simpleDateFormat.format(closedPeriodicEntryBook.getFinancialPeriod().getBeginDate()); - if (!journal.equals(closedPeriodicEntryBook.getEntryBook().getLabel())) { - entryBookReport += constructSubTitleHtml(_("lima-business.document.entrybook") - + " : " + closedPeriodicEntryBook.getEntryBook().getLabel(), - subTitleSecPart); - journal = closedPeriodicEntryBook.getEntryBook().getLabel(); - } else { - entryBookReport += constructSubTitleHtml("", subTitleSecPart); + if (closedPeriodicEntryBook.getEntryBook() != null) { + String label = Strings.isNullOrEmpty(closedPeriodicEntryBook.getEntryBook().getLabel()) == true ? "-" :closedPeriodicEntryBook.getEntryBook().getLabel(); + if (!journal.equals(label)) { + entryBookReport += constructSubTitleHtml(_("lima-business.document.entrybook") + + " : " + label, + subTitleSecPart); + journal = label; + } else { + entryBookReport += constructSubTitleHtml("", subTitleSecPart); + } } entryBookReport += "<table border=\"1\" width=\"100%\" cellpadding=\"3\" cellspacing=\"0\">\n" + @@ -546,12 +516,8 @@ int i = 0; int n = list.size(); + boolean even = true; while (i < n) { - int j = i + n; - if (j > n) { - j = n; - } - List<ReportsDatas> subList = list.subList(i, j); balanceReport += constructHeaderTitle(_("lima-business.document.balance"), beginDate, endDate); @@ -563,18 +529,7 @@ balanceReport += constructTableHeader(columnsNames); balanceReport += "\t\t<tbody>\n"; - if (n > n) { - String boldBegin = "<b>"; - String boldEnd = "</b>"; - String [] columnsBalanceAmount = {"", boldBegin + _("lima-business.document.carryback") + boldEnd, - boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, - boldBegin + currentSoldeDebit.toString() + boldEnd,boldBegin + currentSoldeCredit.toString() + boldEnd}; - balanceReport += constructTableLine(columnsBalanceAmount); - balanceReport += "</tbody></table>\n"; - } - - boolean even = true; - for (ReportsDatas reportsDatas : subList) { + for (ReportsDatas reportsDatas : list) { String soldeDebit = String.valueOf(reportsDatas.getSoldeDebit() ? reportsDatas.getAmountSolde() : 0); String soldeCredit = String.valueOf(reportsDatas.getSoldeDebit() ? 0 : reportsDatas.getAmountSolde()); @@ -583,9 +538,7 @@ soldeDebit, soldeCredit}; balanceReport += constructTableLine(columnsBalanceAmount, even); even = !even; - } - for (ReportsDatas reportsDatas : subList) { currentAmountDebit = currentAmountDebit.add(reportsDatas.getAmountDebit()); currentAmountCredit = currentAmountCredit.add(reportsDatas.getAmountCredit()); if (reportsDatas.getSoldeDebit()) { @@ -595,30 +548,18 @@ } } - if (n > n && i <= n - n) { - String boldBegin = "<b>"; - String boldEnd = "</b>"; - String [] columnsBalanceAmount = {"", boldBegin + _("lima-business.document.carryforward") + boldEnd, - boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, - boldBegin + currentSoldeDebit.toString() + boldEnd,boldBegin + currentSoldeCredit.toString() + boldEnd}; - balanceReport += constructTableLine(columnsBalanceAmount, even); - even = !even; - balanceReport += "</tbody></table>\n"; - } - - //final amounts - if (i >= n - n) { - String boldBegin = "<b>"; - String boldEnd = "</b>"; - String [] columnsBalanceAmount = {"", boldBegin + _("lima-business.document.amounts") + boldEnd, - boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, - boldBegin + currentSoldeDebit.toString() + boldEnd,boldBegin + currentSoldeCredit.toString() + boldEnd}; - balanceReport += constructTableLine(columnsBalanceAmount, even); - even = !even; - balanceReport += "</tbody></table>\n"; - } i = i + n; } + //final amounts + String boldBegin = "<b>"; + String boldEnd = "</b>"; + String [] columnsBalanceAmount = {"", boldBegin + _("lima-business.document.amounts") + boldEnd, + boldBegin + currentAmountDebit.toString() + boldEnd, boldBegin + currentAmountCredit.toString() + boldEnd, + boldBegin + currentSoldeDebit.toString() + boldEnd,boldBegin + currentSoldeCredit.toString() + boldEnd}; + balanceReport += constructTableLine(columnsBalanceAmount, even); + balanceReport += "</tbody></table>\n"; + + balanceReport += "</body>\n</html>"; } catch (Exception ex) { log.error("Can't create document", ex); @@ -742,7 +683,7 @@ if (!entryBookCode.equals(generalEntryBooksDataInList.getCode())) { entryBookCode = generalEntryBooksDataInList.getCode(); code = entryBookCode; - description = generalEntryBooksDataInList.getDescription(); + description = Strings.isNullOrEmpty(generalEntryBooksDataInList.getDescription()) == true ? "" : generalEntryBooksDataInList.getDescription(); } else { code = ""; description = ""; @@ -1004,41 +945,43 @@ String boldItalicBegin = "<b>" + "<i>"; String boldItalicEnd = "</i>" + "</b>"; - String [] columnsNameSociety = {boldItalicBegin + _("lima-business.document.society") + boldItalicEnd, - "<i>" + (StringUtils.isNotEmpty(identity.getName()) ? identity.getName() : " - ") + "</i>", }; - headerTitle += constructTableLine(columnsNameSociety); + if (identity != null) { + String [] columnsNameSociety = {boldItalicBegin + _("lima-business.document.society") + boldItalicEnd, + "<i>" + (StringUtils.isNotEmpty(identity.getName()) ? identity.getName() : " - ") + "</i>", }; + headerTitle += constructTableLine(columnsNameSociety); - String [] columnsDescription = {boldItalicBegin + _("lima-business.document.description") + boldItalicEnd, - "<i>" + (StringUtils.isNotEmpty(identity.getDescription()) ? identity.getDescription() : " - ") + "</i>", }; - headerTitle += constructTableLine(columnsDescription); + String [] columnsDescription = {boldItalicBegin + _("lima-business.document.description") + boldItalicEnd, + "<i>" + (StringUtils.isNotEmpty(identity.getDescription()) ? identity.getDescription() : " - ") + "</i>", }; + headerTitle += constructTableLine(columnsDescription); - String [] columnsAdressOne = {boldItalicBegin + _("lima-business.document.adress") + boldItalicEnd, - "<i>" + (StringUtils.isNotEmpty(identity.getAddress()) ? identity.getAddress() : " - ") + "</i>", }; - headerTitle += constructTableLine(columnsAdressOne); + String [] columnsAdressOne = {boldItalicBegin + _("lima-business.document.adress") + boldItalicEnd, + "<i>" + (StringUtils.isNotEmpty(identity.getAddress()) ? identity.getAddress() : " - ") + "</i>", }; + headerTitle += constructTableLine(columnsAdressOne); - String [] columnsAdressTwo = {boldItalicBegin + _("lima-business.document.adresssuite") + boldItalicEnd, - "<i>" + (StringUtils.isNotEmpty(identity.getAddress2()) ? identity.getAddress2() : " - ") + "</i>", }; - headerTitle += constructTableLine(columnsAdressTwo); + String [] columnsAdressTwo = {boldItalicBegin + _("lima-business.document.adresssuite") + boldItalicEnd, + "<i>" + (StringUtils.isNotEmpty(identity.getAddress2()) ? identity.getAddress2() : " - ") + "</i>", }; + headerTitle += constructTableLine(columnsAdressTwo); - String [] columnsZipCode = {boldItalicBegin + _("lima-business.document.zipcode") + boldItalicEnd, - "<i>" + (StringUtils.isNotEmpty(identity.getZipCode()) ? identity.getZipCode() : " - ") + "</i>", }; - headerTitle += constructTableLine(columnsZipCode); + String [] columnsZipCode = {boldItalicBegin + _("lima-business.document.zipcode") + boldItalicEnd, + "<i>" + (StringUtils.isNotEmpty(identity.getZipCode()) ? identity.getZipCode() : " - ") + "</i>", }; + headerTitle += constructTableLine(columnsZipCode); - String [] columnsCity = {boldItalicBegin + _("lima-business.document.city") + boldItalicEnd, - "<i>" + (StringUtils.isNotEmpty(identity.getCity()) ? identity.getCity() : " - ") + "</i>", }; - headerTitle += constructTableLine(columnsCity); + String [] columnsCity = {boldItalicBegin + _("lima-business.document.city") + boldItalicEnd, + "<i>" + (StringUtils.isNotEmpty(identity.getCity()) ? identity.getCity() : " - ") + "</i>", }; + headerTitle += constructTableLine(columnsCity); - String [] columnsBusinessNumber = {boldItalicBegin + _("lima-business.document.businessnumber") + - boldItalicEnd, "<i>" + (StringUtils.isNotEmpty(identity.getBusinessNumber()) ? identity.getBusinessNumber() : " - ") + "</i>"}; - headerTitle += constructTableLine(columnsBusinessNumber); + String [] columnsBusinessNumber = {boldItalicBegin + _("lima-business.document.businessnumber") + + boldItalicEnd, "<i>" + (StringUtils.isNotEmpty(identity.getBusinessNumber()) ? identity.getBusinessNumber() : " - ") + "</i>"}; + headerTitle += constructTableLine(columnsBusinessNumber); - String [] columnsClassifCode = {boldItalicBegin + _("lima-business.document.classificationcode") + - boldItalicEnd, "<i>" + (StringUtils.isNotEmpty(identity.getClassificationCode()) ? identity.getClassificationCode() : " - ") + "</i>"}; - headerTitle += constructTableLine(columnsClassifCode); + String [] columnsClassifCode = {boldItalicBegin + _("lima-business.document.classificationcode") + + boldItalicEnd, "<i>" + (StringUtils.isNotEmpty(identity.getClassificationCode()) ? identity.getClassificationCode() : " - ") + "</i>"}; + headerTitle += constructTableLine(columnsClassifCode); - String [] columnsVatNumber = {boldItalicBegin + _("lima-business.document.vatnumber") + boldItalicEnd, - "<i>" + (StringUtils.isNotEmpty(identity.getVatNumber()) ? identity.getVatNumber() : " - ") + "</i>", }; - headerTitle += constructTableLine(columnsVatNumber); + String [] columnsVatNumber = {boldItalicBegin + _("lima-business.document.vatnumber") + boldItalicEnd, + "<i>" + (StringUtils.isNotEmpty(identity.getVatNumber()) ? identity.getVatNumber() : " - ") + "</i>", }; + headerTitle += constructTableLine(columnsVatNumber); + } String [] columnsPeriodOne = {boldItalicBegin + _("lima-business.document.period1") + boldItalicEnd, "<i>" + _("lima-business.document.period1format", beginDate)+ "</i>"}; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-02-14 14:59:24 UTC (rev 3745) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-02-14 18:06:21 UTC (rev 3746) @@ -216,7 +216,7 @@ // display result dialog if (verboseMode) { String result = get(); - if (result.equals(null)) { + if (Strings.isNullOrEmpty(null)) { JOptionPane.showMessageDialog(viewComponent, _("lima.ui.importexport.importerror"), _("lima.ui.importexport.importtitle"), JOptionPane.ERROR_MESSAGE);

1 0

Jenkins build became unstable: lima #7
by admin+ci-chorem.org＠codelutin.com 14 Feb '14

14 Feb '14

See <http://ci-ng.chorem.org/jenkins/job/lima/7/>

1 1

Jenkins build became unstable: lima » Lima :: business #7
by admin+ci-chorem.org＠codelutin.com 14 Feb '14

14 Feb '14

See <http://ci-ng.chorem.org/jenkins/job/lima/org.chorem.lima$lima-business/7/>

1 1