svn commit: r614003 - in /ofbiz/trunk/applications/order: config/ webapp/ordermgr/order/ webapp/ordermgr/request/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r614003 - in /ofbiz/trunk/applications/order: config/ webapp/ordermgr/order/ webapp/ordermgr/request/

mrisaliti
Author: mrisaliti
Date: Mon Jan 21 12:34:18 2008
New Revision: 614003

URL: http://svn.apache.org/viewvc?rev=614003&view=rev
Log:
Misc Ui fix for Order Application

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.properties
    ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties
    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?rev=614003&r1=614002&r2=614003&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Mon Jan 21 12:34:18 2008
@@ -911,6 +911,7 @@
 PageTitleEditQuoteItemForCustRequest=Edit a QuoteItem For a CustRequest
 PageTitleEditRequestItem=Edit a Request Item
 PageTitleEditRequestItemWorkEffort=Edit a Request Item WorkEffort
+PageTitleEditRequestRoles=Edit Request Roles
 PageTitleEditRequirement=Edit Requirement
 PageTitleFindApprovedProductRequirements=Find Approved Product Requirements
 PageTitleFindApprovedRequirements=Find Approved Requirements

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties?rev=614003&r1=614002&r2=614003&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties Mon Jan 21 12:34:18 2008
@@ -745,6 +745,7 @@
 PageTitleOrderShowCart=Mostra Carrello
 PageTitleCreateQuoteForCustRequest=Creare un nuovo Preventivo per una Richiesta Cliente
 PageTitleEditRequirement=Aggiorna Fabbisogno
+PageTitleEditRequestRoles=Aggiorna Ruoli Richiesta
 PageTitleEditRequestItem=Aggiorna Riga Richiesta
 PageTitleEditRequestItemWorkEffort=Aggiorna Riga Richiesta Impegno di Lavoro
 PageTitleEditQuoteItemForCustRequest=Aggiorna Riga Preventivo Per una Richiesta Cliente

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?rev=614003&r1=614002&r2=614003&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Mon Jan 21 12:34:18 2008
@@ -42,8 +42,8 @@
     <div class="screenlet-body">
       <table class="basic-table" cellspacing='0'>
         <tr>
-          <td align="right" valign="top" width="15%"><span class="label">&nbsp;${uiLabelMap.CommonName}</span></td>
-          <td width="5">&nbsp;</td>
+          <td align="right" valign="top" width="19%"><span class="label">&nbsp;${uiLabelMap.CommonName}</span></td>
+          <td width="1%">&nbsp;</td>
           <td align="left" valign="top" width="80%">
             <div>
               <#if displayParty?has_content>
