Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions wnprc_billing/src/org/labkey/wnprc_billing/invoice/InvoicePDF.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void createLineItems(List<InvoicedItem> invoicedItems, boolean includeSub

calendarItem.setTime(invoicedItem.getDate());
boolean isDateChange = isFirstItem || calendarCurrent.get(Calendar.DAY_OF_MONTH) != calendarItem.get(Calendar.DAY_OF_MONTH);
boolean isGroupChange = false;
boolean isGroupChange;
if(invoicedItem.getGroupName()== null){
isGroupChange = currentGroup != null;
}
Expand Down Expand Up @@ -188,17 +188,9 @@ protected List<FormattedLineItem> getLineItemsFromInvoicedItem(InvoicedItem invo
addDetailsToLineItem(commentLines.get(0), invoicedItem);
}

if (itemLines.size() > 0) {
for (FormattedLineItem itemLine : itemLines) {
formattedLineItems.add(itemLine);
}
}
formattedLineItems.addAll(itemLines);
formattedLineItems.addAll(commentLines);

if (commentLines.size() > 0) {
for (FormattedLineItem commentLine : commentLines) {
formattedLineItems.add(commentLine);
}
}
return formattedLineItems;
}

Expand All @@ -219,7 +211,7 @@ public void Footer()
}
catch (IOException e)
{
throw new UnexpectedException(e);
throw UnexpectedException.wrap(e);
}
}

Expand Down Expand Up @@ -387,7 +379,7 @@ public void Header()
}
catch (IOException e)
{
throw new UnexpectedException(e);
throw UnexpectedException.wrap(e);
}
}

Expand Down