svn commit: r1736868 [18/20] - in /ofbiz/trunk/applications/orde
Locked
svn commit: r1736868 [18/20] - in /ofbiz/trunk/applications/orde
 
|
Added: ofbiz/trunk/applications/order/template/return/quickReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/quickReturn.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/return/quickReturn.ftl (added) +++ ofbiz/trunk/applications/order/template/return/quickReturn.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,104 @@ +<#-- +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. +--> + +<div class="screenlet"> + <div class="screenlet-title-bar"> + <div class="h3">${uiLabelMap.OrderReturnItems}</div> + </div> + <div class="screenlet-body"> + <#-- DO NOT CHANGE THE NAME OF THIS FORM, it will break the some of the multi-service pattern features --> + <#assign selectAllFormName = "selectAllForm"/> + <form name="selectAllForm" method="post" action="<@ofbizUrl>makeQuickReturn</@ofbizUrl>"> + <input type="hidden" name="_checkGlobalScope" value="Y"/> + <input type="hidden" name="_useRowSubmit" value="Y"/> + <input type="hidden" name="fromPartyId" value="${partyId!}"/> + <input type="hidden" name="toPartyId" value="${toPartyId!}"/> + <input type="hidden" name="orderId" value="${orderId}"/> + <input type="hidden" name="needsInventoryReceive" value="${parameters.needsInventoryReceive?default("Y")}"/> + <input type="hidden" name="destinationFacilityId" value="${destinationFacilityId!}"/> + <input type="hidden" name="returnHeaderTypeId" value="${returnHeaderTypeId}"/> + <#if (orderHeader?has_content) && (orderHeader.currencyUom?has_content)> + <input type="hidden" name="currencyUomId" value="${orderHeader.currencyUom}"/> + </#if> + <#include "returnItemInc.ftl"/> + <hr /> + <#if "CUSTOMER_RETURN" == returnHeaderTypeId> + <h3>${uiLabelMap.FormFieldTitle_paymentMethodId}:</h3> + <table cellspacing="0" class="basic-table"> + <tr><td> + <#if creditCardList?? || eftAccountList??> + <select name='paymentMethodId'> + <option value=""></option> + <#if creditCardList?has_content> + <#list creditCardList as creditCardPm> + <#assign creditCard = creditCardPm.getRelatedOne("CreditCard", false)> + <option value="${creditCard.paymentMethodId}">CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</option> + </#list> + </#if> + <#if eftAccountList?has_content> + <#list eftAccountList as eftAccount> + <option value="${eftAccount.paymentMethodId}">EFT: ${eftAccount.nameOnAccount!}, ${eftAccount.accountNumber!}</option> + </#list> + </#if> + </select> + <#else> + <input type='text' size='20' name='paymentMethodId' /> + </#if> + <#if (party.partyId)?has_content> + <a href="/partymgr/control/editcreditcard?partyId=${party.partyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="smallSubmit">${uiLabelMap.AccountingCreateNewCreditCard}</a> + </#if> + </td></tr> + </table> + </#if> + <table cellspacing="0" class="basic-table"> + <tr><td colspan="8"><hr/></td></tr> + <tr> + <td colspan="8"><h3><#if "CUSTOMER_RETURN" == returnHeaderTypeId>${uiLabelMap.OrderReturnShipFromAddress}<#else>${uiLabelMap["checkhelper.select_shipping_destination"]}</#if></h3></td> + </tr> + <tr> + <td colspan="8"> + <table cellspacing="0" class="basic-table"> + <#list shippingContactMechList as shippingContactMech> + <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> + <tr> + <td align="right" width="1%" valign="top" nowrap="nowrap"> + <input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}" <#if (shippingContactMechList?size == 1)>checked="checked"</#if> /> + </td> + <td width="99%" valign="top" nowrap="nowrap"> + <div> + <#if shippingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${shippingAddress.toName}<br /></#if> + <#if shippingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span></b> ${shippingAddress.attnName}<br /></#if> + <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> + <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> + <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> + <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> + <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> + <#--<a href="<@ofbizUrl>editcontactmech?DONE_PAGE=checkoutoptions&contactMechId=${shippingAddress.contactMechId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>--> + </div> + </td> + </tr> + </#list> + </table> + </td> + </tr> + </table> + </form> + </div> +</div> Propchange: ofbiz/trunk/applications/order/template/return/quickReturn.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/return/quickReturn.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/return/quickReturn.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/return/returnHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/returnHeader.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/return/returnHeader.ftl (added) +++ ofbiz/trunk/applications/order/template/return/returnHeader.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,274 @@ +<#-- +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. +--> + +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="h3">${uiLabelMap.PageTitleReturnHeader}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <#if returnHeader??> + <form name="returnhead" method="post" action="<@ofbizUrl>updateReturn</@ofbizUrl>"> + <input type="hidden" name="returnId" value="${returnHeader.returnId}" /> + <input type="hidden" name="returnHeaderTypeId" value="CUSTOMER_RETURN"/> + <input type="hidden" name="currentStatusId" value="${returnHeader.statusId!}" /> + <#else> + <form name="returnhead" method="post" action="<@ofbizUrl>createReturn</@ofbizUrl>"> + <input type="hidden" name="returnHeaderTypeId" value="CUSTOMER_RETURN"/> + </#if> + + <table cellspacing="0" class="basic-table"> + <#if returnHeader??> + <tr> + <td width='14%'> </td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnId}</td> + <td width='6%'> </td> + <td width='74%' align='left'>${returnHeader.returnId}</td> + </tr> + </#if> + <tr> + <td width='14%'> </td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.CommonCurrency}</td> + <td width='6%'> </td> + <td width='74%'> + <#if returnHeader??> + ${returnHeader.currencyUomId!} + <#else> + <select name="currencyUomId"> + <#if (orderHeader?has_content) && (orderHeader.currencyUom?has_content)> + <option value="${orderHeader.currencyUom}" selected>${orderHeader.getRelatedOne("Uom", false).getString("description",locale)}</option> + <option value="${orderHeader.currencyUom}">---</option> + <#elseif defaultCurrency?has_content> + <option value="${defaultCurrency.uomId}" selected>${defaultCurrency.getString("description")}</option> + <option value="${defaultCurrency.uomId}">---</option> + </#if> + <#if currencies?has_content> + <#list currencies as currency> + <option value="${currency.uomId}">${currency.get("description",locale)}</option> + </#list> + </#if> + </select> + </#if> + </td> + </tr> + <tr> + <td width='14%'> </td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderEntryDate}</td> + <td width='6%'> </td> + <td width='74%'> + <#if returnInfo.entryDate??> + <#assign entryDate = returnInfo.get("entryDate").toString()> + </#if> + <@htmlTemplate.renderDateTimeField name="entryDate" event="" action="" value="${entryDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="entryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + </td> + </tr> + <tr> + <td width='14%'> </td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnFromParty}</td> + <td width='6%'> </td> + <td width='74%'> + <@htmlTemplate.lookupField value='${returnInfo.fromPartyId!}' formName="returnhead" name="fromPartyId" id="fromPartyId" fieldFormName="LookupPartyName"/> + </td> + </tr> + <tr> + <td width='14%'> </td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnToFacility}</td> + <td width='6%'> </td> + <td width='74%'> + <select name='destinationFacilityId'> + <#if currentFacility??> + <option value="${currentFacility.facilityId}">${currentFacility.facilityName?default(currentFacility.facilityId)}</option> + <option value="${currentFacility.facilityId}">---</option> + </#if> + <option value="">${uiLabelMap.FacilityNoFacility}</option> + <#list facilityList as facility> + <option value="${facility.facilityId}" <#if (facilityList?size == 1)>selected="selected"</#if>>${facility.facilityName?default(facility.facilityId)}</option> + </#list> + </td> + </tr> + <tr> + <td width='14%'> </td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.AccountingBillingAccount}</td> + <td width='6%'> </td> + <td width='74%'> + <#if billingAccountList?has_content> + <select name='billingAccountId'> + <#if currentAccount??> + <option value="${currentAccount.billingAccountId}">${currentAccount.billingAccountId}: ${currentAccount.description!}</option> + <option value="${currentAccount.billingAccountId}">---</option> + </#if> + <option value="">${uiLabelMap.AccountingNewBillingAccount}</option> + <#list billingAccountList as ba> + <option value="${ba.billingAccountId}">${ba.billingAccountId}: ${ba.description!}</option> + </#list> + </select> + <#else> + <input type='text' size='20' name='billingAccountId' /> + </#if> + </td> + </tr> + <tr> + <td width='14%'> </td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.FormFieldTitle_paymentMethodId}</td> + <td width='6%'> </td> + <td width='74%'> + <#if creditCardList?? || eftAccountList??> + <select name='paymentMethodId'> + <#if currentCreditCard??> + <option value="${currentCreditCard.paymentMethodId}">CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(currentCreditCard)}</option> + </#if> + <#if currentEftAccount??> + <option value="${currentEftAccount.paymentMethodId}">EFT: ${currentEftAccount.nameOnAccount!}, ${currentEftAccount.accountNumber!}</option> + </#if> + <option value=""></option> + <#if creditCardList?has_content> + <#list creditCardList as creditCardPm> + <#assign creditCard = creditCardPm.getRelatedOne("CreditCard", false)> + <option value="${creditCard.paymentMethodId}">CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</option> + </#list> + </#if> + <#if eftAccountList?has_content> + <#list eftAccountList as eftAccount> + <option value="${eftAccount.paymentMethodId}">EFT: ${eftAccount.nameOnAccount!}, ${eftAccount.accountNumber!}</option> + </#list> + </#if> + </select> + <#else> + <input type='text' size='20' name='paymentMethodId' value="${(returnHeader.paymentMethodId)!}"/> + </#if> + <#if (returnHeader.fromPartyId)?has_content> + <a href="/partymgr/control/editcreditcard?partyId=${returnHeader.fromPartyId}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="smallSubmit">${uiLabelMap.AccountingCreateNewCreditCard}</a> + </#if> + </td> + </tr> + <tr> + <td width='14%'> </td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnNeedsAutoReceive}</td> + <td width='6%'> </td> + <td width='74%'> + <select name='needsInventoryReceive'> + <#if needsInventoryReceive??> + <#if "Y" == needsInventoryReceive> + <option selected="selected" value="${needsInventoryReceive}">${uiLabelMap.CommonYes}</option> + <#elseif "N" == needsInventoryReceive> + <option selected="selected" value="${needsInventoryReceive}">${uiLabelMap.CommonNo}</option> + </#if> + <option value="${needsInventoryReceive}">---</option> + </#if> + <option value="Y">${uiLabelMap.CommonYes}</option> + <option value="N">${uiLabelMap.CommonNo}</option> + </select> + </td> + </tr> + <#if returnHeader?has_content> + <tr> + <td width='14%'> </td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.CommonReturnStatus}</td> + <td width='6%'> </td> + <td width='74%'> + <select name="statusId"> + <#if currentStatus??> + <option value="${currentStatus.statusId}">${currentStatus.get("description",locale)}</option> + <option value="${currentStatus.statusId}">---</option> + </#if> + <#list returnStatus as status> + <option value="${status.statusIdTo}">${status.get("transitionName",locale)}</option> + </#list> + </select> + </td> + </tr> + <tr> + <td width='14%'> </td> + <td width='6%' align='right' nowrap="nowrap" class="label">${uiLabelMap.FormFieldTitle_createdBy}</td> + <td width='6%'> </td> + <td width='74%'>${returnHeader.createdBy?default("Unknown")}</td> + </tr> + <tr> + <td width='14%'> </td> + <td width='6%' align='right' valign='top' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnFromAddress}</td> + <td width='6%'> </td> + <td width='74%'> + <div> + <#if (addressEditable)> + <#list addresses as address > + <@displayAddress postalAddress = address.postalAddress editable = true/> + </#list> + <input type='radio' name="originContactMechId" value="" <#if (!postalAddressFrom?has_content)> checked="checked"</#if> />${uiLabelMap.CommonNoAddress} + <#else> + <#if (postalAddressFrom?has_content)> + <@displayAddress postalAddress = postalAddressFrom editable = false /> + <#else> + ${uiLabelMap.CommonNoAddress} + </#if> + </#if> + </div> + </td> + </tr> + <tr> + <td width='14%'> </td> + <td width='6%' align='right' valign='top' nowrap="nowrap" class="label">${uiLabelMap.OrderReturnToAddress}</td> + <td width='6%'> </td> + <td width='74%'> + <#if (postalAddressTo?has_content)> + <@displayAddress postalAddress = postalAddressTo editable=false /> + </#if> + </td> + </tr> + <tr> + <td width='14%'> </td> + <td width='6%'> </td> + <td width='6%'> </td> + <td width='74%'> + <input type="submit" value="${uiLabelMap.CommonUpdate}"/> + </td> + </tr> + <#else> + <input type="hidden" name="statusId" value="RETURN_REQUESTED" /> + <tr> + <td width='14%'> </td> + <td width='6%'> </td> + <td width='6%'> </td> + <td width='74%'> + <input type="submit" value="${uiLabelMap.CommonCreateNew}"/> + </td> + </tr> + </#if> + </table> + <#macro displayAddress postalAddress editable> + <#if postalAddress?has_content> + <div> + <#if (editable)> + <input type='radio' name="originContactMechId" value="${postalAddress.contactMechId!}" + <#if ( postalAddressFrom?has_content && postalAddressFrom.contactMechId?default("") == postalAddress.contactMechId)>checked="checked"</#if> /> + </#if> + <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${postalAddress.toName}<br /></#if> + <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${postalAddress.attnName}<br /></#if> + <#if postalAddress.address1?has_content> ${postalAddress.address1}<br /></#if> + <#if postalAddress.address2?has_content> ${postalAddress.address2}<br /></#if> + <#if postalAddress.city?has_content> ${postalAddress.city}</#if> + <#if postalAddress.stateProvinceGeoId?has_content> ${postalAddress.stateProvinceGeoId}</#if> + <#if postalAddress.postalCode?has_content> ${postalAddress.postalCode}</#if> + <#if postalAddress.countryGeoId?has_content><br /> ${postalAddress.countryGeoId}</#if> + </div> + </#if> + </#macro> + </div> +</div> \ No newline at end of file Propchange: ofbiz/trunk/applications/order/template/return/returnHeader.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/return/returnHeader.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/return/returnHeader.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/return/returnItemInc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/returnItemInc.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/return/returnItemInc.ftl (added) +++ ofbiz/trunk/applications/order/template/return/returnItemInc.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,262 @@ +<#-- +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. +--> +<table cellspacing="0" class="basic-table"> + <tr> + <td colspan="7"><h3>${uiLabelMap.OrderReturnFromOrder} ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3></td> + <td colspan="2" align="right"> + <span>${uiLabelMap.CommonSelectAll}</span> + <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, '${selectAllFormName}');highlightAllRows(this, 'returnItemId_tableRow_', 'selectAllForm');"/> + </td> + </tr> + + <#-- information about orders and amount refunded/credited on past returns --> + <#if orh??> + <tr><td colspan="10"> + <table cellspacing="0" class="basic-table"> + <tr> + <td class="label" width="25%">${uiLabelMap.OrderOrderTotal}</td> + <td><@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orh.getCurrency()/></td> + </tr> + <tr> + <td class="label" width="25%">${uiLabelMap.OrderAmountAlreadyCredited}</td> + <td><@ofbizCurrency amount=orh.getOrderReturnedCreditTotalBd() isoCode=orh.getCurrency()/></td> + </tr> + <tr> + <td class="label" width="25%">${uiLabelMap.OrderAmountAlreadyRefunded}</td> + <td><@ofbizCurrency amount=orh.getOrderReturnedRefundTotalBd() isoCode=orh.getCurrency()/></td> + </tr> + </table> + </td></tr> + </#if> + <tr class="header-row"> + <td>${uiLabelMap.CommonDescription}</td> + <td>${uiLabelMap.OrderOrderQty}</td> + <td>${uiLabelMap.OrderReturnQty}</td> + <td>${uiLabelMap.OrderUnitPrice}</td> + <td>${uiLabelMap.OrderReturnPrice}*</td> + <td>${uiLabelMap.OrderReturnReason}</td> + <td>${uiLabelMap.OrderReturnType}</td> + <td>${uiLabelMap.OrderItemStatus}</td> + <td align="right">${uiLabelMap.OrderOrderInclude}?</td> + </tr> + <#if returnableItems?has_content> + <#assign rowCount = 0> + <#assign alt_row = false> + <#list returnableItems.keySet() as orderItem> + <#if orderItem.getEntityName() == "OrderAdjustment"> + <#-- this is an order item adjustment --> + <#assign returnAdjustmentType = returnItemTypeMap.get(orderItem.get("orderAdjustmentTypeId"))/> + <#assign adjustmentType = orderItem.getRelatedOne("OrderAdjustmentType", false)/> + <#assign description = orderItem.description?default(adjustmentType.get("description",locale))/> + + <tr id="returnItemId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td colspan="4"> + <input type="hidden" name="returnAdjustmentTypeId_o_${rowCount}" value="${returnAdjustmentType}"/> + <input type="hidden" name="orderAdjustmentId_o_${rowCount}" value="${orderItem.orderAdjustmentId}"/> + ${description?default("N/A")} + </td> + <td> + ${orderItem.amount?string("##0.00")} + <#--<input type="text" size="8" name="amount_o_${rowCount}" <#if orderItem.amount?has_content>value="${orderItem.amount?string("##0.00")}"</#if>/>--> + </td> + <td></td> + <td> + <select name="returnTypeId_o_${rowCount}"> + <#list returnTypes as type> + <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option> + </#list> + </select> + </td> + <td></td> + <td align="right"> + <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, '${selectAllFormName}');highlightRow(this,'returnItemId_tableRow_${rowCount}');"/> + </td> + </tr> + <#else> + <#-- this is an order item --> + <#assign returnItemType = (returnItemTypeMap.get(returnableItems.get(orderItem).get("itemTypeKey")))!/> + <#-- need some order item information --> + <#assign orderHeader = orderItem.getRelatedOne("OrderHeader", false)> + <#assign itemCount = orderItem.quantity> + <#assign itemPrice = orderItem.unitPrice> + <#-- end of order item information --> + + <tr id="returnItemId_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> + <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="${returnItemType}"/> + <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/> + <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/> + <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription!}"/> + + <div> + <#if orderItem.productId??> + ${orderItem.productId} + <input type="hidden" name="productId_o_${rowCount}" value="${orderItem.productId}"/> + </#if> + ${orderItem.itemDescription!} + </div> + </td> + <td align='center'> + <div>${orderItem.quantity?string.number}</div> + </td> + <td> + <input type="text" size="6" name="returnQuantity_o_${rowCount}" value="${returnableItems.get(orderItem).get("returnableQuantity")}"/> + </td> + <td align='left'> + <div><@ofbizCurrency amount=orderItem.unitPrice isoCode=orderHeader.currencyUom/></div> + </td> + <td> + <#if orderItem.productId??> + <#assign product = orderItem.getRelatedOne("Product", false)/> + <#if product.productTypeId == "ASSET_USAGE_OUT_IN"> + <input type="text" size="8" name="returnPrice_o_${rowCount}" value="0.00"/> + <#else> + <input type="text" size="8" name="returnPrice_o_${rowCount}" value="${returnableItems.get(orderItem).get("returnablePrice")?string("##0.00")}"/> + </#if> + </#if> + </td> + <td> + <select name="returnReasonId_o_${rowCount}"> + <#list returnReasons as reason> + <option value="${reason.returnReasonId}">${reason.get("description",locale)?default(reason.returnReasonId)}</option> + </#list> + </select> + </td> + <td> + <select name="returnTypeId_o_${rowCount}"> + <#list returnTypes as type> + <option value="${type.returnTypeId}" <#if type.returnTypeId=="RTN_REFUND">selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option> + </#list> + </select> + </td> + <td> + <select name="expectedItemStatus_o_${rowCount}"> + <option value="INV_RETURNED">${uiLabelMap.OrderReturned}</option> + <option value="INV_RETURNED">---</option> + <#list itemStts as status> + <option value="${status.statusId}">${status.get("description",locale)}</option> + </#list> + </select> + </td> + <td align="right"> + <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, '${selectAllFormName}');highlightRow(this,'returnItemId_tableRow_${rowCount}');"/> + </td> + </tr> + </#if> + <#assign rowCount = rowCount + 1> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + <tr><td colspan="9"><hr/></td></tr> + <tr> + <td colspan="9"><h3>${uiLabelMap.OrderReturnAdjustments} ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3></td> + </tr> + <tr><td colspan="9"><br /></td></tr> + <#if orderHeaderAdjustments?has_content> + <tr class="header-row"> + <td>${uiLabelMap.CommonDescription}</td> + <td>${uiLabelMap.CommonAmount}</td> + <td>${uiLabelMap.OrderReturnType}</td> + <td align="right">${uiLabelMap.OrderOrderInclude}?</td> + </tr> + <#list orderHeaderAdjustments as adj> + <#assign returnAdjustmentType = returnItemTypeMap.get(adj.get("orderAdjustmentTypeId"))/> + <#assign adjustmentType = adj.getRelatedOne("OrderAdjustmentType", false)/> + <#assign description = adj.description?default(adjustmentType.get("description",locale))/> + + <tr> + <td> + <input type="hidden" name="returnAdjustmentTypeId_o_${rowCount}" value="${returnAdjustmentType}"/> + <input type="hidden" name="orderAdjustmentId_o_${rowCount}" value="${adj.orderAdjustmentId}"/> + <input type="hidden" name="returnItemSeqId_o_${rowCount}" value="_NA_"/> + <input type="hidden" name="description_o_${rowCount}" value="${description}"/> + <div> + ${description?default("N/A")} + </div> + </td> + <td> + <input type="text" size="8" name="amount_o_${rowCount}" <#if adj.amount?has_content>value="${adj.amount?string("##0.00")}"</#if>/> + </td> + <td> + <select name="returnTypeId_o_${rowCount}"> + <#list returnTypes as type> + <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option> + </#list> + </select> + </td> + <td align="right"> + <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, '${selectAllFormName}');"/> + </td> + </tr> + <#assign rowCount = rowCount + 1> + </#list> + <#else> + <tr><td colspan="9">${uiLabelMap.OrderNoOrderAdjustments}</td></tr> + </#if> + + <#assign manualAdjRowNum = rowCount/> + <tr> + <td colspan="9"> + <input type="hidden" name="returnItemTypeId_o_${rowCount}" value="RET_MAN_ADJ"/> + <input type="hidden" name="returnItemSeqId_o_${rowCount}" value="_NA_"/> + <hr/> + </td> + </tr> + <tr> + <td colspan="9"> + <h3>${uiLabelMap.OrderReturnManualAdjustment} ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3> + </td> + </tr> + <tr> + <td> + <input type="text" size="30" name="description_o_${rowCount}" /> + </td> + <td> + <input type="text" size="8" name="amount_o_${rowCount}" value="${0.00?string("##0.00")}"/> + </td> + <td> + <select name="returnTypeId_o_${rowCount}"> + <#list returnTypes as type> + <option value="${type.returnTypeId}" <#if type.returnTypeId == "RTN_REFUND">selected="selected"</#if>>${type.get("description",locale)?default(type.returnTypeId)}</option> + </#list> + </select> + </td> + <td align="right"> + <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, '${selectAllFormName}');"/> + </td> + </tr> + <#assign rowCount = rowCount + 1> + + <!-- final row count --> + <tr> + <td colspan="9" align="right"> + <input type="hidden" name="_rowCount" value="${rowCount}"/> + <a href="javascript:document.${selectAllFormName}.submit()" class="buttontext">${uiLabelMap.OrderReturnSelectedItems}</a> + </td> + </tr> + <#else> + <tr> + <td colspan="9" class="label">${uiLabelMap.OrderReturnNoReturnableItems} #${orderId}</td> + </tr> + </#if> + <tr> + <td colspan="3" class="tooltip">*${uiLabelMap.OrderReturnPriceNotIncludeTax}</td> + <td colspan="6"> </td> + </tr> +</table> Propchange: ofbiz/trunk/applications/order/template/return/returnItemInc.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/return/returnItemInc.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/return/returnItemInc.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/return/returnItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/returnItems.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/return/returnItems.ftl (added) +++ ofbiz/trunk/applications/order/template/return/returnItems.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,398 @@ +<#-- +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. +--> + +<#macro displayReturnAdjustment returnAdjustment adjEditable> + <#assign returnHeader = returnAdjustment.getRelatedOne("ReturnHeader", false)> + <#assign adjReturnType = returnAdjustment.getRelatedOne("ReturnType", false)!> + <#if (adjEditable)> + <input type="hidden" name="_rowSubmit_o_${rowCount}" value="Y" /> + <input type="hidden" name="returnAdjustmentId_o_${rowCount}" value="${returnAdjustment.returnAdjustmentId}" /> + </#if> + <tr> + <td colspan="2"> </td> + <td colspan="3" align="right"><span class="label">${returnAdjustment.get("description",locale)?default("N/A")}</span> + <#if returnAdjustment.comments?has_content>: ${returnAdjustment.comments}</#if> + </div></td> + <#if (adjEditable)> + <td align="right"> + <input type="text" size="8" name="amount_o_${rowCount}" value="${returnAdjustment.amount?default(0)?string("##0.00")}"/> + </td> + <#else> + <td align="right"><@ofbizCurrency amount=returnAdjustment.amount?default(0) isoCode=returnHeader.currencyUomId/></td> + </#if> + <td colspan="2"> </td> + <td><div> + <#if (!adjEditable)> + <#if adjReturnType?has_content> + ${adjReturnType.get("description", locale)?default("${uiLabelMap.CommonNA}")} + </#if> + <#else> + <select name="returnTypeId_o_${rowCount}"> + <#if (adjReturnType?has_content)> + <option value="${adjReturnType.returnTypeId}">${adjReturnType.get("description",locale)!}</option> + <option value="${adjReturnType.returnTypeId}">--</option> + </#if> + <#list returnTypes as returnTypeItem> + <option value="${returnTypeItem.returnTypeId}">${returnTypeItem.get("description",locale)!}</option> + </#list> + </select> + </#if> + </div> + </td> + <#if (adjEditable)> + <td align='right'><a href='javascript:document.removeReturnAdjustment_${rowCountForAdjRemove}.submit()' class='buttontext'>${uiLabelMap.CommonRemove}</a></td> + <#else> + <td> </td> + </#if> + <#if (adjEditable)> + <#assign rowCount = rowCount + 1> + <#assign rowCountForAdjRemove = rowCountForAdjRemove + 1> + </#if> + <#assign returnTotal = returnTotal + returnAdjustment.amount?default(0)> + </tr> +</#macro> + + <#if returnHeader?has_content> + <#if returnHeader.destinationFacilityId?has_content && returnHeader.statusId == "RETURN_ACCEPTED" && returnHeader.returnHeaderTypeId?starts_with("CUSTOMER_")> + <#list returnShipmentIds as returnShipmentId> + <a href="/facility/control/ViewShipment?shipmentId=${returnShipmentId.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId}</a> + <a href="/facility/control/ReceiveReturn?facilityId=${returnHeader.destinationFacilityId}&returnId=${returnHeader.returnId!}&shipmentId=${returnShipmentId.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.OrderReceiveReturn}</a> + </#list> + <#elseif returnHeader.statusId == "SUP_RETURN_ACCEPTED" && returnHeader.returnHeaderTypeId == "VENDOR_RETURN"> + <#if returnShipmentIds?has_content> + <#list returnShipmentIds as returnShipmentId> + <a href="/facility/control/ViewShipment?shipmentId=${returnShipmentId.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.ProductShipmentId} ${returnShipmentId.shipmentId}</a> + </#list> + <#else> + <a href="/facility/control/EditShipment?primaryReturnId=${returnHeader.returnId}&partyIdTo=${toPartyId}&statusId=SHIPMENT_INPUT&shipmentTypeId=PURCHASE_RETURN" class="buttontext">${uiLabelMap.OrderCreateReturnShipment}</a> + </#if> + </#if> + </#if> + +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="h3">${uiLabelMap.PageTitleReturnItems}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> +<!-- if we're called with loadOrderItems or createReturn, then orderId would exist --> +<#if !requestParameters.orderId?? && returnHeader?has_content> + <form method="post" action="<@ofbizUrl>updateReturnItems</@ofbizUrl>"> + <input type="hidden" name="_useRowSubmit" value="Y" /> + <table cellspacing="0" class="basic-table"> + <#assign readOnly = (returnHeader.statusId != "RETURN_REQUESTED" && returnHeader.statusId != "SUP_RETURN_REQUESTED")> + <tr><td colspan="10"><h3>${uiLabelMap.OrderOrderReturn} #${returnId}</h3></td></tr> + + <#-- information about orders and amount refunded/credited on past returns --> + <#if orh??> + <tr><td colspan="10"> + <table cellspacing="0" class="basic-table"> + <tr> + <td class="label" width="25%">${uiLabelMap.OrderOrderTotal}</td> + <td><@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orh.getCurrency()/></td> + </tr> + <tr> + <td class="label" width="25%">${uiLabelMap.OrderAmountAlreadyCredited}</td> + <td><@ofbizCurrency amount=orh.getReturnedCreditTotalWithBillingAccountBd() isoCode=orh.getCurrency()/></td> + </tr> + <tr> + <td class="label" width="25%">${uiLabelMap.OrderAmountAlreadyRefunded}</td> + <td><@ofbizCurrency amount=orh.getReturnedRefundTotalWithBillingAccountBd() isoCode=orh.getCurrency()/></td> + </tr> + </table> + </td></tr> + </#if> + <tr><td colspan="10"><br /></td></tr> + <tr class="header-row"> + <td>${uiLabelMap.OrderOrderItems}</td> + <td>${uiLabelMap.ProductProduct}</td> + <td>${uiLabelMap.CommonDescription}</td> + <td>${uiLabelMap.OrderQuantity}</td> + <td>${uiLabelMap.OrderPrice}</td> + <td>${uiLabelMap.OrderSubTotal}</td> + <td>${uiLabelMap.OrderReturnReason}</td> + <td>${uiLabelMap.OrderItemStatus}</td> + <td>${uiLabelMap.CommonType}</td> + <#if (readOnly)> + <td>${uiLabelMap.OrderReturnResponse}</td> + </#if> + <td> </td> + </tr> + <#assign returnTotal = 0.0> + <#assign rowCount = 0> + <#assign rowCountForAdjRemove = 0> + <#if returnItems?has_content> + <#assign alt_row = false> + <#list returnItems as item> + <#assign orderItem = item.getRelatedOne("OrderItem", false)!> + <#assign orderHeader = item.getRelatedOne("OrderHeader", false)!> + <#assign returnReason = item.getRelatedOne("ReturnReason", false)!> + <#assign returnType = item.getRelatedOne("ReturnType", false)!> + <#assign status = item.getRelatedOne("InventoryStatusItem", false)!> + <#assign shipmentReceipts = item.getRelated("ShipmentReceipt", null, null, false)!> + <#if (item.get("returnQuantity")?? && item.get("returnPrice")??)> + <#assign returnTotal = returnTotal + item.get("returnQuantity") * item.get("returnPrice") > + <#assign returnItemSubTotal = item.get("returnQuantity") * item.get("returnPrice") > + </#if> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>orderview?orderId=${item.orderId}</@ofbizUrl>" class="buttontext">${item.orderId}</a> - ${item.orderItemSeqId?default("N/A")} + <input name="orderId_o_${rowCount}" value="${item.orderId}" type="hidden" /> + <input name="returnId_o_${rowCount}" value="${item.returnId}" type="hidden" /> + <input name="returnItemTypeId_o_${rowCount}" value="${item.returnItemTypeId}" type="hidden" /> + <input name="returnItemSeqId_o_${rowCount}" value="${item.returnItemSeqId}" type="hidden" /> + <input type="hidden" name="_rowSubmit_o_${rowCount}" value="Y" /> + </td> + <td><div> + <#if item.get("productId")??> + <a href="/catalog/control/EditProductInventoryItems?productId=${item.productId}" class="buttontext">${item.productId}</a> + <#else> + N/A + </#if></div></td> + <td><div> + <#if readOnly> + ${item.description?default("N/A")} + <#else> + <input name="description_o_${rowCount}" value="${item.description!}" type="text" size="15" /> + </#if> + </div></td> + <td><div> + <#if readOnly> + ${item.returnQuantity?string.number} + <#else> + <input name="returnQuantity_o_${rowCount}" value="${item.returnQuantity?if_exists}" type="text" size="8" align="right" /> + </#if> + <#if item.receivedQuantity??> + <br />${uiLabelMap.OrderTotalQuantityReceive}: ${item.receivedQuantity} + <#list shipmentReceipts! as shipmentReceipt> + <br />${uiLabelMap.OrderQty}: ${shipmentReceipt.quantityAccepted}, ${shipmentReceipt.datetimeReceived}, <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}" class="buttontext">${shipmentReceipt.inventoryItemId}</a> + </#list> + </#if> + </div></td> + <td><div> + <#if readOnly> + <@ofbizCurrency amount=item.returnPrice isoCode=orderHeader.currencyUom/> + <#else> + <input name="returnPrice_o_${rowCount}" value="${item.returnPrice?if_exists}" type="text" size="8" align="right" /> + </#if> + </div></td> + <td> + <#if returnItemSubTotal??><@ofbizCurrency amount=returnItemSubTotal isoCode=orderHeader.currencyUom/></#if> + </td> + <td><div> + <#if readOnly> + ${returnReason.get("description",locale)?default("N/A")} + <#else> + <select name="returnReasonId_o_${rowCount}"> + <#if (returnReason?has_content)> + <option value="${returnReason.returnReasonId}">${returnReason.get("description",locale)!}</option> + <option value="${returnReason.returnReasonId}">--</option> + </#if> + <#list returnReasons as returnReasonItem> + <option value="${returnReasonItem.returnReasonId}">${returnReasonItem.get("description",locale)!}</option> + </#list> + </select> + </#if> + </div></td> + <td><div> + <#if readOnly> + <#if status?has_content> + ${status.get("description",locale)} + <#else> + N/A + </#if> + <#else> + <select name="expectedItemStatus_o_${rowCount}"> + <#if (status?has_content)> + <option value="${status.statusId}">${status.get("description",locale)!}</option> + <option value="${status.statusId}">--</option> + </#if> + <#list itemStatus as returnItemStatus> + <option value="${returnItemStatus.statusId}">${returnItemStatus.get("description",locale)!}</option> + </#list> + </select> + </#if> + </div></td> + <td><div> + <#if (readOnly)> + ${returnType.get("description",locale)?default("N/A")} + <#else> + <select name="returnTypeId_o_${rowCount}"> + <#if (returnType?has_content)> + <option value="${returnType.returnTypeId}">${returnType.get("description",locale)!}</option> + <option value="${returnType.returnTypeId}">--</option> + </#if> + <#list returnTypes as returnTypeItem> + <option value="${returnTypeItem.returnTypeId}">${returnTypeItem.get("description",locale)!}</option> + </#list> + </select> + </#if></div></td> + <#if (readOnly)> + <td> + <#if returnHeader.statusId == "RETURN_COMPLETED" || returnHeader.statusId == "SUP_RETURN_COMPLETED"> + <#assign itemResp = item.getRelatedOne("ReturnItemResponse", false)!> + <#if itemResp?has_content> + <#if itemResp.paymentId?has_content> + <div>${uiLabelMap.AccountingPayment} ${uiLabelMap.CommonNbr}<a href="/accounting/control/paymentOverview?paymentId=${itemResp.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${itemResp.paymentId}</a></div> + <#elseif itemResp.replacementOrderId?has_content> + <div>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl>orderview?orderId=${itemResp.replacementOrderId}</@ofbizUrl>" class="buttontext">${itemResp.replacementOrderId}</a></div> + <#elseif itemResp.billingAccountId?has_content> + <div>${uiLabelMap.AccountingAccountId} ${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${itemResp.billingAccountId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${itemResp.billingAccountId}</a></div> + </#if> + <#else> + <div>${uiLabelMap.CommonNone}</div> + </#if> + <#else> + <div>${uiLabelMap.CommonNA}</div> + </#if> + </td> + </#if> + <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED"> + <td align='right'><a href='javascript:document.removeReturnItem_${item_index}.submit()' class='buttontext'>${uiLabelMap.CommonRemove}</a></td> + <#else> + <td> </td> + </#if> + </tr> + <#assign rowCount = rowCount + 1> + <#assign returnItemAdjustments = item.getRelated("ReturnAdjustment", null, null, false)> + <#if (returnItemAdjustments?has_content)> + <#list returnItemAdjustments as returnItemAdjustment> + <@displayReturnAdjustment returnAdjustment=returnItemAdjustment adjEditable=false/> <#-- adjustments of return items should never be editable --> + </#list> + </#if> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + <#else> + <tr> + <td colspan="9"><div>${uiLabelMap.OrderNoReturnItemsFound}</div></td> + </tr> + </#if> + <tr><td colspan="10"><hr/></td></tr> + <#-- these are general return adjustments not associated with a particular item (itemSeqId = "_NA_" --> + <#if (returnAdjustments?has_content)> + <#list returnAdjustments as returnAdjustment> + <#assign adjEditable = !readOnly> <#-- they are editable if the rest of the return items are --> + <@displayReturnAdjustment returnAdjustment=returnAdjustment adjEditable=adjEditable/> + </#list> + </#if> + <#-- show the return total --> + <tr><td colspan="5"></td><td><hr /></td></tr> + <tr> + <td colspan="2"> </td> + <td colspan="3" class="label">${uiLabelMap.OrderReturnTotal}</td> + <td align="right"><@ofbizCurrency amount=returnTotal isoCode=returnHeader.currencyUomId/></td> + </tr> + <#if (!readOnly) && (rowCount > 0)> + <tr> + <td colspan="6" align="right"> + <input name="returnId" value="${returnHeader.returnId}" type="hidden" /> + <input name="_rowCount" value="${rowCount}" type="hidden" /> + <input type="submit" class="bottontext" value="${uiLabelMap.CommonUpdate}" /></td> + </tr> + </#if> + <tr><td colspan="10"><hr/></td></tr> + </table> + </form> + <#if returnItems?has_content> + <#list returnItems as item> + <form name="removeReturnItem_${item_index}" method="post" action="<@ofbizUrl>removeReturnItem</@ofbizUrl>"> + <input type="hidden" name="returnId" value="${item.returnId}"/> + <input type="hidden" name="returnItemSeqId" value="${item.returnItemSeqId}"/> + </form> + </#list> + </#if> + <#if returnAdjustments?has_content> + <#list returnAdjustments as returnAdjustment> + <form name="removeReturnAdjustment_${returnAdjustment_index}" method="post" action="<@ofbizUrl>removeReturnAdjustment</@ofbizUrl>"> + <input type="hidden" name="returnId" value="${returnAdjustment.returnId}"/> + <input type="hidden" name="returnAdjustmentId" value="${returnAdjustment.returnAdjustmentId}"/> + </form> + </#list> + </#if> + <#if (returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED") && (rowCount > 0)> + <br /> + <form name="acceptReturn" method="post" action="<@ofbizUrl>/updateReturn</@ofbizUrl>"> + <#if returnHeader.returnHeaderTypeId?starts_with("CUSTOMER_")> + <#assign statusId = "RETURN_ACCEPTED"> + <#else> + <#assign statusId = "SUP_RETURN_ACCEPTED"> + </#if> + <input type="hidden" name="returnId" value="${returnId}" /> + <input type="hidden" name="statusId" value="${statusId}" /> + <input type="hidden" name="needsInventoryReceive" value="${returnHeader.needsInventoryReceive!"N"}" /> + <div align="right"><input type="submit" value="${uiLabelMap.OrderReturnAccept}" /></div> + </form> + </#if> + + <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED"> + <br /> + <form name="returnItems" method="post" action="<@ofbizUrl>returnItems</@ofbizUrl>"> + <input type="hidden" name="returnId" value="${returnId}" /> + <table border='0' cellpadding='2' cellspacing='0'> + <tr><td colspan="4"><h3>${uiLabelMap.OrderReturnItems}</h3></td></tr> + <#if partyOrders?has_content> + <tr> + <td width='25%' align='right' nowrap="nowrap" class="label">${uiLabelMap.OrderOrderId}</td> + <td> </td> + <td width='25%'> + <select name="orderId"> + <#list partyOrders as order> + <option value="${order.orderId}">${order.orderId} - ${order.orderDate}</option> + </#list> + </select> + </td> + <td><div class="tooltip">${uiLabelMap.OrderReturnLoadItems}</div></td> + </tr> + <#else> + <tr> + <td colspan="4" nowrap="nowrap"><div>${uiLabelMap.OrderNoOrderFoundForParty}: <a href="${customerDetailLink}${partyId?default('_NA_')}" class="buttontext">${partyId?default('[null]')}</a></div></td> + </tr> + <tr> + <td width='25%' align='right' nowrap="nowrap"><div>${uiLabelMap.OrderOrderId}</div></td> + <td> </td> + <td width='25%'> + <input type='text' name='orderId' size='20' maxlength='20' /> + </td> + <td><div class="tooltip">${uiLabelMap.OrderReturnLoadItems}</div></td> + </tr> + </#if> + <tr> + <td colspan="2"> </td> + <td colspan="2"> + <a href="javascript:document.returnItems.submit();" class="buttontext">${uiLabelMap.OrderReturnLoadItems}</a> + </td> + </tr> + </table> + </form> + </#if> +<!-- if no requestParameters.orderId??, then show list of items --> +<#elseif returnHeader?has_content> + <#assign selectAllFormName = "returnItems"/> + <form name="returnItems" method="post" action="<@ofbizUrl>createReturnItems</@ofbizUrl>"> + <input type="hidden" name="returnId" value="${returnId}" /> + <input type="hidden" name="_useRowSubmit" value="Y" /> + <#include "returnItemInc.ftl"/> + </form> +<#else> + ${uiLabelMap.CommonErrorMessage2} : ${uiLabelMap.CommonPleaseSelect}. ${uiLabelMap.CommonUseBackButton} +</#if> + </div> +</div> Propchange: ofbiz/trunk/applications/order/template/return/returnItems.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/return/returnItems.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/return/returnItems.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/return/returnLinks.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/returnLinks.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/return/returnLinks.ftl (added) +++ ofbiz/trunk/applications/order/template/return/returnLinks.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,82 @@ +<#-- +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. +--> +<#assign selected = tabButtonItem?default("void")> +<#if returnHeader??> + <div class="button-bar tab-bar"> + <ul> + <li> + <ul> + <li<#if selected="OrderReturnHeader"> class="selected"</#if>><a href="<@ofbizUrl>returnMain?returnId=${returnId!}</@ofbizUrl>">${uiLabelMap.OrderReturnHeader}</a></li> + <li<#if selected="OrderReturnItems"> class="selected"</#if>><a href="<@ofbizUrl>returnItems?returnId=${returnId!}</@ofbizUrl>">${uiLabelMap.OrderReturnItems}</a></li> + <li<#if selected="OrderReturnHistory"> class="selected"</#if>><a href="<@ofbizUrl>ReturnHistory?returnId=${returnId!}</@ofbizUrl>">${uiLabelMap.OrderReturnHistory}</a></li> + </ul> + </li> + </ul> + <br /> + </div> + <#if selected != "OrderReturnHistory"> + <div class="button-bar button-style-1"> + <ul> + <li> + <ul> + <li><a href="<@ofbizUrl>return.pdf?returnId=${returnId!}</@ofbizUrl>" target="_BLANK" >PDF</a></li> + <#if returnId??> + <#assign returnItems = delegator.findByAnd("ReturnItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("returnId", returnId, "returnTypeId", "RTN_REFUND"), null, false)/> + <#if returnItems?has_content> + <#assign orderId = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(returnItems)).getString("orderId")/> + <#assign partyId = "${(returnHeader.fromPartyId)!}"/> + <a href="<@ofbizUrl>setOrderCurrencyAgreementShipDates?partyId=${partyId!}&originOrderId=${orderId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateExchangeOrder} ${uiLabelMap.CommonFor} ${orderId!}</a> + </#if> + <#if "RETURN_ACCEPTED" == returnHeader.statusId> + <#assign returnItems = delegator.findByAnd("ReturnItem", {"returnId" : returnId}, null, false)/> + <#if returnItems?has_content> + <#assign orderId = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(returnItems)).getString("orderId")/> + <#assign shipGroupAssoc = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("OrderItemShipGroupAssoc", {"orderId" : orderId}, null, false))/> + <#assign shipGroup = delegator.findOne("OrderItemShipGroup", {"orderId" : orderId, "shipGroupSeqId" : shipGroupAssoc.shipGroupSeqId}, false)> + <#if shipGroup?? && shipGroup.shipmentMethodTypeId != "NO_SHIPPING"> + <#assign shipGroupShipment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("Shipment", {"primaryOrderId" : shipGroup.orderId, "primaryShipGroupSeqId" : shipGroup.shipGroupSeqId}, null, false))/> + <#if shipGroupShipment??> + <#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipGroupShipment.shipmentId}, null, false))> + <#if shipmentRouteSegment??> + <#if "UPS" == shipmentRouteSegment.carrierPartyId> + <li><a href="javascript:document.upsEmailReturnLabel.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a></li> + <li><form name="upsEmailReturnLabel" method="post" action="<@ofbizUrl>upsEmailReturnLabelReturn</@ofbizUrl>"> + <input type="hidden" name="returnId" value="${returnId}"/> + <input type="hidden" name="shipmentId" value="${shipGroupShipment.shipmentId}"/> + <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegment.shipmentRouteSegmentId}" /> + </form></li> + </#if> + </#if> + </#if> + </#if> + </#if> + </#if> + </#if> + </ul> + </li> + </ul> + </div> + </#if> +<#else> + <h1>${uiLabelMap.OrderCreateNewReturn}</h1> + <#if requestParameters.returnId?has_content> + <h2>${uiLabelMap.OrderNoReturnFoundWithId} : ${requestParameters.returnId}</h2> + </#if> + <br /> +</#if> Propchange: ofbiz/trunk/applications/order/template/return/returnLinks.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/return/returnLinks.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/return/returnLinks.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/return/returnList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/returnList.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/return/returnList.ftl (added) +++ ofbiz/trunk/applications/order/template/return/returnList.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,51 @@ +<#-- +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. +--> + +<h1>${uiLabelMap.OrderReturnsCurrent}</h1> +<div><a href="<@ofbizUrl>returnMain</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></div> + +<br /> +<table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td>${uiLabelMap.OrderReturnId} ${uiLabelMap.CommonNbr}</td> + <td>${uiLabelMap.FormFieldTitle_entryDate}</td> + <td>${uiLabelMap.PartyParty}</td> + <td>${uiLabelMap.FacilityFacility}</td> + <td>${uiLabelMap.CommonStatus}</td> + </tr> + <#list returnList as returnHeader> + <#assign statusItem = returnHeader.getRelatedOne("StatusItem", false)> + <#if returnHeader.destinationFacilityId??> + <#assign facility = returnHeader.getRelatedOne("Facility", false)> + </#if> + <tr> + <td><a href="<@ofbizUrl>returnMain?returnId=${returnHeader.returnId}</@ofbizUrl>" class="buttontext">${returnHeader.returnId}</a></td> + <td><div>${returnHeader.entryDate.toString()}</div></td> + <td> + <#if returnHeader.fromPartyId??> + <a href="${customerDetailLink}${returnHeader.fromPartyId}${StringUtil.wrapString(externalKeyParam)}" class='buttontext'>${returnHeader.fromPartyId}</a> + <#else> + <span class="label">${uiLabelMap.CommonNA}</span> + </#if> + </td> + <td><#if facility??>${facility.facilityName?default(facility.facilityId)}<#else>${uiLabelMap.CommonNone}</#if></td> + <td>${statusItem.get("description",locale)}</td> + </tr> + </#list> +</table> \ No newline at end of file Propchange: ofbiz/trunk/applications/order/template/return/returnList.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/return/returnList.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/return/returnList.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl (added) +++ ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,126 @@ +<#-- +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. +--> +<#escape x as x?xml> +<#macro displayReturnAdjustment returnAdjustment> + <#assign returnHeader = returnAdjustment.getRelatedOne("ReturnHeader", false)> + <#assign adjReturnType = returnAdjustment.getRelatedOne("ReturnType", false)!> + <fo:table-row> + <fo:table-cell><fo:block></fo:block></fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> + <fo:table-cell number-columns-spanned="3" padding="1mm"> + <fo:block wrap-option="wrap"> + <#if returnAdjustment.comments?has_content>${returnAdjustment.comments}<#else>${returnAdjustment.description?default("N/A")}</#if> + </fo:block> + </fo:table-cell> + <fo:table-cell><fo:block></fo:block></fo:table-cell> + <fo:table-cell padding="1mm" text-align="right"><fo:block><@ofbizCurrency amount=returnAdjustment.amount isoCode=returnHeader.currencyUomId/></fo:block></fo:table-cell> + </fo:table-row> + <#if returnAdjustment.amount?has_content> + <#assign total = total + returnAdjustment.get("amount")> + </#if> +</#macro> + + <#-- Items returned --> + <fo:block font-size="10pt"> + <fo:table table-layout="fixed" border-style="solid" border-width="0.2pt" width="7.25in" height="5in"> + <fo:table-column column-width="0.875in"/> + <fo:table-column column-width="0.875in"/> + <fo:table-column column-width="2.25in"/> + <fo:table-column column-width="1.0in"/> + <fo:table-column column-width="0.5in"/> + <fo:table-column column-width="0.875in"/> + <fo:table-column column-width="0.875in"/> + <fo:table-body> + + <fo:table-row text-align="center" font-weight="bold"> + <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.OrderOrderId}</fo:block></fo:table-cell> + <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.ProductProductId}</fo:block></fo:table-cell> + <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.CommonDescription}</fo:block></fo:table-cell> + <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.CommonReason}</fo:block></fo:table-cell> + <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.OrderQty}</fo:block></fo:table-cell> + <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.OrderUnitPrice}</fo:block></fo:table-cell> + <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt" display-align="after"><fo:block>${uiLabelMap.OrderAmount}</fo:block></fo:table-cell> + </fo:table-row> + + <#-- each item --> + <#assign total = 0.0/> + <#list returnItems as returnItem> + <fo:table-row> + <fo:table-cell padding="1mm" font-size="8pt"> + <fo:block>${returnItem.orderId}</fo:block> + </fo:table-cell> + <fo:table-cell padding="1mm" font-size="8pt"> + <fo:block> + <#if returnItem.orderItemSeqId??>${returnItem.getRelatedOne("OrderItem", false).getString("productId")}</#if> + </fo:block> + </fo:table-cell> + <fo:table-cell padding="1mm"><fo:block wrap-option="wrap">${returnItem.description!}</fo:block></fo:table-cell> + <fo:table-cell padding="1mm" font-size="8pt"><fo:block><#if returnItem.returnReasonId??>${(returnItem.getRelatedOne("ReturnReason", false)).get("description",locale)?default(returnItem.returnReasonId)}</#if></fo:block></fo:table-cell> + <fo:table-cell padding="1mm" text-align="right"><fo:block>${returnItem.returnQuantity}</fo:block></fo:table-cell> + <fo:table-cell padding="1mm" text-align="right"><fo:block><@ofbizCurrency amount=returnItem.returnPrice isoCode=returnHeader.currencyUomId/></fo:block></fo:table-cell> + <fo:table-cell padding="1mm" text-align="right"><fo:block><@ofbizCurrency amount=(returnItem.returnPrice * returnItem.returnQuantity) isoCode=returnHeader.currencyUomId/></fo:block></fo:table-cell> + </fo:table-row> + <#assign total = total + returnItem.returnQuantity.doubleValue() * returnItem.returnPrice.doubleValue()/> + + <#assign returnItemAdjustments = returnItem.getRelated("ReturnAdjustment", null, null, false)> + <#if (returnItemAdjustments?has_content)> + <#list returnItemAdjustments as returnItemAdjustment> + <@displayReturnAdjustment returnAdjustment=returnItemAdjustment/> + </#list> + </#if> + </#list> + + <#-- order level adjustments --> + <#if (returnAdjustments?has_content)> + <#list returnAdjustments as returnAdjustment> + <@displayReturnAdjustment returnAdjustment=returnAdjustment/> + </#list> + </#if> + + </fo:table-body> + </fo:table> + </fo:block> + + <#-- total --> + <fo:table table-layout="fixed" space-before="5mm" font-size="10pt"> + <fo:table-column column-width="0.875in"/> + <fo:table-column column-width="0.875in"/> + <fo:table-column column-width="2.25in"/> + <fo:table-column column-width="1.0in"/> + <fo:table-column column-width="0.5in"/> + <fo:table-column column-width="0.875in"/> + <fo:table-column column-width="0.875in"/> + <fo:table-body> + <fo:table-row> + <fo:table-cell/> + <fo:table-cell/> + <fo:table-cell/> + <fo:table-cell/> + <fo:table-cell/> + <fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt"> + <fo:block font-weight="bold" text-align="center">${uiLabelMap.CommonTotal}</fo:block> + </fo:table-cell> + <fo:table-cell text-align="right" padding="1mm" border-style="solid" border-width="0.2pt"> + <fo:block><@ofbizCurrency amount=total isoCode=returnHeader.currencyUomId/></fo:block> + </fo:table-cell> + </fo:table-row> + </fo:table-body> + </fo:table> +</#escape> + Propchange: ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl (added) +++ ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,25 @@ +<#-- +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. +--> +<#escape x as x?xml> +<fo:block space-after="40pt"/> +<fo:block font-size="8pt"> + Here is a good place to put boilerplate terms and conditions for a return. +</fo:block> +</#escape> + Propchange: ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl (added) +++ ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,72 @@ +<#-- +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. +--> +<#escape x as x?xml> + + <#assign fromPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", returnHeader.fromPartyId, "compareDate", returnHeader.entryDate, "userLogin", userLogin))/> + <#assign toPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", returnHeader.toPartyId, "compareDate", returnHeader.entryDate, "userLogin", userLogin))/> + + <fo:table> + <fo:table-column column-width="3.50in"/> + <fo:table-column column-width="1.00in"/> + <fo:table-column column-width="2.75in"/> + <fo:table-body> + <fo:table-row> + + <fo:table-cell> + <fo:table table-layout="fixed" border-style="solid" border-width="0.2pt" height="1in"> + <fo:table-column column-width="3.50in"/> + <fo:table-body> + <fo:table-row><fo:table-cell border-style="solid" border-width="0.2pt" padding="1mm"><fo:block font-weight="bold">${uiLabelMap.OrderReturnFromAddress}</fo:block></fo:table-cell></fo:table-row> + <fo:table-row><fo:table-cell padding="1mm"> + <fo:block white-space-collapse="false"><#if fromPartyNameResult.fullName?has_content>${fromPartyNameResult.fullName}<#else/><#if postalAddressFrom??><#if (postalAddressFrom.toName)?has_content>${postalAddressFrom.toName}</#if><#if (postalAddressFrom.attnName)?has_content> +${postalAddressFrom.attnName}</#if></#if></#if><#if postalAddressFrom??> +${postalAddressFrom.address1}<#if (postalAddressFrom.address2)?has_content> +${postalAddressFrom.address2}</#if> +${postalAddressFrom.city}<#if (postalAddressFrom.stateProvinceGeoId)?has_content>, ${postalAddressFrom.stateProvinceGeoId}</#if><#if (postalAddressFrom.postalCode)?has_content>, ${postalAddressFrom.postalCode}</#if></#if> + </fo:block> + + </fo:table-cell></fo:table-row> + </fo:table-body> + </fo:table> + </fo:table-cell> + + <fo:table-cell/> + + <fo:table-cell> + <fo:table table-layout="fixed" border-style="solid" border-width="0.2pt" height="1in"> + <fo:table-column column-width="2.75in"/> + <fo:table-body> + <fo:table-row><fo:table-cell padding="1mm" border-style="solid" border-width="0.2pt"><fo:block font-weight="bold">${uiLabelMap.OrderReturnToAddress}</fo:block></fo:table-cell></fo:table-row> + <fo:table-row><fo:table-cell padding="1mm"> + <fo:block white-space-collapse="false"><#if toPartyNameResult.fullName?has_content>${toPartyNameResult.fullName}<fo:block /><#else/><#if postalAddressTo??><#if (postalAddressTo.toName)?has_content>${postalAddressTo.toName}</#if><#if (postalAddressTo.attnName)?has_content> +${postalAddressTo.attnName}</#if></#if></#if><#if postalAddressTo??> +${postalAddressTo.address1}<#if (postalAddressTo.address2)?has_content> +${postalAddressTo.address2}</#if> +${postalAddressTo.city}<#if (postalAddressTo.stateProvinceGeoId)?has_content>, ${postalAddressTo.stateProvinceGeoId}</#if><#if (postalAddressTo.postalCode)?has_content>, ${postalAddressTo.postalCode}</#if></#if></fo:block> + </fo:table-cell></fo:table-row> + </fo:table-body> + </fo:table> + </fo:table-cell> + + </fo:table-row> + </fo:table-body> + </fo:table> + + <fo:block space-after="10pt"/> +</#escape> Propchange: ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl?rev=1736868&view=auto ============================================================================== --- ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl (added) +++ ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl Mon Mar 28 11:14:22 2016 @@ -0,0 +1,60 @@ +<#-- +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. +--> +<#escape x as x?xml> + <fo:table><fo:table-column column-width="0.3in"/><fo:table-body><fo:table-row><fo:table-cell> + <fo:table table-layout="fixed" font-size="10pt"> + <fo:table-column column-width="1in"/> + <fo:table-column column-width="1in"/> + <fo:table-column column-width="1in"/> + <fo:table-body> + + <fo:table-row> + <fo:table-cell number-columns-spanned="3"> + <fo:block space-after="2mm" font-size="14pt" font-weight="bold" text-align="right">${uiLabelMap.OrderReturnSummary}</fo:block> + </fo:table-cell> + </fo:table-row> + + <fo:table-row> + <fo:table-cell text-align="center" border-style="solid" border-width="0.2pt"> + <fo:block padding="1mm" font-weight="bold">${uiLabelMap.CommonDate}</fo:block> + </fo:table-cell> + <fo:table-cell text-align="center" border-style="solid" border-width="0.2pt"> + <fo:block padding="1mm" font-weight="bold">${uiLabelMap.OrderReturnId}</fo:block> + </fo:table-cell> + <fo:table-cell text-align="center" border-style="solid" border-width="0.2pt"> + <fo:block padding="1mm" font-weight="bold">${uiLabelMap.CommonStatus}</fo:block> + </fo:table-cell> + </fo:table-row> + + <fo:table-row> + <fo:table-cell text-align="center" border-style="solid" border-width="0.2pt"> + <fo:block padding="1mm">${returnHeader.entryDate?string("yyyy-MM-dd")}</fo:block> + </fo:table-cell> + <fo:table-cell text-align="center" border-style="solid" border-width="0.2pt"> + <fo:block padding="1mm">${returnId}</fo:block> + </fo:table-cell> + <fo:table-cell text-align="center" border-style="solid" border-width="0.2pt"> + <fo:block padding="1mm">${currentStatus.get("description",locale)}</fo:block> + </fo:table-cell> + </fo:table-row> + + </fo:table-body></fo:table> + </fo:table-cell></fo:table-row></fo:table-body></fo:table> +</#escape> + |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |