Index: applications/order/widget/ordermgr/OrderForms.xml
===================================================================
--- applications/order/widget/ordermgr/OrderForms.xml	(revision 1165137)
+++ applications/order/widget/ordermgr/OrderForms.xml	(working copy)
@@ -246,5 +246,17 @@
             <display-entity entity-name="RoleType" description="${description}"/>
         </field>
     </form>
-    
+
+    <form name="OrderNewNote" target="createordernote" type="single">
+        <field name="orderId"><hidden/></field>
+        <field name="note" title="${uiLabelMap.OrderNote}"><textarea rows="5" cols="70"/></field>
+        <field name="internalNote" title="${uiLabelMap.OrderInternalNote}" tooltip="${uiLabelMap.OrderInternalNoteMessage}">
+            <drop-down allow-empty="true" no-current-selected-key="Y">
+                <option key="Y" description="${uiLabelMap.CommonYes}"/>
+                <option key="N" description="${uiLabelMap.CommonNo}"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+
 </forms>
Index: applications/order/widget/ordermgr/OrderViewScreens.xml
===================================================================
--- applications/order/widget/ordermgr/OrderViewScreens.xml	(revision 1165137)
+++ applications/order/widget/ordermgr/OrderViewScreens.xml	(working copy)
@@ -262,6 +262,9 @@
     </screen>
     <screen name="OrderNewNote">
         <section>
+            <condition>
+                <if-has-permission permission="ORDERMGR" action="_VIEW"/>
+            </condition>
             <actions>
                 <set field="titleProperty" value="OrderAddNote"/>
                 <set field="headerItem" value="findorders"/>
@@ -270,12 +273,18 @@
             <widgets>
                 <decorator-screen name="CommonOrderViewDecorator">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://order/webapp/ordermgr/order/newnote.ftl"/></html>
-                        </platform-specific>
+                        <screenlet title="${uiLabelMap.OrderAddNote}">
+                            <container>
+                                <link target="orderview?orderId=${orderId}" text="${uiLabelMap.OrderBackToOrder}" style="buttontext"/>
+                            </container>
+                            <include-form name="OrderNewNote" location="component://order/widget/ordermgr/OrderForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
+            <fail-widgets>
+                <label style="h3">${uiLabelMap.OrderViewPermissionError}</label>
+            </fail-widgets>
         </section>
     </screen>
     <screen name="OrderDeliveryScheduleInfo">
Index: applications/order/webapp/ordermgr/order/newnote.ftl
===================================================================
--- applications/order/webapp/ordermgr/order/newnote.ftl	(revision 1165137)
+++ applications/order/webapp/ordermgr/order/newnote.ftl	(working copy)
@@ -1,61 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#if security.hasEntityPermission("ORDERMGR", "_VIEW", session)>
-<div class="screenlet">
-    <div class="screenlet-title-bar">
-      <ul>
-        <li class="h3">${uiLabelMap.OrderAddNote}</li>
-      </ul>
-      <br class="clear"/>
-    </div>
-    <div class="screenlet-body">
-        <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
-        <a href="javascript:document.createnoteform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
-
-        <form method="post" action="<@ofbizUrl>createordernote</@ofbizUrl>" name="createnoteform">
-            <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
-            <table class="basic-table" cellspacing='0'>
-              <tr>
-                <td width="26%" align="right"><span class="label">${uiLabelMap.OrderNote}</span></td>
-                <td width="54%">
-                  <textarea name="note" rows="5" cols="70"></textarea>
-                </td>
-              </tr>
-              <tr>
-                 <td>&nbsp;</td>
-                 <td><span class="label">${uiLabelMap.OrderInternalNote}</span>
-                    <select name="internalNote" size="1">
-                    <option value=""></option>
-                    <option value="Y" selected>${uiLabelMap.CommonYes}</option>
-                    <option value="N">${uiLabelMap.CommonNo}</option>
-                    </select>
-                    <span class="tooltip">${uiLabelMap.OrderInternalNoteMessage}</span>
-                 </td>
-              </tr>
-            </table>
-        </form>
-
-        <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
-        <a href="javascript:document.createnoteform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
-    </div>
-</div>
-<#else>
-  <h3>${uiLabelMap.OrderViewPermissionError}</h3>
-</#if>
\ No newline at end of file
