Políčka s číslem faktury a fakturovanou částkou odstraněna z objednávek.

closes #163
This commit is contained in:
2014-10-24 09:19:15 +02:00
parent 3558d1bd50
commit f1ca2d11c8
10 changed files with 67 additions and 237 deletions
@@ -52,15 +52,6 @@
hflex="10"
sort="auto(deliveredDate))"
label="${labels.OrderFormDeliveredDate}" />
<listheader
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)"
@@ -160,21 +151,6 @@
</div>
</div>
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox
value="@bind(vm.filterTemplate.invoiceNumber)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
<auxheader></auxheader>
<auxheader>
<div zclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
@@ -275,8 +251,6 @@
<listcell label="@load(each.total) @converter(vm.standardBigDecimalConverter)" />
<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)" />
@@ -327,11 +301,6 @@
hflex="15"
sort="czech(description)"
label="${labels.RequirementItemDescription}" />
<listheader
hflex="7"
align="right"
sort="auto(totalInvoice)"
label="${labels.OrderFormInvoiceTotal}" />
<listheader
hflex="5"
sort="auto(reqItem.orderNum)"
@@ -347,7 +316,6 @@
<listcell label="@load(each.unitPrice) @converter(vm.standardBigDecimalConverter)" />
<listcell label="@load(each.total) @converter(vm.standardBigDecimalConverter)" />
<listcell label="@load(each.description)" />
<listcell label="@load(each.totalInvoice) @converter(vm.standardBigDecimalConverter)" />
<listcell label="@load(each.reqItem.orderNum)" />
</listitem>
</template>
@@ -104,27 +104,6 @@
format="${labels.DateFormat}" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.OrderFormInvoiceNumber} :</cell>
<cell>
<textbox
id="idInvoiceNumber"
width="150px"
value="@bind(fx.invoiceNumber)"
placeholder="${labels.NotYetFilled}..."
readonly="@load(empty fx.created)" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.OrderFormInvoiceTotal} :</cell>
<cell>
<textbox
id="idOrderInvoiceTotal"
readonly="true"
width="150px"
value="@bind(fx.invoiceTotal) @converter(vm.standardBigDecimalConverter)" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.OrderFormDescription} :</cell>
<cell>
@@ -543,11 +522,6 @@
hflex="15"
sort="czech(description)"
label="${labels.RequirementItemDescription}" />
<listheader
hflex="7"
align="right"
sort="auto(totalInvoice)"
label="${labels.OrderFormInvoiceTotal}" />
<listheader
hflex="5"
sort="auto(reqItem.orderNum)"
@@ -587,15 +561,6 @@
value="@bind(each.total) @converter(vm.standardBigDecimalConverter)" />
</listcell>
<listcell label="@load(each.description)" />
<listcell>
<textbox
inplace="true"
sclass="grid-textbox-max-right"
readonly="false"
onFocus="@command('onFocusItem', item=each, ctrl=self)"
onChange="@command('recalculateTotalInvoice', form=fx, changed='totalInvoice')"
value="@bind(each.totalInvoice) @converter(vm.standardBigDecimalConverter)" />
</listcell>
<listcell label="@load(each.reqItem.orderNum)" />
</listitem>
</template>