Author: vsalaun Date: 2011-07-26 18:05:28 +0200 (Tue, 26 Jul 2011) New Revision: 3235 Url: http://chorem.org/repositories/revision/lima/3235 Log: #347 add string variable to vat csv and uml used for pdf linkage 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 trunk/lima-callao/src/main/xmi/accounting.zargo 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-26 09:34:52 UTC (rev 3234) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2011-07-26 16:05:28 UTC (rev 3235) @@ -304,7 +304,7 @@ */ public void exportFinancialStatementChartAsCSV(CSVWriter csvWriter, TopiaContext topiaContext) throws LimaException { try { - String[] nextLine = new String[11]; + String[] nextLine = new String[12]; // Get all Financialstatements FinancialStatementDAO financialStatementDAO = LimaCallaoDAOHelper.getFinancialStatementDAO(topiaContext); @@ -385,11 +385,12 @@ /** * Local methode, export vatstatements from database - * structure : TYPE | Label | Header | Accounts + * vatstatement Structure : TYPE | label | header | + * | accounts | subAmount | headerAmount | masterVatStatement | editable */ public void exportVatStatementChartAsCSV(CSVWriter csvWriter, TopiaContext topiaContext) throws LimaException { try { - String[] nextLine = new String[7]; + String[] nextLine = new String[9]; // Get all Vatstatements VatStatementDAO vatStatementDAO = LimaCallaoDAOHelper.getVatStatementDAO(topiaContext); @@ -402,13 +403,14 @@ // For all Vatstatements for (VatStatement vatStatement : listVatStatements) { nextLine[0] = ImportExportEntityEnum.VATSTATEMENT.getLabel(); - nextLine[1] = vatStatement.getLabel(); - nextLine[2] = Boolean.toString( + nextLine[1] = vatStatement.getBoxName(); + nextLine[2] = vatStatement.getLabel(); + nextLine[3] = Boolean.toString( vatStatement.getHeader()); - nextLine[3] = vatStatement.getAccounts(); - nextLine[4] = Boolean.toString( + nextLine[4] = vatStatement.getAccounts(); + nextLine[5] = Boolean.toString( vatStatement.getSubAmount()); - nextLine[5] = Boolean.toString( + nextLine[6] = Boolean.toString( vatStatement.getHeaderAmount()); VatStatement masterVatStatement = vatStatement.getMasterVatStatement(); @@ -417,8 +419,10 @@ masterVatStatementString = masterVatStatement.getLabel(); } - nextLine[6] = masterVatStatementString; - + nextLine[7] = masterVatStatementString; + nextLine[8] = Boolean.toString( + vatStatement.getEditable()); + 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-26 09:34:52 UTC (rev 3234) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2011-07-26 16:05:28 UTC (rev 3235) @@ -847,8 +847,8 @@ /** - * Import and create vatstatement Structure : TYPE | label | header | - * | accounts | subAmount | headerAmount | masterVatStatement + * Import and create vatstatement Structure : TYPE | boxName | label | header + * | accounts | subAmount | headerAmount | masterVatStatement | editable */ public String importVatStatementChartCSV(String[] nextLine, @@ -857,12 +857,14 @@ StringBuffer result = new StringBuffer(); - String label = nextLine[1]; - String header = nextLine[2]; - String accounts = nextLine[3]; - String subAmount = nextLine[4]; - String headerAmount = nextLine[5]; - String masterVatStatement = nextLine[6]; + String boxName = nextLine[1]; + String label = nextLine[2]; + String header = nextLine[3]; + String accounts = nextLine[4]; + String subAmount = nextLine[5]; + String headerAmount = nextLine[6]; + String masterVatStatement = nextLine[7]; + String editable = nextLine[8]; try { @@ -874,11 +876,13 @@ // create it VatStatementImport vatStatementImport = new VatStatementImportImpl(); vatStatementImport.setLabel(label); + vatStatementImport.setBoxName(boxName); vatStatementImport.setHeader(header); vatStatementImport.setAccounts(accounts); vatStatementImport.setSubAmount(subAmount); vatStatementImport.setHeaderAmount(headerAmount); vatStatementImport.setMasterVatStatement(masterVatStatement); + vatStatementImport.setEditable(editable); // put it in hashlinkedlist if (vatStatements.containsKey(label)){ @@ -1062,6 +1066,8 @@ || masterVatStatement != null) { // create it VatStatement vatStatement = new VatStatementImpl(); + vatStatement.setBoxName(vatStatementImport + .getBoxName()); vatStatement.setLabel(vatStatementImport .getLabel()); vatStatement.setAccounts(vatStatementImport @@ -1074,6 +1080,9 @@ .getSubAmount())); vatStatement.setHeaderAmount(vatStatement .getHeaderAmount()); + vatStatement.setEditable(Boolean + .parseBoolean(vatStatementImport + .getEditable())); vatStatementService .createVatStatementWithTransaction( masterVatStatement, Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ)