U požadavků se nyní zobrazuje fakturovaná částka.
Opraveno mazání objednávek- pokud je mazaná objednávka označená jako objednaná, musíme z položek smazat číslo objednávky, aby se nabídly pro další objednávku. closes #193
This commit is contained in:
@@ -40,6 +40,8 @@ RequirementItemUnitPrice=Jedn. cena
|
||||
RequirementItemTotal=Celkem
|
||||
RequirementItemDescription=Poznámka
|
||||
|
||||
RequirementInvoicedAmount=Fakturovaná částka:
|
||||
|
||||
|
||||
AgendaMyOrders=Aktuální
|
||||
AgendaOrdersHistory=Ukončené
|
||||
|
||||
@@ -188,6 +188,14 @@
|
||||
</template>
|
||||
</listbox>
|
||||
<div hflex="3">
|
||||
<include src="/main/approveStatus.zul" />
|
||||
<vbox>
|
||||
<include src="/main/approveStatus.zul" />
|
||||
|
||||
<hbox visible="@load(not empty vm.invoicedAmount)">
|
||||
<label value="${labels.RequirementInvoicedAmount}"/>
|
||||
<label value="@load(vm.invoicedAmount) @converter(vm.bigDecimalConverter)"/>
|
||||
</hbox>
|
||||
|
||||
</vbox>
|
||||
</div>
|
||||
</hbox>
|
||||
|
||||
@@ -188,6 +188,14 @@
|
||||
</template>
|
||||
</listbox>
|
||||
<div hflex="3">
|
||||
<include src="/main/approveStatus.zul" />
|
||||
<vbox>
|
||||
<include src="/main/approveStatus.zul" />
|
||||
|
||||
<hbox visible="@load(not empty vm.invoicedAmount)">
|
||||
<label value="${labels.RequirementInvoicedAmount}"/>
|
||||
<label value="@load(vm.invoicedAmount) @converter(vm.bigDecimalConverter)"/>
|
||||
</hbox>
|
||||
|
||||
</vbox>
|
||||
</div>
|
||||
</hbox>
|
||||
|
||||
@@ -188,6 +188,14 @@
|
||||
</template>
|
||||
</listbox>
|
||||
<div hflex="3">
|
||||
<include src="/main/approveStatus.zul" />
|
||||
<vbox>
|
||||
<include src="/main/approveStatus.zul" />
|
||||
|
||||
<hbox visible="@load(not empty vm.invoicedAmount)">
|
||||
<label value="${labels.RequirementInvoicedAmount}"/>
|
||||
<label value="@load(vm.invoicedAmount) @converter(vm.bigDecimalConverter)"/>
|
||||
</hbox>
|
||||
|
||||
</vbox>
|
||||
</div>
|
||||
</hbox>
|
||||
|
||||
Reference in New Issue
Block a user