Add edit field for Bill.expires.

Also change Bills date fields in editor to <p:calendar> instead of <h:inputText>

code/moya-web/WebContent/bill/edit.xhtml

@@ -20,10 +20,14 @@
 					<h:outputLabel for="billid" value="#{i18n['bill.id']}:" />
 					<h:inputText id="billid" value="#{billEditView.bill.id}" />
 
+					<h:outputLabel for="sentDate" value="#{i18n['bill.sentDate']}:" />
+					<p:calendar id="sentDate" value="#{billEditView.bill.sentDate}" pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
+
+					<h:outputLabel for="expires" value="#{i18n['bill.expires']}:" />
+					<p:calendar id="expires" value="#{billEditView.bill.expires}" pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
+
 					<h:outputLabel for="paidDate" value="#{i18n['bill.paidDate']}:" />
-					<h:inputText id="paidDate" value="#{billEditView.bill.paidDate}">
-						<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
-					</h:inputText>
+					<p:calendar id="paidDate" value="#{billEditView.bill.paidDate}" pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
 
 					<h:outputLabel for="billnr" value="#{i18n['bill.billNumber']}:" />
 					<h:inputText id="billnr" value="#{billEditView.bill.billNumber}" />
@@ -43,12 +47,6 @@
 					<h:outputLabel for="addr5" value="#{i18n['bill.addr5']}:" />
 					<h:inputText id="addr5" value="#{billEditView.bill.addr5}" />
 
-					<h:outputLabel for="sentDate" value="#{i18n['bill.sentDate']}:" />
-					<p:calendar id="sentDate" value="#{billEditView.bill.sentDate}" pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
-
-
-					<h:outputLabel for="expires" value="#{i18n['bill.expires']}:" />
-					<p:calendar id="expires" value="#{billEditView.bill.expires}" pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
 
 					<h:outputLabel for="paymenttime" value="#{i18n['bill.paymentTime']}:" />
 					<h:inputText id="paymenttime" value="#{billEditView.bill.paymentTime}" />