svn commit: r942474 [3/3] - in /ofbiz/branches/release09.04: applications/accounting/webapp/accounting/common/ applications/accounting/webapp/accounting/fixedasset/ applications/accounting/webapp/accounting/invoice/ applications/accounting/webapp/accou...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r942474 [3/3] - in /ofbiz/branches/release09.04: applications/accounting/webapp/accounting/common/ applications/accounting/webapp/accounting/fixedasset/ applications/accounting/webapp/accounting/invoice/ applications/accounting/webapp/accou...

lektran
Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl Sat May  8 22:08:40 2010
@@ -1,98 +1,98 @@
-<#--
-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.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<#-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> -->
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>: ${(productStore.storeName)?if_exists}</title>
-  <#if layoutSettings.shortcutIcon?has_content>
-    <#assign shortcutIcon = layoutSettings.shortcutIcon/>
-  <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
-    <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON.get(0)/>
-  </#if>
-  <#if shortcutIcon?has_content>
-    <link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>" />
-  </#if>
-  <#if layoutSettings.javaScripts?has_content>
-    <#--layoutSettings.javaScripts is a list of java scripts. -->
-    <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
-    <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
-    <#list layoutSettings.javaScripts as javaScript>
-      <#if javaScriptsSet.contains(javaScript)>
-        <#assign nothing = javaScriptsSet.remove(javaScript)/>
-        <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
-      </#if>
-    </#list>
-  </#if>
-  <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
-    <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
-      <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script>
-    </#list>
-  </#if>
-  <#if layoutSettings.styleSheets?has_content>
-    <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.-->
-    <#list layoutSettings.styleSheets as styleSheet>
-      <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
-    </#list>
-  </#if>
-  <#if layoutSettings.VT_STYLESHEET?has_content>
-    <#list layoutSettings.VT_STYLESHEET as styleSheet>
-      <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
-    </#list>
-  </#if>
-  <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
-    <#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.-->
-    <#list layoutSettings.rtlStyleSheets as styleSheet>
-      <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
-    </#list>
-  </#if>
-  <#if layoutSettings.VT_RTL_STYLESHEET?has_content && langDir == "rtl">
-    <#list layoutSettings.VT_RTL_STYLESHEET as styleSheet>
-      <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
-    </#list>
-  </#if>
-  ${layoutSettings.extraHead?if_exists}
-  <#if layoutSettings.VT_EXTRA_HEAD?has_content>
-    <#list layoutSettings.VT_EXTRA_HEAD as extraHead>
-      ${extraHead}
-    </#list>
-  </#if>
-
-  <#-- Append CSS for catalog -->
-  <#if catalogStyleSheet?exists>
-    <link rel="stylesheet" href="${StringUtil.wrapString(catalogStyleSheet)}" type="text/css"/>
-  </#if>
-  <#-- Append CSS for tracking codes -->
-  <#if sessionAttributes.overrideCss?exists>
-    <link rel="stylesheet" href="${StringUtil.wrapString(sessionAttributes.overrideCss)}" type="text/css"/>
-  </#if>
-  <#-- Meta tags if defined by the page action -->
-  <#if metaDescription?exists>
-    <meta name="description" content="${metaDescription}"/>
-  </#if>
-  <#if metaKeywords?exists>
-    <meta name="keywords" content="${metaKeywords}"/>
-  </#if>
-  <#if requireDojo?exists>
-    <script type="text/javascript">
-      dojo.require("dojo.widget.*");
-    </script>
-  </#if>
-</head>
+<#--
+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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<#-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> -->
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  <title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>: ${(productStore.storeName)?if_exists}</title>
+  <#if layoutSettings.shortcutIcon?has_content>
+    <#assign shortcutIcon = layoutSettings.shortcutIcon/>
+  <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
+    <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON.get(0)/>
+  </#if>
+  <#if shortcutIcon?has_content>
+    <link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>" />
+  </#if>
+  <#if layoutSettings.javaScripts?has_content>
+    <#--layoutSettings.javaScripts is a list of java scripts. -->
+    <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
+    <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+    <#list layoutSettings.javaScripts as javaScript>
+      <#if javaScriptsSet.contains(javaScript)>
+        <#assign nothing = javaScriptsSet.remove(javaScript)/>
+        <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+      </#if>
+    </#list>
+  </#if>
+  <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
+    <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
+      <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script>
+    </#list>
+  </#if>
+  <#if layoutSettings.styleSheets?has_content>
+    <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.-->
+    <#list layoutSettings.styleSheets as styleSheet>
+      <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
+    </#list>
+  </#if>
+  <#if layoutSettings.VT_STYLESHEET?has_content>
+    <#list layoutSettings.VT_STYLESHEET as styleSheet>
+      <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
+    </#list>
+  </#if>
+  <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
+    <#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.-->
+    <#list layoutSettings.rtlStyleSheets as styleSheet>
+      <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
+    </#list>
+  </#if>
+  <#if layoutSettings.VT_RTL_STYLESHEET?has_content && langDir == "rtl">
+    <#list layoutSettings.VT_RTL_STYLESHEET as styleSheet>
+      <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
+    </#list>
+  </#if>
+  ${layoutSettings.extraHead?if_exists}
+  <#if layoutSettings.VT_EXTRA_HEAD?has_content>
+    <#list layoutSettings.VT_EXTRA_HEAD as extraHead>
+      ${extraHead}
+    </#list>
+  </#if>
+
+  <#-- Append CSS for catalog -->
+  <#if catalogStyleSheet?exists>
+    <link rel="stylesheet" href="${StringUtil.wrapString(catalogStyleSheet)}" type="text/css"/>
+  </#if>
+  <#-- Append CSS for tracking codes -->
+  <#if sessionAttributes.overrideCss?exists>
+    <link rel="stylesheet" href="${StringUtil.wrapString(sessionAttributes.overrideCss)}" type="text/css"/>
+  </#if>
+  <#-- Meta tags if defined by the page action -->
+  <#if metaDescription?exists>
+    <meta name="description" content="${metaDescription}"/>
+  </#if>
+  <#if metaKeywords?exists>
+    <meta name="keywords" content="${metaKeywords}"/>
+  </#if>
+  <#if requireDojo?exists>
+    <script type="text/javascript">
+      dojo.require("dojo.widget.*");
+    </script>
+  </#if>
+</head>

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Modified: ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl Sat May  8 22:08:40 2010
@@ -1,68 +1,68 @@
-<#--
-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 requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if>
-<#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if>
-<#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
-<#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
-
-<#if !errorMessage?has_content>
-  <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists>
-</#if>
-<#if !errorMessageList?has_content>
-  <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists>
-</#if>
-<#if !eventMessage?has_content>
-  <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists>
-</#if>
-<#if !eventMessageList?has_content>
-  <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists>
-</#if>
-
-<#-- display the error messages -->
-<#if (errorMessage?has_content || errorMessageList?has_content)>
-  <div class="errorMessage">Errors Occurred:</div><br/>
-  <ul>
-    <#if errorMessage?has_content>
-      <li class="errorMessage">${errorMessage}</li>
-    </#if>
-    <#if errorMessageList?has_content>
-      <#list errorMessageList as errorMsg>
-        <li class="errorMessage">${errorMsg}</li>
-      </#list>
-    </#if>
-  </ul>
-  <br/>
-</#if>
-
-<#-- display the event messages -->
-<#if (eventMessage?has_content || eventMessageList?has_content)>
-  <div class="eventMessage">Events:</div><br/>
-  <ul>
-    <#if eventMessage?has_content>
-      <li class="eventMessage">${eventMessage}</li>
-    </#if>
-    <#if eventMessageList?has_content>
-      <#list eventMessageList as eventMsg>
-        <li class="eventMessage">${eventMsg}</li>
-      </#list>
-    </#if>
-  </ul>
-  <br/>
-</#if>
+<#--
+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 requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if>
+<#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if>
+<#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
+<#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
+
+<#if !errorMessage?has_content>
+  <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists>
+</#if>
+<#if !errorMessageList?has_content>
+  <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists>
+</#if>
+<#if !eventMessage?has_content>
+  <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists>
+</#if>
+<#if !eventMessageList?has_content>
+  <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists>
+</#if>
+
+<#-- display the error messages -->
+<#if (errorMessage?has_content || errorMessageList?has_content)>
+  <div class="errorMessage">Errors Occurred:</div><br/>
+  <ul>
+    <#if errorMessage?has_content>
+      <li class="errorMessage">${errorMessage}</li>
+    </#if>
+    <#if errorMessageList?has_content>
+      <#list errorMessageList as errorMsg>
+        <li class="errorMessage">${errorMsg}</li>
+      </#list>
+    </#if>
+  </ul>
+  <br/>
+</#if>
+
+<#-- display the event messages -->
+<#if (eventMessage?has_content || eventMessageList?has_content)>
+  <div class="eventMessage">Events:</div><br/>
+  <ul>
+    <#if eventMessage?has_content>
+      <li class="eventMessage">${eventMessage}</li>
+    </#if>
+    <#if eventMessageList?has_content>
+      <#list eventMessageList as eventMsg>
+        <li class="eventMessage">${eventMsg}</li>
+      </#list>
+    </#if>
+  </ul>
+  <br/>
+</#if>

