You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2007/07/24 19:42:03 UTC
svn commit: r559130 - in /ofbiz/trunk/specialpurpose/oagis:
src/org/ofbiz/oagis/OagisInventoryServices.java
webapp/oagis/message/ReceiveDelivery.ftl
Author: apatel
Date: Tue Jul 24 10:42:02 2007
New Revision: 559130
URL: http://svn.apache.org/viewvc?view=rev&rev=559130
Log:
fixes to message template
Modified:
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl
Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?view=diff&rev=559130&r1=559129&r2=559130
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Tue Jul 24 10:42:02 2007
@@ -122,8 +122,8 @@
*/
String sign = UtilXml.childElementValue(quantityElement, "of:SIGN");
String uom = UtilXml.childElementValue(quantityElement, "of:UOM");
- String productId = UtilXml.childElementValue(inventoryElement, "os:ITEM");
- String itemStatus = UtilXml.childElementValue(inventoryElement, "os:ITEMSTATUS");
+ String productId = UtilXml.childElementValue(inventoryElement, "of:ITEM");
+ String itemStatus = UtilXml.childElementValue(inventoryElement, "of:ITEMSTATUS");
String statusId = null;
if (itemStatus.equals("AVAILABLE")) {
statusId = "INV_AVAILABLE";
@@ -348,7 +348,7 @@
double itemQty = Double.parseDouble(itemQtyStr);
String sign = UtilXml.childElementValue(qtyElement, "of:SIGN");
- String productId = UtilXml.childElementValue(receiptLnElement, "os:ITEM");
+ String productId = UtilXml.childElementValue(receiptLnElement, "of:ITEM");
Element documentRefElement = UtilXml.firstChildElement(receiptLnElement, "os:DOCUMNTREF");
orderId = UtilXml.childElementValue(documentRefElement, "of:DOCUMENTID");
@@ -369,7 +369,7 @@
Debug.logError(e, errMsg, module);
}
// get inventory item status
- String invItemStatus = UtilXml.childElementValue(receiptLnElement, "os:DISPOSITN");
+ String invItemStatus = UtilXml.childElementValue(receiptLnElement, "of:DISPOSITN");
if ( invItemStatus.equals("ReceivedTOAvailable") || invItemStatus.equals("NotAvailableTOAvailable")) {
ripCtx.put("statusId", "INV_AVAILABLE");
} else if ( invItemStatus.equals("ReceivedTONotAvailable") || invItemStatus.equals("AvailableTONotAvailable") ) {
@@ -377,7 +377,7 @@
}
// get the serial number(s)
List serialNumsList = FastList.newInstance();
- List invDetailList = UtilXml.childElementList(receiptLnElement, "os:INVDETAIL");
+ List invDetailList = UtilXml.childElementList(receiptLnElement, "n:INVDETAIL");
if (UtilValidate.isNotEmpty(invDetailList)) {
inventoryItemTypeId = "SERIALIZED_INV_ITEM";
ripCtx.put("inventoryItemTypeId", inventoryItemTypeId);
@@ -585,7 +585,7 @@
double itemQty = Double.parseDouble(itemQtyStr);
String sign = UtilXml.childElementValue(qtyElement, "of:SIGN");
- String productId = UtilXml.childElementValue(receiptLnElement, "os:ITEM");
+ String productId = UtilXml.childElementValue(receiptLnElement, "of:ITEM");
Element documentRefElement = UtilXml.firstChildElement(receiptLnElement, "os:DOCUMNTREF");
returnId = UtilXml.childElementValue(documentRefElement, "of:DOCUMENTID");
@@ -595,7 +595,7 @@
ripCtx.put("returnItemSeqId", returnItemSeqId);
// get inventory item status
- String invItemStatus = UtilXml.childElementValue(receiptLnElement, "os:DISPOSITN");
+ String invItemStatus = UtilXml.childElementValue(receiptLnElement, "of:DISPOSITN");
if ( invItemStatus.equals("ReceivedTOAvailable") || invItemStatus.equals("NotAvailableTOAvailable")) {
ripCtx.put("statusId", "INV_AVAILABLE");
} else if ( invItemStatus.equals("ReceivedTONotAvailable") || invItemStatus.equals("AvailableTONotAvailable") ) {
@@ -603,7 +603,7 @@
}
// get the serial number(s)
List serialNumsList = FastList.newInstance();
- List invDetailList = UtilXml.childElementList(receiptLnElement, "os:INVDETAIL");
+ List invDetailList = UtilXml.childElementList(receiptLnElement, "n:INVDETAIL");
if (UtilValidate.isNotEmpty(invDetailList)) {
inventoryItemTypeId = "SERIALIZED_INV_ITEM";
ripCtx.put("inventoryItemTypeId", inventoryItemTypeId);
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=559130&r1=559129&r2=559130
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl Tue Jul 24 10:42:02 2007
@@ -18,84 +18,84 @@
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">
- <N1:CNTROLAREA>
- <N1:BSR>
- <N2:VERB>RECEIVE</N2:VERB>
- <N2:NOUN>DELIVERY</N2:NOUN>
- <N2:REVISION>001</N2:REVISION>
- </N1:BSR>
- <N1:SENDER>
- <N2:LOGICALID>${logicalId}</N2:LOGICALID>
- <N2:COMPONENT>INVENTORY</N2:COMPONENT>
- <N2:TASK>RMA</N2:TASK>
- <N2:REFERENCEID>${referenceId?if_exists}</N2:REFERENCEID/>
- <N2:CONFIRMATION>1</N2:CONFIRMATION>
- <N2:LANGUAGE>ENG</N2:LANGUAGE>
- <N2:CODEPAGE>NONE</N2:CODEPAGE>
- <N2:AUTHID>${authId}</N2:AUTHID>
- </N1:SENDER>
- <N1:DATETIMEISO>${sentDate?if_exists}</N1:DATETIMEISO>
- </N1:CNTROLAREA>
+ <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>
- <N1:DATETIMEISO>${entryDate?if_exists}</N1:DATETIMEISO>
- <N2:RECEIPTID>${returnId?if_exists}</N2:RECEIPTID>
- <N2:CARRIER></N2:CARRIER>
- <N2:NOTES></N2:NOTES>
- <N2:RECEIPTYPE>RMA</N2:RECEIPTYPE>
- <N1:PARTNER>
- <N2:NAME>${postalAddress.toName?if_exists}</N2:NAME>
- <N2:PARTNRTYPE>SHIPFROM</N2:PARTNRTYPE>
- <N2:CURRENCY>USD</N2:CURRENCY>
+ <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>
- <N1:ADDRESS>
- <N2:ADDRLINE>${postalAddress.address1?if_exists}</N2:ADDRLINE>
+ <os:ADDRESS>
+ <of:ADDRLINE>${postalAddress.address1?if_exists}</of:ADDRLINE>
<#if postalAddress.address2?exists>
- <N2:ADDRLINE>${postalAddress.address2?if_exists}</N2:ADDRLINE>
+ <of:ADDRLINE>${postalAddress.address2?if_exists}</of:ADDRLINE>
</#if>
- <N2:CITY>${postalAddress.city?if_exists}</N2:CITY>
- <N2:COUNTRY>${postalAddress.countryGeoId?if_exists}</N2:COUNTRY>
- <N2:FAX></N2:FAX>
- <N2:POSTALCODE>${postalAddress.postalCode?if_exists}</N2:POSTALCODE>
- <N2:STATEPROVN>${postalAddress.stateProvinceGeoId?if_exists}</N2:STATEPROVN>
- <N2:TELEPHONE>${telecomNumber.countryCode?if_exists}${telecomNumber.areaCode?if_exists}-${telecomNumber.contactNumber?if_exists}</N2:TELEPHONE>
- </N1:ADDRESS>
- <N1:CONTACT>
- <N2:NAME>${postalAddress.toName?if_exists}</N2:NAME>
- <N2:EMAIL>${emailString?if_exists}</N2:EMAIL>
- <N2:FAX></N2:FAX>
- <N2:TELEPHONE>${telecomNumber.countryCode?if_exists}${telecomNumber.areaCode?if_exists}-${telecomNumber.contactNumber?if_exists}</N2:TELEPHONE>
- </N1:CONTACT>
+ <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>
- </N1:PARTNER>
+ </os:PARTNER>
</n:RECEIPTHDR>
<n:RECEIPTUNT>
- <N1:QUANTITY>
- <N2:VALUE>${totalQty?if_exists}</N2:VALUE>
- <N2:NUMOFDEC>0</N2:NUMOFDEC>
- <N2:SIGN>+</N2:SIGN>
- <N2:UOM>EACH</N2:UOM>
- </N1:QUANTITY>
+ <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")>
- <N1:QUANTITY>
- <N2:VALUE>${returnItem.returnQuantity?if_exists}</N2:VALUE>
- <N2:NUMOFDEC>0</N2:NUMOFDEC>
- <N2:SIGN>+</N2:SIGN>
- <N2:UOM>EACH</N2:UOM>
- </N1:QUANTITY>
- <N2:ITEM>${returnItem.productId?if_exists}</N2:ITEM>
- <N2:NOTES>${returnReason.description?if_exists}</N2:NOTES>
- <N1:DOCUMNTREF>
- <N2:DOCTYPE>RMA</N2:DOCTYPE>
- <N2:DOCUMENTID>${returnId?if_exists}</N2:DOCUMENTID>
- <N2:LINENUM>${returnItem.returnItemSeqId}</N2:LINENUM>
- </N1:DOCUMNTREF>
+ <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>
- <N2:SERIALNUM></N2:SERIALNUM>
+ <of:SERIALNUM></of:SERIALNUM>
</n:INVDETAIL>
</n:RECEIPTITM>
</n:RECEIPTUNT>