OFBiz › OFBiz - Commits

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

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

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

erwan
Modified: ofbiz/branches/20120329_portletWidget/applications/party/data/PartyTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/data/PartyTypeData.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/data/PartyTypeData.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/data/PartyTypeData.xml Tue Jun 19 21:36:11 2012
@@ -159,6 +159,7 @@ under the License.
     <Enumeration description="Party Email Address Verification" enumCode="EMAIL_VERIFY" enumId="PRDS_EMAIL_VERIFY" sequenceId="03" enumTypeId="PARTY_EMAIL"/>
     <Enumeration description="Party Invitation" enumCode="INVITE_EMAIL" enumId="PRDS_PARTYINV_EMAIL" sequenceId="04" enumTypeId="PARTY_EMAIL"/>
     <Enumeration description="Contact-Us Notification" enumCode="CONT_EMAIL" enumId="CONT_NOTI_EMAIL" sequenceId="05" enumTypeId="PARTY_EMAIL"/>
+    <Enumeration description="Account Activated Notification" enumCode="ACCOUNT_ACTIVATED" enumId="PRDS_CUST_ACTIVATED" sequenceId="06" enumTypeId="PARTY_EMAIL"/>
     <Enumeration description="Unsubscribe Contact List Notification" enumCode="UNSUB_CONT_EMAIL" enumId="UNSUB_CONT_LIST_NOTI" sequenceId="01" enumTypeId="PARTY_EMAIL"/>
     <Enumeration description="Subscribe Contact List Notification" enumCode="SUB_CONT_EMAIL" enumId="SUB_CONT_LIST_NOTI" sequenceId="02" enumTypeId="PARTY_EMAIL"/>
     <Enumeration description="Unsubscribe Contact List Verify" enumCode="UNSUB_CONT_VERIFY_EMAIL" enumId="UNSUB_CONT_LIST_VERI" sequenceId="03" enumTypeId="PARTY_EMAIL"/>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/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="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>    
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/PartySecurityData.xml"/>
+    <entity-resource type="data" reader-name="security" loader="main" location="data/PartySecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyGeoPointData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/PartyDemoData.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Jun 19 21:36:11 2012
@@ -1126,4 +1126,45 @@ under the License.
             <field-to-result result-name="description" field="roleType.description" />
         </if-not-empty>
     </simple-method>
+    
+    <!-- send account activated email notification -->
+    <simple-method method-name="sendAccountActivatedEmailNotification" short-description="Notification email on account activated" login-required="false">
+        <map-to-map map="parameters" to-map="bodyParameters"/>
+        <set field="emailType" value="PRDS_CUST_ACTIVATED"/>
+        <set field="productStoreId" from-field="parameters.productStoreId" />
+        <entity-one entity-name="ProductStoreEmailSetting" value-field="storeEmail">
+            <field-map field-name="emailType"/>
+            <field-map field-name="productStoreId"/>
+        </entity-one>
+        <entity-and list="webSites" entity-name="WebSite">
+            <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/>
+        </entity-and>
+        <first-from-list entry="webSite" list="webSites"/>
+        <if-not-empty field="storeEmail.bodyScreenLocation">
+            <entity-one entity-name="UserLogin" value-field="userLoginParty"/>
+            <set field="parameters.partyId" from-field="userLoginParty.partyId"/>
+            <entity-condition entity-name="PartyContactDetailByPurpose" list="partyContactDetailByPurposes" filter-by-date="true">
+                <condition-list>
+                    <condition-expr field-name="contactMechPurposeTypeId" operator="equals" value="PRIMARY_EMAIL"/>
+                    <condition-expr field-name="partyId" operator="equals"  from-field="parameters.partyId"/>
+                </condition-list>
+            </entity-condition>
+            <first-from-list entry="partyContactDetailByPurpose" list="partyContactDetailByPurposes"/>
+            <entity-one entity-name="Person" value-field="person"/>
+            <set field="bodyParameters.person" from-field="person"/>
+            <set field="emailParams.bodyParameters" from-field="bodyParameters"/>
+            <set field="contactMechId" from-field="partyContactDetailByPurpose.contactMechId"/>
+            <entity-one entity-name="ContactMech" value-field="contactMech"/>
+            <set field="emailParams.sendTo" from-field="contactMech.infoString"/>
+            <set field="emailParams.subject" from-field="storeEmail.subject"/>
+            <set field="emailParams.sendFrom" from-field="storeEmail.fromAddress"/>
+            <set field="emailParams.sendCc" from-field="storeEmail.ccAddress"/>
+            <set field="emailParams.sendBcc" from-field="storeEmail.bccAddress"/>
+            <set field="emailParams.contentType" from-field="storeEmail.contentType"/>
+            <set field="emailParams.bodyScreenUri" from-field="storeEmail.bodyScreenLocation"/>
+            <set field="emailParams.webSiteId" from-field="webSite.webSiteId"/>
+            <set field="emailParams.emailType" from-field="emailType"/>
+            <call-service service-name="sendMailFromScreen" in-map-name="emailParams"/>
+        </if-not-empty>
+    </simple-method>
 </simple-methods>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/servicedef/services.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/servicedef/services.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/servicedef/services.xml Tue Jun 19 21:36:11 2012
