diff --git a/dist/Programa Caja.jar b/dist/Programa Caja.jar index 2ffa918..4b63ec0 100644 Binary files a/dist/Programa Caja.jar and b/dist/Programa Caja.jar differ diff --git a/src/danielcortes/xyz/informes/InformeLibroDeVentas.java b/src/danielcortes/xyz/informes/InformeLibroDeVentas.java index 3a6a505..5ec50dc 100644 --- a/src/danielcortes/xyz/informes/InformeLibroDeVentas.java +++ b/src/danielcortes/xyz/informes/InformeLibroDeVentas.java @@ -11,7 +11,7 @@ import java.time.YearMonth; import java.util.HashMap; public class InformeLibroDeVentas{ - HashMap informe; + private HashMap informe; private InformeLibroDeVentas(){} public LibroDeVentas get(LocalDate localDate){ @@ -26,7 +26,6 @@ public class InformeLibroDeVentas{ this.informe.put(date, libroDeVentas); } - public static InformeLibroDeVentas generate(YearMonth mes) { InformeLibroDeVentas informeLibroDeVentas = new InformeLibroDeVentas(); informeLibroDeVentas.informe = new HashMap<>(); diff --git a/src/danielcortes/xyz/informes/InformeLibroDeVentasToExcel.java b/src/danielcortes/xyz/informes/InformeLibroDeVentasToExcel.java index 7dee4cc..a5d39e8 100644 --- a/src/danielcortes/xyz/informes/InformeLibroDeVentasToExcel.java +++ b/src/danielcortes/xyz/informes/InformeLibroDeVentasToExcel.java @@ -157,7 +157,8 @@ public class InformeLibroDeVentasToExcel { dataRow.createCell(cellCounter++).setCellValue(data.getExentas()); dataRow.createCell(cellCounter++).setCellFormula( - "E" + (rowCounter + 1) + "+J" + (rowCounter + 1) + "+M" + (rowCounter + 1)); + "E" + (rowCounter + 1) + "+J" + (rowCounter + 1) + "+M" + (rowCounter + 1) + ); dataRow.createCell(cellCounter++) .setCellValue(data.getFacturasInicial() == null ? "0" : data.getFacturasInicial()); @@ -171,7 +172,10 @@ public class InformeLibroDeVentasToExcel { .setCellValue(data.getGuiasFinal() == null ? "0" : data.getGuiasFinal()); dataRow.createCell(cellCounter++).setCellValue(data.getGuias()); - dataRow.createCell(cellCounter++).setCellValue(data.getTotal()); + dataRow.createCell(cellCounter++).setCellFormula( + "E" + (rowCounter + 1) + "+J" + (rowCounter + 1) + "+M" + (rowCounter + 1) + "+Q" + + (rowCounter + 1) + "+T" + (rowCounter + 1) + ); if (rowCounter == 2) { dataRow.createCell(cellCounter).setCellFormula(("U" + (rowCounter + 1))); diff --git a/src/danielcortes/xyz/informes/LibroDeVentas.java b/src/danielcortes/xyz/informes/LibroDeVentas.java index 33662fa..73c996b 100644 --- a/src/danielcortes/xyz/informes/LibroDeVentas.java +++ b/src/danielcortes/xyz/informes/LibroDeVentas.java @@ -71,7 +71,6 @@ public class LibroDeVentas { private String guiasInicial; private String guiasFinal; private int guias; - private int total; public int getDia() { return dia; @@ -225,14 +224,6 @@ public class LibroDeVentas { this.guias = guias; } - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - @Override public String toString() { return "LibroDeVentas{" + @@ -255,7 +246,6 @@ public class LibroDeVentas { ", guiasInicial='" + guiasInicial + '\'' + ", guiasFinal='" + guiasFinal + '\'' + ", guias=" + guias + - ", total=" + total + '}'; } }