diff --git a/src/main/java/info/bukova/isspst/services/invoicing/InvoicingServiceImpl.java b/src/main/java/info/bukova/isspst/services/invoicing/InvoicingServiceImpl.java index 001fb6b1..9fb504b9 100644 --- a/src/main/java/info/bukova/isspst/services/invoicing/InvoicingServiceImpl.java +++ b/src/main/java/info/bukova/isspst/services/invoicing/InvoicingServiceImpl.java @@ -7,9 +7,11 @@ import info.bukova.isspst.services.AbstractOwnedService; import info.bukova.isspst.services.LazyLoader; import java.math.BigDecimal; +import java.util.List; import org.hibernate.Hibernate; import org.hibernate.Query; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; public class InvoicingServiceImpl extends AbstractOwnedService implements @@ -54,4 +56,13 @@ public class InvoicingServiceImpl extends AbstractOwnedService implem invoicing.setTotalInvoiced(total); } + @SuppressWarnings("unchecked") + @Override + @Transactional + @PreAuthorize("hasPermission(this, 'PERM_READ')") + public List getAll() { + Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy order by rq.numser"); + return q.list(); + } + } diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties index 93457367..116bb1a8 100644 --- a/src/main/webapp/WEB-INF/locales/zk-label.properties +++ b/src/main/webapp/WEB-INF/locales/zk-label.properties @@ -346,6 +346,7 @@ InvoicingInvoiceNumber=Číslo faktury InvoicingAmount=Částka InvoicingDescription=Popis InvoicingInvoiced=Fakturováno +InvoicingApplicant=Žadatel HandleComboKeyFilter=#del HandleComboKey=$#del diff --git a/src/main/webapp/main/invoicing/invoicingGrid.zul b/src/main/webapp/main/invoicing/invoicingGrid.zul index 7daee89e..57737c84 100644 --- a/src/main/webapp/main/invoicing/invoicingGrid.zul +++ b/src/main/webapp/main/invoicing/invoicingGrid.zul @@ -29,6 +29,9 @@ label="${labels.RequirementsGridWorkgroup}" width="180px"/> + +