@@ -1348,4 +1348,11 @@ under the License.
         <attribute name="emailType" type="String" mode="IN" optional="true"/>
         <attribute name="productStoreId" type="String" mode="IN" optional="true"/>
     </service>
+    
+    <!-- send account activated email notification -->
+    <service name="sendAccountActivatedEmailNotification" engine="simple"
+            location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="sendAccountActivatedEmailNotification" auth="false">
+        <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
+        <attribute name="productStoreId" type="String" mode="IN" optional="false"/>
+    </service>
 </services>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Tue Jun 19 21:36:11 2012
@@ -397,7 +397,7 @@ public class CommunicationEventServices
                         if (UtilValidate.isNotEmpty(webSite)) {
                             GenericValue productStore = webSite.getRelatedOne("ProductStore", false);
                             if (UtilValidate.isNotEmpty(productStore)) {
-                                List<GenericValue> productStoreEmailSettings = productStore.getRelatedByAnd("ProductStoreEmailSetting", UtilMisc.toMap("emailType", "CONT_EMAIL_TEMPLATE"));
+                                List<GenericValue> productStoreEmailSettings = productStore.getRelated("ProductStoreEmailSetting", UtilMisc.toMap("emailType", "CONT_EMAIL_TEMPLATE"), null, false);
                                 GenericValue productStoreEmailSetting = EntityUtil.getFirst(productStoreEmailSettings);
                                 if (UtilValidate.isNotEmpty(productStoreEmailSetting)) {
                                     // send e-mail using screen template

Modified: ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/contact/ContactHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/contact/ContactHelper.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/contact/ContactHelper.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/contact/ContactHelper.java Tue Jun 19 21:36:11 2012
@@ -60,20 +60,20 @@ public class ContactHelper {
             } else {
                 List<GenericValue> list;
 
-                list = party.getRelatedByAnd("PartyContactMechPurpose", UtilMisc.toMap("contactMechPurposeTypeId", contactMechPurposeTypeId));
+                list = party.getRelated("PartyContactMechPurpose", UtilMisc.toMap("contactMechPurposeTypeId", contactMechPurposeTypeId), null, false);
                 if (!includeOld) {
                     list = EntityUtil.filterByDate(list, true);
                 }
-                partyContactMechList = EntityUtil.getRelated("PartyContactMech", list);
+                partyContactMechList = EntityUtil.getRelated("PartyContactMech", null, list, false);
             }
             if (!includeOld) {
                 partyContactMechList = EntityUtil.filterByDate(partyContactMechList, true);
             }
             partyContactMechList = EntityUtil.orderBy(partyContactMechList, UtilMisc.toList("fromDate DESC"));
             if (contactMechTypeId == null) {
-                return EntityUtil.getRelated("ContactMech", partyContactMechList);
+                return EntityUtil.getRelated("ContactMech", null, partyContactMechList, false);
             } else {
-                return EntityUtil.getRelatedByAnd("ContactMech", UtilMisc.toMap("contactMechTypeId", contactMechTypeId), partyContactMechList);
+                return EntityUtil.getRelated("ContactMech", UtilMisc.toMap("contactMechTypeId", contactMechTypeId), partyContactMechList, false);
             }
         } catch (GenericEntityException gee) {
             Debug.logWarning(gee, module);

Modified: ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java Tue Jun 19 21:36:11 2012
@@ -47,7 +47,7 @@ public class PartyContentWrapper impleme
     public static final String module = PartyContentWrapper.class.getName();
     public static final String CACHE_KEY_SEPARATOR = "::";
 
-    public static UtilCache<String, String> partyContentCache = UtilCache.createUtilCache("party.content.rendered", true);
+    private static final UtilCache<String, String> partyContentCache = UtilCache.createUtilCache("party.content.rendered", true);
 
     protected LocalDispatcher dispatcher;
     protected GenericValue party;
@@ -135,8 +135,11 @@ public class PartyContentWrapper impleme
         }
 
         try {
-            if (useCache && partyContentCache.get(cacheKey) != null) {
-                return partyContentCache.get(cacheKey);
+            if (useCache) {
+                String cachedValue = partyContentCache.get(cacheKey);
+                if (cachedValue != null) {
+                    return cachedValue;
+                }
             }
 
             Writer outWriter = new StringWriter();
@@ -144,10 +147,7 @@ public class PartyContentWrapper impleme
 
             String outString = outWriter.toString();
             if (outString.length() > 0) {
-                if (partyContentCache != null) {
-                    partyContentCache.put(cacheKey, outString);
-                }
-                return outString;
+                return partyContentCache.putIfAbsentAndGet(cacheKey, outString);
             } else {
                 String candidateOut = party.getModelEntity().isField(candidateFieldName) ? party.getString(candidateFieldName): "";
                 return candidateOut == null ? "" : candidateOut;

Modified: ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy Tue Jun 19 21:36:11 2012
@@ -22,7 +22,7 @@
 if (userLogin) {
     userLoginParty = userLogin.getRelatedOne("Party", true);
     if (userLoginParty) {
-        userLoginPartyPrimaryEmails = userLoginParty.getRelatedByAnd("PartyContactMechPurpose", [contactMechPurposeTypeId : "PRIMARY_EMAIL"]);
+        userLoginPartyPrimaryEmails = userLoginParty.getRelated("PartyContactMechPurpose", [contactMechPurposeTypeId : "PRIMARY_EMAIL"], null, false);
         if (userLoginPartyPrimaryEmails) {
             context.thisUserPrimaryEmail = userLoginPartyPrimaryEmails.get(0);
         }

Propchange: ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:r1340642-1346323

Modified: ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl Tue Jun 19 21:36:11 2012
@@ -46,7 +46,7 @@ under the License.
         </thead>
         <tbody>
             <#list ownedFinAccountTransList as ownedFinAccountTrans>
-                <#assign finAccountTransType = ownedFinAccountTrans.getRelatedOne('FinAccountTransType')>
+                <#assign finAccountTransType = ownedFinAccountTrans.getRelatedOne('FinAccountTransType', false)>
                 <#assign displayAmount = ownedFinAccountTrans.amount>
                 <#if ownedFinAccountTrans.finAccountTransTypeId == 'WITHDRAWAL'>
                     <#assign displayAmount = -displayAmount>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl Tue Jun 19 21:36:11 2012
@@ -38,7 +38,7 @@ under the License.
             </thead>
             <tbody>
                 <#list inventoryItemList as inventoryItem>
-                    <#assign product = inventoryItem.getRelatedOne('Product')?if_exists>
+                    <#assign product = inventoryItem.getRelatedOne('Product', false)?if_exists>
                     <tr>
                         <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItem.inventoryItemId}&amp;externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="linktext">${inventoryItem.inventoryItemId}</a></td>
                         <td>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/CommunicationEventForms.xml Tue Jun 19 21:36:11 2012
@@ -489,13 +489,13 @@ under the License.
     <form name="ListPartyCommEvents" type="list" target="RemoveCommunicationEventRole" list-name="listIt"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <set field="parameters.sortField" from-field="parameters.sortField" default-value="${groovy: 'true'.equals(parameters.all)?'-entryDate':'entryDate'}"/>
+            <set field="parameters.sortField" from-field="parameters.sortField" default-value="${groovy: 'true'.equals(parameters.all) ? '-entryDate' : 'entryDate'}"/>
             <set field="searchParameters.partyId" from-field="partyId"/>
             <set field="searchParameters.statusId" value="COM_UNKNOWN_PARTY"/>
             <set field="searchParameters.statusId_op" value="notEqual"/>
-            <set field="searchParameters.roleStatusId" value="${groovy:&quot;true&quot;.equals(parameters.all)?&quot;dummy&quot;:&quot;COM_ROLE_COMPLETED&quot;}"/>
+            <set field="searchParameters.roleStatusId" value="${groovy: 'true'.equals(parameters.all) ? 'dummy' : 'COM_ROLE_COMPLETED'}"/>
             <set field="searchParameters.roleStatusId_op" value="notEqual"/>
-            <set field="searchParameters.communicationEventTypeId" value="${groovy:internalNotesOnly&amp;&amp;&quot;true&quot;.equals(internalNotesOnly)?&quot;COMMENT_NOTE&quot;:&quot;&quot;}"/>
+            <set field="searchParameters.communicationEventTypeId" value="${groovy: internalNotesOnly &amp;&amp; 'true'.equals(internalNotesOnly) ? 'COMMENT_NOTE' : ''}"/>
             <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="searchParameters"/>
                 <field-map field-name="entityName" value="CommunicationEventAndRole"/>
@@ -505,7 +505,7 @@ under the License.
             </service>
         </actions>
         <row-actions>
-            <set field="toComplete" value="${bsh:&quot;COM_ROLE_READ&quot;.equals(roleStatusId)?&quot;PartyToComplete&quot;:&quot;CommonEmptyHeader&quot;}"/>
+            <set field="toComplete" value="${groovy: 'COM_ROLE_READ'.equals(roleStatusId) ? 'PartyToComplete' : ' '}"/>
         </row-actions>
         <field name="deleteCommEventIfLast"><hidden value="Y"/></field>
         <field name="delContentDataResource"><hidden value="Y"/></field>
@@ -956,8 +956,8 @@ under the License.
         <field name="donePage"><hidden value="${donePage}"/></field>
         <field name="communicationEventId"><hidden value="${parameters.communicationEventId}"/></field>
         <field name="delContentDataResource"><hidden value="Y"/></field>
-        <field name="dummy1" title="${uiLabelMap.CommonEmptyHeader}" position="1"><display/></field>
-        <field name="dummy2" title="${uiLabelMap.CommonEmptyHeader}" position="2"><display/></field>
+        <field name="dummy1" title=" " position="1"><display/></field>
+        <field name="dummy2" title=" " position="2"><display/></field>
         <field name="deleteEmail" widget-style="smallSubmit" position="3"><submit/></field>
     </form>
     <form name="EditRequestFromCommEvent" type="single" target="createRequestFromCommEvent" default-map-name="communicationEvent">

Modified: ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/EmailPartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/EmailPartyScreens.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/EmailPartyScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/EmailPartyScreens.xml Tue Jun 19 21:36:11 2012
@@ -53,4 +53,15 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <screen name="AccountActivatedNotification">
+        <section>
+            <actions>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="title" value="${uiLabelMap.PartyNotificationMailActivated}"/>
+            </actions>
+            <widgets>
+                <platform-specific><html><html-template location="component://party/templates/email/AccountActivatedNotification.ftl"/></html></platform-specific>
+            </widgets>
+        </section>
+    </screen>
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyClassificationForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyClassificationForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyClassificationForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyClassificationForms.xml Tue Jun 19 21:36:11 2012
@@ -58,7 +58,7 @@ under the License.
             <display-entity entity-name="PartyClassificationType" key-field-name="partyClassificationTypeId" description="${description}"/>
         </field>
         <field name="parentGroupId"><display/></field>
-        <field name="description" title="${uiLabelMap.CommonEmptyHeader}"><display/></field>
+        <field name="description" title=" "><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
             <hyperlink target="deletePartyClassificationGroup" description="${uiLabelMap.CommonDelete}" also-hidden="false">
                 <parameter param-name="partyClassificationGroupId"/>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml Tue Jun 19 21:36:11 2012
@@ -488,7 +488,7 @@ under the License.
         <field use-when="displayPassword!=null" name="PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><password size="15" maxlength="250"/></field>
         <field use-when="displayPassword!=null" name="CONFIRM_PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="* ${uiLabelMap.CommonConfirm}" widget-style="required"><password size="15" maxlength="250"/></field>
         <field name="USERNAME" title="${uiLabelMap.CommonUsername}" tooltip="* ${uiLabelMap.PartyTemporaryPassword}" widget-style="required"><text size="30" maxlength="250"/></field>
-        <!--<field name="RequiredNote" title="${uiLabelMap.CommonEmptyHeader}"><display description="${uiLabelMap.PartyRequiredNote}" also-hidden="false"/></field> -->
+        <!--<field name="RequiredNote" title=" "><display description="${uiLabelMap.PartyRequiredNote}" also-hidden="false"/></field> -->
 
         <field name="PRODUCT_STORE_ID" title="Product Store" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <drop-down>

Modified: ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyScreens.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyScreens.xml Tue Jun 19 21:36:11 2012
@@ -695,7 +695,7 @@ under the License.
                 <set field="titleProperty" value="PartyCreateNewCustomer"/>
                 <set field="headerItem" value="find"/>
                 <set field="target" value="createCustomer"/>
-                <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
+                <set field="previousParams" from-field="_PREVIOUS_PARAMS_" from-scope="user"/>
                 <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/>
             </actions>
             <widgets>
@@ -741,7 +741,7 @@ under the License.
                 <set field="headerItem" value="find"/>
                 <set field="displayPassword" value="Y"/>
                 <set field="target" value="createProspect"/>
-                <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
+                <set field="previousParams" from-field="_PREVIOUS_PARAMS_" from-scope="user"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -786,7 +786,7 @@ under the License.
                 <set field="headerItem" value="find"/>
                 <set field="displayPassword" value="Y"/>
                 <set field="target" value="createEmployee"/>
-                <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
+                <set field="previousParams" from-field="_PREVIOUS_PARAMS_" from-scope="user"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/config/ProductEntityLabels.xml Tue Jun 19 21:36:11 2012
@@ -470,7 +470,7 @@
         <value xml:lang="ro">Administratie Permisa(Unu)</value>
         <value xml:lang="ru">Администрирование разрешено (Одна)</value>
         <value xml:lang="th">ผู้ดูแลระบบอนุญาต (หนึ่ง)</value>
-        <value xml:lang="vi">Quyền quản trị (một lần)</value>
+        <value xml:lang="vi">Quyền quản trị (duy nhất)</value>
         <value xml:lang="zh">允许管理 (一个)</value>
         <value xml:lang="zh_TW">允許管理 (一個)</value>
     </property>
@@ -483,14 +483,14 @@
         <value xml:lang="ro">Afiseaza Radacina (Unu)</value>
         <value xml:lang="ru">Для просмотра (Одна)</value>
         <value xml:lang="th">แสดง Root (หนึ่ง)</value>
-        <value xml:lang="vi">Duyệt thÆ° mục gốc (một lần)</value>
+        <value xml:lang="vi">Duyệt từ Gốc (duy nhất)</value>
         <value xml:lang="zh">浏览根 (一个)</value>
         <value xml:lang="zh_TW">瀏覽根 (一個)</value>
     </property>
     <property key="ProdCatalogCategoryType.description.PCCT_EBAY_ROOT">
         <value xml:lang="de">Ebay Root (Eine)</value>
         <value xml:lang="en">Ebay Root (One)</value>
-        <value xml:lang="vi">ThÆ° mục gốc Ebay (một lần)</value>
+        <value xml:lang="vi">ThÆ° mục gốc Ebay (duy nhất)</value>
     </property>
     <property key="ProdCatalogCategoryType.description.PCCT_MOST_POPULAR">
         <value xml:lang="de">Am populärsten (Eine)</value>
@@ -501,7 +501,7 @@
         <value xml:lang="ro">Mai Populari (Unu)</value>
         <value xml:lang="ru">Наиболее популярные (Одна)</value>
         <value xml:lang="th">ความนิยมสูงสุด (หนึ่ง)</value>
-        <value xml:lang="vi">Phổ biến nhất (một lần)</value>
+        <value xml:lang="vi">Phổ biến nhất (duy nhất)</value>
         <value xml:lang="zh">最具人气 (一个)</value>
         <value xml:lang="zh_TW">最具人氣 (一個)</value>
     </property>
@@ -527,7 +527,7 @@
         <value xml:lang="ro">Promotii (Unu)</value>
         <value xml:lang="ru">Специальные предложения (Одна)</value>
         <value xml:lang="th">โปรโมชัน (หนึ่ง)</value>
-        <value xml:lang="vi">Khuyến mại (một lần)</value>
+        <value xml:lang="vi">Khuyến mại (duy nhất)</value>
         <value xml:lang="zh">促销 (一个)</value>
         <value xml:lang="zh_TW">促銷 (一個)</value>
     </property>
@@ -540,7 +540,7 @@
         <value xml:lang="ro">Cumparare Permisa(Unu)</value>
         <value xml:lang="ru">Приобретение возможно (Одна)</value>
         <value xml:lang="th">การอนุญาตการสั่งซื้อ (หนึ่ง)</value>
-        <value xml:lang="vi">Quyền mua hàng (một lần)</value>
+        <value xml:lang="vi">Quyền mua hàng (duy nhất)</value>
         <value xml:lang="zh">允许购买 (一个)</value>
         <value xml:lang="zh_TW">允許購買 (一個)</value>
     </property>
@@ -592,7 +592,7 @@
         <value xml:lang="ro">Care Noutati(Unu)</value>
         <value xml:lang="ru">Новые продукты (Одна)</value>
         <value xml:lang="th">อะไรใหม่ (หนึ่ง)</value>
-        <value xml:lang="vi">Có gì mới (một lần)</value>
+        <value xml:lang="vi">Có gì mới (duy nhất)</value>
         <value xml:lang="zh">新品 (一个)</value>
         <value xml:lang="zh_TW">新品 (一個)</value>
     </property>
@@ -885,7 +885,7 @@
         <value xml:lang="ro">Variante Produs</value>
         <value xml:lang="ru">Вариант продукта</value>
         <value xml:lang="th">การเปลี่ยนแปลงสินค้า</value>
-        <value xml:lang="vi">Biến thể sản phẩm</value>
+        <value xml:lang="vi">Sản phẩm 'tá»± tùy chỉnh'</value>
         <value xml:lang="zh">产品变型</value>
         <value xml:lang="zh_TW">產品變型</value>
     </property>
@@ -906,7 +906,7 @@
         <value xml:lang="de">Kategorie Bild Alternativtext</value>
         <value xml:lang="en">Category Image Alt Text</value>
         <value xml:lang="it">Testo alternativo immagine categoria</value>
-        <value xml:lang="vi">Hình ảnh thay thế bởi Chữ</value>
+        <value xml:lang="vi">Hình ảnh minh họa</value>
         <value xml:lang="zh">分类图片替代文字</value>
         <value xml:lang="zh_TW">分類圖片替代文字</value>
     </property>
@@ -932,7 +932,7 @@
         <value xml:lang="ro">Nume Categorie</value>
         <value xml:lang="ru">Имя категории</value>
         <value xml:lang="th">ชื่อหมวดหมู่</value>
-        <value xml:lang="vi">Tên thÆ° mục</value>
+        <value xml:lang="vi">Tên Phân loại Quản lý</value>
         <value xml:lang="zh">分类名称</value>
         <value xml:lang="zh_TW">分類名稱</value>
     </property>
@@ -2444,7 +2444,7 @@
         <value xml:lang="ro">Procent Din Margine</value>
         <value xml:lang="ru">Процент от маржи</value>
         <value xml:lang="th">อัตราร้อยละของผลต่าง</value>
-        <value xml:lang="vi">Tá»· lệ phần trăm của đòn bẩy tài chính</value>
+        <value xml:lang="vi">Phần trăm của Biên độ</value>
         <value xml:lang="zh">利润百分比</value>
         <value xml:lang="zh_TW">利潤百分比</value>
     </property>
@@ -2681,7 +2681,7 @@
         <value xml:lang="ro">Ne Aplicabil</value>
         <value xml:lang="ru">Не применимо</value>
         <value xml:lang="th">ไม่ใช้ประโยชน์ได้</value>
-        <value xml:lang="vi">Không áp dụng</value>
+        <value xml:lang="vi">Không có khả năng Khớp lệnh</value>
         <value xml:lang="zh">不可用</value>
         <value xml:lang="zh_TW">不可用</value>
     </property>
@@ -2693,7 +2693,7 @@
         <value xml:lang="ro">Ne Aplicabil</value>
         <value xml:lang="ru">Не применимо</value>
         <value xml:lang="th">ไม่ใช้ประโยชน์ได้</value>
-        <value xml:lang="vi">Không áp dụng</value>
+        <value xml:lang="vi">Không có khả năng Khớp lệnh</value>
         <value xml:lang="zh">不可用</value>
         <value xml:lang="zh_TW">不可用</value>
     </property>

Modified: ofbiz/branches/20120329_portletWidget/applications/product/config/ProductErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/config/ProductErrorUiLabels.xml?rev=1351866&r1=1351865&r2=1351866&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/config/ProductErrorUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/config/ProductErrorUiLabels.xml Tue Jun 19 21:36:11 2012
@@ -1118,7 +1118,7 @@
     </property>
     <property key="PicklistManageTooMuchQuantity">
         <value xml:lang="en">The quantity entered (${parameters.quantity}) is higher than the quantity expected (${picklistItem.quantity}).</value>
-        <value xml:lang="fr">La quantité entrée (${parameters.quantity}) est supérieure à la quantité attendue (${picklistItem.quantity}).</value>
+        <value xml:lang="fr">La quantité entrée (${parameters.quantity}) est supérieure à  la quantité attendue (${picklistItem.quantity}).</value>
     </property>
     <property key="PicklistManageNoLinkProductAndLot">
         <value xml:lang="en">There is no link between the lot ${parameters.lotId} and the product ${parameters.productId}.</value>
@@ -1130,11 +1130,11 @@
     </property>
     <property key="ProductLotIdMandatory">
         <value xml:lang="en">The lotId is mandatory for the product ${parameters.productId}.</value>
-        <value xml:lang="fr">Le numéro de lot est obligatoire pour ce produit ${parameters.productId}.</value>
+        <value xml:lang="fr">Le numéro de lot est obligatoire pour ce produit ${parameters.productId}.</value>
     </property>
     <property key="ProductLotIdForbidden">
         <value xml:lang="en">The lotId is forbidden for the product ${parameters.productId}.</value>
-        <value xml:lang="fr">Le numéro de lot est interdit pour ce produit ${parameters.productId}.</value>
+        <value xml:lang="fr">Le numéro de lot est interdit pour ce produit ${parameters.productId}.</value>
     </property>
     <property key="variantevents.variantProductId_required_but_missing_enter_an_id">
         <value xml:lang="de">variantProductId wir benötigt fehlt aber, bitte geben Sie eine ID für die neue Produktvariante an.</value>


Free forum by Nabble Edit this page