svn commit: r1197058 - /ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl

[mor-2]

Author: mor
Date: Thu Nov  3 10:37:13 2011
New Revision: 1197058

URL: http://svn.apache.org/viewvc?rev=1197058&view=rev
Log:
Merged from trunk r1197045. Log: Bug fix: Order detail page doesn't show the invoices for purhase orders.

Modified:
    ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl

Modified: ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1197058&r1=1197057&r2=1197058&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Thu Nov  3 10:37:13 2011
@@ -71,6 +71,21 @@ under the License.
            </tr>
          </#list>
        </#list>
+       <#-- invoices -->
+       <#if invoices?has_content>
+         <tr><td colspan="4"><hr /></td></tr>
+         <tr>
+           <td align="right" valign="top" width="29%">&nbsp;<span class="label">${uiLabelMap.OrderInvoices}</span></td>
+           <td width="1%">&nbsp;</td>
+           <td valign="top" width="60%">
+             <#list invoices as invoice>
+               <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}&amp;externalLoginKey=${externalLoginKey}" class="buttontext">${invoice}</a>
+               (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}&amp;externalLoginKey=${externalLoginKey}" class="buttontext">PDF</a>)</div>
+             </#list>
+           </td>
+           <td width="10%">&nbsp;</td>
+         </tr>
+       </#if>
      <#else>
     
      <#-- order payment status -->