some nice billexpire -handling

code/MoyaWeb/WebContent/bill/showBill.xhtml

@@ -59,7 +59,7 @@
 				</table>
 			</ui:fragment>
 			
-			<ui:fragment rendered="#{!billEditView.bill.expired}">
+			<ui:fragment rendered="#{!billEditView.bill.paid and !billEditView.bill.expired}">
 				<h:form>
 					<p:commandButton  id="cancelbtn"  onclick="confirmation.show()" value="#{i18n['bill.cancel']}" />
 				

code/MoyaWeb/WebContent/resources/cditools/bills/showBill.xhtml

@@ -16,7 +16,7 @@
 			<h:outputText id="billnr" value="#{cc.attrs.bill.billNumber}" />
 
 			<h:outputLabel for="refnr" value="#{i18n['bill.referencenumber']}" />
-			<h:outputText id="refnr" value="#{cc.attrs.bill.referenceNumber}" />
+			<h:outputText id="refnr" value="#{cc.attrs.bill.expired ? i18n['bill.isExpired'] : cc.attrs.bill.referenceNumber}" />
 
 			<h:outputLabel for="billAmount" value="#{i18n['bill.billAmount']}" />
 			<h:outputText id="billAmount" value="#{cc.attrs.bill.totalPrice()}">
@@ -29,7 +29,7 @@
 			</h:outputText>
 
 			<h:outputLabel for="paymenttime" value="#{i18n['bill.paymentTime']}:" />
-			<h:outputText id="paymenttime" value="#{cc.attrs.bill.paymentTime eq 0 ? i18n['bill.paymentTime.now'] : cc.attrs.bill.paymentTime}" />
+			<h:outputText id="paymenttime" value="#{cc.attrs.bill.expired ? i18n['bill.isExpired'] : (cc.attrs.bill.paymentTime eq 0 ? i18n['bill.paymentTime.now'] : cc.attrs.bill.paymentTime)}" />
 
 			<h:outputLabel for="noticetime" value="#{i18n['bill.noticetime']}:" />
 			<h:outputText id="noticetime" value="#{cc.attrs.bill.noticetime}" />