Skip to content

Commit

Permalink
added gross values. enhanced reports to include gross values and amou…
Browse files Browse the repository at this point in the history 
…nts paid. close #2269
  • Loading branch information
@j-dimension
j-dimension committed Jan 14, 2024
1 parent f8d0d0a commit 38f3c1a
Show file tree
Hide file tree
Showing 17 changed files with 181 additions and 102 deletions.
2 changes: 1 addition & 1 deletion docker/getversion.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jlversion=`echo "$jlversion" | tr _ .`

# tadaaa!
# echo $jlversion
echo 2.6.0.12
echo 2.6.0.13

Binary file modified j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion j-lawyer-client/src/com/jdimension/jlawyer/client/editors/addresses/AddressPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ private HashMap<Integer, Float> getCumulatedInvoicesValue(List<Invoice> invoices
for (Invoice inv : invoices) {
if (inv.getInvoiceType().isTurnOver()) {
float f = cumulatedInvoiceValues.get(inv.getStatus());
f = f + inv.getTotal();
f = f + inv.getTotalGross();
cumulatedInvoiceValues.put(inv.getStatus(), f);
}
}
Expand Down
2 changes: 1 addition & 1 deletion j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@
<Component id="jLabel21" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="lblCaseChanged" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="358" max="32767" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="txtFileNumber" min="-2" pref="200" max="-2" attributes="0"/>
Expand Down
4 changes: 3 additions & 1 deletion j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4275,7 +4275,9 @@ private void loadAccountEntries() {
InvoiceEntryPanel ie = (InvoiceEntryPanel) this.pnlInvoices.getComponent(i);
Invoice inv = ie.getInvoice();
if(invoiceTotals.containsKey(inv.getId()))
ie.setPaidTotal(invoiceTotals.get(inv.getId()));
ie.setPaidTotal(invoiceTotals.get(inv.getId()), inv.getCurrency());
else
ie.setPaidTotal(0f, inv.getCurrency());
}


Expand Down
13 changes: 7 additions & 6 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2165,7 +2165,7 @@ public void updateTotals(InvoicePositionEntryPanel ep) {
ep.updateEntryTotal();

float totalTax = 0f;
float total = 0f;
float totalGross = 0f;
float totalNet=0f;
for (Component c : this.pnlInvoicePositions.getComponents()) {
if (c instanceof InvoicePositionEntryPanel) {
Expand All @@ -2178,18 +2178,19 @@ public void updateTotals(InvoicePositionEntryPanel ep) {
totalNet = totalNet + (u * up);
if(this.chkTaxes.isSelected()) {
totalTax = totalTax + (u * up * (t / 100f));
total = total + (u * up * (1 + t / 100f));
totalGross = totalGross + (u * up * (1 + t / 100f));
} else {
total = total + (u * up);
totalGross = totalGross + (u * up);
}
}
}
this.lblNetValue.setText(cf.format(totalNet));
this.lblInvoiceTax.setText(cf.format(totalTax));
this.lblInvoiceTotal.setText(cf.format(total));
this.lblInvoiceTotal2.setText(cf.format(total));
this.lblInvoiceTotal.setText(cf.format(totalGross));
this.lblInvoiceTotal2.setText(cf.format(totalGross));
if(this.currentEntry!=null) {
this.currentEntry.setTotal(total);
this.currentEntry.setTotal(totalNet);
this.currentEntry.setTotalGross(totalGross);

}
}
Expand Down
90 changes: 59 additions & 31 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceEntryPanel.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdOpen" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
Expand All @@ -27,38 +27,45 @@
<Component id="cmdDelete" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="lblDueDate" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="lblInvoiceNumber" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="53" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="lblInvoiceType" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="lblName" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="lblDueDate" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="lblInvoiceNumber" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="lblInvoiceType" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="lblName" max="32767" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="lblTotalNet" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="lblStatus" alignment="1" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Component id="lblRecipient" alignment="0" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Group type="102" attributes="0">
<Component id="lblRecipient" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="lblPaidTotal" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<Component id="lblStatus" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="lblTotal" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="282" max="32767" attributes="0"/>
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="lblTotalGross" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Expand Down Expand Up @@ -90,20 +97,25 @@
</Group>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="3" attributes="0">
<Component id="lblTotal" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="lblTotalNet" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="lblPaidTotal" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="lblTotalGross" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
<Component id="cmdDelete" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="lblPaidTotal" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Expand Down Expand Up @@ -217,11 +229,11 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmdCopyActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="lblTotal">
<Component class="javax.swing.JLabel" name="lblTotalNet">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
<FontInfo relative="true">
<Font component="lblTotal" property="font" relativeSize="true" size="0"/>
<Font component="lblTotalNet" property="font" relativeSize="true" size="0"/>
</FontInfo>
</Property>
<Property name="horizontalAlignment" type="int" value="4"/>
Expand All @@ -241,13 +253,29 @@
</Component>
<Component class="javax.swing.JLabel" name="jLabel2">
<Properties>
<Property name="text" type="java.lang.String" value="Rechnungssumme:"/>
<Property name="text" type="java.lang.String" value="netto:"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel3">
<Properties>
<Property name="text" type="java.lang.String" value="Zahlungseingang:"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="lblTotalGross">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
<FontInfo relative="true">
<Font component="lblTotalGross" property="font" relativeSize="true" size="0"/>
</FontInfo>
</Property>
<Property name="horizontalAlignment" type="int" value="4"/>
<Property name="text" type="java.lang.String" value="0,00"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel4">
<Properties>
<Property name="text" type="java.lang.String" value="brutto:"/>
</Properties>
</Component>
</SubComponents>
</Form>
Loading

0 comments on commit 38f3c1a

Please sign in to comment.