You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/03/28 13:14:24 UTC
svn commit: r1736868 [7/20] - in /ofbiz/trunk/applications/order: template/
template/entry/ template/entry/cart/ template/entry/catalog/
template/entry/order/ template/order/ template/product/ template/quote/
template/reports/ template/request/ templat...
Added: ofbiz/trunk/applications/order/template/entry/orderterms.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/orderterms.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/orderterms.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/orderterms.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,130 @@
+<#--
+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 border="0" width="100%" cellspacing="0" cellpadding="0" class="boxoutside">
+ <tr>
+ <td width="100%">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom">
+ <tr>
+ <td>
+ <#-- checkoutsetupform is used for the order entry "continue" link -->
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <input type="hidden" name="finalizeMode" value="term" />
+ </form>
+ <#if orderTerms?has_content && parameters.createNew?default('') != 'Y'>
+ <table class="basic-table hover-bar">
+ <tr class="header-row">
+ <td>${uiLabelMap.OrderOrderTermType}</td>
+ <td align="center">${uiLabelMap.OrderOrderTermValue}</td>
+ <td align="center">${uiLabelMap.OrderOrderTermDays}</td>
+ <td align="center">${uiLabelMap.OrderOrderTextValue}</td>
+ <td>${uiLabelMap.CommonDescription}</td>
+ <td> </td>
+ </tr>
+ <#list orderTerms as orderTerm>
+ <tr <#if orderTerm_index % 2 != 0>class="alternate-row"</#if> >
+ <td nowrap="nowrap">${orderTerm.getRelatedOne('TermType', false).get('description', locale)}</td>
+ <td align="center">${orderTerm.termValue!}</td>
+ <td align="center">${orderTerm.termDays!}</td>
+ <td nowrap="nowrap">${orderTerm.textValue!}</td>
+ <td nowrap="nowrap">${orderTerm.description?if_exists}</td>
+ <td align="right">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>
+ </td>
+ </tr>
+ </#list>
+ <tr>
+ <td colspan="5">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew}</a>
+ </td>
+ </tr>
+ </table>
+ <#else>
+ <form method="post" action="<@o...@ofbizUrl>" name="termform">
+ <input type="hidden" name="termIndex" value="${termIndex!}" />
+ <table class="basic-table">
+ <tr>
+ <td width="26%" align="right" valign="top">
+ ${uiLabelMap.OrderOrderTermType}
+ </td>
+ <td width="5"> </td>
+ <td width="74%">
+ <select name="termTypeId">
+ <option value=""></option>
+ <#list termTypes! as termType>
+ <option value="${termType.termTypeId}"
+ <#if termTypeId?default('') == termType.termTypeId>selected="selected"</#if>
+ >${termType.get('description', locale)}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top">
+ ${uiLabelMap.OrderOrderTermValue}
+ </td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="60" name="termValue" value="${termValue!}" />
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top">
+ ${uiLabelMap.OrderOrderTermDays}
+ </td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="60" name="termDays" value="${termDays!}" />
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top">
+ ${uiLabelMap.OrderOrderTextValue}
+ </td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="60" name="textValue" value="${textValue?if_exists}" />
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top">
+ ${uiLabelMap.CommonDescription}
+ </td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="255" name="description" value="${description?if_exists}" />
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"> </td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ </#if>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
Propchange: ofbiz/trunk/applications/order/template/entry/orderterms.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/orderterms.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/orderterms.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/poheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/poheader.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/poheader.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/poheader.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,90 @@
+<#--
+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 width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <#-- left side -->
+ <td width="50%" valign="top">
+
+ <#-- header box -->
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">PO For ${partyId!}</div>
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <tr><td><div>Supplier Information Here</div></td></tr>
+ </table>
+ </div>
+ </div>
+ <#-- end of header box -->
+
+ <#-- payment box -->
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">Place Holder</div>
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+
+ </table>
+ </div>
+ </div>
+ <#-- end of payment box -->
+
+ </td>
+ <#-- end of left side -->
+
+ <#-- left/right spacer -->
+ <td width="1"> </td>
+ <#-- end of left/right spacer -->
+
+ <#-- right side -->
+ <td width="50%" valign="top">
+
+ <#-- contact box -->
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">Place Holder</div>
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+
+ </table>
+ </div>
+ </div>
+ <#-- end of contact box -->
+
+ <#-- shipping info box -->
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">Place Holder</div>
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+
+ </table>
+ </div>
+ </div>
+ <#-- end of shipping info box -->
+
+ </td>
+ <#-- end of right side -->
+ </tr>
+</table>
Propchange: ofbiz/trunk/applications/order/template/entry/poheader.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/poheader.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/poheader.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,136 @@
+<#--
+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.
+-->
+
+<#-- ==================== Party Selection dialog box ========================= -->
+<div class="screenlet">
+ <div class="screenlet-body">
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <input type="hidden" name="finalizeReqAdditionalParty" value="false"/>
+ <input type="hidden" name="finalizeMode" value="addpty"/>
+ </form>
+ <form method="post" action="<@o...@ofbizUrl>" name="quickAddPartyForm">
+
+ <tr>
+ <td><div>1) ${uiLabelMap.OrderSelectPartyToOrder} :</div></td>
+ </tr>
+ <tr>
+ <td width="100%">
+ <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
+ <tr>
+ <td align="right">
+ <input type="radio" id="additionalPartyType_Person" name="additionalPartyType" value="Person" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if (additionalPartyType?? && additionalPartyType == "Person")> checked="checked"</#if> />
+ </td>
+ <td>
+ <label for="additionalPartyType_Person">${uiLabelMap.CommonPerson}</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">
+ <input type="radio" id="additionalPartyType_Group" name="additionalPartyType" value="Group" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if additionalPartyType?? && additionalPartyType == "Group"> checked="checked"</#if> />
+ </td>
+ <td>
+ <label for="additionalPartyType_Group">${uiLabelMap.CommonGroup}</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">
+ <input type="radio" id="additionalPartyType_None" name="additionalPartyType" value="None" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if !additionalPartyType??> checked="checked"</#if> />
+ </td>
+ <td>
+ <label for="additionalPartyType_None">${uiLabelMap.OrderPartyDontWish}</label>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td> </td>
+ </tr>
+
+ <#if additionalPartyType?? && additionalPartyType != "" && additionalPartyType != "None">
+ <#if additionalPartyType == "Person">
+ <#assign lookupPartyView="LookupPerson">
+ <#else>
+ <#assign lookupPartyView="LookupPartyGroup">
+ </#if>
+ <tr>
+ <td><div>2) ${uiLabelMap.PartyFindParty} :</div></td>
+ </tr>
+
+ <tr>
+ <td width="100%">
+ <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
+ <tr>
+ <td>
+ <div>${uiLabelMap.CommonIdentifier} :</div>
+ </td>
+ <td>
+ <@htmlTemplate.lookupField value="${additionalPartyId!}" formName="quickAddPartyForm" name="additionalPartyId" id="additionalPartyId" fieldFormName="${lookupPartyView}"/>
+ </td>
+ <td>
+ <a href="javascript:document.quickAddPartyForm.submit()" class="buttontext">${uiLabelMap.CommonApply}</a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td> </td>
+ </tr>
+
+ </form>
+
+ <#if roles?has_content>
+ <tr>
+ <td><div>3) ${uiLabelMap.OrderPartySelectRoleForParty} :</div></td>
+ </tr>
+
+ <tr>
+ <td width="100%">
+ <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
+ <form method="post" action="<@o...@ofbizUrl>" name="addAdditionalPartyForm" id="addAdditionalPartyForm">
+ <tr>
+ <td> </td>
+ <td>
+ <select name="additionalRoleTypeId" id="additionalRoleTypeId" size="5" multiple="multiple">
+ <#list roles as role>
+ <option value="${role.roleTypeId}">${role.get("description",locale)}</option>
+ </#list>
+ </select>
+ </td>
+ <td> </td>
+ <td>
+ <input type="hidden" name="additionalPartyId" value="${additionalPartyId}" />
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd} "/>
+ </td>
+ </tr>
+ </form>
+ </table>
+ </td>
+ </tr>
+ </#if> <#-- roles?has_content -->
+ <#else>
+ </form>
+ </#if> <#-- additionalPartyType?has_content -->
+</table>
+ </div>
+</div>
Propchange: ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/shipsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/shipsettings.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/shipsettings.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/shipsettings.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,316 @@
+<#--
+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.
+-->
+<script language="JavaScript" type="text/javascript">
+ jQuery(document).ready(function(){
+ jQuery('#shipToSameParty, #shipToOtherParty').change(function(){
+ if(jQuery('#shipToSameParty').is(':checked')){
+ jQuery('#shipToParty').val("");
+ }
+ if(jQuery('#shipToOtherParty').is(':checked')){
+ jQuery('#shipToParty').val("${shipToPartyId!}");
+ }
+ })
+ });
+</script>
+<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
+
+<#-- Purchase Orders -->
+
+ <#if facilityMaps??>
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <input type="hidden" name="finalizeMode" value="ship"/>
+ <input type="hidden" name="shipToPartyId" id="shipToParty"/>
+ <#if (cart.getShipGroupSize() > 1)>
+ <input type="hidden" name="finalizeReqShipGroups" value="true"/>
+ </#if>
+ <table width='100%' border='0' cellspacing='0' cellpadding='0' class="boxboutside">
+ <tr>
+ <td colspan="4">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShipGroup}</a>
+ <#list 1..cart.getShipGroupSize() as currIndex>
+ <#assign shipGroupIndex = currIndex - 1>
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <tr>
+ <td colspan="4">
+ <h1>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</h1>
+ </td>
+ </tr>
+ <#assign i = 0>
+ <#assign shipGroup = cart.getShipInfo(shipGroupIndex)>
+ <#list facilityMaps as facilityMap>
+ <#assign facility = facilityMap.facility>
+ <#assign facilityContactMechList = facilityMap.facilityContactMechList>
+ <tr>
+ <td colspan="4">
+ <div>${uiLabelMap.FacilityFacility}: ${facility.facilityName!} [${facility.facilityId}]</div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="4"><hr /></td>
+ </tr>
+
+<#-- company postal addresses -->
+
+ <#if facilityContactMechList?has_content>
+ <#list facilityContactMechList as shippingContactMech>
+ <#if shippingContactMech.postalAddress??>
+ <#assign shippingAddress = shippingContactMech.postalAddress>
+ <tr>
+ <td valign="top" nowrap="nowrap">
+ <#assign checked='' />
+ <#if shipGroup?has_content && (shipGroup.getFacilityId()?has_content && shipGroup.getFacilityId() == facility.facilityId) && (shipGroup.getContactMechId()?has_content && shipGroup.getContactMechId() == shippingAddress.contactMechId) && !shipToPartyShippingContactMechList?has_content>
+ <#assign checked='checked' />
+ <#elseif i == 0 && !shipToPartyShippingContactMechList?has_content>
+ <#assign checked='checked' />
+ </#if>
+ <input type="radio" id="shipToSameParty" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}_@_${facility.facilityId}" ${checked}/>
+ </td>
+ <td nowrap="nowrap"> </td>
+ <td valign="top" width="100%" nowrap="nowrap">
+ <div>
+ <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if>
+ <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</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>
+ </div>
+ </td>
+ <td>
+ <div><a href="/facility/control/EditContactMech?facilityId=${facility.facilityId}&contactMechId=${shippingAddress.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div>
+ </td>
+ </tr>
+ <#if shippingContactMech_has_next>
+ <tr><td colspan="4"><hr /></td></tr>
+ </#if>
+ </#if>
+ <#assign i = i + 1>
+ </#list>
+ <#else>
+ <tr>
+ <td colspan="4">
+ <div>
+ ${uiLabelMap.CommonNoContactInformationOnFile}:
+ <a href="/facility/control/EditContactMech?facilityId=${facility.facilityId}&preContactMechTypeId=POSTAL_ADDRESS" target="_blank" class="buttontext">${uiLabelMap.CommonNew}</a>
+ </div>
+ </td>
+ </tr>
+ </#if>
+ </#list>
+ </table>
+ </#list>
+ </td>
+ </tr>
+ <#if shipToPartyShippingContactMechList?has_content>
+ <tr><td colspan="4"><hr /></td></tr>
+ <tr><td colspan="4">${uiLabelMap.OrderShipToAnotherParty}: <b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(shipToParty)}</b></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
+ <#list shipToPartyShippingContactMechList as shippingContactMech>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
+ <tr>
+ <td valign="top" nowrap="nowrap">
+ <input type="radio" id="shipToOtherParty" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"s/>
+ </td>
+ <td nowrap="nowrap"> </td>
+ <td valign="top" width="100%" nowrap="nowrap">
+ <div>
+ <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if>
+ <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</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>
+ </div>
+ </td>
+ <td>
+ <div><a href="/partymgr/control/editcontactmech?partyId=${orderParty.partyId}&contactMechId=${shippingContactMech.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div>
+ </td>
+ </tr>
+ <#if shippingContactMech_has_next>
+ <tr><td colspan="4"><hr /></td></tr>
+ </#if>
+ </#list>
+ </#if>
+ </table>
+ </form>
+ <#else>
+
+<#-- Sales Orders -->
+
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <input type="hidden" name="finalizeMode" value="ship"/>
+ <input type="hidden" name="shipToPartyId" id="shipToParty"/>
+ <#if (cart.getShipGroupSize() > 1)>
+ <input type="hidden" name="finalizeReqShipGroups" value="true"/>
+ </#if>
+ <table width='100%' border='0' cellspacing='0' cellpadding='0' class="boxoutside">
+ <tr>
+ <td>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew} ${uiLabelMap.OrderShipGroup}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShippingAddress}</a>
+ <#list 1..cart.getShipGroupSize() as currIndex>
+ <#assign shipGroupIndex = currIndex - 1>
+ <#assign currShipContactMechId = cart.getShippingContactMechId(shipGroupIndex)!>
+ <#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)!>
+ <#assign facilityId = cart.getShipGroupFacilityId(shipGroupIndex)!>
+ <hr />
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <tr>
+ <td colspan="3">
+ <h1>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</h1>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <div>
+ ${uiLabelMap.PartySupplier}:
+ <select name="${shipGroupIndex?default("0")}_supplierPartyId">
+ <option value=""></option>
+ <#list suppliers as supplier>
+ <option value="${supplier.partyId}"<#if supplierPartyId??><#if supplier.partyId == supplierPartyId> selected="selected"</#if></#if>>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option>
+ </#list>
+ </select>
+ ${uiLabelMap.ProductReserveInventoryFromFacility}:
+ <select name="${shipGroupIndex?default("0")}_shipGroupFacilityId">
+ <option value=""></option>
+ <#list productStoreFacilities as productStoreFacility>
+ <#assign facility = productStoreFacility.getRelatedOne("Facility", false)>
+ <option value="${productStoreFacility.facilityId}"<#if facilityId??><#if productStoreFacility.facilityId == facilityId> selected="selected"</#if></#if>>${facility.facilityName!} </option>
+ </#list>
+ </select>
+ </div>
+ </td>
+ </tr>
+ <#if shippingContactMechList?has_content>
+ <tr><td colspan="3"><hr /></td></tr>
+ <#assign i = 0>
+ <#list shippingContactMechList as shippingContactMech>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
+ <#if currShipContactMechId?? && currShipContactMechId?has_content>
+ <#if currShipContactMechId == shippingContactMech.contactMechId>
+ <#assign checkedValue = "checked='checked'">
+ <#else>
+ <#assign checkedValue = "">
+ </#if>
+ <#else>
+ <#if i == 0>
+ <#assign checkedValue = "checked='checked'">
+ <#else>
+ <#assign checkedValue = "">
+ </#if>
+ </#if>
+ <tr>
+ <td valign="top" width="1%" nowrap="nowrap">
+ <input type="radio" id="shipToSameParty" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}" ${checkedValue} />
+ </td>
+ <td valign="top" width="99%" nowrap="nowrap">
+ <div>
+ <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if>
+ <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</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>
+ </div>
+ </td>
+ <td>
+ <div><a href="/partymgr/control/editcontactmech?partyId=${orderParty.partyId}&contactMechId=${shippingContactMech.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div>
+ </td>
+ </tr>
+ <#if shippingContactMech_has_next>
+ <tr><td colspan="3"><hr /></td></tr>
+ </#if>
+ <#assign i = i + 1>
+ </#list>
+ </#if>
+ <#if shipToPartyShippingContactMechList?has_content>
+ <tr><td colspan="3"><hr /></td></tr>
+ <tr><td colspan="3">${uiLabelMap.OrderShipToAnotherParty}: <b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(shipToParty)}</b></td></tr>
+ <tr><td colspan="3"><hr /></td></tr>
+ <#list shipToPartyShippingContactMechList as shippingContactMech>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
+ <tr>
+ <td valign="top" width="1%" nowrap="nowrap">
+ <input type="radio" id="shipToOtherParty" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"/>
+ </td>
+ <td valign="top" width="99%" nowrap="nowrap">
+ <div>
+ <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if>
+ <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</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>
+ </div>
+ </td>
+ <td> </td>
+ </tr>
+ <#if shippingContactMech_has_next>
+ <tr><td colspan="3"><hr /></td></tr>
+ </#if>
+ </#list>
+ </#if>
+ </table>
+ </#list>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </#if>
+
+<#-- select a party id to ship to instead -->
+
+ <br />
+ <form method="post" action="setShipping" name="partyshipform">
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.OrderShipToAnotherParty}</li>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
+ <tr><td colspan="4"> </td></tr>
+ <tr>
+ <td> </td>
+ <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartyPartyId}</div></td>
+ <td> </td>
+ <td valign='middle'>
+ <div class='tabletext'>
+ <@htmlTemplate.lookupField value='${thisPartyId!}' formName="partyshipform" name="shipToPartyId" id="shipToPartyId" fieldFormName="LookupPartyName"/>
+ <input type="submit" class="smallSubmit" value="Continue" />
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </form>
+<#else>
+ <h3>${uiLabelMap.OrderViewPermissionError}</h3>
+</#if>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/order/template/entry/shipsettings.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/shipsettings.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/shipsettings.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/survey.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/survey.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/survey.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/survey.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,27 @@
+<#--
+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.
+-->
+
+<#-- Render the survey -->
+<#if requestAttributes.surveyWrapper?? && requestAttributes.surveyAction??>
+ <form method="post" enctype="multipart/form-data" action="<@o...@ofbizUrl>" style="margin: 0;">
+ ${requestAttributes.surveyWrapper.renderSurvey()}
+ </form>
+<#else>
+ <h1>${uiLabelMap.OrderNothingToDoHere}</h1>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/survey.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/survey.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/survey.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl (added)
+++ ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,59 @@
+<#--
+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.
+-->
+
+<form id="addGiftCertificate" action="<@o...@ofbizUrl>" method="post">
+ <fieldset>
+ <#if surveyId?? && surveyId?has_content>
+ <input type="hidden" name="quantity" value="1" />
+ <input type="hidden" name="surveyId" value="${surveyId!}" />
+ <#if giftCardProductList?has_content>
+ <label>${uiLabelMap.OrderSelectGiftAmount}</label>
+ <#list giftCardProductList?sort_by("price") as giftCardProduct>
+ <div>
+ <input type="radio" name="add_product_id" id="productId_${giftCardProduct.price!}" value="${giftCardProduct.productId!}" checked="checked" />
+ <label for="productId_${giftCardProduct.price!}"> ${giftCardProduct.productId!} : ${giftCardProduct.productName!} : <@ofbizCurrency amount=giftCardProduct.price! isoCode=currencyUomId/></label>
+ </div>
+ </#list>
+ <div>
+ <label for="emailAddress">${uiLabelMap.OrderRecipientEmailAdd}</label>
+ <input type="text" id="emailAddress" name="answers_1002" value="" />
+ </div>
+ <div>
+ <label for="recipientName">${uiLabelMap.OrderRecipientName}</label>
+ <input type="text" id="recipientName" name="answers_1001" value="" />
+ </div>
+ <div>
+ <label for="senderName">${uiLabelMap.OrderSenderName}</label>
+ <input type="text" id="senderName" name="answers_1000" value="" />
+ <div>
+ <label for="message">${uiLabelMap.OrderGiftMessage}:</label>
+ <textarea id="message" name="answers_1003"></textarea>
+ </div>
+ <div>
+ <input type="submit" value="${uiLabelMap.CommonSubmit}" />
+ </div>
+ <#else>
+ <label>${uiLabelMap.OrderNoGiftCertificatesFound}</label>
+ </#if>
+ <#else>
+ <label>${uiLabelMap.OrderNoProductStoreFinAccountSettingsFound}</label>
+ </#if>
+ </fieldset>
+</form>
+
Propchange: ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/order/GiftCertificates.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl (added)
+++ ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,41 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if hasPermission>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.OrderScheduleDelivery}</li>
+ <#if orderId??>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderViewOrder}</a></li>
+ </#if>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <#if orderId?has_content>
+ ${updatePODeliveryInfoWrapper.renderFormString(context)}
+ <#else>
+ ${uiLabelMap.OrderNoPurchaseSpecified}
+ </#if>
+ </div>
+</div>
+<#else>
+ <h3>${uiLabelMap.OrderViewPermissionError}</h3>
+</#if>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/order/OrderDeliveryScheduleInfo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl (added)
+++ ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,77 @@
+<#--
+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 id="findOrdersList" class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.OrderOrderReceivedOn} ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(filterDate)}</li>
+ <#assign listSize = state.getSize()>
+ <#if (listSize > 10)>
+ <li><a href="/ordermgr/control/orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate!}">${uiLabelMap.CommonMore}</a></li>
+ </#if>
+ <#if orderHeaderList?has_content>
+ <li>1-${orderHeaderList.size()} ${uiLabelMap.CommonOf} ${state.getSize()}</li>
+ </#if>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <#if orderHeaderList?has_content>
+ <table class="basic-table hover-bar" cellspacing='0'>
+ <tr class="header-row">
+ <td width="10%">${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</td>
+ <td width="15%">${uiLabelMap.OrderOrderBillToParty}</td>
+ <td width="25%">${uiLabelMap.OrderProductStore}</td>
+ <td width="10%">${uiLabelMap.CommonAmount}</td>
+ <td width="20%">${uiLabelMap.OrderTrackingCode}</td>
+ <td width="20%">${uiLabelMap.CommonStatus}</td>
+ </tr>
+ <#assign alt_row = false>
+ <#list orderHeaderList as orderHeader>
+ <#assign status = orderHeader.getRelatedOne("StatusItem", true)>
+ <#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)>
+ <#assign billToParty = orh.getBillToParty()!>
+ <#if billToParty?has_content>
+ <#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
+ <#assign billTo = billToPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")/>
+ </#if>
+ <#assign productStore = orderHeader.getRelatedOne("ProductStore", true)! />
+ <tr<#if alt_row> class="alternate-row"</#if>>
+ <#assign alt_row = !alt_row>
+ <td><a href="/ordermgr/control/orderview?orderId=${orderHeader.orderId}" class="buttontext">${orderHeader.orderId}</a></td>
+ <td>${billTo!}</td>
+ <td><#if productStore?has_content>${productStore.storeName?default(productStore.productStoreId)}</#if></td>
+ <td><@ofbizCurrency amount=orderHeader.grandTotal isoCode=orderHeader.currencyUom/></td>
+ <td>
+ <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder", null, null, false)>
+ <#list trackingCodes as trackingCode>
+ <#if trackingCode?has_content>
+ <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey!}">${trackingCode.trackingCodeId}</a><br />
+ </#if>
+ </#list>
+ </td>
+ <td>${orderHeader.getRelatedOne("StatusItem", true).get("description",locale)}</td>
+ </tr>
+ </#list>
+ </table>
+ <#else>
+ <h3>${uiLabelMap.OrderNoOrderFound}</h3>
+ </#if>
+ </div>
+</div>
Propchange: ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/order/OrderListByDate.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl (added)
+++ ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,47 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if salesReps?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3"> ${uiLabelMap.OrderSalesReps}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <table class="basic-table" cellspacing='0'>
+ <tr class="header-row">
+ <td width="50%">${uiLabelMap.PartyLastName}</td>
+ <td width="50%">${uiLabelMap.PartyFirstName}</td>
+ </tr>
+ <#list salesReps as salesRep>
+ <#assign party = salesRep.getRelatedOne("Party", false)!/>
+ <#assign person = party.getRelatedOne("Person", false)!/>
+ <#if person?? && person?has_content>
+ <tr>
+ <td width="50%">${person.lastName}</td>
+ <td width="50%">${person.firstName}</td>
+ </tr>
+ </#if>
+ </#list>
+ </table>
+ </div>
+</div>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/order/OrderSalesReps.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/appendorderitem.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/order/appendorderitem.ftl (added)
+++ ofbiz/trunk/applications/order/template/order/appendorderitem.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,135 @@
+<#--
+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.
+-->
+
+<script language="JavaScript" type="text/javascript">
+ function quicklookup(element) {
+ window.location='<@o...@ofbizUrl>?orderId='+element.value;
+ }
+</script>
+
+<#if orderHeader?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3"> ${uiLabelMap.OrderAddToOrder}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <form method="post" action="<@o...@ofbizUrl>" name="appendItemForm">
+ <input type="hidden" size="25" name="orderId" value="${orderId!}"/>
+ <#if !catalogCol?has_content>
+ <input type="hidden" name="prodCatalogId" value=""/>
+ </#if>
+ <#if catalogCol?has_content && catalogCol?size == 1>
+ <input type="hidden" name="prodCatalogId" value="${catalogCol.first}"/>
+ </#if>
+ <#if shipGroups?size == 1>
+ <input type="hidden" name="shipGroupSeqId" value="${shipGroups.first.shipGroupSeqId}"/>
+ </#if>
+ <table class="basic-table" cellspacing="0">
+ <#if catalogCol?has_content && (catalogCol?size > 1)>
+ <tr>
+ <td class="label">${uiLabelMap.ProductChooseCatalog}</td>
+ <td><select name='prodCatalogId'>
+ <#list catalogCol as catalogId>
+ <#assign thisCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)>
+ <option value='${catalogId}'>${thisCatalogName}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ </#if>
+ <tr>
+ <td class="label">${uiLabelMap.ProductProductId}</td>
+ <td>
+ <#-- FIXME Problem here: the input field is shared -->
+ <@htmlTemplate.lookupField formName="appendItemForm" name="productId" id="productId" fieldFormName="LookupProduct"/>
+ <#if "PURCHASE_ORDER" == orderHeader.orderTypeId>
+ <a href="javascript:quicklookup(document.appendItemForm.orderId)" class="buttontext">${uiLabelMap.OrderQuickLookup}</a>
+ </#if>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.OrderPrice}</td>
+ <td>
+ <input type="text" size="6" name="basePrice" value="${requestParameters.price!}"/>
+ <input type="checkbox" name="overridePrice" value="Y"/> ${uiLabelMap.OrderOverridePrice}
+ </td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.OrderQuantity}</td>
+ <td><input type="text" size="6" name="quantity" value="${requestParameters.quantity?default("1")}"/></td>
+ </tr>
+ <#if (shipGroups?size > 1)>
+ <tr>
+ <td class="label">${uiLabelMap.OrderShipGroup}</td>
+ <td><select name="shipGroupSeqId">
+ <#list shipGroups as shipGroup>
+ <option value="${shipGroup.shipGroupSeqId}">${shipGroup.shipGroupSeqId}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ </#if>
+ <tr>
+ <td class="label">${uiLabelMap.OrderDesiredDeliveryDate}</td>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="itemDesiredDeliveryDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="itemDesiredDeliveryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.OrderReturnReason}</td>
+ <td>
+ <select name="reasonEnumId">
+ <option value=""> </option>
+ <#list orderItemChangeReasons as reason>
+ <option value="${reason.enumId}">${reason.get("description",locale)?default(reason.enumId)}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ <#if orderHeader.orderTypeId == "PURCHASE_ORDER" && purchaseOrderItemTypeList?has_content>
+ <tr>
+ <td class="label">${uiLabelMap.OrderOrderItemType}</td>
+ <td>
+ <select name="orderItemTypeId">
+ <option value=""> </option>
+ <#list purchaseOrderItemTypeList as orderItemType>
+ <option value="${orderItemType.orderItemTypeId}">${orderItemType.description}</option>
+ </#list>
+ </select>
+ </td>
+ </tr>
+ </#if>
+ <tr>
+ <td class="label">${uiLabelMap.CommonComment}</td>
+ <td>
+ <input type="text" size="25" name="changeComments"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label"> </td>
+ <td><input type="submit" value="${uiLabelMap.OrderAddToOrder}"/></td>
+ </tr>
+ </table>
+ </form>
+ </div>
+</div>
+</#if>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl (added)
+++ ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,108 @@
+<#--
+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 text-align="left">
+ <#if logoImageUrl?has_content><fo:external-graphic src="<@o...@ofbizContentUrl>" overflow="hidden" height="40px" content-height="scale-to-fit" content-width="2.00in"/></#if>
+</fo:block>
+
+<fo:block font-size="8pt">
+ <fo:block>${companyName}</fo:block>
+ <#if postalAddress??>
+ <#if postalAddress?has_content>
+ ${setContextField("postalAddress", postalAddress)}
+ ${screens.render("component://party/widget/partymgr/PartyScreens.xml#postalAddressPdfFormatter")}
+ </#if>
+ <#else>
+ <fo:block>${uiLabelMap.CommonNoPostalAddress}</fo:block>
+ <fo:block>${uiLabelMap.CommonFor}: ${companyName}</fo:block>
+ </#if>
+
+ <#if sendingPartyTaxId?? || phone?? || email?? || website?? || eftAccount??>
+ <fo:list-block provisional-distance-between-starts=".5in">
+ <#if sendingPartyTaxId??>
+ <fo:list-item>
+ <fo:list-item-label>
+ <fo:block>${uiLabelMap.PartyTaxId}:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>${sendingPartyTaxId}</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </#if>
+ <#if phone??>
+ <fo:list-item>
+ <fo:list-item-label>
+ <fo:block>${uiLabelMap.CommonTelephoneAbbr}:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block><#if phone.countryCode??>${phone.countryCode}-</#if><#if phone.areaCode??>${phone.areaCode}-</#if>${phone.contactNumber!}</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </#if>
+ <#if email??>
+ <fo:list-item>
+ <fo:list-item-label>
+ <fo:block>${uiLabelMap.CommonEmail}:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>${email.infoString!}</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </#if>
+ <#if website??>
+ <fo:list-item>
+ <fo:list-item-label>
+ <fo:block>${uiLabelMap.CommonWebsite}:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>${website.infoString!}</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </#if>
+ <#if eftAccount??>
+ <fo:list-item>
+ <fo:list-item-label>
+ <fo:block>${uiLabelMap.CommonFinBankName}:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>${eftAccount.bankName!}</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item>
+ <fo:list-item-label>
+ <fo:block>${uiLabelMap.CommonRouting}:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>${eftAccount.routingNumber!}</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item>
+ <fo:list-item-label>
+ <fo:block>${uiLabelMap.CommonBankAccntNrAbbr}:</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>${eftAccount.accountNumber!}</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </#if>
+ </fo:list-block>
+ </#if>
+</fo:block>
+</#escape>
Propchange: ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain