You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/06/19 23:36:33 UTC

svn commit: r1351866 [46/48] - in /ofbiz/branches/20120329_portletWidget: ./ applications/accounting/ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/i...

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Tue Jun 19 21:36:11 2012
@@ -105,10 +105,10 @@ under the License.
           </#if>
         </#list>
       <#else>
-        <#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment")?if_exists>
+        <#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)?if_exists>
         <#if WorkOrderItemFulfillments?has_content>
           <#list WorkOrderItemFulfillments as WorkOrderItemFulfillment>
-            <#assign workEffortSave = WorkOrderItemFulfillment.getRelatedOneCache("WorkEffort")?if_exists>
+            <#assign workEffortSave = WorkOrderItemFulfillment.getRelatedOne("WorkEffort", true)?if_exists>
             <#break>
            </#list>
         </#if>
@@ -120,10 +120,10 @@ under the License.
             ${orderItem.itemDescription?default("")}
           </td>
         <#else>
-          <#assign product = orderItem.getRelatedOneCache("Product")?if_exists/> <#-- should always exist because of FK constraint, but just in case -->
+          <#assign product = orderItem.getRelatedOne("Product", true)?if_exists/> <#-- should always exist because of FK constraint, but just in case -->
           <td >
             <a href="<@ofbizCatalogAltUrl fullPath="true" secure="false" productId=orderItem.productId/>" class="linktext">${orderItem.productId} - ${orderItem.itemDescription?default("")}</a>
-            <#assign orderItemAttributes = orderItem.getRelated("OrderItemAttribute")/>
+            <#assign orderItemAttributes = orderItem.getRelated("OrderItemAttribute", null, null, false)/>
             <#if orderItemAttributes?has_content>
                 <ul>
                 <#list orderItemAttributes as orderItemAttribute>
@@ -138,31 +138,31 @@ under the License.
                   [${uiLabelMap.OrderPieces}: ${product.piecesIncluded}]
               </#if>
               <#if (product.quantityIncluded?exists && product.quantityIncluded != 0) || product.quantityUomId?has_content>
-                <#assign quantityUom = product.getRelatedOneCache("QuantityUom")?if_exists/>
+                <#assign quantityUom = product.getRelatedOne("QuantityUom", true)?if_exists/>
                   [${uiLabelMap.CommonQuantity}: ${product.quantityIncluded?if_exists} ${((quantityUom.abbreviation)?default(product.quantityUomId))?if_exists}]
               </#if>
               <#if (product.weight?exists && product.weight != 0) || product.weightUomId?has_content>
-                <#assign weightUom = product.getRelatedOneCache("WeightUom")?if_exists/>
+                <#assign weightUom = product.getRelatedOne("WeightUom", true)?if_exists/>
                   [${uiLabelMap.CommonWeight}: ${product.weight?if_exists} ${((weightUom.abbreviation)?default(product.weightUomId))?if_exists}]
               </#if>
               <#if (product.productHeight?exists && product.productHeight != 0) || product.heightUomId?has_content>
-                <#assign heightUom = product.getRelatedOneCache("HeightUom")?if_exists/>
+                <#assign heightUom = product.getRelatedOne("HeightUom", true)?if_exists/>
                   [${uiLabelMap.CommonHeight}: ${product.productHeight?if_exists} ${((heightUom.abbreviation)?default(product.heightUomId))?if_exists}]
               </#if>
               <#if (product.productWidth?exists && product.productWidth != 0) || product.widthUomId?has_content>
-                <#assign widthUom = product.getRelatedOneCache("WidthUom")?if_exists/>
+                <#assign widthUom = product.getRelatedOne("WidthUom", true)?if_exists/>
                   [${uiLabelMap.CommonWidth}: ${product.productWidth?if_exists} ${((widthUom.abbreviation)?default(product.widthUomId))?if_exists}]
               </#if>
               <#if (product.productDepth?exists && product.productDepth != 0) || product.depthUomId?has_content>
-                <#assign depthUom = product.getRelatedOneCache("DepthUom")?if_exists/>
+                <#assign depthUom = product.getRelatedOne("DepthUom", true)?if_exists/>
                   [${uiLabelMap.CommonDepth}: ${product.productDepth?if_exists} ${((depthUom.abbreviation)?default(product.depthUomId))?if_exists}]
               </#if>
             </#if>
             <#if maySelectItems?default("N") == "Y">
-              <#assign returns = orderItem.getRelated("ReturnItem")?if_exists>
+              <#assign returns = orderItem.getRelated("ReturnItem", null, null, false)?if_exists>
               <#if returns?has_content>
                 <#list returns as return>
-                  <#assign returnHeader = return.getRelatedOne("ReturnHeader")>
+                  <#assign returnHeader = return.getRelatedOne("ReturnHeader", false)>
                   <#if returnHeader.statusId != "RETURN_CANCELLED">
                     <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "RETURN_APPROVED">
                       <#assign displayState = "Return Pending">
@@ -252,12 +252,12 @@ under the License.
             <#if orderItemAdjustment.description?has_content>: ${orderItemAdjustment.description}</#if>
             <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
               <#if orderItemAdjustment.primaryGeoId?has_content>
-                <#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/>
+                <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/>
                 <#if primaryGeo.geoName?has_content>
                   ${uiLabelMap.OrderJurisdiction}: ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
                 </#if>
                 <#if orderItemAdjustment.secondaryGeoId?has_content>
-                  <#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/>
+                  <#assign secondaryGeo = orderItemAdjustment.getRelatedOne("SecondaryGeo", true)/>
                   (${uiLabelMap.CommonIn}: ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}])
                 </#if>
               </#if>
