diff --git a/src/main/java/info/bukova/isspst/data/Invoicing.java b/src/main/java/info/bukova/isspst/data/Invoicing.java
index 6f5666c1..4256e389 100644
--- a/src/main/java/info/bukova/isspst/data/Invoicing.java
+++ b/src/main/java/info/bukova/isspst/data/Invoicing.java
@@ -19,7 +19,7 @@ import org.hibernate.annotations.LazyCollectionOption;
@Table(name = "INVOICING")
public class Invoicing extends BaseData {
- @OneToOne(fetch = FetchType.EAGER)
+ @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "REQUIREMENT_ID")
private Requirement requirement;
diff --git a/src/main/java/info/bukova/isspst/data/RequirementItem.java b/src/main/java/info/bukova/isspst/data/RequirementItem.java
index 1b708cc8..20c7e95a 100644
--- a/src/main/java/info/bukova/isspst/data/RequirementItem.java
+++ b/src/main/java/info/bukova/isspst/data/RequirementItem.java
@@ -58,6 +58,9 @@ public class RequirementItem
@Column(name = "ORDERNUM")
private String orderNum;
+
+ @Column(name = "PAID")
+ private Boolean paid;
public int getId()
{
@@ -215,4 +218,12 @@ public class RequirementItem
{
this.orderNum = orderNum;
}
+
+ public Boolean getPaid() {
+ return paid;
+ }
+
+ public void setPaid(Boolean paid) {
+ this.paid = paid;
+ }
}
diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties
index 2cc2ee12..1d446c72 100644
--- a/src/main/webapp/WEB-INF/locales/zk-label.properties
+++ b/src/main/webapp/WEB-INF/locales/zk-label.properties
@@ -344,6 +344,7 @@ InvoicingDate=Datum
InvoicingInvoiceNumber=Číslo faktury
InvoicingAmount=Částka
InvoicingDescription=Popis
+InvoicingInvoiced=Fakturováno
HandleComboKeyFilter=#del
HandleComboKey=$#del
diff --git a/src/main/webapp/main/invoicing/invoicingForm.zul b/src/main/webapp/main/invoicing/invoicingForm.zul
index 9e72aa3e..ebd67520 100644
--- a/src/main/webapp/main/invoicing/invoicingForm.zul
+++ b/src/main/webapp/main/invoicing/invoicingForm.zul
@@ -152,6 +152,10 @@
hflex="10"
align="right"
label="${labels.RequirementItemTotal}" />
+
@@ -179,6 +183,9 @@
+
+
+