Propchange: ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ofbiz/branches/release09.04/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl Sat May  8 22:08:40 2010
@@ -1,64 +1,64 @@
-<#--
-    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.
--->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>${title}</title>
-    <#-- this needs to be fully qualified to appear in email; the server must also be available -->
-    <link rel="stylesheet" href="${baseUrl}/images/maincss.css" type="text/css"/>
-  </head>
-
-  <body>
-    <h1>${title}</h1>
-    <#-- custom logo or text can be inserted here -->
-    <br/>
-    <div class="screenlet-header">
-      <div class="boxhead">${uiLabelMap.OagisInventoryDescription}<b></b></div>
-    </div>
-    <div class="screenlet-body">
-      <table class="basic-table" cellspacing="0">
-        <tr valign="bottom" class="header-row">
-          <td width="10%"><b>${uiLabelMap.ProductProduct}</b></td>
-          <td width="10%" align="center"><b>${uiLabelMap.OagisInventoryLevelDateTime}</b></td>
-          <td width="10%" align="right"><b>${uiLabelMap.OrderReturnItemInventoryStatus}</b></td>
-          <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Inventory)</b></td>
-          <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Message)</b></td>
-          <td width="10%" align="right"><b>${uiLabelMap.OagisQuantityDiff}.</b></td>
-        </tr>
-        <tr><td colspan="10"><hr/></td></tr>
-        <#assign alt_row = false>
-        <#list inventoryMapList as inventoryMap>
-          <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
-            <td valign="top"> ${inventoryMap.productId?if_exists}</td>
-            <td align="right" valign="top"> ${inventoryMap.timestamp?if_exists?if_exists}</td>
-            <td align="right" valign="top"> ${inventoryMap.statusId?if_exists?if_exists}</td>
-            <td align="center" valign="top"> ${inventoryMap.quantityOnHandTotal?if_exists?if_exists}</td>
-            <td align="center" valign="top"> ${inventoryMap.quantityFromMessage?if_exists?if_exists}</td>
-            <td align="right" valign="top"> ${inventoryMap.quantityDiff?if_exists?if_exists}</td>
-          </tr>
-          <#-- toggle the row color -->
-          <#assign alt_row = !alt_row>
-        </#list>
-        <tr><td colspan="10"><hr/></td></tr>
-      </table>
-    </div>
-  </body>
+<#--
+    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.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <title>${title}</title>
+    <#-- this needs to be fully qualified to appear in email; the server must also be available -->
+    <link rel="stylesheet" href="${baseUrl}/images/maincss.css" type="text/css"/>
+  </head>
+
+  <body>
+    <h1>${title}</h1>
+    <#-- custom logo or text can be inserted here -->
+    <br/>
+    <div class="screenlet-header">
+      <div class="boxhead">${uiLabelMap.OagisInventoryDescription}<b></b></div>
+    </div>
+    <div class="screenlet-body">
+      <table class="basic-table" cellspacing="0">
+        <tr valign="bottom" class="header-row">
+          <td width="10%"><b>${uiLabelMap.ProductProduct}</b></td>
+          <td width="10%" align="center"><b>${uiLabelMap.OagisInventoryLevelDateTime}</b></td>
+          <td width="10%" align="right"><b>${uiLabelMap.OrderReturnItemInventoryStatus}</b></td>
+          <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Inventory)</b></td>
+          <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Message)</b></td>
+          <td width="10%" align="right"><b>${uiLabelMap.OagisQuantityDiff}.</b></td>
+        </tr>
+        <tr><td colspan="10"><hr/></td></tr>
+        <#assign alt_row = false>
+        <#list inventoryMapList as inventoryMap>
+          <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+            <td valign="top"> ${inventoryMap.productId?if_exists}</td>
+            <td align="right" valign="top"> ${inventoryMap.timestamp?if_exists?if_exists}</td>
+            <td align="right" valign="top"> ${inventoryMap.statusId?if_exists?if_exists}</td>
+            <td align="center" valign="top"> ${inventoryMap.quantityOnHandTotal?if_exists?if_exists}</td>
+            <td align="center" valign="top"> ${inventoryMap.quantityFromMessage?if_exists?if_exists}</td>
+            <td align="right" valign="top"> ${inventoryMap.quantityDiff?if_exists?if_exists}</td>
+          </tr>
+          <#-- toggle the row color -->
+          <#assign alt_row = !alt_row>
+        </#list>
+        <tr><td colspan="10"><hr/></td></tr>
+      </table>
+    </div>
+  </body>
 </html>
\ No newline at end of file

Propchange: ofbiz/branches/release09.04/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl Sat May  8 22:08:40 2010
@@ -1,67 +1,67 @@
-<?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.
--->
-<#--  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"
-        xmlns:os="http://www.openapplications.org/oagis_segments"
-        xmlns:of="http://www.openapplications.org/oagis_fields">
-  <os:CNTROLAREA>
-    <os:BSR>
-      <of:VERB>CONFIRM</of:VERB>
-      <of:NOUN>BOD</of:NOUN>
-      <of:REVISION>004</of:REVISION>
-    </os:BSR>
-    <os:SENDER>
-      <of:LOGICALID>${logicalId}</of:LOGICALID>
-      <of:COMPONENT>EXCEPTION</of:COMPONENT>
-      <of:TASK>RECEIPT</of:TASK>
-      <of:REFERENCEID>${referenceId}</of:REFERENCEID>
-      <of:CONFIRMATION>1</of:CONFIRMATION>
-      <of:LANGUAGE>ENG</of:LANGUAGE>
-      <of:CODEPAGE>NONE</of:CODEPAGE>
-      <of:AUTHID>${authId?if_exists}</of:AUTHID>
-    </os:SENDER>
-    <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO>
-  </os:CNTROLAREA>
-  <n:DATAAREA>
-    <n:CONFIRM_BOD>
-      <n:CONFIRM>
-        <os:CNTROLAREA>
-          <os:SENDER>
-            <of:LOGICALID>${errorLogicalId?if_exists}</of:LOGICALID>
-            <of:COMPONENT>${errorComponent?if_exists}</of:COMPONENT>
-            <of:TASK>${errorTask?if_exists}</of:TASK>
-            <of:REFERENCEID>${errorReferenceId?if_exists}</of:REFERENCEID>
-          </os:SENDER>
-          <os:DATETIMEISO></os:DATETIMEISO>
-        </os:CNTROLAREA>
-        <of:ORIGREF>${origRef?if_exists}</of:ORIGREF>
-        <#if errorMapList?exists>
-          <#list errorMapList as errorMap>
-            <n:CONFIRMMSG>
-              <of:DESCRIPTN>${errorMap.description?if_exists?xml}</of:DESCRIPTN>
-              <of:REASONCODE>${errorMap.reasonCode?if_exists?xml}</of:REASONCODE>
-            </n:CONFIRMMSG>
-          </#list>
-        </#if>
-      </n:CONFIRM>
-    </n:CONFIRM_BOD>
-  </n:DATAAREA>
-</n:CONFIRM_BOD_004>
+<?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.
+-->
+<#--  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"
+        xmlns:os="http://www.openapplications.org/oagis_segments"
+        xmlns:of="http://www.openapplications.org/oagis_fields">
+  <os:CNTROLAREA>
+    <os:BSR>
+      <of:VERB>CONFIRM</of:VERB>
+      <of:NOUN>BOD</of:NOUN>
+      <of:REVISION>004</of:REVISION>
+    </os:BSR>
+    <os:SENDER>
+      <of:LOGICALID>${logicalId}</of:LOGICALID>
+      <of:COMPONENT>EXCEPTION</of:COMPONENT>
+      <of:TASK>RECEIPT</of:TASK>
+      <of:REFERENCEID>${referenceId}</of:REFERENCEID>
+      <of:CONFIRMATION>1</of:CONFIRMATION>
+      <of:LANGUAGE>ENG</of:LANGUAGE>
+      <of:CODEPAGE>NONE</of:CODEPAGE>
+      <of:AUTHID>${authId?if_exists}</of:AUTHID>
+    </os:SENDER>
+    <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO>
+  </os:CNTROLAREA>
+  <n:DATAAREA>
+    <n:CONFIRM_BOD>
+      <n:CONFIRM>
+        <os:CNTROLAREA>
+          <os:SENDER>
+            <of:LOGICALID>${errorLogicalId?if_exists}</of:LOGICALID>
+            <of:COMPONENT>${errorComponent?if_exists}</of:COMPONENT>
+            <of:TASK>${errorTask?if_exists}</of:TASK>
+            <of:REFERENCEID>${errorReferenceId?if_exists}</of:REFERENCEID>
+          </os:SENDER>
+          <os:DATETIMEISO></os:DATETIMEISO>
+        </os:CNTROLAREA>
+        <of:ORIGREF>${origRef?if_exists}</of:ORIGREF>
+        <#if errorMapList?exists>
+          <#list errorMapList as errorMap>
+            <n:CONFIRMMSG>
+              <of:DESCRIPTN>${errorMap.description?if_exists?xml}</of:DESCRIPTN>
+              <of:REASONCODE>${errorMap.reasonCode?if_exists?xml}</of:REASONCODE>
+            </n:CONFIRMMSG>
+          </#list>
+        </#if>
+      </n:CONFIRM>
+    </n:CONFIRM_BOD>
+  </n:DATAAREA>
+</n:CONFIRM_BOD_004>

Propchange: ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl Sat May  8 22:08:40 2010
@@ -1,166 +1,166 @@
-<?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.
--->
-<#-- 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" -->
-<#-- NOTE: not all of these are used -->
-<#assign partnerNameSize = 35/>
-<#assign partnerAddressLineSize = 35/>
-<#assign partnerAddressCitySize = 15/>
-<#assign partnerAddressStateSize = 2/>
-<#assign partnerAddressPostalSize = 9/>
-<#assign partnerAddressCountrySize = 2/>
-<#assign partnerContactNameSize = 35/>
-<#assign partnerContactPhoneSize = 21/>
-<#assign partnerContactFaxSize = 10/>
-<#assign partnerContactEmailSize = 65/>
-<#assign shipmentNotesSize = 65/>
-<n:PROCESS_SHIPMENT_001
-    xmlns:n="http://www.openapplications.org/161B_PROCESS_SHIPMENT_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>PROCESS</of:VERB>
-      <of:NOUN>SHIPMENT</of:NOUN>
-      <of:REVISION>001</of:REVISION>
-    </os:BSR>
-    <os:SENDER>
-      <of:LOGICALID>${logicalId}</of:LOGICALID>
-      <of:COMPONENT>INVENTORY</of:COMPONENT>
-      <of:TASK>SHIPREQUEST</of:TASK>
-      <of:REFERENCEID>${referenceId}</of:REFERENCEID>
-      <of:CONFIRMATION>1</of:CONFIRMATION>
-      <of:LANGUAGE>ENG</of:LANGUAGE>
-      <of:CODEPAGE>NONE</of:CODEPAGE>
-      <of:AUTHID>${authId?if_exists}</of:AUTHID>
-    </os:SENDER>
-    <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO>
-  </os:CNTROLAREA>
-  <n:DATAAREA>
-    <n:PROCESS_SHIPMENT>
-      <n:SHIPMENT>
-        <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID>
-        <#if shipperId?has_content>
-          <of:SHIPPERID>${shipperId}</of:SHIPPERID><#-- fill in from PartyCarrierAccount.accountNumber; make sure filter by from/thru date and PartyCarrierAccount.carrierPartyId==orderItemShipGroup.carrierPartyId; get most recent fromDate -->
-          <#-- this we will also only send if there is a SHIPPERID, normally fulfillment partner will select based on TRANSMETHD, address, weight, etc -->
-          <of:CARRIER>${orderItemShipGroup.carrierPartyId?if_exists}</of:CARRIER>
-        </#if>
-        <#if shipperId?has_content>
-          <of:FRGHTTERMS>COLLECT</of:FRGHTTERMS>
-        <#else>
-          <of:FRGHTTERMS>PREPAID</of:FRGHTTERMS>
-        </#if>
-        <of:NOTES>${orderItemShipGroup.shippingInstructions?if_exists?xml}</of:NOTES>
-        <of:SHIPNOTES>${shipnotes?if_exists?xml}</of:SHIPNOTES><#-- if order was a return replacement order (associated with return), then set to RETURNLABEL otherwise leave blank -->
-        <of:TRANSMETHD>${orderItemShipGroup.shipmentMethodTypeId?if_exists}</of:TRANSMETHD>
-        <os:PARTNER>
-          <#if address?has_content>
-            <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if>
-            <#if (partyNameView.middleName)?has_content><#assign partyName = partyName + " " + partyNameView.middleName/></#if>
-            <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if>
-
-            <#-- NOTE: this is the to name -->
-            <#assign toName = (address.toName)?default(partyName)?if_exists/>
-            <#if (toName?length > partnerNameSize)><#assign toName = (toName?substring(0,partnerNameSize))?if_exists/></#if>
-            <of:NAME>${toName?if_exists?xml}</of:NAME>
-            <of:PARTNRTYPE>SHIPTO</of:PARTNRTYPE>
-            <of:CURRENCY>USD</of:CURRENCY>
-            <os:ADDRESS>
-              <#assign address1 = address.address1?if_exists/>
-              <#if (address1?length > partnerAddressLineSize)><#assign address1 = (address1?substring(0,partnerAddressLineSize))?if_exists/></#if>
-              <of:ADDRLINE>${address1?if_exists?xml}</of:ADDRLINE>
-              <#if address.address2?exists>
-                <#assign address2 = address.address2?if_exists/>
-                <#if (address2?length > partnerAddressLineSize)><#assign address2 = (address2?substring(0,partnerAddressLineSize))?if_exists/></#if>
-                <of:ADDRLINE>${address2?xml}</of:ADDRLINE>
-              </#if>
-              <#assign city = address.city?if_exists/>
-              <#if (city?length > partnerAddressCitySize)><#assign city = (city?substring(0,partnerAddressCitySize))?if_exists/></#if>
-              <of:CITY>${city?if_exists?xml}</of:CITY>
-              <#assign countryGeoId = address.countryGeoId?if_exists/>
-              <#if (countryGeoId?length > partnerAddressCountrySize)><#assign countryGeoId = (countryGeoId?substring(0,partnerAddressCountrySize))?if_exists/></#if>
-              <of:COUNTRY>${countryGeoId?if_exists}</of:COUNTRY>
-              <#--<of:DESCRIPTN></of:DESCRIPTN>
-              <of:FAX></of:FAX>-->
-              <of:POSTALCODE>${address.postalCode?if_exists?xml}</of:POSTALCODE>
-              <of:STATEPROVN>${address.stateProvinceGeoId?if_exists}</of:STATEPROVN>
-              <#if telecomNumber?has_content>
-              <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
-              </#if>
-            </os:ADDRESS>
-            <os:CONTACT>
-              <#-- NOTE: this is the attention name -->
-              <#assign attnName = (address.attnName)?default(partyName)?if_exists/>
-              <#if (attnName?length > partnerContactNameSize)><#assign attnName = (attnName?substring(0,partnerContactNameSize))?if_exists/></#if>
-              <of:NAME>${attnName?if_exists?xml}</of:NAME>
-              <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL>
-              <#--<of:FAX></of:FAX>-->
-              <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
-            </os:CONTACT>
-          </#if>
-        </os:PARTNER>
-        <#list shipmentItems as shipmentItem>
-        <#assign product = shipmentItem.getRelatedOne("Product")>
-        <#assign productType = product.getRelatedOne("ProductType")>
-        <#if productType.isPhysical == "Y" || productType.isPhysical == "y">
-        <n:SHIPITEM>
-            <os:QUANTITY>
-              <of:VALUE>${shipmentItem.quantity?if_exists}</of:VALUE>
-              <of:NUMOFDEC>0</of:NUMOFDEC>
-              <of:SIGN>+</of:SIGN>
-              <of:UOM>EACH</of:UOM>
-            </os:QUANTITY>
-            <of:ITEM>${shipmentItem.productId?if_exists}</of:ITEM>
-            <of:DISPOSITN>FIFO</of:DISPOSITN><#-- TODO: figure out if this is a reviewer order, if so set this to LIFO -->
-            <n:DOCUMNTREF>
-              <of:DOCTYPE>SHIPMENT</of:DOCTYPE>
-              <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID>
-              <of:LINENUM>${shipmentItem.shipmentItemSeqId?if_exists}</of:LINENUM>
-            </n:DOCUMNTREF>
-        </n:SHIPITEM>
-        </#if>
-        </#list>
-        <#list externalIdSet?if_exists as externalId>
-        <n:DOCUMNTREF>
-          <of:DOCTYPE>PARTNER_SO</of:DOCTYPE>
-          <of:DOCUMENTID>${externalId?if_exists?xml}</of:DOCUMENTID>
-        </n:DOCUMNTREF>
-        </#list>
-        <#list correspondingPoIdSet?if_exists as correspondingPoId>
-        <n:DOCUMNTREF>
-          <of:DOCTYPE>CUST_PO</of:DOCTYPE>
-          <of:DOCUMENTID>${correspondingPoId?if_exists?xml}</of:DOCUMENTID>
-        </n:DOCUMNTREF>
-        </#list>
-        <#-- data preparation code to create the replacementReturnId; this is the returnId if the order is a return replacement order -->
-        <#if replacementReturnId?exists>
-        <n:DOCUMNTREF>
-          <of:DOCTYPE>RMA</of:DOCTYPE>
-          <of:DOCUMENTID>${replacementReturnId}</of:DOCUMENTID>
-        </n:DOCUMNTREF>
-        </#if>
-        <n:DOCUMNTREF>
-          <of:DOCTYPE>SO</of:DOCTYPE>
-          <of:DOCUMENTID>${orderId}</of:DOCUMENTID>
-        </n:DOCUMNTREF>
-      </n:SHIPMENT>
-    </n:PROCESS_SHIPMENT>
-  </n:DATAAREA>
-</n:PROCESS_SHIPMENT_001>
+<?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.
+-->
+<#-- 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" -->
+<#-- NOTE: not all of these are used -->
+<#assign partnerNameSize = 35/>
+<#assign partnerAddressLineSize = 35/>
+<#assign partnerAddressCitySize = 15/>
+<#assign partnerAddressStateSize = 2/>
+<#assign partnerAddressPostalSize = 9/>
+<#assign partnerAddressCountrySize = 2/>
+<#assign partnerContactNameSize = 35/>
+<#assign partnerContactPhoneSize = 21/>
+<#assign partnerContactFaxSize = 10/>
+<#assign partnerContactEmailSize = 65/>
+<#assign shipmentNotesSize = 65/>
+<n:PROCESS_SHIPMENT_001
+    xmlns:n="http://www.openapplications.org/161B_PROCESS_SHIPMENT_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>PROCESS</of:VERB>
+      <of:NOUN>SHIPMENT</of:NOUN>
+      <of:REVISION>001</of:REVISION>
+    </os:BSR>
+    <os:SENDER>
+      <of:LOGICALID>${logicalId}</of:LOGICALID>
+      <of:COMPONENT>INVENTORY</of:COMPONENT>
+      <of:TASK>SHIPREQUEST</of:TASK>
+      <of:REFERENCEID>${referenceId}</of:REFERENCEID>
+      <of:CONFIRMATION>1</of:CONFIRMATION>
+      <of:LANGUAGE>ENG</of:LANGUAGE>
+      <of:CODEPAGE>NONE</of:CODEPAGE>
+      <of:AUTHID>${authId?if_exists}</of:AUTHID>
+    </os:SENDER>
+    <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO>
+  </os:CNTROLAREA>
+  <n:DATAAREA>
+    <n:PROCESS_SHIPMENT>
+      <n:SHIPMENT>
+        <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID>
+        <#if shipperId?has_content>
+          <of:SHIPPERID>${shipperId}</of:SHIPPERID><#-- fill in from PartyCarrierAccount.accountNumber; make sure filter by from/thru date and PartyCarrierAccount.carrierPartyId==orderItemShipGroup.carrierPartyId; get most recent fromDate -->
+          <#-- this we will also only send if there is a SHIPPERID, normally fulfillment partner will select based on TRANSMETHD, address, weight, etc -->
+          <of:CARRIER>${orderItemShipGroup.carrierPartyId?if_exists}</of:CARRIER>
+        </#if>
+        <#if shipperId?has_content>
+          <of:FRGHTTERMS>COLLECT</of:FRGHTTERMS>
+        <#else>
+          <of:FRGHTTERMS>PREPAID</of:FRGHTTERMS>
+        </#if>
+        <of:NOTES>${orderItemShipGroup.shippingInstructions?if_exists?xml}</of:NOTES>
+        <of:SHIPNOTES>${shipnotes?if_exists?xml}</of:SHIPNOTES><#-- if order was a return replacement order (associated with return), then set to RETURNLABEL otherwise leave blank -->
+        <of:TRANSMETHD>${orderItemShipGroup.shipmentMethodTypeId?if_exists}</of:TRANSMETHD>
+        <os:PARTNER>
+          <#if address?has_content>
+            <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if>
+            <#if (partyNameView.middleName)?has_content><#assign partyName = partyName + " " + partyNameView.middleName/></#if>
+            <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if>
+
+            <#-- NOTE: this is the to name -->
+            <#assign toName = (address.toName)?default(partyName)?if_exists/>
+            <#if (toName?length > partnerNameSize)><#assign toName = (toName?substring(0,partnerNameSize))?if_exists/></#if>
+            <of:NAME>${toName?if_exists?xml}</of:NAME>
+            <of:PARTNRTYPE>SHIPTO</of:PARTNRTYPE>
+            <of:CURRENCY>USD</of:CURRENCY>
+            <os:ADDRESS>
+              <#assign address1 = address.address1?if_exists/>
+              <#if (address1?length > partnerAddressLineSize)><#assign address1 = (address1?substring(0,partnerAddressLineSize))?if_exists/></#if>
+              <of:ADDRLINE>${address1?if_exists?xml}</of:ADDRLINE>
+              <#if address.address2?exists>
+                <#assign address2 = address.address2?if_exists/>
+                <#if (address2?length > partnerAddressLineSize)><#assign address2 = (address2?substring(0,partnerAddressLineSize))?if_exists/></#if>
+                <of:ADDRLINE>${address2?xml}</of:ADDRLINE>
+              </#if>
+              <#assign city = address.city?if_exists/>
+              <#if (city?length > partnerAddressCitySize)><#assign city = (city?substring(0,partnerAddressCitySize))?if_exists/></#if>
+              <of:CITY>${city?if_exists?xml}</of:CITY>
+              <#assign countryGeoId = address.countryGeoId?if_exists/>
+              <#if (countryGeoId?length > partnerAddressCountrySize)><#assign countryGeoId = (countryGeoId?substring(0,partnerAddressCountrySize))?if_exists/></#if>
+              <of:COUNTRY>${countryGeoId?if_exists}</of:COUNTRY>
+              <#--<of:DESCRIPTN></of:DESCRIPTN>
+              <of:FAX></of:FAX>-->
+              <of:POSTALCODE>${address.postalCode?if_exists?xml}</of:POSTALCODE>
+              <of:STATEPROVN>${address.stateProvinceGeoId?if_exists}</of:STATEPROVN>
+              <#if telecomNumber?has_content>
+              <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
+              </#if>
+            </os:ADDRESS>
+            <os:CONTACT>
+              <#-- NOTE: this is the attention name -->
+              <#assign attnName = (address.attnName)?default(partyName)?if_exists/>
+              <#if (attnName?length > partnerContactNameSize)><#assign attnName = (attnName?substring(0,partnerContactNameSize))?if_exists/></#if>
+              <of:NAME>${attnName?if_exists?xml}</of:NAME>
+              <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL>
+              <#--<of:FAX></of:FAX>-->
+              <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
+            </os:CONTACT>
+          </#if>
+        </os:PARTNER>
+        <#list shipmentItems as shipmentItem>
+        <#assign product = shipmentItem.getRelatedOne("Product")>
+        <#assign productType = product.getRelatedOne("ProductType")>
+        <#if productType.isPhysical == "Y" || productType.isPhysical == "y">
+        <n:SHIPITEM>
+            <os:QUANTITY>
+              <of:VALUE>${shipmentItem.quantity?if_exists}</of:VALUE>
+              <of:NUMOFDEC>0</of:NUMOFDEC>
+              <of:SIGN>+</of:SIGN>
+              <of:UOM>EACH</of:UOM>
+            </os:QUANTITY>
+            <of:ITEM>${shipmentItem.productId?if_exists}</of:ITEM>
+            <of:DISPOSITN>FIFO</of:DISPOSITN><#-- TODO: figure out if this is a reviewer order, if so set this to LIFO -->
+            <n:DOCUMNTREF>
+              <of:DOCTYPE>SHIPMENT</of:DOCTYPE>
+              <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID>
+              <of:LINENUM>${shipmentItem.shipmentItemSeqId?if_exists}</of:LINENUM>
+            </n:DOCUMNTREF>
+        </n:SHIPITEM>
+        </#if>
+        </#list>
+        <#list externalIdSet?if_exists as externalId>
+        <n:DOCUMNTREF>
+          <of:DOCTYPE>PARTNER_SO</of:DOCTYPE>
+          <of:DOCUMENTID>${externalId?if_exists?xml}</of:DOCUMENTID>
+        </n:DOCUMNTREF>
+        </#list>
+        <#list correspondingPoIdSet?if_exists as correspondingPoId>
+        <n:DOCUMNTREF>
+          <of:DOCTYPE>CUST_PO</of:DOCTYPE>
+          <of:DOCUMENTID>${correspondingPoId?if_exists?xml}</of:DOCUMENTID>
+        </n:DOCUMNTREF>
+        </#list>
+        <#-- data preparation code to create the replacementReturnId; this is the returnId if the order is a return replacement order -->
+        <#if replacementReturnId?exists>
+        <n:DOCUMNTREF>
+          <of:DOCTYPE>RMA</of:DOCTYPE>
+          <of:DOCUMENTID>${replacementReturnId}</of:DOCUMENTID>
+        </n:DOCUMNTREF>
+        </#if>
+        <n:DOCUMNTREF>
+          <of:DOCTYPE>SO</of:DOCTYPE>
+          <of:DOCUMENTID>${orderId}</of:DOCUMENTID>
+        </n:DOCUMNTREF>
+      </n:SHIPMENT>
+    </n:PROCESS_SHIPMENT>
+  </n:DATAAREA>
+</n:PROCESS_SHIPMENT_001>

Propchange: ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl Sat May  8 22:08:40 2010
@@ -1,115 +1,115 @@
-<?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.
--->
-<#-- 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>
-                <#if postalAddress?has_content>
-                    <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if>
-                    <#if (partyNameView.middleName)?has_content><#assign partyName = partyName + " " + partyNameView.middleName/></#if>
-                    <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if>
-                    <of:NAME>${postalAddress.toName?default(partyName)?if_exists?xml}</of:NAME>
-                    <of:PARTNRTYPE>SHIPFROM</of:PARTNRTYPE>
-                    <of:CURRENCY>USD</of:CURRENCY>
-                    <os:ADDRESS>
-                        <of:ADDRLINE>${postalAddress.address1?if_exists?xml}</of:ADDRLINE>
-                        <#if postalAddress.address2?has_content>
-                        <of:ADDRLINE>${postalAddress.address2?if_exists?xml}</of:ADDRLINE>
-                        </#if>
-                        <of:CITY>${postalAddress.city?if_exists?xml}</of:CITY>
-                        <of:COUNTRY>${postalAddress.countryGeoId?if_exists}</of:COUNTRY>
-                        <#-- <of:FAX></of:FAX> -->
-                        <of:POSTALCODE>${postalAddress.postalCode?if_exists?xml}</of:POSTALCODE>
-                        <of:STATEPROVN>${postalAddress.stateProvinceGeoId?if_exists}</of:STATEPROVN>
-                        <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
-                    </os:ADDRESS>
-                    <os:CONTACT>
-                        <of:NAME>${postalAddress.attnName?default(partyName)?if_exists?xml}</of:NAME>
-                        <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL>
-                        <#-- <of:FAX></of:FAX> -->
-                        <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</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>
-                <#list returnItems as returnItem>
-                    <#assign returnReason = returnItem.getRelatedOne("ReturnReason")/>
-                    <#assign serialNumberList = serialNumberListByReturnItemSeqIdMap.get(returnItem.returnItemSeqId)?if_exists/>
-                <n:RECEIPTITM>
-                    <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?xml}</of:NOTES>
-                    <os:DOCUMNTREF>
-                        <of:DOCTYPE>RMA</of:DOCTYPE>
-                        <of:DOCUMENTID>${returnItem.returnId}</of:DOCUMENTID>
-                        <of:LINENUM>${returnItem.returnItemSeqId}</of:LINENUM>
-                    </os:DOCUMNTREF>
-                    <#list serialNumberList?if_exists as serialNumber>
-                    <n:INVDETAIL>
-                        <of:SERIALNUM>${serialNumber?xml}</of:SERIALNUM>
-                    </n:INVDETAIL>
-                    </#list>
-                </n:RECEIPTITM>
-                </#list>
-            </n:RECEIPTUNT>
-        </n:RECEIVE_DELIVERY>
-    </n:DATAAREA>
-</n:RECEIVE_DELIVERY_001>
+<?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.
+-->
+<#-- 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>
+                <#if postalAddress?has_content>
+                    <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if>
+                    <#if (partyNameView.middleName)?has_content><#assign partyName = partyName + " " + partyNameView.middleName/></#if>
+                    <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if>
+                    <of:NAME>${postalAddress.toName?default(partyName)?if_exists?xml}</of:NAME>
+                    <of:PARTNRTYPE>SHIPFROM</of:PARTNRTYPE>
+                    <of:CURRENCY>USD</of:CURRENCY>
+                    <os:ADDRESS>
+                        <of:ADDRLINE>${postalAddress.address1?if_exists?xml}</of:ADDRLINE>
+                        <#if postalAddress.address2?has_content>
+                        <of:ADDRLINE>${postalAddress.address2?if_exists?xml}</of:ADDRLINE>
+                        </#if>
+                        <of:CITY>${postalAddress.city?if_exists?xml}</of:CITY>
+                        <of:COUNTRY>${postalAddress.countryGeoId?if_exists}</of:COUNTRY>
+                        <#-- <of:FAX></of:FAX> -->
+                        <of:POSTALCODE>${postalAddress.postalCode?if_exists?xml}</of:POSTALCODE>
+                        <of:STATEPROVN>${postalAddress.stateProvinceGeoId?if_exists}</of:STATEPROVN>
+                        <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
+                    </os:ADDRESS>
+                    <os:CONTACT>
+                        <of:NAME>${postalAddress.attnName?default(partyName)?if_exists?xml}</of:NAME>
+                        <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL>
+                        <#-- <of:FAX></of:FAX> -->
+                        <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</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>
+                <#list returnItems as returnItem>
+                    <#assign returnReason = returnItem.getRelatedOne("ReturnReason")/>
+                    <#assign serialNumberList = serialNumberListByReturnItemSeqIdMap.get(returnItem.returnItemSeqId)?if_exists/>
+                <n:RECEIPTITM>
+                    <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?xml}</of:NOTES>
+                    <os:DOCUMNTREF>
+                        <of:DOCTYPE>RMA</of:DOCTYPE>
+                        <of:DOCUMENTID>${returnItem.returnId}</of:DOCUMENTID>
+                        <of:LINENUM>${returnItem.returnItemSeqId}</of:LINENUM>
+                    </os:DOCUMNTREF>
+                    <#list serialNumberList?if_exists as serialNumber>
+                    <n:INVDETAIL>
+                        <of:SERIALNUM>${serialNumber?xml}</of:SERIALNUM>
+                    </n:INVDETAIL>
+                    </#list>
+                </n:RECEIPTITM>
+                </#list>
+            </n:RECEIPTUNT>
+        </n:RECEIVE_DELIVERY>
+    </n:DATAAREA>
+</n:RECEIVE_DELIVERY_001>

