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

r3168 - trunk
by vsalaun＠users.chorem.org 10 Jun '11

10 Jun '11

Author: vsalaun Date: 2011-06-10 11:52:47 +0200 (Fri, 10 Jun 2011) New Revision: 3168 Url: http://chorem.org/repositories/revision/lima/3168 Log: #347 fixed dependencies cause Eric said to Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-10 09:45:02 UTC (rev 3167) +++ trunk/pom.xml 2011-06-10 09:52:47 UTC (rev 3168) @@ -198,16 +198,6 @@ <artifactId>pdfbox</artifactId> <version>1.5.0</version> </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15</artifactId> - <version>1.44</version> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15</artifactId> - <version>1.44</version> - </dependency> </dependencies>

1 0

r3167 - in trunk: . lima-business
by vsalaun＠users.chorem.org 10 Jun '11

10 Jun '11

Author: vsalaun Date: 2011-06-10 11:45:02 +0200 (Fri, 10 Jun 2011) New Revision: 3167 Url: http://chorem.org/repositories/revision/lima/3167 Log: #347 add pdfbox Modified: trunk/lima-business/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-06-09 15:30:11 UTC (rev 3166) +++ trunk/lima-business/pom.xml 2011-06-10 09:45:02 UTC (rev 3167) @@ -27,8 +27,11 @@ <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> </dependency> - <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + </dependency> + <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-09 15:30:11 UTC (rev 3166) +++ trunk/pom.xml 2011-06-10 09:45:02 UTC (rev 3167) @@ -190,6 +190,24 @@ <artifactId>servlet-api</artifactId> <version>2.5-6.0.1</version> </dependency> + +  + + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>1.5.0</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15</artifactId> + <version>1.44</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcmail-jdk15</artifactId> + <version>1.44</version> + </dependency> </dependencies>

1 0

r3166 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/java/org/chorem/lima/business/ejbinterface lima-swing/src/main/resources/i18n
by vsalaun＠users.chorem.org 09 Jun '11

09 Jun '11

Author: vsalaun Date: 2011-06-09 17:30:11 +0200 (Thu, 09 Jun 2011) New Revision: 3166 Url: http://chorem.org/repositories/revision/lima/3166 Log: #347 add VAT service Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.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/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2011-06-09 14:05:37 UTC (rev 3165) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2011-06-09 15:30:11 UTC (rev 3166) @@ -29,6 +29,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; + +import javax.ejb.EJB; import javax.ejb.Stateless; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -37,8 +39,11 @@ import org.chorem.lima.beans.BalanceTrialImpl; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.beans.ReportsDatasImpl; +import org.chorem.lima.beans.VatReports; +import org.chorem.lima.beans.VatReportsImpl; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ejbinterface.FinancialPeriodService; import org.chorem.lima.business.ejbinterface.ReportService; import org.chorem.lima.business.ejbinterface.ReportServiceLocal; import org.chorem.lima.entity.Account; @@ -46,7 +51,9 @@ import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryDAO; +import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialTransaction; +import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.LimaCallaoDAOHelper; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; @@ -61,6 +68,9 @@ private TopiaContext rootContext; + @EJB + protected FinancialPeriodService financialPeriodService; + public ReportServiceImpl() { LimaConfig config = LimaConfig.getInstance(); try { @@ -536,7 +546,108 @@ return generateBalanceTrial(beginDate, endDate, selectedAccounts, true, movementedFilter); } + /** + * Generate VAT + * + * @return VatReports + * @throws TopiaException + */ + @Override + public List<VatReports> generateVat(FiscalPeriod fiscalPeriod) throws LimaException { + + List<VatReports> vatReportsList = new ArrayList<VatReports>(); + + //gets the list of all the financialPeriods from the given fiscalPeriod + List<FinancialPeriod> financialPeriodsList = + financialPeriodService.getFinancialPeriods(fiscalPeriod.getBeginDate(), fiscalPeriod.getEndDate()); + + //Sets variables used to save amount for the following period + BigDecimal payable = BigDecimal.ZERO; + BigDecimal remainingCredit = BigDecimal.ZERO; + + TopiaContext topiaTransaction = null; + try { + topiaTransaction = beginTransaction(); + + AccountDAO accountDAO = + LimaCallaoDAOHelper.getAccountDAO(topiaTransaction); + //for each account, add the amount to the correct VatReports variable + + List<Account> accountsList = null; + + //Remove Spaces + String result = "445711,445712,445714,445715"; // TVA collectee + result = result.concat(",44562,445661,445662,445664,445665"); //TVA deductible + //build list account from selectedAccounts + accountsList = accountDAO.stringToListAccounts(result, false); + for (FinancialPeriod financialPeriod : financialPeriodsList) { + //Variable to save the vat total sum (collected - deductible) + BigDecimal vat = BigDecimal.ZERO; + //Sets VatReports variables to Zero + VatReports vatReports = new VatReportsImpl(); + vatReports.setPeriod(financialPeriod); + vatReports.setAmountCollected(BigDecimal.ZERO); + vatReports.setAmountDeductible(BigDecimal.ZERO); + vatReports.setAmountDue(BigDecimal.ZERO); + vatReports.setAmountCredit(BigDecimal.ZERO); + vatReports.setAmountRepayments(BigDecimal.ZERO); + vatReports.setAmountRemainingCredit(BigDecimal.ZERO); + //if remainingCredit is not nul then report it to the current period + if (!remainingCredit.equals(BigDecimal.ZERO)) { + vatReports.setAmountRemainingCredit(remainingCredit); + remainingCredit = BigDecimal.ZERO; + } + //if payable is not null then report it to the current period + vatReports.setAmountPayable(BigDecimal.ZERO); + if (!payable.equals(BigDecimal.ZERO)) { + vatReports.setAmountPayable(payable); + payable = BigDecimal.ZERO; + } + vatReports.setAmountPaid(BigDecimal.ZERO); + for (Account account : accountsList) { + ReportsDatas reportsDatas = + generateSubAccountBalanceWithTransaction(account, financialPeriod.getBeginDate(), + financialPeriod.getEndDate(), false, topiaTransaction); + //445711,445712,445714,445715 TVA collectee + if (("445711,445712,445714,445715").contains(account.getAccountNumber()) + && (reportsDatas.getAmountSolde() != null)) { + vatReports.setAmountCollected(vatReports.getAmountCollected().add(reportsDatas.getAmountSolde())); + vat = vat.add(reportsDatas.getAmountSolde()); + } + //44562,445661,445662,445664,445665TVA deductible + if (("44562,445661,445662,445664,445665").contains(account.getAccountNumber()) + && (reportsDatas.getAmountSolde() != null)) { + vatReports.setAmountDeductible(vatReports.getAmountDeductible().add(reportsDatas.getAmountSolde())); + vat = vat.add(reportsDatas.getAmountSolde().negate()); + } + } + //if vat is positive it's a credit + if (vat.compareTo(BigDecimal.ZERO) < 0) { + vatReports.setAmountRemainingCredit(vat.abs()); + remainingCredit = vat.abs(); + } + //if vat is negative it's a debit + if (vat.compareTo(BigDecimal.ZERO) > 0) { + vatReports.setAmountDue(vat.abs()); + payable = vat.abs(); + } + if (vatReports != null) { + vatReportsList.add(vatReports); + } + } + + //commitTransaction(topiaTransaction); + } + catch (TopiaException ex) { + doCatch(topiaTransaction, ex, log); + } + finally { + doFinally(topiaTransaction, log); + } + return vatReportsList; + } + protected TopiaContext beginTransaction() throws TopiaException { // basic check done, make check in database // TODO move it into JTA Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java 2011-06-09 14:05:37 UTC (rev 3165) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java 2011-06-09 15:30:11 UTC (rev 3166) @@ -26,12 +26,16 @@ package org.chorem.lima.business.ejbinterface; import java.util.Date; +import java.util.List; + import javax.ejb.Remote; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.beans.VatReports; import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.FiscalPeriod; /** * Service de generation des rapports. @@ -86,5 +90,10 @@ * Generation du rapports des journaux */ ReportsDatas generateEntryBooksReports(EntryBook entryBook, Date beginDate, Date endDate) throws LimaException; + + /** + * Generate VAT + */ + List<VatReports> generateVat(FiscalPeriod fiscalPeriod) throws LimaException; } 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 2011-06-09 14:05:37 UTC (rev 3165) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2011-06-09 15:30:11 UTC (rev 3166) @@ -203,6 +203,7 @@ lima.reports.entrybooks=Edit entrybook lima.reports.financialstatement=Financialstatements lima.reports.ledger=Ledger +lima.reports.vat=Edit VAT lima.response.no=No lima.response.yes=Yes lima.splash.1=Loading services... @@ -214,8 +215,8 @@ lima.table.balance=Balance lima.table.closure=Closed lima.table.code=Code +lima.table.collectedvat=Collected VAT lima.table.credit=Credit -lima.table.collectedvat=Collected VAT lima.table.date=Date lima.table.debit=Debit lima.table.debitcredit=Debit and credit 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 2011-06-09 14:05:37 UTC (rev 3165) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2011-06-09 15:30:11 UTC (rev 3166) @@ -203,6 +203,7 @@ lima.reports.entrybooks=Edition journal lima.reports.financialstatement=Bilan et Compte de r\u00E9sultat lima.reports.ledger=Grand Livre +lima.reports.vat=Edition TVA lima.response.no=Non lima.response.yes=Oui lima.splash.1=Chargement des services... @@ -240,7 +241,7 @@ lima.table.vatcredit=Cr\u00E9dit de TVA lima.table.vatdue=TVA due lima.table.vatpaid=TVA pay\u00E9e -lima.table.vatpayable=TVA \u00e0 payer +lima.table.vatpayable=TVA \u00E0 payer lima.table.voucher=Pi\u00E8ce comptable lima.title=Lutin Invoice Monitoring and Accounting lima.title.about=\u00C0 propos de Lima...

1 0

r3165 - in trunk: lima-callao/src/main/xmi lima-swing/src/main/java/org/chorem/lima/ui/vatreports
by vsalaun＠users.chorem.org 09 Jun '11

09 Jun '11

Author: vsalaun Date: 2011-06-09 16:05:37 +0200 (Thu, 09 Jun 2011) New Revision: 3165 Url: http://chorem.org/repositories/revision/lima/3165 Log: #347 Updating VatReports (table, model, view, accounting.zargo) Modified: trunk/lima-callao/src/main/xmi/accounting.zargo trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java 2011-06-09 14:01:42 UTC (rev 3164) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java 2011-06-09 14:05:37 UTC (rev 3165) @@ -1,23 +1,20 @@ package org.chorem.lima.ui.vatreports; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; +import java.awt.Color; +import java.awt.Component; import java.math.BigDecimal; -import java.util.Date; +import java.text.SimpleDateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.entity.Account; -import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.ui.celleditor.AccountTableCellEditor; +import org.chorem.lima.beans.VatReports; import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; -import org.chorem.lima.ui.celleditor.DateTableCellEditor; -import org.chorem.lima.ui.celleditor.EmptyCellRenderer; -import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.ColorHighlighter; +import org.jdesktop.swingx.decorator.ComponentAdapter; +import org.jdesktop.swingx.decorator.HighlightPredicate; +import org.jdesktop.swingx.decorator.Highlighter; public class VatTable extends JXTable { @@ -28,27 +25,47 @@ private static final Log log = LogFactory.getLog(VatTable.class); protected VatViewHandler handler; + + protected VatTableModel model; + + private Highlighter colorTransaction; public VatTable(VatViewHandler handler) { this.handler = handler; - //Get new date editor - setDefaultEditor(Date.class, new DateTableCellEditor()); - //Get new entry book editor - setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); - //Get new account editor - setDefaultEditor(Account.class, new AccountTableCellEditor()); - //Get new amount editor + model = this.handler.getView().getVatTableModel(); + + //Get new BigDecimal editor setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); - //get new String renderer for empty cells - setDefaultRenderer(String.class, new EmptyCellRenderer()); - //get new Account renderer for empty cells - setDefaultRenderer(Account.class, new EmptyCellRenderer()); - //get new EntryBook renderer for empty cells - setDefaultRenderer(EntryBook.class, new EmptyCellRenderer()); + + //highlight financial financial transactions + //FIXME 2011.06.09 doen't work !!! + addMonthColor(); } + + /* + * Color the background row in grey if the month number is even (pair in french) + */ + protected void addMonthColor() { + HighlightPredicate predicate = new HighlightPredicate() { + @Override + public boolean isHighlighted(Component renderer, + ComponentAdapter adapter) { + VatReports vatReport = model.getElementAt(adapter.row); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM"); + int month = Integer.parseInt(simpleDateFormat.format( + vatReport.getPeriod().getBeginDate())); + // true if month is even + return ((month % 2)==0); + + } + }; + colorTransaction = + new ColorHighlighter(predicate, new Color(222,222,222), null); + addHighlighter(colorTransaction); + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java 2011-06-09 14:01:42 UTC (rev 3164) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java 2011-06-09 14:05:37 UTC (rev 3165) @@ -2,8 +2,8 @@ import static org.nuiton.i18n.I18n._; +import java.text.SimpleDateFormat; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -11,12 +11,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.beans.VatReports; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ReportServiceMonitorable; import org.chorem.lima.business.ServiceListener; -import org.chorem.lima.entity.Account; -import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; -import org.chorem.lima.entity.Letter; +import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.util.ErrorHelper; public class VatTableModel extends AbstractTableModel implements ServiceListener { @@ -27,19 +28,38 @@ private static final Log log = LogFactory .getLog(VatTableModel.class); + /** Services. */ + protected ReportServiceMonitorable reportService; + /** selected financial period */ protected FiscalPeriod selectedFiscalPeriod; /** data cache */ - protected List<Object> cacheDataList; + protected List<VatReports> cacheDataList; + protected VatReports vatReportsCache; public VatTableModel() { - // + reportService = + LimaServiceFactory.getInstance().getService( + ReportServiceMonitorable.class); } - protected List<Object> getDataList() { - List<Object> results = new ArrayList<Object>(); + protected List<VatReports> getDataList() { + List<VatReports> results = null; + + if (selectedFiscalPeriod != null) { + try { + results = reportService.generateVat(selectedFiscalPeriod); + } + catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.debug("Can't update model", eee); + } + ErrorHelper.showErrorDialog("Can't get VAT list", eee); + } + } + return results; } @@ -114,11 +134,55 @@ public int getColumnCount() { return 8; } + + public VatReports getElementAt(int row){ + VatReports currentRow = (VatReports) cacheDataList.get(row); + return currentRow; + } @Override - public Object getValueAt(int rowIndex, int columnIndex) { - // TODO Auto-generated method stub - return null; + public Object getValueAt(int row, int column) { + Object result = null; + VatReports currentRow = (VatReports) cacheDataList.get(row); + //get entries for the period for the current row + + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMM yyyy"); + + try { + switch (column) { + case 0: + //result = currentRow.getDate(); //date + result = simpleDateFormat.format(currentRow.getPeriod().getBeginDate()) + + " - " + simpleDateFormat.format(currentRow.getPeriod().getEndDate()); + break; + case 1: + result = currentRow.getAmountCollected(); //tva collectee + break; + case 2: + result = currentRow.getAmountDeductible(); //tva deductible + break; + case 3: + result = currentRow.getAmountDue(); //tva due + break; + case 4: + result = currentRow.getAmountCredit(); //credit de tva + break; + case 5: + result = currentRow.getAmountRepayments(); //remboursemments + break; + case 6: + result = currentRow.getAmountRemainingCredit(); //credit restant + break; + case 7: + result = currentRow.getAmountPayable(); //tva a payer + break; + } + } + catch (Exception eee) { + log.debug("Can't get entries", eee); + } + + return result; } public void setFiscalPeriod(FiscalPeriod fiscalPeriod){ Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx 2011-06-09 14:01:42 UTC (rev 3164) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx 2011-06-09 14:05:37 UTC (rev 3165) @@ -32,6 +32,10 @@ onActionPerformed="getVatTableModel().setFiscalPeriod((FiscalPeriod)fiscalPeriodComboBox.getSelectedItem())" editable="false"/> </cell> + <cell> + <JButton id="editVatButton" text="lima.reports.vat" + onActionPerformed="getHandler().editVat()"/> + </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" rows="3" columns="11"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java 2011-06-09 14:01:42 UTC (rev 3164) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java 2011-06-09 14:05:37 UTC (rev 3165) @@ -21,6 +21,23 @@ this.view = view; } + /** + * @return VatView + */ + public VatView getView() { + return view; + } + + /** + * Edit VAT document + */ + public void editVat() { + + } + + /** + * Refresh VatTableModel + */ public void refresh(){ tableModel = view.getVatTableModel(); tableModel.refresh();

1 0

r3164 - trunk/lima-swing/src/main/java/org/chorem/lima/ui
by vsalaun＠users.chorem.org 09 Jun '11

09 Jun '11

Author: vsalaun Date: 2011-06-09 16:01:42 +0200 (Thu, 09 Jun 2011) New Revision: 3164 Url: http://chorem.org/repositories/revision/lima/3164 Log: #347 add VAT reports menu item Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-06-09 08:52:35 UTC (rev 3163) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-06-09 14:01:42 UTC (rev 3164) @@ -185,6 +185,8 @@ actionIcon='reports-ledger'/> <JMenuItem text="lima.reports.financialstatement" onActionPerformed='getHandler().showFinancialStatementReportsView(this)' actionIcon='reports-financialstatement'/> + <JMenuItem text="lima.reports.vat" onActionPerformed='getHandler().showVatView(this)' + actionIcon='reports-financialstatement'/> </JMenu> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2011-06-09 08:52:35 UTC (rev 3163) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2011-06-09 14:01:42 UTC (rev 3164) @@ -54,6 +54,7 @@ import org.chorem.lima.ui.importexport.ImportExport; import org.chorem.lima.ui.ledger.LedgerView; import org.chorem.lima.ui.lettering.LetteringView; +import org.chorem.lima.ui.vatreports.VatView; import org.chorem.lima.util.ErrorHelper; /** @@ -405,6 +406,13 @@ FinancialStatementReportView financialStatementReportView = new FinancialStatementReportView(mainView); mainView.showTab(_("lima.reports.financialstatement"), financialStatementReportView); } + + public void showVatView(JAXXContext rootContext) { + MainView mainView = getUI(rootContext); + VatView vatView = new VatView(mainView); + mainView.showTab(_("lima.reports.vat"), vatView); + + } public void showImportExportView(JAXXContext rootContext, ImportExportEnum type) { MainView mainView = getUI(rootContext);

1 0

r3163 - trunk/lima-callao/src/main/xmi
by vsalaun＠users.chorem.org 09 Jun '11

09 Jun '11

Author: vsalaun Date: 2011-06-09 10:52:35 +0200 (Thu, 09 Jun 2011) New Revision: 3163 Url: http://chorem.org/repositories/revision/lima/3163 Log: #347 add VatReports to accounting.zargo Modified: trunk/lima-callao/src/main/xmi/accounting.zargo Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ)

1 0

r3162 - trunk
by tchemit＠users.chorem.org 07 Jun '11

07 Jun '11

Author: tchemit Date: 2011-06-07 22:10:32 +0200 (Tue, 07 Jun 2011) New Revision: 3162 Url: http://chorem.org/repositories/revision/lima/3162 Log: Update mavenpom4redmine to 2.5.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-07 16:31:55 UTC (rev 3161) +++ trunk/pom.xml 2011-06-07 20:10:32 UTC (rev 3162) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> </parent> <groupId>org.chorem</groupId>

1 0

r3161 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: . vatreports
by vsalaun＠users.chorem.org 07 Jun '11

07 Jun '11

Author: vsalaun Date: 2011-06-07 18:31:55 +0200 (Tue, 07 Jun 2011) New Revision: 3161 Url: http://chorem.org/repositories/revision/lima/3161 Log: #347 adding table, tableModeln, view Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java 2011-06-07 16:31:55 UTC (rev 3161) @@ -0,0 +1,54 @@ +package org.chorem.lima.ui.vatreports; + +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.math.BigDecimal; +import java.util.Date; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.ui.celleditor.AccountTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; +import org.chorem.lima.ui.celleditor.DateTableCellEditor; +import org.chorem.lima.ui.celleditor.EmptyCellRenderer; +import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; +import org.jdesktop.swingx.JXTable; + +public class VatTable extends JXTable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 4042515416850867834L; + + /** log. */ + private static final Log log = LogFactory.getLog(VatTable.class); + + protected VatViewHandler handler; + + public VatTable(VatViewHandler handler) { + + this.handler = handler; + + //Get new date editor + setDefaultEditor(Date.class, new DateTableCellEditor()); + //Get new entry book editor + setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); + //Get new account editor + setDefaultEditor(Account.class, new AccountTableCellEditor()); + //Get new amount editor + setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + //get new String renderer for empty cells + setDefaultRenderer(String.class, new EmptyCellRenderer()); + //get new Account renderer for empty cells + setDefaultRenderer(Account.class, new EmptyCellRenderer()); + //get new EntryBook renderer for empty cells + setDefaultRenderer(EntryBook.class, new EmptyCellRenderer()); + } + +} Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java 2011-06-07 16:31:55 UTC (rev 3161) @@ -0,0 +1,135 @@ +package org.chorem.lima.ui.vatreports; + +import static org.nuiton.i18n.I18n._; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.swing.table.AbstractTableModel; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.entity.Letter; + +public class VatTableModel extends AbstractTableModel implements ServiceListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = -6301817853711018389L; + + /** log. */ + private static final Log log = LogFactory + .getLog(VatTableModel.class); + + /** selected financial period */ + protected FiscalPeriod selectedFiscalPeriod; + + /** data cache */ + protected List<Object> cacheDataList; + + + public VatTableModel() { + // + } + + protected List<Object> getDataList() { + List<Object> results = new ArrayList<Object>(); + return results; + } + + public void refresh(){ + cacheDataList = getDataList(); + fireTableDataChanged(); + } + + @Override + public Class<?> getColumnClass(int column) { + + Class<?> result = null; + + switch (column) { + case 0: + result = Date.class; + break; + default: + result = BigDecimal.class; + break; + } + + return result; + } + + @Override + public String getColumnName(int column) { + String result = "n/a"; + + switch (column) { + case 0: + result = _("lima.table.date"); //date + break; + case 1: + result = _("lima.table.collectedvat"); //tva collectee + break; + case 2: + result = _("lima.table.deductiblevat"); //tva deductible + break; + case 3: + result = _("lima.table.vatdue"); //tva due + break; + case 4: + result = _("lima.table.vatcredit"); //credit de tva + break; + case 5: + result = _("lima.table.repayments"); //remboursemments + break; + case 6: + result = _("lima.table.remainingcredit"); //credit restant + break; + case 7: + result = _("lima.table.vatpayable"); //tva a payer + break; + } + + return result; + } + + @Override + public int getRowCount() { + int result = 0; + + if (cacheDataList != null) { + result = cacheDataList.size(); + } + + return result; + } + + @Override + public int getColumnCount() { + return 8; + } + + @Override + public Object getValueAt(int rowIndex, int columnIndex) { + // TODO Auto-generated method stub + return null; + } + + public void setFiscalPeriod(FiscalPeriod fiscalPeriod){ + selectedFiscalPeriod = fiscalPeriod; + refresh(); + } + + @Override + public void notifyMethod(String serviceName, String methodeName) { + // TODO Auto-generated method stub + + } + +} Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx 2011-06-07 16:31:55 UTC (rev 3161) @@ -0,0 +1,50 @@ +<Table> + <VatViewHandler id="handler" javaBean="new VatViewHandler(this)" /> + <Boolean id="selectedRow" javaBean="false" /> + + <script> + <![CDATA[ + import org.chorem.lima.entity.FiscalPeriod; + import org.chorem.lima.entity.FinancialPeriod; + import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel; + import org.chorem.lima.ui.financialtransaction.FinancialPeriodComboBox; + import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer; + import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxRenderer; + import org.chorem.lima.ui.vatreports.VatTableModel; + import org.chorem.lima.ui.vatreports.VatTable; + + void $afterCompleteSetup() { + getHandler().refresh(); + } + + ]]> + </script> + + <row weightx="1" weighty="0" anchor="center"> + <cell anchor="east"> + <JLabel id="fiscalPeriodLabel" text="lima.charts.fiscalyear"/> + </cell> + <cell anchor="west"> + <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/> + <JComboBox id="fiscalPeriodComboBox" + model="{getModelFiscalPeriod()}" + renderer="{new FiscalPeriodComboBoxRenderer()}" + onActionPerformed="getVatTableModel().setFiscalPeriod((FiscalPeriod)fiscalPeriodComboBox.getSelectedItem())" + editable="false"/> + </cell> + </row> + <row> + <cell fill="both" weightx="1" weighty="1" rows="3" columns="11"> + <JScrollPane> + <org.chorem.lima.ui.vatreports.VatTableModel + id="vatTableModel"/> + <org.chorem.lima.ui.vatreports.VatTable + id="vatTable" sortable="false" rowHeight="22" + constructorParams="getHandler()" model="{getVatTableModel()}" + selectionMode="{ListSelectionModel.SINGLE_SELECTION}" /> + <javax.swing.ListSelectionModel javaBean="getVatTable().getSelectionModel()" + onValueChanged="setSelectedRow(vatTable.getSelectedRow() != -1)"/> + </JScrollPane> + </cell> + </row> +</Table> \ No newline at end of file Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java 2011-06-07 16:31:55 UTC (rev 3161) @@ -0,0 +1,29 @@ +package org.chorem.lima.ui.vatreports; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.ui.vatreports.VatTable; +import org.chorem.lima.ui.vatreports.VatTableModel; +import org.chorem.lima.ui.vatreports.VatView; + +public class VatViewHandler { + /** log. */ + private static final Log log = + LogFactory.getLog(VatViewHandler.class); + + protected VatView view; + + protected VatTable table; + + protected VatTableModel tableModel; + + protected VatViewHandler(VatView view) { + this.view = view; + } + + public void refresh(){ + tableModel = view.getVatTableModel(); + tableModel.refresh(); + } + +}

1 0

r3160 - trunk/lima-swing/src/main/resources/i18n
by vsalaun＠users.chorem.org 07 Jun '11

07 Jun '11

Author: vsalaun Date: 2011-06-07 17:10:55 +0200 (Tue, 07 Jun 2011) New Revision: 3160 Url: http://chorem.org/repositories/revision/lima/3160 Log: #347 VAT text properties Modified: 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-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2011-06-07 12:50:05 UTC (rev 3159) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2011-06-07 15:10:55 UTC (rev 3160) @@ -215,9 +215,11 @@ lima.table.closure=Closed lima.table.code=Code lima.table.credit=Credit +lima.table.collectedvat=Collected VAT lima.table.date=Date lima.table.debit=Debit lima.table.debitcredit=Debit and credit +lima.table.deductiblevat=Deductible VAT lima.table.description=Description lima.table.entrybook=EntryBook lima.table.fiscalperiod=Fiscalperiod @@ -230,9 +232,15 @@ lima.table.number=Account Number lima.table.period=Period lima.table.provisiondeprecationamount=Provision & Deprecation +lima.table.remainingcredit=Remaining credit +lima.table.repayments=Repayments lima.table.solde=Solder lima.table.solde.credit=Credit solde lima.table.solde.debit=Debit solde +lima.table.vatcredit=VAT credit +lima.table.vatdue=Due VAT +lima.table.vatpaid=VAT paid +lima.table.vatpayable=VAT payable lima.table.voucher=Voucher lima.title=Lutin Invoice Monitoring and Accounting lima.title.about=About Lima... 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 2011-06-07 12:50:05 UTC (rev 3159) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2011-06-07 15:10:55 UTC (rev 3160) @@ -214,10 +214,12 @@ lima.table.balance=Balance lima.table.closure=Cloture lima.table.code=Code +lima.table.collectedvat=TVA collect\u00E9e lima.table.credit=Cr\u00E9dit lima.table.date=Date lima.table.debit=D\u00E9bit lima.table.debitcredit=D\u00E9bit et Cr\u00E9dit +lima.table.deductiblevat=TVA d\u00E9ductible lima.table.description=Description lima.table.entrybook=Journal lima.table.fiscalperiod=Exercice @@ -230,9 +232,15 @@ lima.table.number=Num\u00E9ro de compte lima.table.period=P\u00E9riode lima.table.provisiondeprecationamount=Amortissements et provisions +lima.table.remainingcredit=Cr\u00E9dit de TVA +lima.table.repayments=Remboursements lima.table.solde=Solde lima.table.solde.credit=Solde cr\u00E9dit lima.table.solde.debit=Solde d\u00E9bit +lima.table.vatcredit=Cr\u00E9dit de TVA +lima.table.vatdue=TVA due +lima.table.vatpaid=TVA pay\u00E9e +lima.table.vatpayable=TVA \u00e0 payer lima.table.voucher=Pi\u00E8ce comptable lima.title=Lutin Invoice Monitoring and Accounting lima.title.about=\u00C0 propos de Lima...