@@ -275,11 +275,11 @@ under the License.
         </tr>
       </#list>
       <#-- show the order item ship group info -->
-      <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc")?if_exists>
+      <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc", null, null, false)?if_exists>
       <#if orderItemShipGroupAssocs?has_content>
         <#list orderItemShipGroupAssocs as shipGroupAssoc>
-          <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup")?if_exists>
-          <#assign shipGroupAddress = (shipGroup.getRelatedOne("PostalAddress"))?if_exists>
+          <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup", false)?if_exists>
+          <#assign shipGroupAddress = (shipGroup.getRelatedOne("PostalAddress", false))?if_exists>
           <tr>
             <td>
               ${uiLabelMap.OrderShipGroup}: [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("N/A")}

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl Tue Jun 19 21:36:11 2012
@@ -116,7 +116,7 @@ under the License.
             <#assign groupIdx = 0>
             <#list orderItemShipGroups as shipGroup>
                 <#if orderHeader?has_content>
-                  <#assign shippingAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists>
+                  <#assign shippingAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists>
                   <#assign groupNumber = shipGroup.shipGroupSeqId?if_exists>
                 <#else>
                   <#assign shippingAddress = cart.getShippingAddress(groupIdx)?if_exists>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl Tue Jun 19 21:36:11 2012
@@ -67,7 +67,7 @@ under the License.
                 <input type="hidden" name="returnPrice_o_${rowCount}" value="${returnableItems.get(orderItem).get("returnablePrice")}"/>
 
                 <#-- need some order item information -->
-                <#assign orderHeader = orderItem.getRelatedOne("OrderHeader")>
+                <#assign orderHeader = orderItem.getRelatedOne("OrderHeader", false)>
                 <#assign itemCount = orderItem.quantity>
                 <#assign itemPrice = orderItem.unitPrice>
                 <#-- end of order item information -->
@@ -119,7 +119,7 @@ under the License.
                 <td colspan="6">
                   <table cellspacing="1" cellpadding="2" width="100%">
                     <#list shippingContactMechList as shippingContactMech>
-                      <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
+                      <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
                       <tr>
                         <td align="right" width="1%" valign="top" nowrap="nowrap">
                           <input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl Tue Jun 19 21:36:11 2012
@@ -78,7 +78,7 @@ function submitForm(form, mode, value) {
                       <select name="shippingContactMechId" class="selectBox" onchange="javascript:submitForm(document.editgroupform${groupIdx}, 'SA', null);">
                         <option value="">${uiLabelMap.OrderSelectShippingAddress}</option>
                         <#list shippingContactMechList as shippingContactMech>
-                          <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
+                          <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
                           <option value="${shippingAddress.contactMechId}" <#if (shippingAddress.contactMechId == selectedContactMechId)>selected="selected"</#if>>${shippingAddress.address1}</option>
                         </#list>
                       </select>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl Tue Jun 19 21:36:11 2012
@@ -47,7 +47,7 @@ under the License.
                 <td width="10">&nbsp;</td>
             </tr>
             <#list quoteList as quote>
-                <#assign status = quote.getRelatedOneCache("StatusItem")>
+                <#assign status = quote.getRelatedOne("StatusItem", true)>
                 
                 <tr>
                     <td>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl Tue Jun 19 21:36:11 2012
@@ -51,8 +51,8 @@ under the License.
                 <td width="10">&nbsp;</td>
             </tr>
             <#list requestList as custRequest>
-                <#assign status = custRequest.getRelatedOneCache("StatusItem")>
-                <#assign type = custRequest.getRelatedOneCache("CustRequestType")>
+                <#assign status = custRequest.getRelatedOne("StatusItem", true)>
+                <#assign type = custRequest.getRelatedOne("CustRequestType", true)>
                 
                 <tr>
                     <td>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl Tue Jun 19 21:36:11 2012
@@ -24,8 +24,8 @@ under the License.
         <table cellspacing="0" class="basic-table">
          <#assign row = 1>
          <#list requestParties as requestParty>
-            <#assign roleType = requestParty.getRelatedOne("RoleType")>
-            <#assign party = requestParty.getRelatedOne("Party")>
+            <#assign roleType = requestParty.getRelatedOne("RoleType", false)>
+            <#assign party = requestParty.getRelatedOne("Party", false)>
               <tr>
                   <td align="right" valign="top" width="15%" class="label">
                       &nbsp;${roleType.get("description", locale)?if_exists}

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Tue Jun 19 21:36:11 2012
@@ -224,7 +224,7 @@ under the License.
                 <td><div class="tableheadtext">${uiLabelMap.EcommerceRecurrence}</div></td>
                 <td>
                   <#if recurrenceInfo?has_content>
-                    <#assign recurrenceRule = recurrenceInfo.getRelatedOne("RecurrenceRule")?if_exists>
+                    <#assign recurrenceRule = recurrenceInfo.getRelatedOne("RecurrenceRule", false)?if_exists>
                   </#if>
                   <select name="intervalNumber" class="selectBox">
                     <option value="">${uiLabelMap.EcommerceSelectInterval}</option>
@@ -263,7 +263,7 @@ under the License.
                     <option value="">${uiLabelMap.OrderSelectAShippingAddress}</option>
                     <#if shippingContactMechList?has_content>
                       <#list shippingContactMechList as shippingContactMech>
-                        <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
+                        <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
                         <option value="${shippingContactMech.contactMechId}"<#if (shoppingList.contactMechId)?default("") == shippingAddress.contactMechId> selected="selected"</#if>>${shippingAddress.address1}</option>
                       </#list>
                     <#else>
@@ -307,10 +307,10 @@ under the License.
                     <option value="">${uiLabelMap.OrderSelectPaymentMethod}</option>
                     <#list paymentMethodList as paymentMethod>
                       <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
-                        <#assign creditCard = paymentMethod.getRelatedOne("CreditCard")>
+                        <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)>
                         <option value="${paymentMethod.paymentMethodId}" <#if (shoppingList.paymentMethodId)?default("") == paymentMethod.paymentMethodId>selected="selected"</#if>>CC:&nbsp;${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</option>
                       <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT">
-                        <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount")>
+                        <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
                         <option value="${paymentMethod.paymentMethodId}">EFT:&nbsp;${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</option>
                       </#if>
                     </#list>
@@ -508,7 +508,7 @@ under the License.
                           <input type="hidden" name="quantity" value="${shoppingListItem.quantity}"/>
                           <select name="add_product_id" class="selectBox">
                               <#list productVariantAssocs as productVariantAssoc>
-                                <#assign variantProduct = productVariantAssoc.getRelatedOneCache("AssocProduct")>
+                                <#assign variantProduct = productVariantAssoc.getRelatedOne("AssocProduct", true)>
                                 <#if variantProduct?exists>
                                 <#assign variantProductContentWrapper = Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(variantProduct, request)>
                                   <option value="${variantProduct.productId}">${variantProductContentWrapper.get("PRODUCT_NAME")?default("No Name")} [${variantProduct.productId}]</option>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ContentForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ContentForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ContentForms.xml Tue Jun 19 21:36:11 2012
@@ -29,7 +29,7 @@ under the License.
     <form name="searchList" type="list" target="" list-name="queryResults"
         default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"
         paginate-target="/AdminSearch">
-        <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
+        <field name="editContent" title=" ">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit">
                 <parameter param-name="contentId"/>
                 <parameter param-name="drDataResourceId"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ForumForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ForumForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ForumForms.xml Tue Jun 19 21:36:11 2012
@@ -99,7 +99,7 @@ under the License.
         <field name="newTopicDescription" title="Description"  position="3">
             <text size="24"/>
         </field>
-        <field name="createTopic" title="${uiLabelMap.CommonEmptyHeader}"  position="4">
+        <field name="createTopic" title=" "  position="4">
             <hyperlink also-hidden="false" target="createTopic${pageName}" description="Create Topic">
                 <parameter param-name="mode" value="restore"/>
             </hyperlink>
@@ -193,7 +193,7 @@ under the License.
     <form name="listFindContent" type="list" target=""
         default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"
         paginate-target="/FindContent">
-        <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
+        <field name="editContent" title=" ">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContent">
                 <parameter param-name="contentId"/>
                 <parameter param-name="drDataResourceId"/>
@@ -281,7 +281,7 @@ under the License.
         <field name="newTopicDescription" title="Description"  position="3">
             <text size="24"/>
         </field>
-        <field name="createTopic" title="${uiLabelMap.CommonEmptyHeader}"  position="4">
+        <field name="createTopic" title=" "  position="4">
             <hyperlink also-hidden="false" target="createTopic${pageName}" description="Create Topic">
                 <parameter param-name="mode" value="restore"/>
             </hyperlink>
@@ -644,7 +644,7 @@ under the License.
                 <hidden value="${dataResourceTypeId}"/>
         </field>
 <!--
-        <field name="submitContentEdit" title="${uiLabelMap.CommonEmptyHeader}">
+        <field name="submitContentEdit" title=" ">
             <hyperlink also-hidden="false" description="Submit" target="javascript:document.EditAddContent.action='${persistAction}'; document.EditAddContent.submit()" target-type="plain"/>
         </field>
 -->

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogForms.xml Tue Jun 19 21:36:11 2012
@@ -68,7 +68,7 @@
             </service>
         </actions>
 
-        <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
+        <field name="editContent" title=" ">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit">
                 <parameter param-name="contentId"/>
                 <parameter param-name="drDataResourceId"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -36,7 +36,7 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
     <!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/ExampleSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortletData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortalSeedData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleHelpData.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleForms.xml Tue Jun 19 21:36:11 2012
@@ -178,8 +178,8 @@ under the License.
         </field>
 
         <field name="entityOptionsFields1" title="${uiLabelMap.ExampleDropDownEntityOptions}"><display description="${uiLabelMap.ExampleDropDownEntityOptionsTooltip1}" also-hidden="false"/></field>
-        <field name="entityOptionsFields2" title="${uiLabelMap.CommonEmptyHeader}"><display description="${uiLabelMap.ExampleDropDownEntityOptionsTooltip2}" also-hidden="false"/></field>
-        <field name="entityOptionsFields3" title="${uiLabelMap.CommonEmptyHeader}"><display description="${uiLabelMap.ExampleDropDownEntityOptionsTooltip3}" also-hidden="false"/></field>
+        <field name="entityOptionsFields2" title=" "><display description="${uiLabelMap.ExampleDropDownEntityOptionsTooltip2}" also-hidden="false"/></field>
+        <field name="entityOptionsFields3" title=" "><display description="${uiLabelMap.ExampleDropDownEntityOptionsTooltip3}" also-hidden="false"/></field>
         <!-- ***************** -->
         <!-- ***   field3  *** -->
         <!-- ***************** -->
@@ -240,7 +240,7 @@ under the License.
         <!-- *** Autocomplete dropdown *** -->
         <!-- ****************************** -->
         <!-- TODO : return only the Id, else you need to edit the field to remove the description -->
-        <field name="emptyField1" title="${uiLabelMap.CommonEmptyHeader}"><display/></field>
+        <field name="emptyField1" title=" "><display/></field>
         <field name="geoId" title="${uiLabelMap.ExampleAutocompleteDropdown}"
             tooltip="${uiLabelMap.ExampleAutocompleteTooltip}">
             <drop-down>
@@ -254,7 +254,7 @@ under the License.
         <!-- ****************************** -->
         <!-- ***   Dependent dropdowns  *** -->
         <!-- ****************************** -->
-        <field name="emptyField2" title="${uiLabelMap.CommonEmptyHeader}"><display/></field>
+        <field name="emptyField2" title=" "><display/></field>
         <field name="dependendDropDownFields" title="${uiLabelMap.ExampleDependentDropDowns}">
             <display description="${uiLabelMap.ExampleDependentDropDownTooltip}"/>
         </field>
@@ -274,7 +274,7 @@ under the License.
         <!-- ****************************** -->
         <!-- See why this is used here http://www.ryancramer.com/journal/entries/select_multiple/ -->
     <form name="DropDownMultipleFieldExampleForm" type="single" title="">
-        <field name="emptyField1" title="${uiLabelMap.CommonEmptyHeader}"><display/></field>
+        <field name="emptyField1" title=" "><display/></field>
         <field name="multipleDropDownFields" title="${uiLabelMap.ExampleMultipleDropDowns}">
             <display description="${uiLabelMap.ExampleMultipleDropDownTooltip}"/>
         </field>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/data/GoogleBaseTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/data/GoogleBaseTypeData.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/data/GoogleBaseTypeData.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/data/GoogleBaseTypeData.xml Tue Jun 19 21:36:11 2012
@@ -21,7 +21,6 @@ under the License.
 <entity-engine-xml>
 
     <GoodIdentificationType description="Google Id" goodIdentificationTypeId="GOOGLE_ID" hasTable="N" parentTypeId=""/>
-    <WebSite webSiteId="GOOGLEBASE" siteName="Google Base Application" visualThemeSetId="BACKOFFICE"/>
     
     <GoodIdentificationType description="Google Id en_US" goodIdentificationTypeId="GOOGLE_ID_en_US" hasTable="N"/>
     <GoodIdentificationType description="Google Id en_GB" goodIdentificationTypeId="GOOGLE_ID_en_GB" hasTable="N"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -27,7 +27,7 @@ under the License.
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleBaseTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleBaseSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/GoogleBaseSecurityData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGoogleBaseData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java Tue Jun 19 21:36:11 2012
@@ -126,7 +126,7 @@ public class ProductsExportToGoogle {
                             if (prodCatMemb != null) {
                                 String productId = prodCatMemb.getString("productId");
                                 if (productId != null) {
-                                    GenericValue prod = prodCatMemb.getRelatedOne("Product");
+                                    GenericValue prod = prodCatMemb.getRelatedOne("Product", false);
                                     Timestamp salesDiscontinuationDate = prod.getTimestamp("salesDiscontinuationDate");
                                     // do not consider discontinued product
                                     if (salesDiscontinuationDate == null) {
@@ -552,7 +552,7 @@ public class ProductsExportToGoogle {
                 Iterator<GenericValue> productCategoryMembersIter = productCategoryMembers.iterator();
                 while (productCategoryMembersIter.hasNext()) {
                     GenericValue productCategoryMember = productCategoryMembersIter.next();
-                    GenericValue productCategory = productCategoryMember.getRelatedOne("ProductCategory");
+                    GenericValue productCategory = productCategoryMember.getRelatedOne("ProductCategory", false);
                     String productCategoryId = productCategory.getString("productCategoryId");
                     String checkCategory = null;
                     if ("GB".equals(countryCode)) {

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/data/GoogleCheckoutTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/data/GoogleCheckoutTypeData.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/data/GoogleCheckoutTypeData.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/data/GoogleCheckoutTypeData.xml Tue Jun 19 21:36:11 2012
@@ -21,7 +21,6 @@ under the License.
 <entity-engine-xml>
     <Enumeration description="Google Checkout Channel" enumCode="GC_CHANNEL" enumId="GC_SALES_CHANNEL" sequenceId="01" enumTypeId="ORDER_SALES_CHANNEL"/>
     <PaymentMethodType description="Google Checkout" paymentMethodTypeId="EXT_GOOGLE_CHECKOUT"/>
-    <WebSite webSiteId="GOOGLECHECKOUT" siteName="Google Checkout Application" visualThemeSetId="BACKOFFICE"/>
     
     <EnumerationType description="Google Environment Types" enumTypeId="GOOGLE_ENV_TYPE" hasTable="N" parentTypeId=""/>
     <Enumeration description="Sandbox" enumCode="SANDBOX" enumId="GOOGLE_SANDBOX" sequenceId="01" enumTypeId="GOOGLE_ENV_TYPE"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -28,7 +28,7 @@
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/GoogleCheckoutSecurityData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGoogleCheckoutData.xml"/>
     
     <service-resource type="model" loader="main" location="servicedef/services_request.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java Tue Jun 19 21:36:11 2012
@@ -148,7 +148,7 @@ public class GoogleCheckoutHelper {
         }
         if (UtilValidate.isNotEmpty(orders)) {
             GenericValue order = EntityUtil.getFirst(orders);
-            List<GenericValue> orderPaymentPreferences = order.getRelated("OrderPaymentPreference");
+            List<GenericValue> orderPaymentPreferences = order.getRelated("OrderPaymentPreference", null, null, false);
             if (UtilValidate.isNotEmpty(orderPaymentPreferences)) {
                 orderPaymentPreference = EntityUtil.getFirst(orderPaymentPreferences);
                 BigDecimal maxAmount = new BigDecimal(info.getAuthorizationAmount());
@@ -177,7 +177,7 @@ public class GoogleCheckoutHelper {
         }
         if (UtilValidate.isNotEmpty(orders)) {
             GenericValue order = EntityUtil.getFirst(orders);
-            List<GenericValue> orderPaymentPreferences = order.getRelated("OrderPaymentPreference");
+            List<GenericValue> orderPaymentPreferences = order.getRelated("OrderPaymentPreference", null, null, false);
             if (UtilValidate.isNotEmpty(orderPaymentPreferences)) {
                 orderPaymentPreference = EntityUtil.getFirst(orderPaymentPreferences);
                 BigDecimal maxAmount = new BigDecimal(info.getTotalChargeAmount());
@@ -207,7 +207,7 @@ public class GoogleCheckoutHelper {
         }
         if (UtilValidate.isNotEmpty(orders)) {
             GenericValue order = EntityUtil.getFirst(orders);
-            List<GenericValue> orderPaymentPreferences = order.getRelated("OrderPaymentPreference");
+            List<GenericValue> orderPaymentPreferences = order.getRelated("OrderPaymentPreference", null, null, false);
             if (UtilValidate.isNotEmpty(orderPaymentPreferences)) {
                 orderPaymentPreference = EntityUtil.getFirst(orderPaymentPreferences);
                 BigDecimal maxAmount = new BigDecimal(info.getTotalRefundAmount());

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java Tue Jun 19 21:36:11 2012
@@ -517,7 +517,7 @@ public class GoogleRequestServices {
                 GenericValue googleOrder = null;
                 ShipItemsRequest isr = null;
                 for (GenericValue issue : issued) {
-                    GenericValue orderItem = issue.getRelatedOne("OrderItem");
+                    GenericValue orderItem = issue.getRelatedOne("OrderItem", false);
                     String shipmentItemSeqId = issue.getString("shipmentItemSeqId");
                     String productId = orderItem.getString("productId");
                     String orderId = issue.getString("orderId");
@@ -538,12 +538,12 @@ public class GoogleRequestServices {
                         GenericValue packageContent = EntityUtil.getFirst(spc);
                         String carrier = null;
                         if (UtilValidate.isNotEmpty(packageContent)) {
-                            GenericValue shipPackage = packageContent.getRelatedOne("ShipmentPackage");
+                            GenericValue shipPackage = packageContent.getRelatedOne("ShipmentPackage", false);
                             if (UtilValidate.isNotEmpty(shipPackage)) {
-                                List<GenericValue> prs = shipPackage.getRelated("ShipmentPackageRouteSeg");
+                                List<GenericValue> prs = shipPackage.getRelated("ShipmentPackageRouteSeg", null, null, false);
                                 GenericValue packageRoute = EntityUtil.getFirst(prs);
                                 if (UtilValidate.isNotEmpty(packageRoute)) {
-                                    List<GenericValue> srs = packageRoute.getRelated("ShipmentRouteSegment");
+                                    List<GenericValue> srs = packageRoute.getRelated("ShipmentRouteSegment", null, null, false);
                                     GenericValue route = EntityUtil.getFirst(srs);
                                     String track = packageRoute.getString("trackingCode");
                                     if (UtilValidate.isNotEmpty(route)) {

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -24,7 +24,7 @@ under the License.
     <resource-loader name="main" type="component"/>
     <classpath type="jar" location="build/lib/*"/>
 
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/HhFacilitySecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/HhFacilitySecurityData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services_hhfacility.xml"/>
 

Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:r1340642-1346323

Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:r1340642-1346323

Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:r1340642-1346323

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/controller.xml Tue Jun 19 21:36:11 2012
@@ -22,23 +22,6 @@ under the License.
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
     <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
     <description>Facility Handheld Demo</description>
-    
-    <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
-
-    <!-- view handlers -->
-    <handler name="ftl" type="view" class="org.ofbiz.webapp.ftl.FreeMarkerViewHandler"/>
-
-    <!-- Events to run on every request before security (chains exempt) -->
-    <!--
-    <preprocessor>
-    </preprocessor>
-    -->
-    <!-- Events to run on every request after all other processing (chains exempt) -->
-    <!--
-    <postprocessor>
-        <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/>
-    </postprocessor>
-    -->
 
     <!-- Request Mappings -->
     <request-map uri="main">

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml Tue Jun 19 21:36:11 2012
@@ -54,7 +54,7 @@ under the License.
         <field name="facilityId"><hidden/></field>
         <field name="productId"><hidden/></field>
         <field name="productId" entry-name="product.productId" ><display/></field>
-        <field name="productName" title="${uiLabelMap.CommonEmptyHeader}" entry-name="product.productName" ><display/></field>
+        <field name="productName" title=" " entry-name="product.productName" ><display/></field>
         <field name="productLocation" title="${uiLabelMap.FormFieldTitle_locationSeqId}" event="onkeypress" action="return enter(event,document.forms[0].productQty)"><text size="10"/></field>
         <field name="productQty" required-field="true" title="${uiLabelMap.CommonQty}" ><text default-value="1" size="5"/></field>
         <field name="submitButton" title="${uiLabelMap.ProductReceiveProduct}" widget-style="standardSubmit"><submit button-type="button"/></field>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/config/MyPortalUiLabels.xml Tue Jun 19 21:36:11 2012
@@ -24,11 +24,13 @@
         <value xml:lang="fr">Menu des applications</value>
         <value xml:lang="it">Mia pagina</value>
         <value xml:lang="th">แอปพริเคชันของฉัน</value>
+        <value xml:lang="vi">Trung tâm ứng dụng riêng</value>
         <value xml:lang="zh">我的页面应用程序栏</value>
         <value xml:lang="zh_TW">個人網頁應用程式列</value>
     </property>
     <property key="MyPortalBillToCustomer">
         <value xml:lang="en">Bill To Customer</value>
+        <value xml:lang="vi">Hóa đơn tới Khách hàng</value>
         <value xml:lang="zh_TW">發送帳單給客戶</value>
     </property>
     <property key="MyPortalCaptchaMissingError">
@@ -36,18 +38,21 @@
         <value xml:lang="fr">Vérifier le code captcha, il est absent ou erroné</value>
         <value xml:lang="it">Verifica il codice captcha, è mancante o errato</value>
         <value xml:lang="th">รหัสตัวเลขที่ท่านกรอกมีข้อผิดพลาด</value>
+        <value xml:lang="vi">Mã ảnh xác nhận bị thiếu hoặc bị sai</value>
         <value xml:lang="zh">缺少验证码或验证码错误</value>
         <value xml:lang="zh_TW">沒有驗證碼或是錯誤</value>
     </property>
     <property key="MyPortalEndUserCustomer">
         <value xml:lang="en">End User Customer</value>
         <value xml:lang="zh_TW">最終使用客戶</value>
+        <value xml:lang="vi">Khách hàng người dùng cuối</value>
     </property>    
     <property key="MyPortalFirstNameMissing">
         <value xml:lang="en">Your firstName is missing</value>
         <value xml:lang="fr">Votre prénom est absent</value>
         <value xml:lang="it">Nome mancante</value>
         <value xml:lang="th">กรุณากรอกชื่อของท่าน</value>
+        <value xml:lang="vi"></value>
         <value xml:lang="zh">缺少你的名</value>
         <value xml:lang="zh_TW">缺少名字(Firstname)</value>
     </property>
@@ -56,6 +61,7 @@
         <value xml:lang="fr">Mes informations </value>
         <value xml:lang="it">Mie informazioni</value>
         <value xml:lang="th">ข้อมูลของฉัน</value>
+        <value xml:lang="vi">Thông tin riêng</value>
         <value xml:lang="zh">我的信息</value>
         <value xml:lang="zh_TW">入口網站</value>
     </property>
@@ -64,18 +70,21 @@
         <value xml:lang="fr">Votre nom est absent</value>
         <value xml:lang="it">Cognome mancante</value>
         <value xml:lang="th">กรุณากรอกนามสกุลของท่าน</value>
+        <value xml:lang="vi">Thông tin Họ của bạn chưa có</value>
         <value xml:lang="zh">缺少你的姓</value>
         <value xml:lang="zh_TW">缺少姓氏(Lastname)</value>
     </property>
     <property key="MyPortalMyOrders">
         <value xml:lang="en">My Orders</value>
         <value xml:lang="zh_TW">我的訂單</value>
+        <value xml:lang="vi">Các đặt hàng của tôi</value>
     </property>
     <property key="MyPortalNewRegistration">
         <value xml:lang="en">New Registration </value>
         <value xml:lang="fr">Nouvel enregistrement</value>
         <value xml:lang="it">Nuovo utente</value>
         <value xml:lang="th">ลงทะเบียน </value>
+        <value xml:lang="vi">Đăng ký mới</value>
         <value xml:lang="zh">新注册</value>
         <value xml:lang="zh_TW">新的註冊</value>
     </property>
@@ -84,11 +93,13 @@
         <value xml:lang="fr">Code captcha</value>
         <value xml:lang="it">Codice captcha</value>
         <value xml:lang="th">รหัสตรวจสอบ</value>
+        <value xml:lang="vi">Mã ảnh xác nhận</value>
         <value xml:lang="zh">验证码</value>
         <value xml:lang="zh_TW">驗證碼</value>
     </property>
     <property key="MyPortalPlacingCustomer">
         <value xml:lang="en">Placing Customer</value>
+        <value xml:lang="vi">Khách hàng đặt chỗ</value>
         <value xml:lang="zh_TW">安排客戶</value>
     </property>
     <property key="MyPortalRegisterComplete">
@@ -96,17 +107,20 @@
         <value xml:lang="fr">L'enregistrement de la nouvelle personne est complet...SVP</value>
         <value xml:lang="it">Creazione nuovo utente completata...prego </value>
         <value xml:lang="th">การลงทะเบียนใหม่สำหรับบุคคลได้ทำการเสร็จสิ้นสมบูรณ์แล้ว...สามารถเข้าสู่ระบบได้ </value>
+        <value xml:lang="vi">Người dùng mới đă đăng ký thành công...Làm ơn</value>
         <value xml:lang="zh">完成新人员注册...请</value>
         <value xml:lang="zh_TW">註冊新的使用者完成...請</value>
     </property>
     <property key="MyPortalReloadImage">
         <value xml:lang="en">reload image</value>
         <value xml:lang="it">Ricarica immagine</value>
+        <value xml:lang="vi">Tải lại ảnh</value>
         <value xml:lang="zh">刷新图片</value>
         <value xml:lang="zh_TW">重載圖片</value>
     </property>
     <property key="MyPortalShipToCustomer">
         <value xml:lang="en">Ship To Customer</value>
+        <value xml:lang="vi">Chuyển tới khách hàng</value>
         <value xml:lang="zh_TW">寄送給客戶</value>
     </property>
     <property key="MyPortalTaskActEndDate">
@@ -114,6 +128,7 @@
         <value xml:lang="fr">Fin réelle de de la tâche</value>
         <value xml:lang="it">Fine compito effettiva</value>
         <value xml:lang="th">เสร็จสิ้นการทำ</value>
+        <value xml:lang="vi">Ngày kết thúc thực hiện</value>
         <value xml:lang="zh">任务操作结束</value>
         <value xml:lang="zh_TW">任務作業結束</value>
     </property>
@@ -122,6 +137,7 @@
         <value xml:lang="fr">Début réel de de la tâche</value>
         <value xml:lang="it">Inizio compito effettivo</value>
         <value xml:lang="th">เรื่มต้นการทำ</value>
+        <value xml:lang="vi">Ngày bắt đầu thực hiện</value>
         <value xml:lang="zh">任务操作开始</value>
         <value xml:lang="zh_TW">任務作業開始</value>
     </property>
@@ -130,6 +146,7 @@
         <value xml:lang="fr">Fin estimée de la tâche</value>
         <value xml:lang="it">Fine compito pianificata</value>
         <value xml:lang="th">สิ้นสุดชิ้นงาน</value>
+        <value xml:lang="vi">Ngày kết thúc theo kế hoạch</value>
         <value xml:lang="zh">任务计划结束</value>
         <value xml:lang="zh_TW">任務計畫結束</value>
     </property>
@@ -138,6 +155,7 @@
         <value xml:lang="fr">Début estimé de la tâche</value>
         <value xml:lang="it">Inizio compito pianificato</value>
         <value xml:lang="th">เริ่มต้นชิ้นงาน</value>
+        <value xml:lang="vi">Ngày bắt đầu theo kế hoạch</value>
         <value xml:lang="zh">任务计划开始</value>
         <value xml:lang="zh_TW">任務計畫開始</value>
     </property>
@@ -146,6 +164,7 @@
         <value xml:lang="fr">Status de la tâche</value>
         <value xml:lang="it">Stato compito</value>
         <value xml:lang="th">สถานะของงาน</value>
+        <value xml:lang="vi">Trạng thái</value>
         <value xml:lang="zh">任务状态</value>
         <value xml:lang="zh_TW">任務狀態</value>
     </property>
@@ -154,6 +173,7 @@
         <value xml:lang="fr">Mes Tâches</value>
         <value xml:lang="it">Miei compiti</value>
         <value xml:lang="th">งานของฉัน</value>
+        <value xml:lang="vi"></value>
         <value xml:lang="zh">我的任务</value>
         <value xml:lang="zh_TW">我的任務</value>
     </property>
@@ -162,6 +182,7 @@
         <value xml:lang="fr">Identifiant de connexion</value>
         <value xml:lang="it">Login utente</value>
         <value xml:lang="th">ข้อมูลการลงทะเบียน</value>
+        <value xml:lang="vi">Tác vụ - Đầu việc của tôi</value>
         <value xml:lang="zh">用户登录</value>
         <value xml:lang="zh_TW">使用者登入</value>
     </property>
@@ -170,12 +191,14 @@
         <value xml:lang="fr">Vérifier le code captcha</value>
         <value xml:lang="it">Verifica codice captcha</value>
         <value xml:lang="th">ใส่รหัสตามรูป</value>
+        <value xml:lang="vi">Mã xác nhận</value>
         <value xml:lang="zh">验证验证码</value>
         <value xml:lang="zh_TW">驗證碼</value>
     </property>
     <property key="PageTitleFindPortalPage">
         <value xml:lang="en">Find Portal page</value>
         <value xml:lang="fr">Rech. page portail</value>
+        <value xml:lang="vi">Tìm trang trên Cổng thông tin</value>
         <value xml:lang="zh_TW">查找入口網頁</value>
     </property>
     <property key="PageTitleMyPortal">
@@ -183,6 +206,7 @@
         <value xml:lang="fr">Mon portail pour : </value>
         <value xml:lang="it">Mio portale per : </value>
         <value xml:lang="th">ส่วนตัวสำหรับ </value>
+        <value xml:lang="vi">Cổng riêng của :</value>
         <value xml:lang="zh">我的门户用于：</value>
         <value xml:lang="zh_TW">入口網站使用者:</value>
     </property>
@@ -191,6 +215,7 @@
         <value xml:lang="fr">Ma page de portail</value>
         <value xml:lang="it">Pagina mio portale</value>
         <value xml:lang="th">หน้าส่วนตัวของฉัน</value>
+        <value xml:lang="vi">Cổng thông tin Riêng</value>
         <value xml:lang="zh">我的门户页面</value>
         <value xml:lang="zh_TW">入口網頁</value>
     </property>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -24,8 +24,8 @@
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
 
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalSecurityData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalTypeData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/MyPortalSecurityData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalPageDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalDemoData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -28,7 +28,7 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
 
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OagisTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/OagisSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/OagisSecurityData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <!-- Uncomment To activate automatic messaging to the partner

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Tue Jun 19 21:36:11 2012
@@ -1099,7 +1099,7 @@ public class OagisShipmentServices {
 
                 // for each ReturnItem also get serial numbers using ItemIssuanceAndInventoryItem
                 // NOTE: technically if the ReturnItem.quantity != OrderItem.quantity then we don't know which serial number is being returned, so rather than guessing we will send it only in that case
-                GenericValue orderItem = returnItem.getRelatedOne("OrderItem");
+                GenericValue orderItem = returnItem.getRelatedOne("OrderItem", false);
                 if (orderItem != null) {
                     if (orderItem.getDouble("quantity").doubleValue() == itemQty) {
                         List<GenericValue> itemIssuanceAndInventoryItemList = delegator.findByAnd("ItemIssuanceAndInventoryItem",

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl Tue Jun 19 21:36:11 2012
@@ -117,8 +117,8 @@ under the License.
           </#if>
         </os:PARTNER>
         <#list shipmentItems as shipmentItem>
-        <#assign product = shipmentItem.getRelatedOne("Product")>
-        <#assign productType = product.getRelatedOne("ProductType")>
+        <#assign product = shipmentItem.getRelatedOne("Product", false)>
+        <#assign productType = product.getRelatedOne("ProductType", false)>
         <#if productType.isPhysical == "Y" || productType.isPhysical == "y">
         <n:SHIPITEM>
             <os:QUANTITY>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl Tue Jun 19 21:36:11 2012
@@ -86,7 +86,7 @@ under the License.
                     <of:UOM>EACH</of:UOM>
                 </os:QUANTITY>
                 <#list returnItems as returnItem>
-                    <#assign returnReason = returnItem.getRelatedOne("ReturnReason")/>
+                    <#assign returnReason = returnItem.getRelatedOne("ReturnReason", false)/>
                     <#assign serialNumberList = serialNumberListByReturnItemSeqIdMap.get(returnItem.returnItemSeqId)?if_exists/>
                 <n:RECEIPTITM>
                     <os:QUANTITY>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml Tue Jun 19 21:36:11 2012
@@ -29,7 +29,7 @@ under the License.
     <classpath type="jar" location="build/lib/*"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/PosSecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/PosSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PosTypeData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRetail.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/PosSyncSettings.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Tue Jun 19 21:36:11 2012
@@ -374,7 +374,7 @@ public class PosTransaction implements S
             String paymentMethodTypeId = infValue.getString("paymentMethodTypeId");
             GenericValue pmt = null;
             try {
-                 pmt = infValue.getRelatedOne("PaymentMethodType");
+                 pmt = infValue.getRelatedOne("PaymentMethodType", false);
             } catch (GenericEntityException e) {
                 Debug.logError(e, module);
             }
@@ -386,7 +386,7 @@ public class PosTransaction implements S
             if ("CREDIT_CARD".equals(paymentMethodTypeId)) {
                 GenericValue cc = null;
                 try {
-                    cc = infValue.getRelatedOne("CreditCard");
+                    cc = infValue.getRelatedOne("CreditCard", false);
                 } catch (GenericEntityException e) {
                     Debug.logError(e, module);
                 }
@@ -407,7 +407,7 @@ public class PosTransaction implements S
                 /*
                 GenericValue gc = null;
                 try {
-                    gc = infValue.getRelatedOne("GiftCard"); //FIXME is this really useful ? (Maybe later...)
+                    gc = infValue.getRelatedOne("GiftCard", false); //FIXME is this really useful ? (Maybe later...)
                 } catch (GenericEntityException e) {
                     Debug.logError(e, module);
                 }
@@ -1057,7 +1057,7 @@ public class PosTransaction implements S
                 if ("PaymentMethod".equals(paymentInfoObj.getEntityName())) {
                     paymentMethod = paymentInfoObj;
                     try {
-                        paymentMethodType = paymentMethod.getRelatedOne("PaymentMethodType");
+                        paymentMethodType = paymentMethod.getRelatedOne("PaymentMethodType", false);
                     } catch (GenericEntityException e) {
                         Debug.logError(e, module);
                     }
@@ -1288,7 +1288,7 @@ public class PosTransaction implements S
         for (GenericValue shoppingList : shoppingLists) {
             List<GenericValue> items = null;
             try {
-                items = shoppingList.getRelated("ShoppingListItem", UtilMisc.toList("shoppingListItemSeqId"));
+                items = shoppingList.getRelated("ShoppingListItem", null, UtilMisc.toList("shoppingListItemSeqId"), false);
             } catch (GenericEntityException e) {
                 Debug.logError(e, module);
             }

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Tue Jun 19 21:36:11 2012
@@ -238,7 +238,7 @@ public class ManagerEvents {
                     // transmit final data to server
                     GenericValue terminal = null;
                     try {
-                        terminal = state.getRelatedOne("PosTerminal");
+                        terminal = state.getRelatedOne("PosTerminal", false);
                     } catch (GenericEntityException e) {
                         Debug.logError(e, module);
                         pos.showDialog("dialog/error/exception", e.getMessage());

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java Tue Jun 19 21:36:11 2012
@@ -48,7 +48,7 @@ import org.ofbiz.base.util.cache.UtilCac
 public class PosDialog {
 
     public static final String module = PosDialog.class.getName();
-    protected static UtilCache<Object, Object> instances = UtilCache.createUtilCache("pos.Dialogs", 0, 0);
+    private static final UtilCache<XPage, PosDialog> instances = UtilCache.createUtilCache("pos.Dialogs", 0, 0);
 
     protected final Frame clientFrame = XProjectManager.getCurrentProject().getAppFrame();
     protected final Window appWindow = XProjectManager.getCurrentProject().getAppWindow();
@@ -71,14 +71,7 @@ public class PosDialog {
     public static PosDialog getInstance(XPage page, boolean modal, int padding) {
         PosDialog dialog = (PosDialog) instances.get(page);
         if (dialog == null) {
-            synchronized(PosDialog.class) {
-                dialog = (PosDialog) instances.get(page);
-
-                if (dialog == null) {
-                    dialog = new PosDialog(page, modal, padding);
-                    instances.put(page, dialog);
-                }
-            }
+            dialog = instances.putIfAbsentAndGet(page, new PosDialog(page, modal, padding));
         }
 
         dialog.modal = modal;