You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/11/14 11:55:34 UTC
svn commit: r1201663 - in /ofbiz/trunk/applications: accounting/config/
order/webapp/ordermgr/WEB-INF/actions/order/ order/webapp/ordermgr/order/
Author: sascharodekamp
Date: Mon Nov 14 10:55:34 2011
New Revision: 1201663
URL: http://svn.apache.org/viewvc?rev=1201663&view=rev
Log:
Orderview UI improvements (https://issues.apache.org/jira/browse/OFBIZ-4561). A patch from Dimitri Unruh, which improves the OrderDetail Screens, optimizes the Data fields and Labels.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1201663&r1=1201662&r2=1201663&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Nov 14 10:55:34 2011
@@ -6357,6 +6357,10 @@
<value xml:lang="zh">æ¯ä»</value>
<value xml:lang="zh_TW">æ¯ä»</value>
</property>
+ <property key="AccountingInvoicePerShipment">
+ <value xml:lang="de">Rechnung pro Lieferung</value>
+ <value xml:lang="en">Invoice Per Shipment</value>
+ </property>
<property key="AccountingInvoicePurchase">
<value xml:lang="ar">ÙاتÙرة اÙشراء</value>
<value xml:lang="de">Einkaufsrechnung</value>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=1201663&r1=1201662&r2=1201663&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Mon Nov 14 10:55:34 2011
@@ -270,7 +270,8 @@ if (orderHeader) {
context.mktgPkgQOHMap = inventorySummary.mktgPkgQOHMap;
// get inventory summary with respect to facility
- productStore = orderHeader.getRelatedOne("ProductStore");
+ productStore = orderReadHelper.getProductStore();
+ context.productStore = productStore;
if (productStore) {
facility = productStore.getRelatedOne("Facility");
inventorySummaryByFacility = dispatcher.runSync("getProductInventorySummaryForItems", [orderItems : orderItems, facilityId : facility.facilityId]);
@@ -309,7 +310,6 @@ if (orderHeader) {
if ("SALES_ORDER".equals(orderType)) {
context.returnHeaderTypeId = "CUSTOMER_RETURN";
// also set the product store facility Id for sales orders
- productStore = orderHeader.getRelatedOne("ProductStore");
if (productStore) {
context.storeFacilityId = productStore.inventoryFacilityId;
if (productStore.reqReturnInventoryReceive) {
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=1201663&r1=1201662&r2=1201663&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Mon Nov 14 10:55:34 2011
@@ -84,7 +84,7 @@ under the License.
${displayPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")}
</#if>
<#if partyId?exists>
- (<a href="${customerDetailLink}${partyId}" target="partymgr" class="buttontext">${partyId}</a>)
+ (<a href="${customerDetailLink}${partyId}${externalKeyParam}" target="partymgr" class="buttontext">${partyId}</a>)
<br/>
<#if orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL">
<div>
@@ -106,7 +106,6 @@ under the License.
<#list orderContactMechValueMaps as orderContactMechValueMap>
<#assign contactMech = orderContactMechValueMap.contactMech>
<#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType>
- <#--<#assign partyContactMech = orderContactMechValueMap.partyContactMech>-->
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="19%">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=1201663&r1=1201662&r2=1201663&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Mon Nov 14 10:55:34 2011
@@ -159,18 +159,16 @@ under the License.
</td>
</tr>
<tr><td colspan="3"><hr /></td></tr>
- <tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderProductStore}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
- <#if orderHeader.productStoreId?has_content>
- <a href="/catalog/control/EditProductStore?productStoreId=${orderHeader.productStoreId}${externalKeyParam}" target="catalogmgr" class="buttontext">${orderHeader.productStoreId}</a>
- <#else>
- ${uiLabelMap.CommonNA}
- </#if>
- </td>
- </tr>
- <tr><td colspan="3"><hr /></td></tr>
+ <#if productStore?has_content>
+ <tr>
+ <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderProductStore}</td>
+ <td width="5%"> </td>
+ <td valign="top" width="80%">
+ ${productStore.storeName!} <a href="/catalog/control/EditProductStore?productStoreId=${productStore.productStoreId}${externalKeyParam}" target="catalogmgr" class="buttontext">(${productStore.productStoreId})</a>
+ </td>
+ </tr>
+ <tr><td colspan="3"><hr /></td></tr>
+ </#if>
<tr>
<td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderOriginFacility}</td>
<td width="5%"> </td>
@@ -255,7 +253,7 @@ under the License.
</#if>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> Invoice Per Shipment</td>
+ <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.AccountingInvoicePerShipment}</td>
<td width="5%"> </td>
<td valign="top" width="80%">
<form name="setInvoicePerShipment" method="post" action="<@o...@ofbizUrl>">
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=1201663&r1=1201662&r2=1201663&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Mon Nov 14 10:55:34 2011
@@ -62,7 +62,7 @@ under the License.
${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists}
<#if (product.salesDiscontinuationDate)?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)>
<br />
- <span style="color: red;">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span>
+ <span style="color: red;">${uiLabelMap.OrderItemDiscontinued}: ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(product.salesDiscontinuationDate, "", locale, timeZone)!}</span>
</#if>
<#elseif orderItemType?exists>
${orderItemType.description} - ${orderItem.itemDescription?if_exists}
@@ -71,7 +71,7 @@ under the License.
</#if>
</div>
<div style="float:right;">
- <a href="/catalog/control/EditProduct?productId=${productId}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a>
+ <a href="/catalog/control/EditProduct?productId=${productId}${externalKeyParam}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a>
<a href="/ecommerce/control/product?product_id=${productId}" class="buttontext" target="_blank">${uiLabelMap.OrderEcommerce}</a>
<#if orderItemContentWrapper.get("IMAGE_URL")?has_content>
<a href="<@o...@ofbizUrl>"
@@ -108,7 +108,7 @@ under the License.
<tr>
<td style="text-align: right; padding-bottom: 10px;">
<a class="buttontext"
- href="/catalog/control/EditProductInventoryItems?productId=${productId}&showAllFacilities=Y&externalLoginKey=${externalLoginKey}"
+ href="/catalog/control/EditProductInventoryItems?productId=${productId}&showAllFacilities=Y${externalKeyParam}"
target="_blank">${uiLabelMap.ProductInventory}</a>
</td>
<td> </td>
@@ -184,7 +184,7 @@ under the License.
<#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)>
<#list orderItemStatuses as orderItemStatus>
<#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")>
- ${(orderItemStatus.statusDatetime.toString())?if_exists} ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}
+ <#if orderItemStatus.statusDatetime?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderItemStatus.statusDatetime, "", locale, timeZone)!} </#if>${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}
</#list>
</div>
</div>
@@ -317,8 +317,8 @@ under the License.
${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId"))).get("description",locale))?if_exists}
<#else>
${uiLabelMap.CommonFrom}
- : ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}
- : ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNumberOfPersons}
+ : <#if workEffort.estimatedStartDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(workEffort.estimatedStartDate, "", locale, timeZone)!}</#if> ${uiLabelMap.CommonTo}
+ : <#if workEffort.estimatedCompletionDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(workEffort.estimatedCompletionDate, "", locale, timeZone)!}</#if> ${uiLabelMap.OrderNumberOfPersons}
: ${workEffort.reservPersons?default("")}
</#if>
</td>
@@ -474,7 +474,7 @@ under the License.
<#if orderItem.estimatedShipDate?exists>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
- <span class="label">${uiLabelMap.OrderEstimatedShipDate}</span> ${orderItem.estimatedShipDate?string.short}
+ <span class="label">${uiLabelMap.OrderEstimatedShipDate}</span> ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.estimatedShipDate, "", locale, timeZone)!}
</td>
<td colspan="5"> </td>
</tr>
@@ -482,7 +482,7 @@ under the License.
<#if orderItem.estimatedDeliveryDate?exists>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
- <span class="label">${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate}</span> ${orderItem.estimatedDeliveryDate?string.short}
+ <span class="label">${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate}</span> ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.estimatedDeliveryDate, "", locale, timeZone)!}
</td>
<td colspan="5"> </td>
</tr>
@@ -490,7 +490,7 @@ under the License.
<#if orderItem.shipAfterDate?exists>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
- <span class="label">${uiLabelMap.OrderShipAfterDate}</span> ${orderItem.shipAfterDate?string.short}
+ <span class="label">${uiLabelMap.OrderShipAfterDate}</span> ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.shipAfterDate, "", locale, timeZone)!}
</td>
<td colspan="5"> </td>
</tr>
@@ -498,7 +498,7 @@ under the License.
<#if orderItem.shipBeforeDate?exists>
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
- <span class="label">${uiLabelMap.OrderShipBeforeDate}</span> ${orderItem.shipBeforeDate?string.short}
+ <span class="label">${uiLabelMap.OrderShipBeforeDate}</span> ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.shipBeforeDate, "", locale, timeZone)!}
</td>
<td colspan="5"> </td>
</tr>
@@ -623,7 +623,7 @@ under the License.
href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}&externalLoginKey=${externalLoginKey}"
class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists}
</#if>
- ${shipmentReceipt.datetimeReceived}
+ <#if shipmentReceipt.datetimeReceived?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(shipmentReceipt.datetimeReceived, "", locale, timeZone)!}</#if>
<span class="label">${uiLabelMap.CommonInventory}</span>
<a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}&externalLoginKey=${externalLoginKey}"
class="buttontext">${shipmentReceipt.inventoryItemId}</a>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl?rev=1201663&r1=1201662&r2=1201663&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl Mon Nov 14 10:55:34 2011
@@ -41,7 +41,7 @@ under the License.
<#if note.noteParty?has_content>
<div> <span class="label">${uiLabelMap.CommonBy}</span> ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</div>
</#if>
- <div> <span class="label">${uiLabelMap.CommonAt}</span> ${note.noteDateTime?string?if_exists}</div>
+ <div> <span class="label">${uiLabelMap.CommonAt}</span> <#if note.noteDateTime?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(note.noteDateTime, "", locale, timeZone)!}</#if></div>
</td>
<td valign="top" width="50%">
${note.noteInfo?replace("\n", "<br/>")}