Propchange: ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/appbar.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/appbar.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/appbar.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/footer.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/footer.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/footer.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/header.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/header.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/header.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/messages.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/messages.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/messages.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/secondary-appbar.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/secondary-appbar.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/themes/bizznesstime/includes/secondary-appbar.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/themes/multiflex/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/multiflex/includes/footer.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/multiflex/includes/footer.ftl (original)
+++ ofbiz/branches/release09.04/themes/multiflex/includes/footer.ftl Sat May  8 22:08:40 2010
@@ -1,35 +1,35 @@
-<#--
-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 nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
-
-<div class="footer">
-  <p align="center">
-    <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" class="tabletext" target="_blank">www.apache.org</a></p>
-    <p>Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></p>
-  </p>
-  <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
-    <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
-      <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
-    </#list>
-  </#if>
-</div>
-</div>
-</body>
-</html>
+<#--
+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 nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
+
+<div class="footer">
+  <p align="center">
+    <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" class="tabletext" target="_blank">www.apache.org</a></p>
+    <p>Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></p>
+  </p>
+  <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
+    <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
+      <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+    </#list>
+  </#if>
+</div>
+</div>
+</body>
+</html>

Propchange: ofbiz/branches/release09.04/themes/multiflex/includes/footer.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/themes/multiflex/includes/footer.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/themes/multiflex/includes/footer.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/themes/multiflex/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/multiflex/includes/header.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/themes/multiflex/includes/header.ftl (original)
+++ ofbiz/branches/release09.04/themes/multiflex/includes/header.ftl Sat May  8 22:08:40 2010
@@ -1,128 +1,128 @@
-<#--
-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.
--->
-<#include "component://ecommerce/webapp/ecommerce/includes/headerHead.ftl" />
-
-<!-- Global IE fix to avoid layout crash when single word size wider than column width -->
-<!--[if IE]><style type="text/css"> body {word-wrap: break-word;}</style><![endif]-->
-
-<body>
-  <div class="page-container">
-    <div class="header">
-      <div class="header-top">
-
-        <!-- Sitelogo and sitename -->
-        <a class="sitelogo" href="<@ofbizUrl>main</@ofbizUrl>" title="${uiLabelMap.CommonMain}"></a>
-        <div class="sitename">
-          <#if !productStore?exists>
-            <h1><a href="index.html" title="Go to Start page">${uiLabelMap.EcommerceNoProductStore}</a></h1>
-          </#if>
-          <#if (productStore.title)?exists><h1><a href="index.html" title="Go to Start page">${productStore.title}</a></h1></#if>
-          <#if (productStore.subtitle)?exists><h2>${productStore.subtitle}</h2></#if>
-        </div>
-
-        <!-- Navigation Level 0 -->
-        <div class="nav0">
-          <ul>
-            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=it</@ofbizUrl>"><img src="/multiflex/flag_it.gif" /></a></li>
-            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=en</@ofbizUrl>"><img src="/multiflex/flag_en.gif" /></a></li>
-            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=de</@ofbizUrl>"><img src="/multiflex/flag_de.gif" /></a></li>
-            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=fr</@ofbizUrl>"><img src="/multiflex/flag_fr.gif" /></a></li>
-          </ul>
-        </div>
-
-        <!-- Navigation Level 1 -->
-        <div class="nav1">
-          <ul>
-            <li><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li>
-            <li><a href="<@ofbizUrl>contactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a></li>
-            <li><a href="<@ofbizUrl>policies</@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></li>
-          </ul>
-        </div>
-      </div>
-
-      <!-- A.2 HEADER MIDDLE -->
-      <div class="header-middle">
-        <!-- Site message -->
-        <div class="sitemessage">
-          <h1>EASY &bull; FLEXIBLE &bull; ROBUST</h1>
-          <h2>
-          <#if sessionAttributes.autoName?has_content>
-            ${uiLabelMap.CommonWelcome}&nbsp;${sessionAttributes.autoName}!
-            (${uiLabelMap.CommonNotYou}?&nbsp;<a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)
-          <#else/>
-            ${uiLabelMap.CommonWelcome}!
-          </#if>
-          </h2>
-          <h3><a href="#">&rsaquo;&rsaquo;&nbsp;More details</a></h3>
-        </div>
-      </div>
-
-      <!-- A.3 HEADER BOTTOM -->
-      <div class="header-bottom">
-
-        <!-- Navigation Level 2 (Drop-down menus) -->
-        <div class="nav2">
-
-          <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
-            <!-- Navigation item -->
-            <ul>
-              <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
-            </ul>
-          <#else/>
-            <!-- Navigation item -->
-            <ul>
-              <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
-            </ul>
-
-            <!-- Navigation item -->
-            <ul>
-              <li><a href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.EcommerceRegister}</a></li>
-            </ul>
-          </#if>
-
-          <#if catalogQuickaddUse>
-            <!-- Navigation item -->
-            <ul>
-              <li id="header-bar-quickadd"><a href="<@ofbizUrl>quickadd</@ofbizUrl>">${uiLabelMap.CommonQuickAdd}</a></li>
-            </ul>
-          </#if>
-
-          <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
-            <!-- Navigation item -->
-            <ul>
-              <li><a href="#">Utente<!--[if IE 7]><!--></a><!--<![endif]-->
-                <!--[if lte IE 6]><table><tr><td><![endif]-->
-                  <ul>
-                    <li id="header-bar-viewprofile"><a href="<@ofbizUrl>viewprofile</@ofbizUrl>">${uiLabelMap.CommonProfile}</a></li>
-                    <li id="header-bar-ListQuotes"><a href="<@ofbizUrl>ListQuotes</@ofbizUrl>">${uiLabelMap.OrderOrderQuotes}</a></li>
-                    <li id="header-bar-ListRequests"><a href="<@ofbizUrl>ListRequests</@ofbizUrl>">${uiLabelMap.OrderRequests}</a></li>
-                    <li id="header-bar-editShoppingList"><a href="<@ofbizUrl>editShoppingList</@ofbizUrl>">${uiLabelMap.EcommerceShoppingLists}</a></li>
-                    <li id="header-bar-orderhistory"><a href="<@ofbizUrl>orderhistory</@ofbizUrl>">${uiLabelMap.EcommerceOrderHistory}</a></li>
-                  </ul>
-                <!--[if lte IE 6]></td></tr></table></a><![endif]-->
-              </li>
-            </ul>
-          </#if>
-
-        </div>
-  </div>
-
-      <!-- Breadcrumbs -->
-      <div class="header-breadcrumbs">
-    </div>
+<#--
+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.
+-->
+<#include "component://ecommerce/webapp/ecommerce/includes/headerHead.ftl" />
+
+<!-- Global IE fix to avoid layout crash when single word size wider than column width -->
+<!--[if IE]><style type="text/css"> body {word-wrap: break-word;}</style><![endif]-->
+
+<body>
+  <div class="page-container">
+    <div class="header">
+      <div class="header-top">
+
+        <!-- Sitelogo and sitename -->
+        <a class="sitelogo" href="<@ofbizUrl>main</@ofbizUrl>" title="${uiLabelMap.CommonMain}"></a>
+        <div class="sitename">
+          <#if !productStore?exists>
+            <h1><a href="index.html" title="Go to Start page">${uiLabelMap.EcommerceNoProductStore}</a></h1>
+          </#if>
+          <#if (productStore.title)?exists><h1><a href="index.html" title="Go to Start page">${productStore.title}</a></h1></#if>
+          <#if (productStore.subtitle)?exists><h2>${productStore.subtitle}</h2></#if>
+        </div>
+
+        <!-- Navigation Level 0 -->
+        <div class="nav0">
+          <ul>
+            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=it</@ofbizUrl>"><img src="/multiflex/flag_it.gif" /></a></li>
+            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=en</@ofbizUrl>"><img src="/multiflex/flag_en.gif" /></a></li>
+            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=de</@ofbizUrl>"><img src="/multiflex/flag_de.gif" /></a></li>
+            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=fr</@ofbizUrl>"><img src="/multiflex/flag_fr.gif" /></a></li>
+          </ul>
+        </div>
+
+        <!-- Navigation Level 1 -->
+        <div class="nav1">
+          <ul>
+            <li><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li>
+            <li><a href="<@ofbizUrl>contactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a></li>
+            <li><a href="<@ofbizUrl>policies</@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></li>
+          </ul>
+        </div>
+      </div>
+
+      <!-- A.2 HEADER MIDDLE -->
+      <div class="header-middle">
+        <!-- Site message -->
+        <div class="sitemessage">
+          <h1>EASY &bull; FLEXIBLE &bull; ROBUST</h1>
+          <h2>
+          <#if sessionAttributes.autoName?has_content>
+            ${uiLabelMap.CommonWelcome}&nbsp;${sessionAttributes.autoName}!
+            (${uiLabelMap.CommonNotYou}?&nbsp;<a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)
+          <#else/>
+            ${uiLabelMap.CommonWelcome}!
+          </#if>
+          </h2>
+          <h3><a href="#">&rsaquo;&rsaquo;&nbsp;More details</a></h3>
+        </div>
+      </div>
+
+      <!-- A.3 HEADER BOTTOM -->
+      <div class="header-bottom">
+
+        <!-- Navigation Level 2 (Drop-down menus) -->
+        <div class="nav2">
+
+          <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
+            <!-- Navigation item -->
+            <ul>
+              <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
+            </ul>
+          <#else/>
+            <!-- Navigation item -->
+            <ul>
+              <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
+            </ul>
+
+            <!-- Navigation item -->
+            <ul>
+              <li><a href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.EcommerceRegister}</a></li>
+            </ul>
+          </#if>
+
+          <#if catalogQuickaddUse>
+            <!-- Navigation item -->
+            <ul>
+              <li id="header-bar-quickadd"><a href="<@ofbizUrl>quickadd</@ofbizUrl>">${uiLabelMap.CommonQuickAdd}</a></li>
+            </ul>
+          </#if>
+
+          <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
+            <!-- Navigation item -->
+            <ul>
+              <li><a href="#">Utente<!--[if IE 7]><!--></a><!--<![endif]-->
+                <!--[if lte IE 6]><table><tr><td><![endif]-->
+                  <ul>
+                    <li id="header-bar-viewprofile"><a href="<@ofbizUrl>viewprofile</@ofbizUrl>">${uiLabelMap.CommonProfile}</a></li>
+                    <li id="header-bar-ListQuotes"><a href="<@ofbizUrl>ListQuotes</@ofbizUrl>">${uiLabelMap.OrderOrderQuotes}</a></li>
+                    <li id="header-bar-ListRequests"><a href="<@ofbizUrl>ListRequests</@ofbizUrl>">${uiLabelMap.OrderRequests}</a></li>
+                    <li id="header-bar-editShoppingList"><a href="<@ofbizUrl>editShoppingList</@ofbizUrl>">${uiLabelMap.EcommerceShoppingLists}</a></li>
+                    <li id="header-bar-orderhistory"><a href="<@ofbizUrl>orderhistory</@ofbizUrl>">${uiLabelMap.EcommerceOrderHistory}</a></li>
+                  </ul>
+                <!--[if lte IE 6]></td></tr></table></a><![endif]-->
+              </li>
+            </ul>
+          </#if>
+
+        </div>
+  </div>
+
+      <!-- Breadcrumbs -->
+      <div class="header-breadcrumbs">
+    </div>

Propchange: ofbiz/branches/release09.04/themes/multiflex/includes/header.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/themes/multiflex/includes/header.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/themes/multiflex/includes/header.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain