svn commit: r420944 - in /incubator/ofbiz/trunk/applications/order: config/OrderErrorUiLabels.properties webapp/ordermgr/order/editorderitems.ftl webapp/ordermgr/order/orderView.fo.ftl

[sichen]

Author: sichen
Date: Tue Jul 11 11:33:03 2006
New Revision: 420944

URL: http://svn.apache.org/viewvc?rev=420944&view=rev
Log:
Cosmetic improvements to add adjustment to completed order. OFBIZ-55.  Thanks to Ashish Vijaywargiya.

Modified:
    incubator/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.properties
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl

Modified: incubator/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.properties?rev=420944&r1=420943&r2=420944&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.properties Tue Jul 11 11:33:03 2006
@@ -205,6 +205,8 @@
 OrderSecurityErrorToRunCheckCreateOrderRequirement=Security Error : to run checkCreateOrderRequirement you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission
 OrderSecurityErrorToRunCheckCreateStockRequirement=Security Error : to run checkCreateStockRequirement you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission
 OrderSecurityErrorToRunCreateOrderAdjustement=Security Error : to run createOrderAdjustment you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission
+OrderSecurityErrorToRunUpdateOrderAdjustement=Security Error : to run updateOrderAdjustment you must have the ORDERMGR_UPDATE or ORDERMGR_ADMIN permission
+OrderSecurityErrorToRunDeleteOrderAdjustement=Security Error : to run deleteOrderAdjustment you must have the ORDERMGR_DELETE or ORDERMGR_ADMIN permission
 OrderSecurityErrorToRunCreateOrderShipment=Security Error : to run createOrderShipment you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission
 OrderSecurityErrorToRunCreateQuote=Security Error : to run createQuote you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission
 OrderSecurityErrorToRunCreateQuoteAndQuoteItemForRequest=Security Error : to run createQuoteAndQuoteItemForRequest you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=420944&r1=420943&r2=420944&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Tue Jul 11 11:33:03 2006
@@ -174,7 +174,7 @@
                         <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcItemAdjustment(orderItemAdjustment, orderItem) isoCode=currencyUomId/>
                       </div>
                      </td>
-                    <td>&nbsp;</td>
+                    <td colspan="3">&nbsp;</td>
                   </tr>
                 </#list>
               </#if>
@@ -227,7 +227,7 @@
                 <td align="right" colspan="4">
                   <div class="tabletext"><b>${adjustmentType.get("description",locale)}</b> ${orderHeaderAdjustment.comments?if_exists} :</div>
                 </td>
-                <td align="left" nowrap colspan="2">
+                <td align="left" nowrap>
                   <div class="tabletext"><input type="text" name="description" value="${orderHeaderAdjustment.get("description")?if_exists}" size="30" maxlength="60" class="inputBox"></div>
                 </td>
                 <td align="left" nowrap>
@@ -245,29 +245,18 @@
             <form name="addAdjustmentForm" method="post" action="<@ofbizUrl>createOrderAdjustment?${paramString}</@ofbizUrl>">
              <input type="hidden" name="comments" value="Added manually by [${userLogin.userLoginId}]"/>
               <tr>
-                <td align="right" colspan="5"><div class="tableheadtext">${uiLabelMap.OrderAdjustmentType} :</div></td>
-                <td align="left" colspan="2">
+                <td align="right" colspan="4">
+                  <span class="tableheadtext">${uiLabelMap.OrderAdjustment} :</span>
                   <select name="orderAdjustmentTypeId" class="selectBox">
                     <#list orderAdjustmentTypes as type>
                          <option value="${type.orderAdjustmentTypeId}">${type.get("description",locale)?default(type.orderAdjustmentTypeId)}</option>
                     </#list>
                   </select>
                 </td>
-              </tr>
-              <tr>
-                <td align="right" colspan="5"><div class="tableheadtext">${uiLabelMap.CommonComment} :</div></td>
-                <td align="left" colspan="2"><div class="tabletext"><input type="text" name="description" value="" size="30" maxlength="60" class="inputBox"></div></td>
-              </tr>
-              <tr>  
-                <td align="right" colspan="5"><div class="tableheadtext">${uiLabelMap.CommonAmount} :</div></td>
-                <td  align="left" colspan="2">
+                <td align="left"><div class="tabletext"><input type="text" name="description" value="" size="30" maxlength="60" class="inputBox"></div></td>
+                <td  align="left">
                    <input type="text" name="amount" size="6" value="<@ofbizAmount amount=0.00/>" class="inputBox"/>
-                </td>
-              </tr>
-              <tr >
-                <td align="right" colspan="5"></td>
-                <td align="left" colspan="3">
-                  <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"/>
+                   <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"/>
                 </td>
               </tr>
             </form>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl?rev=420944&r1=420943&r2=420944&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl Tue Jul 11 11:33:03 2006
@@ -245,6 +245,17 @@
                     </fo:table-row>
                     </#if>
            </#list>
+          <#list orderHeaderAdjustments as orderHeaderAdjustment>
+            <#assign adjustmentType = orderHeaderAdjustment.getRelatedOne("OrderAdjustmentType")>
+            <#assign adjustmentAmount = Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(orderHeaderAdjustment, orderSubTotal)>
+            <#if adjustmentAmount != 0>
+            <fo:table-row>
+               <fo:table-cell></fo:table-cell>
+               <fo:table-cell number-columns-spanned="2"><fo:block font-weight="bold">${adjustmentType.get("description",locale)} : <#if orderHeaderAdjustment.get("description")?has_content>(${orderHeaderAdjustment.get("description")?if_exists})</#if> </fo:block></fo:table-cell>
+               <fo:table-cell text-align="right"><fo:block><@ofbizCurrency amount=adjustmentAmount isoCode=currencyUomId/></fo:block></fo:table-cell>
+            </fo:table-row>
+            </#if>
+          </#list>
 
            <#-- summary of order amounts -->
                     <fo:table-row>