Do objednávek přidána suma za fakturu.

closes #152
This commit is contained in:
2014-10-08 08:16:00 +02:00
parent 49f921847d
commit a06b2cbb14
7 changed files with 185 additions and 109 deletions
@@ -326,6 +326,7 @@ OrderFormDescription=Popis
OrderFormOrdered=Objednáno
OrderFormDeliveredDate=Dodáno dne
OrderFormInvoiceNumber=Číslo faktury
OrderFormInvoiceTotal=Částka faktury
HandleComboKeyFilter=#del
HandleComboKey=$#del
@@ -51,6 +51,11 @@
hflex="10"
sort="auto(invoiceNumber)"
label="${labels.OrderFormInvoiceNumber}" />
<listheader
hflex="7"
align="right"
sort="auto(invoiceTotal)"
label="${labels.OrderFormInvoiceTotal}" />
<listheader
hflex="15"
sort="auto(suplier.company)"
@@ -151,6 +156,7 @@
</div>
</div>
</auxheader>
<auxheader></auxheader>
<auxheader>
<div zclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
@@ -251,6 +257,7 @@
<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
<listcell label="@load(each.deliveredDate) @converter('formatedDate', format=labels.DateFormat)" />
<listcell label="@load(each.invoiceNumber)" />
<listcell label="@load(each.invoiceTotal) @converter(vm.standardBigDecimalConverter)" />
<listcell label="@load(each.suplier)" />
<listcell label="@load(each.deliveryAddress)" />
<listcell label="@load(each.address)" />
@@ -103,6 +103,15 @@
readonly="@load(empty fx.created)" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.OrderFormInvoiceTotal} :</cell>
<cell>
<textbox
id="idOrderInvoiceTotal"
width="150px"
value="@bind(fx.invoiceTotal) @converter(vm.standardBigDecimalConverter)" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.OrderFormDescription} :</cell>
<cell>