From: Si C. <si...@ea...> - 2007-11-27 22:11:59
|
Author: sichen Date: 2007-11-27 14:12:03 -0800 (Tue, 27 Nov 2007) New Revision: 957 Modified: versions/0.9/trunk/webapp/financials/invoices/viewInvoice.ftl Log: handle case where there are no productId/description Modified: versions/0.9/trunk/webapp/financials/invoices/viewInvoice.ftl =================================================================== --- versions/0.9/trunk/webapp/financials/invoices/viewInvoice.ftl 2007-11-09 18:19:03 UTC (rev 956) +++ versions/0.9/trunk/webapp/financials/invoices/viewInvoice.ftl 2007-11-27 22:12:03 UTC (rev 957) @@ -210,8 +210,8 @@ <input type="hidden" name="invoiceItemSeqId" value="${item.invoiceItemSeqId}"> <@displayLink href="updateInvoiceItemForm?invoiceId=${item.invoiceId}&invoiceItemSeqId=${item.invoiceItemSeqId}" text=displayItemSeqId /> <@display text=item.getRelatedOneCache("InvoiceItemType").get("description") /> - <@inputLookup name="productId" default=item.productId lookup="LookupProduct" form="updateInvoiceItem_o_${item_index}" size="10" /> - <@inputText name="description" default=item.description size=60 /> + <@inputLookup name="productId" default=item.productId?default("") lookup="LookupProduct" form="updateInvoiceItem_o_${item_index}" size="10" /> + <@inputText name="description" default=item.description?default("") size=60 /> <@inputText name="quantity" default=item.quantity size=4 /> <@inputText name="amount" default=item.amount size=6 /> <@displayCurrency amount=rowTotal currencyUomId=item.uomId?default(invoice.currencyUomId) /> |