svn commit: r563018 - in /ofbiz/trunk/specialpurpose/oa
Locked
 
|
Author: jonesde
Date: Sun Aug 5 20:38:13 2007 New Revision: 563018 URL: http://svn.apache.org/viewvc?view=rev&rev=563018 Log: A few cleanups in outgoing message files; big reformatting in the ReceiveDelivery.ftl file Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl?view=diff&rev=563018&r1=563017&r2=563018 ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl (original) +++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl Sun Aug 5 20:38:13 2007 @@ -17,10 +17,9 @@ specific language governing permissions and limitations under the License. --> - +<#-- xsi:schemaLocation="http://www.openapplications.org/002_confirm_bod_004 file:///C:/Documents%20and%20Settings/022523/My%20Documents/Vudu/XML%20Specs/OAG%20721/002_confirm_bod_004.xsd" --> <n:CONFIRM_BOD_004 xmlns:n="http://www.openapplications.org/002_confirm_bod_004" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openapplications.org/002_confirm_bod_004 file:///C:/Documents%20and%20Settings/022523/My%20Documents/Vudu/XML%20Specs/OAG%20721/002_confirm_bod_004.xsd" xmlns:os="http://www.openapplications.org/oagis_segments" xmlns:of="http://www.openapplications.org/oagis_fields"> <os:CNTROLAREA> Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl?view=diff&rev=563018&r1=563017&r2=563018 ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (original) +++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl Sun Aug 5 20:38:13 2007 @@ -17,10 +17,10 @@ specific language governing permissions and limitations under the License. --> +<#-- xsi:schemaLocation="http://www.openapplications.org/161B_PROCESS_SHIPMENT_001 file:///C:/Documents%20and%20Settings/022523/My%20Documents/Vudu/XML%20Specs/REL%201%20-%20VER%202/161B_process_shipment_005.xsd" --> <n:PROCESS_SHIPMENT_001 xmlns:n="http://www.openapplications.org/161B_PROCESS_SHIPMENT_001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openapplications.org/161B_PROCESS_SHIPMENT_001 file:///C:/Documents%20and%20Settings/022523/My%20Documents/Vudu/XML%20Specs/REL%201%20-%20VER%202/161B_process_shipment_005.xsd" xmlns:os="http://www.openapplications.org/oagis_segments" xmlns:of="http://www.openapplications.org/oagis_fields"> <os:CNTROLAREA> Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl?view=diff&rev=563018&r1=563017&r2=563018 ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl (original) +++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl Sun Aug 5 20:38:13 2007 @@ -1,104 +1,109 @@ <?xml version="1.0" encoding="UTF-8"?> <#-- - 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. +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. --> -<n:RECEIVE_DELIVERY_001 xmlns:n="http://www.openapplications.org/197_receive_delivery_001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openapplications.org/197_receive_delivery_001 file:///C:/Documents%20and%20Settings/022523/My%20Documents/Vudu/XML%20Specs/OAG%20721/197_receive_delivery_001.xsd" xmlns:N1="http://www.openapplications.org/oagis_segments" xmlns:N2="http://www.openapplications.org/oagis_fields"> - <os:CNTROLAREA> - <os:BSR> - <of:VERB>RECEIVE</of:VERB> - <of:NOUN>DELIVERY</of:NOUN> - <of:REVISION>001</of:REVISION> - </os:BSR> - <os:SENDER> - <of:LOGICALID>${logicalId}</of:LOGICALID> - <of:COMPONENT>INVENTORY</of:COMPONENT> - <of:TASK>RMA</of:TASK> - <of:REFERENCEID>${referenceId?if_exists}</of:REFERENCEID/> - <of:CONFIRMATION>1</of:CONFIRMATION> - <of:LANGUAGE>ENG</of:LANGUAGE> - <of:CODEPAGE>NONE</of:CODEPAGE> - <of:AUTHID>${authId}</of:AUTHID> - </os:SENDER> - <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO> - </os:CNTROLAREA> - <n:DATAAREA> - <n:RECEIVE_DELIVERY> - <n:RECEIPTHDR> - <os:DATETIMEISO>${entryDate?if_exists}</os:DATETIMEISO> - <of:RECEIPTID>${returnId?if_exists}</of:RECEIPTID> - <of:CARRIER></of:CARRIER> - <of:NOTES></of:NOTES> - <of:RECEIPTYPE>RMA</of:RECEIPTYPE> - <os:PARTNER> - <of:NAME>${postalAddress.toName?if_exists}</of:NAME> - <of:PARTNRTYPE>SHIPFROM</of:PARTNRTYPE> - <of:CURRENCY>USD</of:CURRENCY> - <#if postalAddress?has_content> - <os:ADDRESS> - <of:ADDRLINE>${postalAddress.address1?if_exists}</of:ADDRLINE> - <#if postalAddress.address2?exists> - <of:ADDRLINE>${postalAddress.address2?if_exists}</of:ADDRLINE> - </#if> - <of:CITY>${postalAddress.city?if_exists}</of:CITY> - <of:COUNTRY>${postalAddress.countryGeoId?if_exists}</of:COUNTRY> - <of:FAX></of:FAX> - <of:POSTALCODE>${postalAddress.postalCode?if_exists}</of:POSTALCODE> - <of:STATEPROVN>${postalAddress.stateProvinceGeoId?if_exists}</of:STATEPROVN> - <of:TELEPHONE>${telecomNumber.countryCode?if_exists}${telecomNumber.areaCode?if_exists}-${telecomNumber.contactNumber?if_exists}</of:TELEPHONE> - </os:ADDRESS> - <os:CONTACT> - <of:NAME>${postalAddress.toName?if_exists}</of:NAME> - <of:EMAIL>${emailString?if_exists}</of:EMAIL> - <of:FAX></of:FAX> - <of:TELEPHONE>${telecomNumber.countryCode?if_exists}${telecomNumber.areaCode?if_exists}-${telecomNumber.contactNumber?if_exists}</of:TELEPHONE> - </os:CONTACT> - </#if> - </os:PARTNER> - </n:RECEIPTHDR> - <n:RECEIPTUNT> - <os:QUANTITY> - <of:VALUE>${totalQty?if_exists}</of:VALUE> - <of:NUMOFDEC>0</of:NUMOFDEC> - <of:SIGN>+</of:SIGN> - <of:UOM>EACH</of:UOM> - </os:QUANTITY> - <n:RECEIPTITM> - <#list returnItems as returnItem> - <#assign returnReason = returnItem.getRelatedOne("ReturnReason")> - <os:QUANTITY> - <of:VALUE>${returnItem.returnQuantity?if_exists}</of:VALUE> - <of:NUMOFDEC>0</of:NUMOFDEC> - <of:SIGN>+</of:SIGN> - <of:UOM>EACH</of:UOM> - </os:QUANTITY> - <of:ITEM>${returnItem.productId?if_exists}</of:ITEM> - <of:NOTES>${returnReason.description?if_exists}</of:NOTES> - <os:DOCUMNTREF> - <of:DOCTYPE>RMA</of:DOCTYPE> - <of:DOCUMENTID>${returnId?if_exists}</of:DOCUMENTID> - <of:LINENUM>${returnItem.returnItemSeqId}</of:LINENUM> - </os:DOCUMNTREF> - </#list> - <n:INVDETAIL> - <of:SERIALNUM></of:SERIALNUM> - </n:INVDETAIL> - </n:RECEIPTITM> - </n:RECEIPTUNT> - </n:RECEIVE_DELIVERY> - </n:DATAAREA> +<#-- xsi:schemaLocation="http://www.openapplications.org/197_receive_delivery_001 file:///C:/Documents%20and%20Settings/022523/My%20Documents/Vudu/XML%20Specs/OAG%20721/197_receive_delivery_001.xsd" --> +<n:RECEIVE_DELIVERY_001 + xmlns:n="http://www.openapplications.org/197_receive_delivery_001" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:os="http://www.openapplications.org/oagis_segments" + xmlns:of="http://www.openapplications.org/oagis_fields"> + <os:CNTROLAREA> + <os:BSR> + <of:VERB>RECEIVE</of:VERB> + <of:NOUN>DELIVERY</of:NOUN> + <of:REVISION>001</of:REVISION> + </os:BSR> + <os:SENDER> + <of:LOGICALID>${logicalId}</of:LOGICALID> + <of:COMPONENT>INVENTORY</of:COMPONENT> + <of:TASK>RMA</of:TASK> + <of:REFERENCEID>${referenceId?if_exists}</of:REFERENCEID/> + <of:CONFIRMATION>1</of:CONFIRMATION> + <of:LANGUAGE>ENG</of:LANGUAGE> + <of:CODEPAGE>NONE</of:CODEPAGE> + <of:AUTHID>${authId}</of:AUTHID> + </os:SENDER> + <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO> + </os:CNTROLAREA> + <n:DATAAREA> + <n:RECEIVE_DELIVERY> + <n:RECEIPTHDR> + <os:DATETIMEISO>${entryDate?if_exists}</os:DATETIMEISO> + <of:RECEIPTID>${returnId?if_exists}</of:RECEIPTID> + <of:CARRIER></of:CARRIER> + <of:NOTES></of:NOTES> + <of:RECEIPTYPE>RMA</of:RECEIPTYPE> + <os:PARTNER> + <of:NAME>${postalAddress.toName?if_exists}</of:NAME> + <of:PARTNRTYPE>SHIPFROM</of:PARTNRTYPE> + <of:CURRENCY>USD</of:CURRENCY> + <#if postalAddress?has_content> + <os:ADDRESS> + <of:ADDRLINE>${postalAddress.address1?if_exists}</of:ADDRLINE> + <#if postalAddress.address2?exists> + <of:ADDRLINE>${postalAddress.address2?if_exists}</of:ADDRLINE> + </#if> + <of:CITY>${postalAddress.city?if_exists}</of:CITY> + <of:COUNTRY>${postalAddress.countryGeoId?if_exists}</of:COUNTRY> + <of:FAX></of:FAX> + <of:POSTALCODE>${postalAddress.postalCode?if_exists}</of:POSTALCODE> + <of:STATEPROVN>${postalAddress.stateProvinceGeoId?if_exists}</of:STATEPROVN> + <of:TELEPHONE>${telecomNumber.countryCode?if_exists}${telecomNumber.areaCode?if_exists}-${telecomNumber.contactNumber?if_exists}</of:TELEPHONE> + </os:ADDRESS> + <os:CONTACT> + <of:NAME>${postalAddress.toName?if_exists}</of:NAME> + <of:EMAIL>${emailString?if_exists}</of:EMAIL> + <of:FAX></of:FAX> + <of:TELEPHONE>${telecomNumber.countryCode?if_exists}${telecomNumber.areaCode?if_exists}-${telecomNumber.contactNumber?if_exists}</of:TELEPHONE> + </os:CONTACT> + </#if> + </os:PARTNER> + </n:RECEIPTHDR> + <n:RECEIPTUNT> + <os:QUANTITY> + <of:VALUE>${totalQty?if_exists}</of:VALUE> + <of:NUMOFDEC>0</of:NUMOFDEC> + <of:SIGN>+</of:SIGN> + <of:UOM>EACH</of:UOM> + </os:QUANTITY> + <n:RECEIPTITM> + <#list returnItems as returnItem> + <#assign returnReason = returnItem.getRelatedOne("ReturnReason")> + <os:QUANTITY> + <of:VALUE>${returnItem.returnQuantity?if_exists}</of:VALUE> + <of:NUMOFDEC>0</of:NUMOFDEC> + <of:SIGN>+</of:SIGN> + <of:UOM>EACH</of:UOM> + </os:QUANTITY> + <of:ITEM>${returnItem.productId?if_exists}</of:ITEM> + <of:NOTES>${returnReason.description?if_exists}</of:NOTES> + <os:DOCUMNTREF> + <of:DOCTYPE>RMA</of:DOCTYPE> + <of:DOCUMENTID>${returnId?if_exists}</of:DOCUMENTID> + <of:LINENUM>${returnItem.returnItemSeqId}</of:LINENUM> + </os:DOCUMNTREF> + </#list> + <n:INVDETAIL> + <of:SERIALNUM></of:SERIALNUM> + </n:INVDETAIL> + </n:RECEIPTITM> + </n:RECEIPTUNT> + </n:RECEIVE_DELIVERY> + </n:DATAAREA> </n:RECEIVE_DELIVERY_001> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |