Byl přidán checkbox "Fakturováno" k položkám v agendě Fakturace. Bude

označovat položky vykryté fakturou.
closes #170
This commit is contained in:
2014-11-17 21:15:17 +01:00
parent 9f07c52f2c
commit c521fc3c87
4 changed files with 20 additions and 1 deletions
@@ -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;
@@ -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;
}
}
@@ -344,6 +344,7 @@ InvoicingDate=Datum
InvoicingInvoiceNumber=Číslo faktury
InvoicingAmount=Částka
InvoicingDescription=Popis
InvoicingInvoiced=Fakturováno
HandleComboKeyFilter=#del
HandleComboKey=$#del
@@ -152,6 +152,10 @@
hflex="10"
align="right"
label="${labels.RequirementItemTotal}" />
<listheader
hflex="10"
align="right"
label="${labels.InvoicingInvoiced}" />
<listheader
hflex="15"
label="${labels.RequirementItemDescription}" />
@@ -179,6 +183,9 @@
<listcell>
<label value="@bind(each.total) @converter(vm.standardBigDecimalConverter)" />
</listcell>
<listcell>
<checkbox checked="@bind(each.paid)"/>
</listcell>
<listcell>
<label value="@bind(each.description)" />
</listcell>