Author: vsalaun Date: 2011-07-25 10:07:59 +0200 (Mon, 25 Jul 2011) New Revision: 3232 Url: http://chorem.org/repositories/revision/lima/3232 Log: #347 add import and export for vat CSV Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2011-07-25 08:06:05 UTC (rev 3231) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2011-07-25 08:07:59 UTC (rev 3232) @@ -389,7 +389,7 @@ */ public void exportVatStatementChartAsCSV(CSVWriter csvWriter, TopiaContext topiaContext) throws LimaException { try { - String[] nextLine = new String[11]; + String[] nextLine = new String[7]; // Get all Vatstatements VatStatementDAO vatStatementDAO = LimaCallaoDAOHelper.getVatStatementDAO(topiaContext); @@ -403,7 +403,22 @@ for (VatStatement vatStatement : listVatStatements) { nextLine[0] = ImportExportEntityEnum.VATSTATEMENT.getLabel(); nextLine[1] = vatStatement.getLabel(); - nextLine[2] = vatStatement.getAccounts(); + nextLine[2] = Boolean.toString( + vatStatement.getHeader()); + nextLine[3] = vatStatement.getAccounts(); + nextLine[4] = Boolean.toString( + vatStatement.getSubAmount()); + nextLine[5] = Boolean.toString( + vatStatement.getHeaderAmount()); + VatStatement masterVatStatement = + vatStatement.getMasterVatStatement(); + String masterVatStatementString = ""; + if (masterVatStatement != null){ + masterVatStatementString = + masterVatStatement.getLabel(); + } + nextLine[6] = masterVatStatementString; + csvWriter.writeNext(nextLine); } } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2011-07-25 08:06:05 UTC (rev 3231) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2011-07-25 08:07:59 UTC (rev 3232) @@ -847,7 +847,8 @@ /** - * Import and create vatstatement Structure : TYPE | label | accounts + * Import and create vatstatement Structure : TYPE | label | header | + * | accounts | subAmount | headerAmount | masterVatStatement */ public String importVatStatementChartCSV(String[] nextLine, @@ -859,8 +860,11 @@ String label = nextLine[1]; String header = nextLine[2]; String accounts = nextLine[3]; - String masterVatStatement = nextLine[4]; + String subAmount = nextLine[4]; + String headerAmount = nextLine[5]; + String masterVatStatement = nextLine[6]; + try { VatStatementDAO vatStatementDAO = LimaCallaoDAOHelper .getVatStatementDAO(topiaContext); @@ -872,6 +876,8 @@ vatStatementImport.setLabel(label); vatStatementImport.setHeader(header); vatStatementImport.setAccounts(accounts); + vatStatementImport.setSubAmount(subAmount); + vatStatementImport.setHeaderAmount(headerAmount); vatStatementImport.setMasterVatStatement(masterVatStatement); // put it in hashlinkedlist @@ -1063,6 +1069,11 @@ vatStatement.setHeader(Boolean .parseBoolean(vatStatementImport .getHeader())); + vatStatement.setSubAmount(Boolean + .parseBoolean(vatStatementImport + .getSubAmount())); + vatStatement.setHeaderAmount(vatStatement + .getHeaderAmount()); vatStatementService .createVatStatementWithTransaction( masterVatStatement,