@@ -51,11 +51,12 @@
                 ${displayPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")}
               </#if>
               <#if partyId?exists>
-                <span>&nbsp;(<a href="${customerDetailLink}${partyId}" target="partymgr" class="buttontext">${partyId}</a>)</span>
-                <span>
+                &nbsp;(<a href="${customerDetailLink}${partyId}" target="partymgr" class="buttontext">${partyId}</a>)
+                </br>
+                <div>
                    <a href="<@ofbizUrl>/orderentry?partyId=${partyId}&amp;orderTypeId=${orderHeader.orderTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNewOrder}</a>
                    <a href="<@ofbizUrl>/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;viewIndex=1&amp;viewSize=20</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOtherOrders}</a>
-                </span>
+                </div>
               </#if>
             </div>
           </td>
@@ -64,12 +65,12 @@
           <#assign contactMech = orderContactMechValueMap.contactMech>
           <#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType>
           <#--<#assign partyContactMech = orderContactMechValueMap.partyContactMech>-->
-          <tr><td colspan="7"><hr/></td></tr>
+          <tr><td colspan="3"><hr/></td></tr>
           <tr>
-            <td align="right" valign="top" width="15%">
+            <td align="right" valign="top" width="19%">
               <span class="label">&nbsp;${contactMechPurpose.get("description",locale)}</span>
             </td>
-            <td width="5">&nbsp;</td>
+            <td width="1%">&nbsp;</td>
             <td align="left" valign="top" width="80%">
               <#if contactMech.contactMechTypeId == "POSTAL_ADDRESS">
                 <#assign postalAddress = orderContactMechValueMap.postalAddress>
@@ -116,7 +117,7 @@
                 <div>
                   ${contactMech.infoString}
                   <#if security.hasEntityPermission("ORDERMGR", "_SEND_CONFIRMATION", session)>
-                     <br/>(<a href="<@ofbizUrl>confirmationmailedit?orderId=${orderId}&amp;partyId=${partyId}&amp;sendTo=${contactMech.infoString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSendConfirmationEmail}</a>)
+                     (<a href="<@ofbizUrl>confirmationmailedit?orderId=${orderId}&amp;partyId=${partyId}&amp;sendTo=${contactMech.infoString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSendConfirmationEmail}</a>)
                   <#else>
                      <a href="mailto:${contactMech.infoString}" class="buttontext">(${uiLabelMap.OrderSendEmail})</a>
                   </#if>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=614003&r1=614002&r2=614003&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Mon Jan 21 12:34:18 2008
@@ -158,7 +158,6 @@
                   <td align="right" valign="top" nowrap="nowrap">
                     <table>
                       <tr valign="top">
-                        <td>
                         <#assign remainingQuantity = (orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0))>
                         <#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)>
                         <#-- to compute shortfall amount, sum up the orderItemShipGrpInvRes.quantityNotAvailable -->
@@ -168,22 +167,51 @@
                             <#assign shortfalledQuantity = shortfalledQuantity + orderItemShipGrpInvRes.quantityNotAvailable/>
                           </#if>
                         </#list>
-                          <div><span class="label">${uiLabelMap.OrderOrdered}</span>&nbsp;${orderItem.quantity?default(0)?string.number}&nbsp;&nbsp;</div>
-                          <div><span class="label">${uiLabelMap.OrderCancelled}</span>&nbsp;${orderItem.cancelQuantity?default(0)?string.number}&nbsp;&nbsp;</div>
-                          <div><span class="label">${uiLabelMap.OrderRemaining}</span>&nbsp;${remainingQuantity}&nbsp;&nbsp;</div>
-                          <div><span class="label">${uiLabelMap.OrderShortfalled}</span>&nbsp;${shortfalledQuantity}&nbsp;&nbsp;</div>
-                        </td>
-                        <td>
-                          <div><span class="label">${uiLabelMap.OrderShipRequest}</span>&nbsp;${orderReadHelper.getItemReservedQuantity(orderItem)}&nbsp;&nbsp;</div>
-                          <#if orderHeader.orderTypeId == "SALES_ORDER">                        
-                              <div><#if pickedQty gt 0 && orderHeader.statusId == "ORDER_APPROVED"><font color="red"><span class="label">${uiLabelMap.OrderQtyPicked}</span>&nbsp;${pickedQty?default(0)?string.number}</font><#else><span class="label">${uiLabelMap.OrderQtyPicked}</span>&nbsp;${pickedQty?default(0)?string.number}</#if>&nbsp;&nbsp;</div>
-                          </#if>    
-                          <div><span class="label">${uiLabelMap.OrderQtyShipped}</span>&nbsp;${shippedQuantity}&nbsp;&nbsp;</div>
-                          <div><span class="label">${uiLabelMap.OrderOutstanding}</span>&nbsp;
+                          <td><b>${uiLabelMap.OrderOrdered}</b></td>
+                          <td>${orderItem.quantity?default(0)?string.number}</td>
+                          <td><b>${uiLabelMap.OrderShipRequest}</b></td>
+                          <td>${orderReadHelper.getItemReservedQuantity(orderItem)}</td>
+                       </tr>
+                       <tr valign="top">
+                          <td><b>${uiLabelMap.OrderCancelled}</b></td>
+                          <td>${orderItem.cancelQuantity?default(0)?string.number}</td>
+                      <#if orderHeader.orderTypeId == "SALES_ORDER">                        
+                        <#if pickedQty gt 0 && orderHeader.statusId == "ORDER_APPROVED">
+                          <td><font color="red"><b>${uiLabelMap.OrderQtyPicked}</b></font></td>
+                          <td><font color="red">${pickedQty?default(0)?string.number}</font></td>
+                        <#else>
+                          <td><b>${uiLabelMap.OrderQtyPicked}</b></td>
+                          <td>${pickedQty?default(0)?string.number}</td>
+                        </#if>
+                      <#else>
+                          <td>&nbsp;</td>
+                          <td>&nbsp;</td>
+                      </#if>
+                       </tr>
+                       <tr valign="top">
+                          <td><b>${uiLabelMap.OrderRemaining}</b></td>
+                          <td>${remainingQuantity}</td>
+                          <td><b>${uiLabelMap.OrderQtyShipped}</b></td>
+                          <td>${shippedQuantity}</td>
+                       </tr>
+                       <tr valign="top">
+                          <td><b>${uiLabelMap.OrderShortfalled}</b></td>
+                          <td>${shortfalledQuantity}</td>
+                          <td><b>${uiLabelMap.OrderOutstanding}</b></td>
+                          <td>
                           <#-- Make sure digital goods without shipments don't always remainn "outstanding": if item is completed, it must have no outstanding quantity.  -->
-                          <#if (orderItem.statusId != null) && (orderItem.statusId == "ITEM_COMPLETED")>0<#else>${orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0) - shippedQuantity}</#if>&nbsp;&nbsp;</div>
-                          <div><span class="label">${uiLabelMap.OrderInvoiced}</span>&nbsp;${orderReadHelper.getOrderItemInvoicedQuantity(orderItem)}&nbsp;&nbsp;</div>
-                          <div><span class="label">${uiLabelMap.OrderReturned}</span>&nbsp;${returnQuantityMap.get(orderItem.orderItemSeqId)?default(0)}&nbsp;&nbsp;</div>
+                          <#if (orderItem.statusId != null) && (orderItem.statusId == "ITEM_COMPLETED")>
+                          0
+                          <#else>${orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0) - shippedQuantity}
+                          </#if>
+                          </td>
+                       </tr>
+                       <tr valign="top">
+                       </tr>
+                          <td><b>${uiLabelMap.OrderInvoiced}</b></td>
+                          <td>${orderReadHelper.getOrderItemInvoicedQuantity(orderItem)}</td>
+                          <td><b>${uiLabelMap.OrderReturned}</b></td>
+                          <td>${returnQuantityMap.get(orderItem.orderItemSeqId)?default(0)}</td>
                         </td>
                       </tr>
                     </table>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=614003&r1=614002&r2=614003&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Mon Jan 21 12:34:18 2008
@@ -26,9 +26,9 @@
      <table class="basic-table" cellspacing='0'>
      <#-- order payment status -->
      <tr>
-       <td align="center" valign="top" width="25%" class="label">&nbsp;${uiLabelMap.OrderStatusHistory}</td>
-       <td width="15">&nbsp;</td>
-       <td>
+       <td align="center" valign="top" width="29%" class="label">&nbsp;${uiLabelMap.OrderStatusHistory}</td>
+       <td width="1%">&nbsp;</td>
+       <td width="60%">
          <#assign orderPaymentStatuses = orderReadHelper.getOrderPaymentStatuses()>
          <#if orderPaymentStatuses?has_content>
            <#list orderPaymentStatuses as orderPaymentStatus>
@@ -43,8 +43,9 @@
            </#list>
          </#if>
        </td>
+       <td width="10%">&nbsp;</td>
      </tr>
-     <tr><td colspan="3"><hr/></td></tr>
+     <tr><td colspan="4"><hr/></td></tr>
      <#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content>
         <#list orderPaymentPreferences as orderPaymentPreference>
           <#assign pmBillingAddress = {}>
@@ -65,7 +66,7 @@
                 <#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse")>
                 <#assign finAccountType = finAccount.getRelatedOne("FinAccountType")?if_exists/>
                 <tr>
-                  <td align="right" valign="top" width="15%">
+                  <td align="right" valign="top" width="29%">
                     <div>
                     <span class="label">&nbsp;${uiLabelMap.AccountingFinAccount}</span>
                     <#if orderPaymentPreference.maxAmount?has_content>
@@ -73,8 +74,8 @@
                     </#if>
                     </div>
                   </td>
-                  <td width="5">&nbsp;</td>
-                  <td align="left" valign="top" width="80%">
+                  <td width="1%">&nbsp;</td>
+                  <td align="left" valign="top" width="60%">
                     <div class="tabletext">
                       <#if (finAccountType?has_content)>
                         ${finAccountType.description?default(finAccountType.finAccountTypeId)}&nbsp;                        
@@ -111,27 +112,27 @@
                       </div>
                     </#if>
                   </td>
-                  <td>
-                     <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))>
+                  <td width="10%">
+                    <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))>
                      <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
-                        <a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a>&nbsp;
-                     </#if>
+                        <div><a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a></div>
                      </#if>
+                    </#if>
                   </td>
                 </tr>
               </#if>
             <#else>
               <tr>
-                <td align="right" valign="top" width="15%">
+                <td align="right" valign="top" width="29%">
                   <div>&nbsp;<span class"label">${paymentMethodType.get("description",locale)?if_exists}</span>&nbsp;
                   <#if orderPaymentPreference.maxAmount?has_content>
                   <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
                   </#if>
                   </div>
                 </td>
-                <td width="5">&nbsp;</td>
+                <td width="1%">&nbsp;</td>
                 <#if paymentMethodType.paymentMethodTypeId != "EXT_OFFLINE" && paymentMethodType.paymentMethodTypeId != "EXT_PAYPAL" && paymentMethodType.paymentMethodTypeId != "EXT_COD">
-                  <td align="left">
+                  <td align="left" width="60%">
                     <div>
                       <#if orderPaymentPreference.maxAmount?has_content>
                          <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
@@ -142,20 +143,20 @@
                     <div class="tabletext"><@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>&nbsp;-&nbsp;${(orderPaymentPreference.authDate.toString())?if_exists}</div>
                     <div class="tabletext">&nbsp;<#if orderPaymentPreference.authRefNum?exists>(${uiLabelMap.OrderReference}: ${orderPaymentPreference.authRefNum})</#if></div>
                     -->
-                 </td>
+                  </td>
                 <#else>
-                  <td align="right">
+                  <td align="right" width="60%">
                     <a href="<@ofbizUrl>receivepayment?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingReceivePayment}</a>
                   </td>
                 </#if>
-                <td>
+                  <td width="10%">
                    <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))>
-                   <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">                        
-                      <a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&amp;orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&amp;statusId=PAYMENT_CANCELLED&amp;checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a>&nbsp;
-                   </#if>
+                    <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">                        
+                      <div><a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&amp;orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&amp;statusId=PAYMENT_CANCELLED&amp;checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a></div>
+                    </#if>
                    </#if>
-                </td>
-              </tr>
+                  </td>
+                </tr>
             </#if>
           <#else>
             <#if paymentMethod.paymentMethodTypeId?if_exists == "CREDIT_CARD">
@@ -165,15 +166,15 @@
                 <#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress")?if_exists>
               </#if>
               <tr>
-                <td align="right" valign="top" width="15%">
+                <td align="right" valign="top" width="29%">
                   <div>&nbsp;<span class="label">${uiLabelMap.AccountingCreditCard}</span>
                   <#if orderPaymentPreference.maxAmount?has_content>
                      <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
                   </#if>
                   </div>
                 </td>
-                <td width="5">&nbsp;</td>
-                <td align="left" valign="top" width="80%">
+                <td width="1%">&nbsp;</td>
+                <td align="left" valign="top" width="60%">
                   <div>
                     <#if creditCard?has_content>
                       <#if creditCard.companyNameOnCard?exists>${creditCard.companyNameOnCard}<br/></#if>
@@ -225,12 +226,12 @@
                     </div>
                   </#if>
                 </td>
-                <td align="right" valign="top" width="20%">
-                   <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))>
+                <td width="10%">
+                  <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))>
                    <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">                        
-                      <a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&amp;orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&amp;statusId=PAYMENT_CANCELLED&amp;checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a>&nbsp;
-                   </#if>
+                      <div><a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&amp;orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&amp;statusId=PAYMENT_CANCELLED&amp;checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a></div>
                    </#if>
+                  </#if>
                 </td>
               </tr>
             <#elseif paymentMethod.paymentMethodTypeId?if_exists == "EFT_ACCOUNT">
@@ -239,15 +240,15 @@
                 <#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress")?if_exists>
               </#if>
               <tr>
-                <td align="right" valign="top" width="15%">
+                <td align="right" valign="top" width="29%">
                   <div>&nbsp;<span class="label">${uiLabelMap.AccountingEFTAccount}</span>
                   <#if orderPaymentPreference.maxAmount?has_content>
                   <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
                   </#if>
                   </div>
                 </td>
-                <td width="5">&nbsp;</td>
-                <td align="left" valign="top" width="80%">
+                <td width="1%">&nbsp;</td>
+                <td align="left" valign="top" width="60%">
                   <div class="tabletext">
                     <#if eftAccount?has_content>
                       ${eftAccount.nameOnAccount?if_exists}<br/>
@@ -259,12 +260,12 @@
                     </#if>
                   </div>
                 </td>
-                <td>
-                   <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))>
+                <td width="10%">
+                  <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))>
                    <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">                        
-                      <a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a>&nbsp;
-                   </#if>
+                      <div><a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a></div>
                    </#if>
+                  </#if>
                 </td>
               </tr>
             <#elseif paymentMethod.paymentMethodTypeId?if_exists == "GIFT_CARD">
@@ -273,15 +274,15 @@
                 <#assign pmBillingAddress = giftCard.getRelatedOne("PostalAddress")?if_exists>
               </#if>
               <tr>
-                <td align="right" valign="top" width="15%">
+                <td align="right" valign="top" width="29%">
                   <div>&nbsp;<span class="label">${uiLabelMap.OrderGiftCard}</span>
                   <#if orderPaymentPreference.maxAmount?has_content>
                   <br/>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
                   </#if>
                   </div>
                 </td>
-                <td width="5">&nbsp;</td>
-                <td align="left" valign="top" width="80%">
+                <td width="1%">&nbsp;</td>
+                <td align="left" valign="top" width="60%">
                   <div>
                     <#if giftCard?has_content>
                       <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)>
@@ -311,22 +312,22 @@
                     </#if>
                   </div>
                 </td>
-                <td>
-                   <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))>
+                <td width="10%">
+                  <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))>
                    <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">                        
-                      <a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a>&nbsp;
-                   </#if>
+                      <div><a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a></div>
                    </#if>
+                  </#if>
                 </td>
               </tr>
             </#if>
           </#if>
           <#if pmBillingAddress?has_content>
-            <tr><td>&nbsp;</td><td>&nbsp;</td><td colspan="2"><hr/></td></tr>
+            <tr><td>&nbsp;</td><td>&nbsp;</td><td colspan="3"><hr/></td></tr>
             <tr>
-              <td align="right" valign="top" width="15%">&nbsp;</td>
-              <td width="5">&nbsp;</td>
-              <td colspan="2" align="left" valign="top" width="80%">
+              <td align="right" valign="top" width="29%">&nbsp;</td>
+              <td width="1%">&nbsp;</td>
+              <td align="left" valign="top" width="60%">
                 <div>
                   <#if pmBillingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span>&nbsp;${pmBillingAddress.toName}<br/></#if>
                   <#if pmBillingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span>&nbsp;${pmBillingAddress.attnName}<br/></#if>
@@ -337,6 +338,7 @@
                   ${pmBillingAddress.countryGeoId?if_exists}
                 </div>
               </td>
+              <td width="10%">&nbsp;</td>
             </tr>
           </#if>
         </#list>
@@ -347,7 +349,7 @@
             <tr><td colspan="4"><hr/></td></tr>
           </#if>
           <tr>
-            <td align="right" valign="top" width="15%">
+            <td align="right" valign="top" width="29%">
               <#-- billing accounts require a special OrderPaymentPreference because it is skipped from above section of OPPs -->
               <div>&nbsp;<span class="label">${uiLabelMap.AccountingBillingAccount}</span>&nbsp;
                   <#if billingAccountMaxAmount?has_content>
@@ -355,18 +357,20 @@
                   </#if>
                   </div>
             </td>
-            <td width="5">&nbsp;</td>
-            <td colspan="2" align="left" valign="top" width="80%">
+            <td width="1%">&nbsp;</td>
+            <td align="left" valign="top" width="60%">
                 #<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}&amp;externalLoginKey=${externalLoginKey}" class="buttontext">${billingAccount.billingAccountId}</a>  - ${billingAccount.description?if_exists}              
             </td>
+            <td width="10%">&nbsp;</td>
           </tr>
         </#if>
         <#if customerPoNumber?has_content>
           <tr><td colspan="4"><hr/></td></tr>
           <tr>
-            <td align="right" valign="top" width="15%"><span class="label">${uiLabelMap.OrderPONumber}</span></td>
-            <td width="5">&nbsp;</td>
-            <td colspan="2" align="left" valign="top" width="80%">${customerPoNumber?if_exists}</td>
+            <td align="right" valign="top" width="29%"><span class="label">${uiLabelMap.OrderPONumber}</span></td>
+            <td width="1%">&nbsp;</td>
+            <td align="left" valign="top" width="60%">${customerPoNumber?if_exists}</td>
+            <td width="10%">&nbsp;</td>
           </tr>
         </#if>
 
@@ -374,14 +378,15 @@
         <#if invoices?has_content>
           <tr><td colspan="4"><hr/></td></tr>
           <tr>
-            <td align="right" valign="top" width="15%">&nbsp;<span class="label">${uiLabelMap.OrderInvoices}</span></td>
-            <td width="5">&nbsp;</td>
-            <td colspan="2" align="left" valign="top" width="80%">
+            <td align="right" valign="top" width="29%">&nbsp;<span class="label">${uiLabelMap.OrderInvoices}</span></td>
+            <td width="1%">&nbsp;</td>
+            <td align="left" valign="top" width="60%">
               <#list invoices as invoice>
                 <div>${uiLabelMap.OrderNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}&amp;externalLoginKey=${externalLoginKey}" class="buttontext">${invoice}</a>
                 (<a href="/accounting/control/invoice.pdf?invoiceId=${invoice}" class="buttontext">PDF</a>)</div>
               </#list>
             </td>
+            <td width="10%">&nbsp;</td>
           </tr>
         </#if>
    <#else>
@@ -396,9 +401,9 @@
    <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
    <table class="basic-table" cellspacing='0'>
    <tr>
-      <td width="15%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.AccountingPaymentMethod}</span></td>
-      <td width="5">&nbsp;</td>
-      <td nowrap="nowrap">
+      <td width="29%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.AccountingPaymentMethod}</span></td>
+      <td width="1%">&nbsp;</td>
+      <td width="60%" nowrap="nowrap">
          <select name="paymentMethodId">
            <#list paymentMethodValueMaps as paymentMethodValueMap>
              <#assign paymentMethod = paymentMethodValueMap.paymentMethod/>
@@ -421,21 +426,24 @@
            </#list>
          </select>
       </td>
+      <td width="10%">&nbsp;</td>
    </tr>                    
    <#assign openAmount = orderReadHelper.getOrderOpenAmount()>
    <tr>
-      <td width="20%" align="right"><span class="label">${uiLabelMap.AccountingAmount}</span></td>
-      <td width="2%">&nbsp;</td>
-      <td nowrap="nowrap">
+      <td width="29%" align="right"><span class="label">${uiLabelMap.AccountingAmount}</span></td>
+      <td width="1%">&nbsp;</td>
+      <td width="60%" nowrap="nowrap">
          <input type="text" name="maxAmount" value="${openAmount}"/>
       </td>
+      <td width="10%">&nbsp;</td>
    </tr>
    <tr>
-      <td align="right" valign="top" width="15%">&nbsp;</td>
-      <td width="5">&nbsp;</td>
-      <td align="left" valign="top" width="80%">
+      <td align="right" valign="top" width="29%">&nbsp;</td>
+      <td width="1%">&nbsp;</td>
+      <td align="left" valign="top" width="60%">
         <input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/>        
       </td>
+      <td width="10%">&nbsp;</td>
    </tr>
    </table>
    </form>    

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=614003&r1=614002&r2=614003&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Mon Jan 21 12:34:18 2008
@@ -264,17 +264,14 @@
          <#if security.hasEntityPermission("FACILITY", "_CREATE", session)>
          <tr><td colspan="3"><hr/></td></tr>
          <tr>
-           <td align="right" valign="top" width="15%">
-             <span class="label">&nbsp;<#if orderHeader.orderTypeId == "PURCHASE_ORDER">${uiLabelMap.ProductDestinationFacility}</#if></span>
-           </td>
-           <td width="5">&nbsp;</td>
-           <td align="left" valign="top" width="80%">
+           <td colspan="3" valign="top" align="center">
              <div>
                <#if orderHeader.orderTypeId == "SALES_ORDER">
                  <#if !shipGroup.supplierPartyId?has_content>
                    <a href="<@ofbizUrl>quickShipOrder?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickShipEntireOrder}</a>
                  </#if>
                <#else> <#-- PURCHASE_ORDER -->
+                 <span class="label">&nbsp;<#if orderHeader.orderTypeId == "PURCHASE_ORDER">${uiLabelMap.ProductDestinationFacility}</#if></span>
                  <#assign facilities = facilitiesForShipGroup.get(shipGroup.shipGroupSeqId)>
                  <#if facilities?has_content>
                  <form action="/facility/control/quickShipPurchaseOrder?externalLoginKey=${externalLoginKey}" method="POST">

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl?rev=614003&r1=614002&r2=614003&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestTabBar.ftl Mon Jan 21 12:34:18 2008
@@ -28,15 +28,19 @@
         </ul>
         <br/>
     </div>
+    <br/>
     <#if custRequestItem?exists>
-      <div class="tabContainer">
-        <a href="<@ofbizUrl>EditRequestItem?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitem?default(unselectedClassName)}">${uiLabelMap.OrderRequestItem}</a>
-        <a href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemnotes?default(unselectedClassName)}">${uiLabelMap.OrderNotes}</a>
-        <#if custRequest.custRequestTypeId = "RF_QUOTE">
-        <a href="<@ofbizUrl>RequestItemQuotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemquotes?default(unselectedClassName)}">${uiLabelMap.OrderOrderQuotes}</a>
-        </#if>
-        <a href="<@ofbizUrl>requestitemrequirements?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.requestitemrequirements?default(unselectedClassName)}">${uiLabelMap.OrderRequirements}</a>
-        <a href="<@ofbizUrl>EditRequestItemWorkEfforts?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="${selectedClassMap.EditRequestItemWorkEfforts?default(unselectedClassName)}">${uiLabelMap.WorkEffortWorkEfforts}</a>
+      <div class="button-bar tab-bar">
+          <ul>
+              <li<#if selected="requestitem"> class="selected"</#if>><a href="<@ofbizUrl>EditRequestItem?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>">${uiLabelMap.OrderRequestItem}</a></li>
+              <li<#if selected="requestitemnotes"> class="selected"</#if>><a href="<@ofbizUrl>requestitemnotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>">${uiLabelMap.OrderNotes}</a></li>
+            <#if custRequest.custRequestTypeId = "RF_QUOTE">
+              <li<#if selected="requestitemquotes"> class="selected"</#if>><a href="<@ofbizUrl>RequestItemQuotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>">${uiLabelMap.OrderOrderQuotes}</a></li>
+            </#if>
+              <li<#if selected="requestitemrequirements"> class="selected"</#if>><a href="<@ofbizUrl>requestitemrequirements?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>">${uiLabelMap.OrderRequirements}</a></li>
+              <li<#if selected="task"> class="selected"</#if>><a href="<@ofbizUrl>EditRequestItemWorkEfforts?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>">${uiLabelMap.WorkEffortWorkEfforts}</a></li>
+          </ul>
+          <br/>
       </div>
     </#if>
 </#if>