1 0

r3159 - in trunk/lima-business/src/main: java/org/chorem/lima/business/ejb java/org/chorem/lima/business/ejbinterface resources/i18n
by vsalaun＠users.chorem.org 07 Jun '11

07 Jun '11

Author: vsalaun Date: 2011-06-07 14:50:05 +0200 (Tue, 07 Jun 2011) New Revision: 3159 Url: http://chorem.org/repositories/revision/lima/3159 Log: #345 Adding business services Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.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/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-06-07 08:53:23 UTC (rev 3158) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-06-07 12:50:05 UTC (rev 3159) @@ -25,34 +25,44 @@ 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.Collections; + import java.util.Date; import java.util.List; import javax.ejb.EJB; import javax.ejb.Stateless; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.FinancialStatementWayEnum; +import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.FinancialTransactionSearch; +import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.AccountingRules; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; -import org.chorem.lima.business.ejbinterface.AccountService; import org.chorem.lima.business.ejbinterface.EntryBookService; -import org.chorem.lima.business.ejbinterface.FinancialStatementService; +import org.chorem.lima.business.ejbinterface.FinancialPeriodService; import org.chorem.lima.business.ejbinterface.FinancialTransactionService; import org.chorem.lima.business.ejbinterface.FinancialTransactionServiceLocal; -import org.chorem.lima.business.ejbinterface.FiscalPeriodService; import org.chorem.lima.business.ejbinterface.ReportService; +import org.chorem.lima.business.utils.FinancialPeriodComparator; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountDAO; +import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryDAO; +import org.chorem.lima.entity.EntryImpl; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialPeriodDAO; +import org.chorem.lima.entity.FinancialTransactionImpl; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.Letter; import org.chorem.lima.entity.LetterDAO; @@ -87,18 +97,9 @@ protected AccountingRules accountingRules; @EJB - protected FiscalPeriodService fiscalPeriodService; + protected FinancialPeriodService financialPeriodService; @EJB - protected AccountService accountServiceImpl; - - @EJB - protected FinancialStatementService financialStatementService; - - @EJB - protected FinancialTransactionService financialTransactionService; - - @EJB protected ReportService reportService; @EJB @@ -661,19 +662,125 @@ } } - public void addRetainedEarnings(FiscalPeriod previousFiscalPeriod, FiscalPeriod fiscalPeriod, EntryBook entryBook) throws LimaException { - //TODO + @Override + public void addRetainedEarnings(FiscalPeriod previousFiscalPeriod, FiscalPeriod fiscalPeriod, EntryBook entryBook, Date date) throws LimaException { TopiaContext topiaContext = null; try { + + + BalanceTrial results = reportService.generateBalanceTrial(previousFiscalPeriod.getBeginDate(), previousFiscalPeriod.getEndDate(), null, false, false); + + List<ReportsDatas> reportsDatasList = (List<ReportsDatas>) results.getReportsDatas(); + topiaContext = beginTransaction(); - //temporary method + //Sets entryBook + //search for the entryBook to use using param + boolean found = false; + List<EntryBook> entryBooksList = entryBookService.getAllEntryBooks(); + for (EntryBook entry : entryBooksList) { + if (!found && entry.getCode().equals(entryBook.getCode()) && entry.getLabel().equals(entryBook.getLabel())) { + entryBook = entry; + found = true; + } + } + //if entrybook is not found + //then create it + if (!found) { + entryBookService.createEntryBook(entryBook); + entryBooksList = entryBookService.getAllEntryBooks(); + for (EntryBook entry : entryBooksList) { + if (!found && entry.getCode().equals(entryBook.getCode()) && entry.getLabel().equals(entryBook.getLabel())) { + entryBook = entry; + found = true; + } + } + } - // + Net Income - // - Dividends Paid - // + Beginning Retained Earnings - // = Ending Retained Earnings + //Sets the financialTransaction + FinancialTransaction financialTransaction = new FinancialTransactionImpl(); + financialTransaction.setAmountDebit(BigDecimal.ZERO); + financialTransaction.setAmountCredit(BigDecimal.ZERO); + financialTransaction.setEntryBook(entryBook); + FinancialPeriod financialPeriod = null; + + //Sets date for description + Calendar calendar = Calendar.getInstance(); + calendar.setTime(previousFiscalPeriod.getEndDate()); + + + found = false; + + //look for the first financial period on the current fiscal year with is unlocked + List<ClosedPeriodicEntryBook> resultsArray = + new ArrayList<ClosedPeriodicEntryBook>(); + List<ClosedPeriodicEntryBook> closedPeriodicEntryBook = + financialPeriodService.getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod(); + Collections.sort(closedPeriodicEntryBook, new FinancialPeriodComparator()); + resultsArray.addAll(closedPeriodicEntryBook); + + for (ClosedPeriodicEntryBook cPeriodicEntryBook : resultsArray) { + if (!found && (cPeriodicEntryBook.getFinancialPeriod().getBeginDate().compareTo(date) <= 0) + && (cPeriodicEntryBook.getFinancialPeriod().getEndDate().compareTo(date) >= 1)) { + if (cPeriodicEntryBook.getFinancialPeriod().getLocked() || cPeriodicEntryBook.getLocked()) { + throw new LimaException("Can't set financialPeriod"); + } + if (cPeriodicEntryBook.getEntryBook().getCode().equals(entryBook.getCode()) + && cPeriodicEntryBook.getEntryBook().getLabel().equals(entryBook.getLabel())) { + found = true; + financialPeriod = cPeriodicEntryBook.getFinancialPeriod(); + } + } + } + if (!found) { + throw new LimaException("Can't set financialPeriod"); + } + financialTransaction.setFinancialPeriod(financialPeriod); + financialTransaction.setTransactionDate(date); + // create it + createFinancialTransactionWithTransaction(financialTransaction, topiaContext); + commitTransaction(topiaContext); + + //Sets entries + Entry entry = null; + + + + for (ReportsDatas report : reportsDatasList) { + //Account class from 1 to 7 + if (Integer.valueOf(report.getAccount().getAccountNumber().substring(0, 1)) < 8) { + if (report.getSoldeDebit()){ + if (!report.getAmountDebit().equals(BigDecimal.ZERO)) { + entry = new EntryImpl(); + entry.setDescription(_("lima-business.financialtransaction.retainedearnings.description") + " (" + calendar.get(Calendar.YEAR) + ")"); + entry.setVoucher(_("lima-business.financialtransaction.retainedearnings.voucher")); + entry.setFinancialTransaction(financialTransaction); + entry.setAccount(report.getAccount()); + entry.setAmount(report.getAmountDebit().abs()); + entry.setDebit(true); + topiaContext = beginTransaction(); + createEntryWithTransaction(entry, topiaContext); + commitTransaction(topiaContext); + } + } + if (!report.getSoldeDebit()){ + if (!report.getAmountCredit().equals(BigDecimal.ZERO)) { + entry = new EntryImpl(); + entry.setDescription(_("lima-business.financialtransaction.retainedearnings.description") + " (" + calendar.get(Calendar.YEAR) + ")"); + entry.setVoucher(_("lima-business.financialtransaction.retainedearnings.voucher")); + entry.setFinancialTransaction(financialTransaction); + entry.setAccount(report.getAccount()); + entry.setAmount(report.getAmountCredit().abs()); + entry.setDebit(false); + topiaContext = beginTransaction(); + createEntryWithTransaction(entry, topiaContext); + commitTransaction(topiaContext); + } + } + } + } + //commit commitTransaction(topiaContext); } @@ -683,7 +790,6 @@ finally { doFinally(topiaContext, log); } - //WORK } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java 2011-06-07 08:53:23 UTC (rev 3158) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java 2011-06-07 12:50:05 UTC (rev 3159) @@ -99,7 +99,7 @@ * @throws LimaException */ - void addRetainedEarnings(FiscalPeriod previousFiscalPeriod, FiscalPeriod fiscalPeriod, EntryBook entryBook) throws LimaException; + void addRetainedEarnings(FiscalPeriod previousFiscalPeriod, FiscalPeriod fiscalPeriod, EntryBook entryBook, Date date) throws LimaException; /** 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 2011-06-07 08:53:23 UTC (rev 3158) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2011-06-07 12:50:05 UTC (rev 3159) @@ -1,64 +1,67 @@ -lima-business.account.accountalreardyexist=An account already exists with this number \: %s -lima-business.common.failed=FAILED \: %s \n -lima-business.document.accountnumber=Account N\u00B0 -lima-business.document.amounts=Amounts -lima-business.document.balance=Balance -lima-business.document.businessnumber=Business N\u00B0 -lima-business.document.carryback=Carry Back -lima-business.document.carryforward=reporter\u00C0 -lima-business.document.classificationcode=Classification Code -lima-business.document.createdate1=Editing Date -lima-business.document.createdate2=to -lima-business.document.credit=Credit -lima-business.document.date=Date -lima-business.document.date.begin=Begin date -lima-business.document.date.end=End date -lima-business.document.debit=Debit -lima-business.document.description=Description -lima-business.document.entrybook=EntryBook -lima-business.document.financialstatement=FinancialStatement -lima-business.document.generalentrybook=General EntryBook -lima-business.document.grossamount=Gross Amount -lima-business.document.label=Label -lima-business.document.ledger=Ledger -lima-business.document.movementcredit=Credit movement -lima-business.document.movementdebit=Debit movement -lima-business.document.netamount=Net Amount -lima-business.document.pagenumber=Page N\u00B0 -lima-business.document.period1=Periode from -lima-business.document.period2=to -lima-business.document.provisiondeprecationamount=Provision Deprecation Amount -lima-business.document.solde=Solde -lima-business.document.soldecredit=Credit solde -lima-business.document.soldedebit=Debit solde -lima-business.document.vatnumber=VAT N\u00B0 -lima-business.document.voucher=Voucher -lima-business.entrybook.entrybookalreadyexist=An EntryBook already exists with this label \: %s -lima-business.financialstatement.check.nothing=Not found \: %s - %s \n -lima-business.financialstatement.check.warn=Warning this function is just an help.\n Many accounts must no calculate on Financialstatement.\n Some account marked not found is normally.\n\n -lima-business.import.accountadded=SUCCES \: Account %s - %s added\n -lima-business.import.accountalreadyexist=FAILED \: Account %s already exist \n -lima-business.import.accountnomaster=FAILED \: The account %s have master \: %s which not exist \n -lima-business.import.closedperiodicentrybookupdated=SUCCESS \: The blockClosedPeriodicEntryBook %s - %s - %s is updated \! \n -lima-business.import.ebpmissingaccount=FAILED \: Account %s already exist, import aborted. \nCreate all accounts before import entries. -lima-business.import.ebpnoentry=FAILED \: This file contains no entries. -lima-business.import.entriesoutofdatesrange=WARNING \: %s entries is out of range of opened fiscal periods. Entry was skip \!\n -lima-business.import.entryadded=SUCCES \: Entry %s %s added\n" -lima-business.import.entrybookalreadyexist=FAILED \: The entrybook %s already exists \!\n -lima-business.import.entrybooknotexist=WARNING \: Entrybook %s not exist was created \!\n -lima-business.import.financialstatementadded=SUCCESS \: The financialStatement %s is created \n -lima-business.import.financialstatementalnomaster=FAILED \: The financialStatement %s have master \: %s which not exist \n -lima-business.import.financialstatementalreadyexist=FAILED \: The financialstatement %s already exists \!\n -lima-business.import.fiscalperiodadded=SUCCESS \: The fiscalPeriod %s - %s is created \! \n -lima-business.import.fiscalperiodalreadyexist=FAILED \: The fiscalperiod %s - %s already exists \!\n -lima-business.import.identityadded=SUCCESS \: The identity %s is created \! \n -lima-business.import.letteradded=SUCCESS \: The letter %s - %s is created \! \n -lima-business.import.letteralreadyexist=FAILED \: The letter %s already exists \!\n -lima-business.import.noaccount=ERROR \: This file contains no account -lima-business.import.nofiscalperiodopen=FAILED \: No Fiscal period open \! \n -lima-business.import.transactionadded=SUCCES \: FinancialTransaction, %s - %s, added\n -lima.config.configFileName.description= -lima.config.httpport=HTTP Port -lima.config.reportsdir=Reports directories -lima.config.rulesnationality=Rules Nationality -lima.config.serveraddress=Server Address += +lima-business.account.accountalreardyexist=An account already exists with this number \: %s +lima-business.common.failed=FAILED \: %s \n +lima-business.document.accountnumber=Account N\u00B0 +lima-business.document.amounts=Amounts +lima-business.document.balance=Balance +lima-business.document.businessnumber=Business N\u00B0 +lima-business.document.carryback=Carry Back +lima-business.document.carryforward=reporter\u00C0 +lima-business.document.classificationcode=Classification Code +lima-business.document.createdate1=Editing Date +lima-business.document.createdate2=to +lima-business.document.credit=Credit +lima-business.document.date=Date +lima-business.document.date.begin=Begin date +lima-business.document.date.end=End date +lima-business.document.debit=Debit +lima-business.document.description=Description +lima-business.document.entrybook=EntryBook +lima-business.document.financialstatement=FinancialStatement +lima-business.document.generalentrybook=General EntryBook +lima-business.document.grossamount=Gross Amount +lima-business.document.label=Label +lima-business.document.ledger=Ledger +lima-business.document.movementcredit=Credit movement +lima-business.document.movementdebit=Debit movement +lima-business.document.netamount=Net Amount +lima-business.document.pagenumber=Page N\u00B0 +lima-business.document.period1=Periode from +lima-business.document.period2=to +lima-business.document.provisiondeprecationamount=Provision Deprecation Amount +lima-business.document.solde=Solde +lima-business.document.soldecredit=Credit solde +lima-business.document.soldedebit=Debit solde +lima-business.document.vatnumber=VAT N\u00B0 +lima-business.document.voucher=Voucher +lima-business.entrybook.entrybookalreadyexist=An EntryBook already exists with this label \: %s +lima-business.financialstatement.check.nothing=Not found \: %s - %s \n +lima-business.financialstatement.check.warn=Warning this function is just an help.\n Many accounts must no calculate on Financialstatement.\n Some account marked not found is normally.\n\n +lima-business.financialtransaction.retainedearnings.description=Report \u00E0 nouveau +lima-business.financialtransaction.retainedearnings.voucher=Selon d\u00E9cision AG +lima-business.import.accountadded=SUCCES \: Account %s - %s added\n +lima-business.import.accountalreadyexist=FAILED \: Account %s already exist \n +lima-business.import.accountnomaster=FAILED \: The account %s have master \: %s which not exist \n +lima-business.import.closedperiodicentrybookupdated=SUCCESS \: The blockClosedPeriodicEntryBook %s - %s - %s is updated \! \n +lima-business.import.ebpmissingaccount=FAILED \: Account %s already exist, import aborted. \nCreate all accounts before import entries. +lima-business.import.ebpnoentry=FAILED \: This file contains no entries. +lima-business.import.entriesoutofdatesrange=WARNING \: %s entries is out of range of opened fiscal periods. Entry was skip \!\n +lima-business.import.entryadded=SUCCES \: Entry %s %s added\n" +lima-business.import.entrybookalreadyexist=FAILED \: The entrybook %s already exists \!\n +lima-business.import.entrybooknotexist=WARNING \: Entrybook %s not exist was created \!\n +lima-business.import.financialstatementadded=SUCCESS \: The financialStatement %s is created \n +lima-business.import.financialstatementalnomaster=FAILED \: The financialStatement %s have master \: %s which not exist \n +lima-business.import.financialstatementalreadyexist=FAILED \: The financialstatement %s already exists \!\n +lima-business.import.fiscalperiodadded=SUCCESS \: The fiscalPeriod %s - %s is created \! \n +lima-business.import.fiscalperiodalreadyexist=FAILED \: The fiscalperiod %s - %s already exists \!\n +lima-business.import.identityadded=SUCCESS \: The identity %s is created \! \n +lima-business.import.letteradded=SUCCESS \: The letter %s - %s is created \! \n +lima-business.import.letteralreadyexist=FAILED \: The letter %s already exists \!\n +lima-business.import.noaccount=ERROR \: This file contains no account +lima-business.import.nofiscalperiodopen=FAILED \: No Fiscal period open \! \n +lima-business.import.transactionadded=SUCCES \: FinancialTransaction, %s - %s, added\n +lima.config.configFileName.description= +lima.config.httpport=HTTP Port +lima.config.reportsdir=Reports directories +lima.config.rulesnationality=Rules Nationality +lima.config.serveraddress=Server Address 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 2011-06-07 08:53:23 UTC (rev 3158) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2011-06-07 12:50:05 UTC (rev 3159) @@ -1,64 +1,69 @@ -lima-business.account.accountalreardyexist=Un compte existe d\u00E9j\u00E0 avec ce num\u00E9ro \: %s -lima-business.common.failed=\u00C9chec \: %s \n -lima-business.document.accountnumber=N\u00B0 Compte -lima-business.document.amounts=Totaux -lima-business.document.balance=Balance -lima-business.document.businessnumber=N\u00B0 Siret -lima-business.document.carryback=Report -lima-business.document.carryforward=\u00C0 reporter -lima-business.document.classificationcode=NAF -lima-business.document.createdate1=Date de tirage -lima-business.document.createdate2=\u00E0 -lima-business.document.credit=Cr\u00E9dit -lima-business.document.date=Date -lima-business.document.date.begin=Date de d\u00E9but \: -lima-business.document.date.end=Date de fin \: -lima-business.document.debit=D\u00E9bit -lima-business.document.description=Description -lima-business.document.entrybook=Journal -lima-business.document.financialstatement=Bilan et compte de r\u00E9sultat -lima-business.document.generalentrybook=Journal G\u00E9n\u00E9ral -lima-business.document.grossamount=Brut -lima-business.document.label=Libell\u00E9 -lima-business.document.ledger=Grand Livre -lima-business.document.movementcredit=Mouvement Cr\u00E9diteur -lima-business.document.movementdebit=Mouvement D\u00E9biteur -lima-business.document.netamount=Net -lima-business.document.pagenumber=N\u00B0 page -lima-business.document.period1=P\u00E9riode du -lima-business.document.period2=au -lima-business.document.provisiondeprecationamount=Amortissements et provisions -lima-business.document.solde=Solde -lima-business.document.soldecredit=Solde Cr\u00E9diteur -lima-business.document.soldedebit=Solde D\u00E9biteur -lima-business.document.vatnumber=N\u00B0 TVA -lima-business.document.voucher=Pi\u00E8ce comptable -lima-business.entrybook.entrybookalreadyexist=Un journal existe d\u00E9j\u00E0 avec ce libell\u00E9 \: %s -lima-business.financialstatement.check.nothing=Introuvable \: %s - %s \n -lima-business.financialstatement.check.warn=Attention cette fonctionnalit\u00E9 n'est qu'une aide utilisateur.\n Certains comptes ne doivent pas \u00EAtre pr\u00E9sent au bilan et compte de r\u00E9sultat.\n Il est donc normal que des comptes sont marqu\u00E9s comme introuvable.\n\n -lima-business.import.accountadded=Succ\u00E8s \: Compte %s - %s ajout\u00E9\n -lima-business.import.accountalreadyexist=\u00C9chec \: Le compte %s existe d\u00E9j\u00E0 \n -lima-business.import.accountnomaster=\u00C9chec \: Le compte %s poss\u00E8de le master \: %s inexistant \n -lima-business.import.closedperiodicentrybookupdated=Succ\u00E8s \: La p\u00E9riode financi\u00E8re %s - %s - %s est ajout\u00E9e \! \n -lima-business.import.ebpmissingaccount=\u00C9chec \: Compte %s inexistant. \nImportation annul\u00E9e. \nCr\u00E9er tous les comptes avant d'importer les \u00E9critures. -lima-business.import.ebpnoentry=\u00C9chec \: Ce fichier ne contient aucune entr\u00E9e. -lima-business.import.entriesoutofdatesrange=Attention \: Cette entr\u00E9e %s ne fait partie d'aucune p\u00E9riode ouverte. Entr\u00E9e non import\u00E9e \!\n -lima-business.import.entryadded=Succ\u00E8s \: Entr\u00E9e %s %s ajout\u00E9e \n -lima-business.import.entrybookalreadyexist=\u00C9chec \: Le journal %s exist d\u00E9j\u00E0 \!\n -lima-business.import.entrybooknotexist=Attention \: Le journal %s inexistant a \u00E9t\u00E9 cr\u00E9\u00E9 \!\n -lima-business.import.financialstatementadded=Succ\u00E8s \: Mouvement %s ajout\u00E9e \n -lima-business.import.financialstatementalnomaster=u00C9chec \: Le mouvement %s poss\u00E8de le master \: %s inexistant \n -lima-business.import.financialstatementalreadyexist=u00C9chec \: Le mouvement %s exist d\u00E9j\u00E0 \!\n -lima-business.import.fiscalperiodadded=Succ\u00E8s \: Exercice %s - %s ajout\u00E9e \! \n -lima-business.import.fiscalperiodalreadyexist=u00C9chec \: L'exerice %s - %s existe d\u00E9j\u00E0 \!\n -lima-business.import.identityadded=Succ\u00E8s \: Identit\u00E9 %s ajout\u00E9e \! \n -lima-business.import.letteradded=Succ\u00E8s \: ajout\u00E9e \! \n -lima-business.import.letteralreadyexist=u00C9chec \: La lettre %s existe d\u00E9j\u00E0 \!\n -lima-business.import.noaccount=Erreur \: Ce fichier ne contient aucun compte. -lima-business.import.nofiscalperiodopen=u00C9chec \: Aucun exercice ouvert \! \n -lima-business.import.transactionadded=Succ\u00E8s \: Transaction, %s, %s, ajout\u00E9e\n -lima.config.configFileName.description= -lima.config.httpport=Port HTTP -lima.config.reportsdir=Dossier des rapports -lima.config.rulesnationality=R\u00E8gles nationales -lima.config.serveraddress=Addresse serveur += +lima-bisuness.financialtransaction.retainedearnings.description=Selon d\u00E9cision AG +lima-bisuness.financialtransaction.retainedearnings.voucher= +lima-business.account.accountalreardyexist=Un compte existe d\u00E9j\u00E0 avec ce num\u00E9ro \: %s +lima-business.common.failed=\u00C9chec \: %s \n +lima-business.document.accountnumber=N\u00B0 Compte +lima-business.document.amounts=Totaux +lima-business.document.balance=Balance +lima-business.document.businessnumber=N\u00B0 Siret +lima-business.document.carryback=Report +lima-business.document.carryforward=\u00C0 reporter +lima-business.document.classificationcode=NAF +lima-business.document.createdate1=Date de tirage +lima-business.document.createdate2=\u00E0 +lima-business.document.credit=Cr\u00E9dit +lima-business.document.date=Date +lima-business.document.date.begin=Date de d\u00E9but \: +lima-business.document.date.end=Date de fin \: +lima-business.document.debit=D\u00E9bit +lima-business.document.description=Description +lima-business.document.entrybook=Journal +lima-business.document.financialstatement=Bilan et compte de r\u00E9sultat +lima-business.document.generalentrybook=Journal G\u00E9n\u00E9ral +lima-business.document.grossamount=Brut +lima-business.document.label=Libell\u00E9 +lima-business.document.ledger=Grand Livre +lima-business.document.movementcredit=Mouvement Cr\u00E9diteur +lima-business.document.movementdebit=Mouvement D\u00E9biteur +lima-business.document.netamount=Net +lima-business.document.pagenumber=N\u00B0 page +lima-business.document.period1=P\u00E9riode du +lima-business.document.period2=au +lima-business.document.provisiondeprecationamount=Amortissements et provisions +lima-business.document.solde=Solde +lima-business.document.soldecredit=Solde Cr\u00E9diteur +lima-business.document.soldedebit=Solde D\u00E9biteur +lima-business.document.vatnumber=N\u00B0 TVA +lima-business.document.voucher=Pi\u00E8ce comptable +lima-business.entrybook.entrybookalreadyexist=Un journal existe d\u00E9j\u00E0 avec ce libell\u00E9 \: %s +lima-business.financialstatement.check.nothing=Introuvable \: %s - %s \n +lima-business.financialstatement.check.warn=Attention cette fonctionnalit\u00E9 n'est qu'une aide utilisateur.\n Certains comptes ne doivent pas \u00EAtre pr\u00E9sent au bilan et compte de r\u00E9sultat.\n Il est donc normal que des comptes sont marqu\u00E9s comme introuvable.\n\n +lima-business.financialtransaction.retainedearnings.description=Report \u00E0 nouveau +lima-business.financialtransaction.retainedearnings.voucher=Selon d\u00E9cision AG +lima-business.import.accountadded=Succ\u00E8s \: Compte %s - %s ajout\u00E9\n +lima-business.import.accountalreadyexist=\u00C9chec \: Le compte %s existe d\u00E9j\u00E0 \n +lima-business.import.accountnomaster=\u00C9chec \: Le compte %s poss\u00E8de le master \: %s inexistant \n +lima-business.import.closedperiodicentrybookupdated=Succ\u00E8s \: La p\u00E9riode financi\u00E8re %s - %s - %s est ajout\u00E9e \! \n +lima-business.import.ebpmissingaccount=\u00C9chec \: Compte %s inexistant. \nImportation annul\u00E9e. \nCr\u00E9er tous les comptes avant d'importer les \u00E9critures. +lima-business.import.ebpnoentry=\u00C9chec \: Ce fichier ne contient aucune entr\u00E9e. +lima-business.import.entriesoutofdatesrange=Attention \: Cette entr\u00E9e %s ne fait partie d'aucune p\u00E9riode ouverte. Entr\u00E9e non import\u00E9e \!\n +lima-business.import.entryadded=Succ\u00E8s \: Entr\u00E9e %s %s ajout\u00E9e \n +lima-business.import.entrybookalreadyexist=\u00C9chec \: Le journal %s exist d\u00E9j\u00E0 \!\n +lima-business.import.entrybooknotexist=Attention \: Le journal %s inexistant a \u00E9t\u00E9 cr\u00E9\u00E9 \!\n +lima-business.import.financialstatementadded=Succ\u00E8s \: Mouvement %s ajout\u00E9e \n +lima-business.import.financialstatementalnomaster=u00C9chec \: Le mouvement %s poss\u00E8de le master \: %s inexistant \n +lima-business.import.financialstatementalreadyexist=u00C9chec \: Le mouvement %s exist d\u00E9j\u00E0 \!\n +lima-business.import.fiscalperiodadded=Succ\u00E8s \: Exercice %s - %s ajout\u00E9e \! \n +lima-business.import.fiscalperiodalreadyexist=u00C9chec \: L'exerice %s - %s existe d\u00E9j\u00E0 \!\n +lima-business.import.identityadded=Succ\u00E8s \: Identit\u00E9 %s ajout\u00E9e \! \n +lima-business.import.letteradded=Succ\u00E8s \: ajout\u00E9e \! \n +lima-business.import.letteralreadyexist=u00C9chec \: La lettre %s existe d\u00E9j\u00E0 \!\n +lima-business.import.noaccount=Erreur \: Ce fichier ne contient aucun compte. +lima-business.import.nofiscalperiodopen=u00C9chec \: Aucun exercice ouvert \! \n +lima-business.import.transactionadded=Succ\u00E8s \: Transaction, %s, %s, ajout\u00E9e\n +lima.config.configFileName.description= +lima.config.httpport=Port HTTP +lima.config.reportsdir=Dossier des rapports +lima.config.rulesnationality=R\u00E8gles nationales +lima.config.serveraddress=Addresse serveur

1 0