Author: vsalaun Date: 2011-08-11 11:26:08 +0200 (Thu, 11 Aug 2011) New Revision: 3260 Url: http://chorem.org/repositories/revision/lima/3260 Log: #347 make code simplier (delete non usefull variables) 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-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.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-08-11 09:23:09 UTC (rev 3259) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2011-08-11 09:26:08 UTC (rev 3260) @@ -385,12 +385,12 @@ /** * Local methode, export vatstatements from database - * vatstatement Structure : TYPE | label | header | - * | accounts | subAmount | headerAmount | masterVatStatement + * vatstatement Structure : TYPE | boxName | label | header + * | accounts | masterVatStatement */ public void exportVatStatementChartAsCSV(CSVWriter csvWriter, TopiaContext topiaContext) throws LimaException { try { - String[] nextLine = new String[8]; + String[] nextLine = new String[6]; // Get all Vatstatements VatStatementDAO vatStatementDAO = LimaCallaoDAOHelper.getVatStatementDAO(topiaContext); @@ -408,10 +408,6 @@ nextLine[3] = Boolean.toString( vatStatement.getHeader()); nextLine[4] = vatStatement.getAccounts(); - nextLine[5] = Boolean.toString( - vatStatement.getSubAmount()); - nextLine[6] = Boolean.toString( - vatStatement.getHeaderAmount()); VatStatement masterVatStatement = vatStatement.getMasterVatStatement(); String masterVatStatementString = ""; @@ -419,7 +415,7 @@ masterVatStatementString = masterVatStatement.getLabel(); } - nextLine[7] = masterVatStatementString; + nextLine[5] = 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-08-11 09:23:09 UTC (rev 3259) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2011-08-11 09:26:08 UTC (rev 3260) @@ -908,8 +908,8 @@ /** - * Import and create vatstatement Structure : TYPE | boxName | label | header - * | accounts | subAmount | headerAmount | masterVatStatement + * Import and create vatstatement Structure : TYPE | boxName | label + * | header | accounts | masterVatStatement */ public String importVatStatementChartCSV(String[] nextLine, @@ -922,9 +922,7 @@ 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 masterVatStatement = nextLine[5]; try { @@ -939,8 +937,6 @@ vatStatementImport.setBoxName(boxName); vatStatementImport.setHeader(header); vatStatementImport.setAccounts(accounts); - vatStatementImport.setSubAmount(subAmount); - vatStatementImport.setHeaderAmount(headerAmount); vatStatementImport.setMasterVatStatement(masterVatStatement); // put it in hashlinkedlist @@ -1134,11 +1130,6 @@ vatStatement.setHeader(Boolean .parseBoolean(vatStatementImport .getHeader())); - vatStatement.setSubAmount(Boolean - .parseBoolean(vatStatementImport - .getSubAmount())); - vatStatement.setHeaderAmount(vatStatement - .getHeaderAmount()); vatStatement.setAmount(BigDecimal.ZERO); vatStatementService .createVatStatementWithTransaction( Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java 2011-08-11 09:23:09 UTC (rev 3259) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java 2011-08-11 09:26:08 UTC (rev 3260) @@ -459,7 +459,7 @@ VatStatementAmounts headerVatStatementAmounts = vatStatementDatas.getVatStatementAmounts(); //Si sous-total - if (subVatStatement.getSubAmount()){ + if (subVatStatement.getHeader()){ VatStatementAmounts header = new VatStatementAmountsImpl(); header.setLabel(headerVatStatementAmounts.getLabel()); @@ -474,18 +474,6 @@ //ajoute une ligne vide subResult.add(new VatStatementAmountsImpl()); - }//sinon - else { - if (subVatStatement.getHeaderAmount()){ - subResult.add(headerVatStatementAmounts); - } - else { - subResult.add(headerVatStatementAmounts); - } - //ajoute liste - if (vatStatementDatas.getListResult() != null){ - subResult.addAll(vatStatementDatas.getListResult()); - } } } } Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ)