You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/08/03 18:13:26 UTC
svn commit: r1153560 [6/15] - in /ofbiz/branches/jackrabbit20100709: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accountin...
Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Wed Aug 3 16:12:58 2011
@@ -16,27 +16,58 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
+<script type="text/javascript">
+ function callDocumentByPaginate(info) {
+ var str = info.split('~');
+ var checkUrl = '<@o...@ofbizUrl>';
+ if(checkUrl.search("http"))
+ var ajaxUrl = '<@o...@ofbizUrl>';
+ else
+ var ajaxUrl = '<@o...@ofbizUrl>';
+
+ //jQuerry Ajax Request
+ jQuery.ajax({
+ url: ajaxUrl,
+ type: 'POST',
+ data: {"category_id" : str[0], "VIEW_SIZE" : str[1], "VIEW_INDEX" : str[2]},
+ error: function(msg) {
+ alert("An error occured loading content! : " + msg);
+ },
+ success: function(msg) {
+ jQuery('#div3').html(msg);
+ }
+ });
+ }
+</script>
<#macro paginationControls>
<#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize - 1)?double / viewSize?double)>
<#if (viewIndexMax?int > 0)>
<div class="product-prevnext">
<#-- Start Page Select Drop-Down -->
- <select name="pageSelect" onchange="window.location=this[this.selectedIndex].value;">
+ <#-- select name="pageSelect" onchange="window.location=this[this.selectedIndex].value;">
<option value="#">${uiLabelMap.CommonPage} ${viewIndex?int} ${uiLabelMap.CommonOf} ${viewIndexMax + 1}</option>
<#list 0..viewIndexMax as curViewNum>
<option value="<@ofbizCatalogAltUrl productCategoryId=productCategoryId viewSize=viewSize viewIndex=(curViewNum?int + 1)/>">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option>
</#list>
+ </select -->
+ <select name="pageSelect" onchange="callDocumentByPaginate(this[this.selectedIndex].value);">
+ <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int} ${uiLabelMap.CommonOf} ${viewIndexMax + 1}</option>
+ <#list 0..viewIndexMax as curViewNum>
+ <option value="${productCategoryId}~${viewSize}~${curViewNum?int + 1}">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option>
+ </#list>
</select>
<#-- End Page Select Drop-Down -->
<#if (viewIndex?int > 1)>
- <a href="<@ofbizCatalogAltUrl productCategoryId=productCategoryId viewSize=viewSize viewIndex=(viewIndex?int - 1)/>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
+ <#-- a href="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int - 1}</...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a --> |
+ <a href="javascript: void(0);" onclick="callDocumentByPaginate('${productCategoryId}~${viewSize}~${viewIndex?int - 1}');" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
</#if>
<#if ((listSize?int - viewSize?int) > 0)>
<span>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
</#if>
<#if highIndex?int < listSize?int>
- | <a href="<@ofbizCatalogAltUrl productCategoryId=productCategoryId viewSize=viewSize viewIndex=(viewIndex?int + 1)/>" class="buttontext">${uiLabelMap.CommonNext}</a>
+ <#-- | <a href="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int + 1}</...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a -->
+ | <a href="javascript: void(0);" onclick="callDocumentByPaginate('${productCategoryId}~${viewSize}~${viewIndex?int + 1}');" class="buttontext">${uiLabelMap.CommonNext}</a>
</#if>
</div>
</#if>
Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl Wed Aug 3 16:12:58 2011
@@ -114,6 +114,7 @@ ${virtualJavaScript?if_exists}
<input type="hidden" name="add_product_id" value="${product.productId}"/>
<input type="text" size="5" name="quantity" value="1"/>
<input type="hidden" name="clearSearch" value="N"/>
+ <input type="hidden" name="mainSubmited" value="Y"/>
<a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}form.submit()" class="buttontext">${uiLabelMap.OrderAddToCart}</a>
<#if mainProducts?has_content>
<input type="hidden" name="product_id" value=""/>
@@ -131,14 +132,22 @@ ${virtualJavaScript?if_exists}
</form>
<#if prodCatMem?exists && prodCatMem.quantity?exists && 0.00 < prodCatMem.quantity?double>
+ <form method="post" action="<@o...@ofbizUrl>" name="the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform" style="margin: 0;">
+ <input type="hidden" name="add_product_id" value="${prodCatMem.productId?if_exists}"/>
+ <input type="hidden" name="quantity" value="${prodCatMem.quantity?if_exists}"/>
+ <input type="hidden" name="clearSearch" value="N"/>
+ <input type="hidden" name="mainSubmited" value="Y"/>
+ <a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a>
+ </form>
<#assign productCategory = delegator.findByPrimaryKey("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", prodCatMem.productCategoryId))/>
<#if productCategory.productCategoryTypeId != "BEST_SELL_CATEGORY">
- <form method="post" action="<@o...@ofbizUrl>" name="the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform" style="margin: 0;">
- <input type="hidden" name="add_product_id" value="${prodCatMem.productId?if_exists}"/>
- <input type="hidden" name="quantity" value="${prodCatMem.quantity?if_exists}"/>
- <input type="hidden" name="clearSearch" value="N"/>
- <a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a>
- </form>
+ <form method="post" action="<@o...@ofbizUrl>" name="the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform" style="margin: 0;">
+ <input type="hidden" name="add_product_id" value="${prodCatMem.productId?if_exists}"/>
+ <input type="hidden" name="quantity" value="${prodCatMem.quantity?if_exists}"/>
+ <input type="hidden" name="clearSearch" value="N"/>
+ <input type="hidden" name="mainSubmited" value="Y"/>
+ <a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a>
+ </form>
</#if>
</#if>
</#if>
@@ -210,6 +219,7 @@ ${virtualJavaScript?if_exists}
</#if>
<form method="post" action="<@ofbizUrl secure="${request.isSecure()?string}">addToCompare</...@ofbizUrl>" name="addToCompare${requestAttributes.listIndex?if_exists}form">
<input type="hidden" name="productId" value="${product.productId}"/>
+ <input type="hidden" name="mainSubmited" value="Y"/>
</form>
<a href="javascript:document.addToCompare${requestAttributes.listIndex?if_exists}form.submit()" class="buttontext">${uiLabelMap.ProductAddToCompare}</a>
</div>
Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderitems.ftl Wed Aug 3 16:12:58 2011
@@ -137,7 +137,7 @@ under the License.
${qohQuantity} (${uiLabelMap.ProductAtp}: ${atpQuantity})
</td>
</tr>
- <#if (product != null) && (product.productTypeId != null) && Static["org.ofbiz.entity.util.EntityTypeUtil"].hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG")>
+ <#if (product?has_content) && (product.productTypeId?has_content) && Static["org.ofbiz.entity.util.EntityTypeUtil"].hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG")>
<tr>
<td>${uiLabelMap.ProductMarketingPackageQOH}</td>
<td style="padding-left: 15px; text-align: left;">
@@ -171,6 +171,16 @@ under the License.
<div class="current-status">
<span class="label">${uiLabelMap.CommonCurrent}</span> ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}
</div>
+ <#if ("ITEM_CREATED" == (currentItemStatus.statusId) && "ORDER_APPROVED" == (orderHeader.statusId)) && (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) || security.hasRolePermission("ORDERMGR", "_UPDATE", "", "", session))>
+ <div>
+ <a href="javascript:document.OrderApproveOrderItem_${orderItem.orderItemSeqId?default("")}.submit()" class="buttontext">${uiLabelMap.OrderApproveOrder}</a>
+ <form name="OrderApproveOrderItem_${orderItem.orderItemSeqId?default("")}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="statusId" value="ITEM_APPROVED"/>
+ <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
+ <input type="hidden" name="orderItemSeqId" value="${orderItem.orderItemSeqId?if_exists}"/>
+ </form>
+ </div>
+ </#if>
<#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)>
<#list orderItemStatuses as orderItemStatus>
<#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")>
@@ -255,7 +265,7 @@ under the License.
<td><b>${uiLabelMap.OrderOutstanding}</b></td>
<td>
<#-- Make sure digital goods without shipments don't always remainn "outstanding": if item is completed, it must have no outstanding quantity. -->
- <#if (orderItem.statusId != null) && (orderItem.statusId == "ITEM_COMPLETED")>
+ <#if (orderItem.statusId?has_content) && (orderItem.statusId == "ITEM_COMPLETED")>
0
<#elseif orderHeader.orderTypeId == "PURCHASE_ORDER">
${(orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - totalReceived?double}
Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl Wed Aug 3 16:12:58 2011
@@ -85,7 +85,7 @@ under the License.
</table>
</form>
<br />
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
<a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a>
</div>
</div>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/config/PartyEntityLabels.xml Wed Aug 3 16:12:58 2011
@@ -411,7 +411,7 @@
<value xml:lang="de">Fakturierung E-Mail-Adresse</value>
<value xml:lang="en">Billing (AP) Email</value>
<value xml:lang="es">Correo electrónico de facturación</value>
- <value xml:lang="fr">Courriel de facturation</value>
+ <value xml:lang="fr">Adresse courriel de facturation</value>
<value xml:lang="hi_IN">दà¥à¤¯à¤à¤¾à¤à¤à¤¨(बिलिà¤à¤)(à¤à¤ªà¥) à¤à¤®à¥à¤²</value>
<value xml:lang="it">Email Fatturazione (AP)</value>
<value xml:lang="nl">Factuur e-mailadres</value>
@@ -436,6 +436,10 @@
<value xml:lang="zh">å¯è´¦åå°å</value>
<value xml:lang="zh_TW">å¯è³¬å®å°å</value>
</property>
+ <property key="ContactMechPurposeType.description.FAX_BILLING">
+ <value xml:lang="en">Billing Destination Fax Number</value>
+ <value xml:lang="fr">Numéro de télécopie du service comptabilité</value>
+ </property>
<property key="ContactMechPurposeType.description.FAX_NUMBER">
<value xml:lang="de">Haupt Faxnummer</value>
<value xml:lang="en">Main Fax Number</value>
@@ -466,6 +470,10 @@
<value xml:lang="zh">第äºä¸ªä¼ çå·ç </value>
<value xml:lang="zh_TW">第äºåå³çè碼</value>
</property>
+ <property key="ContactMechPurposeType.description.FAX_SHIPPING">
+ <value xml:lang="en">Shipping Destination Fax Number</value>
+ <value xml:lang="fr">Numéro de télécopie du service expédition</value>
+ </property>
<property key="ContactMechPurposeType.description.GENERAL_LOCATION">
<value xml:lang="de">Allgemeine Korrespondenzadresse</value>
<value xml:lang="en">General Correspondence Address</value>
@@ -481,6 +489,14 @@
<value xml:lang="zh">éä¿¡å°å</value>
<value xml:lang="zh_TW">éä¿¡å°å</value>
</property>
+ <property key="ContactMechPurposeType.description.ICAL_URL">
+ <value xml:lang="en">iCalendar URL</value>
+ <value xml:lang="fr">Adresse du calendrier (URL)</value>
+ </property>
+ <property key="ContactMechPurposeType.description.MARKETING_EMAIL">
+ <value xml:lang="en">Primary Marketing Email Address</value>
+ <value xml:lang="fr">Adresse courriel du service marketing</value>
+ </property>
<property key="ContactMechPurposeType.description.ORDER_EMAIL">
<value xml:lang="de">Auftrags-Benachrichtigungen E-Mail-Adresse</value>
<value xml:lang="en">Order Notification Email Address</value>
@@ -515,7 +531,7 @@
<value xml:lang="de">Zahlung E-Mail-Adresse</value>
<value xml:lang="en">Payment (AR) Email</value>
<value xml:lang="es">Correo electrónico de pago</value>
- <value xml:lang="fr">Courriel de paiement</value>
+ <value xml:lang="fr">Adresse courriel de paiement</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ (à¤à¤à¤°) à¤à¤®à¥à¤²</value>
<value xml:lang="it">Email Pagamento (AR) </value>
<value xml:lang="nl">Betaal emailadres</value>
@@ -529,7 +545,7 @@
<value xml:lang="de">Zahlungsadresse</value>
<value xml:lang="en">Payment (AR) Address</value>
<value xml:lang="es">Dirección de pago</value>
- <value xml:lang="fr">Adresse du service comptabilité (paiments)</value>
+ <value xml:lang="fr">Adresse du service comptabilité (paiements)</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ (à¤à¤à¤°) à¤à¤¾ पता</value>
<value xml:lang="it">Indirizzo Pagamento (AR)</value>
<value xml:lang="nl">Betaaladres</value>
@@ -571,6 +587,7 @@
</property>
<property key="ContactMechPurposeType.description.PHONE_DID">
<value xml:lang="en">Direct Inward Dialing Phone Number</value>
+ <value xml:lang="fr">Numéro de téléphone interne directe</value>
<value xml:lang="hi_IN">डायरà¥à¤à¥à¤ à¤à¤µà¤ डायलन फà¥à¤¨ नà¤à¤¬à¤°</value>
<value xml:lang="it">Numero telefono interno diretto per connettersi</value>
<value xml:lang="pt_BR">Ramal</value>
@@ -623,6 +640,7 @@
</property>
<property key="ContactMechPurposeType.description.PHONE_QUICK">
<value xml:lang="en">Quick Calls Phone Number</value>
+ <value xml:lang="fr">Numéro de téléphone d'appels express</value>
<value xml:lang="hi_IN">तà¥à¤µà¤°à¤¿à¤¤ à¤à¥à¤² फ़à¥à¤¨ नà¤à¤¬à¤°</value>
<value xml:lang="it">Numero di telefono per chiamate veloci</value>
<value xml:lang="pt_BR">Telefone para chamadas rápidas</value>
@@ -749,7 +767,7 @@
<value xml:lang="de">1. Webseite URL</value>
<value xml:lang="en">Primary Website URL</value>
<value xml:lang="es">Sitio web principal</value>
- <value xml:lang="fr">URL princpale du site Web</value>
+ <value xml:lang="fr">Site Web principal (URL)</value>
<value xml:lang="hi_IN">पà¥à¤°à¤¾à¤¥à¤®à¤¿à¤ वà¥à¤¬à¤¸à¤¾à¤à¤ यà¥à¤à¤°à¤à¤²(URL)</value>
<value xml:lang="it">URL Primario Sito Web</value>
<value xml:lang="nl">Website URL</value>
@@ -824,7 +842,7 @@
<value xml:lang="de">Elektronische Adresse</value>
<value xml:lang="en">Electronic Address</value>
<value xml:lang="es">Dirección electrónica</value>
- <value xml:lang="fr">(Adresse électronique)</value>
+ <value xml:lang="fr">Adresse électronique</value>
<value xml:lang="hi_IN">à¤à¤²à¥à¤à¥à¤à¥à¤°à¥à¤¨à¤¿à¤ पता</value>
<value xml:lang="it">Indirizzo Elettronico</value>
<value xml:lang="nl">Electronisch adres</value>
@@ -850,6 +868,10 @@
<value xml:lang="zh">çµåé®ä»¶å°å</value>
<value xml:lang="zh_TW">é»åéµä»¶å°å</value>
</property>
+ <property key="ContactMechType.description.INTERNAL_PARTYID">
+ <value xml:lang="en">Internal Party Note</value>
+ <value xml:lang="fr">Note Interne</value>
+ </property>
<property key="ContactMechType.description.IP_ADDRESS">
<value xml:lang="de">Internet IP Adresse</value>
<value xml:lang="en">Internet IP Address</value>
@@ -865,6 +887,10 @@
<value xml:lang="zh">äºèç½IPå°å</value>
<value xml:lang="zh_TW">äºè¯ç¶²IPä½å</value>
</property>
+ <property key="ContactMechType.description.LDAP_ADDRESS">
+ <value xml:lang="en">LDAP Address</value>
+ <value xml:lang="fr">Annuaire (URL)</value>
+ </property>
<property key="ContactMechType.description.POSTAL_ADDRESS">
<value xml:lang="de">Postadresse</value>
<value xml:lang="en">Postal Address</value>
@@ -1435,6 +1461,7 @@
</property>
<property key="PartyRelationshipType.partyRelationshipName.SPOUSE">
<value xml:lang="en">Spouse</value>
+ <value xml:lang="fr">Conjoint</value>
<value xml:lang="hi_IN">पति या पतà¥à¤¨à¥</value>
<value xml:lang="it">Sposo</value>
<value xml:lang="pt_BR">Esposo</value>
@@ -1723,6 +1750,7 @@
</property>
<property key="RoleType.description.BCC">
<value xml:lang="en">Blind Copy</value>
+ <value xml:lang="fr">Copie cachée"</value>
<value xml:lang="hi_IN">बà¥à¤²à¤¾à¤à¤à¤¡ à¤à¥à¤ªà¥(BCC)</value>
<value xml:lang="it">Copia nascosta</value>
<value xml:lang="pt_BR">Cópia oculta</value>
@@ -1986,6 +2014,7 @@
</property>
<property key="RoleType.description.CC">
<value xml:lang="en">Carbon Copy</value>
+ <value xml:lang="fr">Copie à </value>
<value xml:lang="hi_IN">à¤à¤¾à¤°à¥à¤¬à¤¨ à¤à¥à¤ªà¥</value>
<value xml:lang="it">Copia conoscenza</value>
<value xml:lang="pt_BR">Cópia carbono</value>
@@ -2092,6 +2121,7 @@
</property>
<property key="RoleType.description.CONTENT">
<value xml:lang="en">Content Member</value>
+ <value xml:lang="fr">Gestionnaire de document</value>
<value xml:lang="hi_IN">सामà¤à¥à¤°à¥(Content) à¤à¥ सदसà¥à¤¯</value>
<value xml:lang="it">Membro contenuto</value>
<value xml:lang="pt_BR">Membro de conteúdo</value>
@@ -2100,6 +2130,7 @@
</property>
<property key="RoleType.description.CONTENT_ADMIN">
<value xml:lang="en">Content Administrator</value>
+ <value xml:lang="fr">Administrateur de document</value>
<value xml:lang="hi_IN">सामà¤à¥à¤°à¥(Content) पà¥à¤°à¤¶à¤¾à¤¸à¤</value>
<value xml:lang="it">Amministratore contenuto</value>
<value xml:lang="pt_BR">Administrador de conteúdo</value>
@@ -2108,6 +2139,7 @@
</property>
<property key="RoleType.description.CONTENT_AUTHOR">
<value xml:lang="en">Content Author</value>
+ <value xml:lang="fr">Auteur de document</value>
<value xml:lang="hi_IN">सामà¤à¥à¤°à¥(Content) लà¥à¤à¤</value>
<value xml:lang="it">Autore contenuto</value>
<value xml:lang="pt_BR">Autor de conteúdo</value>
@@ -2116,6 +2148,7 @@
</property>
<property key="RoleType.description.CONTENT_EDITOR">
<value xml:lang="en">Content Editor</value>
+ <value xml:lang="fr">Rédacteur de document</value>
<value xml:lang="hi_IN">सामà¤à¥à¤°à¥(Content) सà¤à¤ªà¤¾à¤¦à¤</value>
<value xml:lang="it">Redattore contenuto</value>
<value xml:lang="pt_BR">Editor de conteúdo</value>
@@ -2124,6 +2157,7 @@
</property>
<property key="RoleType.description.CONTENT_GUEST">
<value xml:lang="en">Content Guest</value>
+ <value xml:lang="fr">Lecteur de document</value>
<value xml:lang="hi_IN">सामà¤à¥à¤°à¥(Content) à¤
तिथि</value>
<value xml:lang="it">Ospite contenuto</value>
<value xml:lang="pt_BR">Visitante de conteúdo</value>
@@ -2132,6 +2166,7 @@
</property>
<property key="RoleType.description.CONTENT_PUBLISHER">
<value xml:lang="en">Content Publisher</value>
+ <value xml:lang="fr">Editeur de document</value>
<value xml:lang="hi_IN">सामà¤à¥à¤°à¥(Content) पà¥à¤°à¤à¤¾à¤¶à¤</value>
<value xml:lang="it">Editore contenuto</value>
<value xml:lang="pt_BR">Editor de conteúdo(Publicação)</value>
@@ -2140,6 +2175,7 @@
</property>
<property key="RoleType.description.CONTENT_USER">
<value xml:lang="en">Content User</value>
+ <value xml:lang="fr">Utilisateur de document</value>
<value xml:lang="hi_IN">सामà¤à¥à¤°à¥(Content) à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾</value>
<value xml:lang="it">Utente contenuto</value>
<value xml:lang="pt_BR">Usuário de conteúdo</value>
@@ -2232,6 +2268,7 @@
</property>
<property key="RoleType.description.EMAIL_ADMIN">
<value xml:lang="en">Email Administrator</value>
+ <value xml:lang="en">Administrateur des emails</value>
<value xml:lang="hi_IN">à¤à¤®à¥à¤² पà¥à¤°à¤¶à¤¾à¤¸à¤</value>
<value xml:lang="it">Amministratore email</value>
<value xml:lang="pt_BR">Administrador de e-mail</value>
@@ -2290,6 +2327,7 @@
</property>
<property key="RoleType.description.FAM_MANAGER">
<value xml:lang="en">Maintenance Manager or Supervisor</value>
+ <value xml:lang="en">Responsable de la maintenance</value>
<value xml:lang="hi_IN">à¤
नà¥à¤°à¤à¥à¤·à¤£ पà¥à¤°à¤¬à¤à¤§à¤ à¤
थवा सà¥à¤ªà¤°à¤µà¤¾à¤à¤à¤°</value>
<value xml:lang="it">Gestione manutenzione o supervisore</value>
<value xml:lang="pt_BR">Gerente ou supervisor de manutenção</value>
@@ -2298,6 +2336,7 @@
</property>
<property key="RoleType.description.FAM_SUPPLIER">
<value xml:lang="en">Maintenance Supplier or Service</value>
+ <value xml:lang="fr">Fournisseur ou service de maintenance</value>
<value xml:lang="hi_IN">रà¤à¤°à¤à¤¾à¤µ पà¥à¤°à¤¦à¤¾à¤¯à¤ या सà¥à¤µà¤¾</value>
<value xml:lang="it">Manutenzione fornitore o servizio</value>
<value xml:lang="pt_BR">Fornecedor ou serviço de manutenção</value>
@@ -2306,6 +2345,7 @@
</property>
<property key="RoleType.description.FAM_WORKER">
<value xml:lang="en">Maintenance Worker</value>
+ <value xml:lang="fr">Opérateur de maintenance</value>
<value xml:lang="hi_IN">रà¤à¤°à¤à¤¾à¤µ à¤à¤¾à¤°à¥à¤¯à¤à¤°à¥à¤¤à¤¾</value>
<value xml:lang="it">Impiegato manutenzione</value>
<value xml:lang="pt_BR">Funcionário de manutenção</value>
@@ -2896,6 +2936,7 @@
</property>
<property key="RoleType.description.SPONSOR">
<value xml:lang="en">Sponsor</value>
+ <value xml:lang="fr">Sponsor/Parrain</value>
<value xml:lang="hi_IN">पà¥à¤°à¤¾à¤¯à¥à¤à¤</value>
<value xml:lang="it">Sponsorizzatore</value>
<value xml:lang="pt_BR">Patrocinador</value>
@@ -2904,6 +2945,7 @@
</property>
<property key="RoleType.description.SPOUSE">
<value xml:lang="en">Spouse</value>
+ <value xml:lang="fr">Conjoint</value>
<value xml:lang="hi_IN">पति या पतà¥à¤¨à¥</value>
<value xml:lang="it">Sposo</value>
<value xml:lang="pt_BR">Esposo</value>
@@ -3123,6 +3165,7 @@
</property>
<property key="TermType.description.CFR">
<value xml:lang="en">Incoterm Cost and Freight</value>
+ <value xml:lang="fr">Incoterm : chargé dans le bateau, livraison au port de départ, sans assurance</value>
<value xml:lang="it">Costi e spese di trasporto incoterm</value>
<value xml:lang="pt_BR">Incoterm CFR</value>
<value xml:lang="zh">å½é
è´¸æææ¬å è¿è´¹ä»·æ ¼</value>
@@ -3130,6 +3173,7 @@
</property>
<property key="TermType.description.CIF">
<value xml:lang="en">Incoterm Cost, Insurance and Freight</value>
+ <value xml:lang="fr">Incoterm : chargé sur le bateau, frais jusqu'au port d'arrivée, avec assurance</value>
<value xml:lang="it">Costi, assicurazione e spese di trasporto incoterm</value>
<value xml:lang="pt_BR">Incoterm CIF</value>
<value xml:lang="zh">å½é
è´¸æå°å²¸ä»·æ ¼ï¼ææ¬ãä¿é©è´¹å è¿è´¹ï¼</value>
@@ -3137,6 +3181,7 @@
</property>
<property key="TermType.description.CIP">
<value xml:lang="en">Incoterm Carriage and Insurance Paid to</value>
+ <value xml:lang="fr">Incoterm : livraison au premier transporteur, frais jusqu'au déchargement du mode de transport, avec assurance</value>
<value xml:lang="it">Trasporto e assicurazione pagata incoterm</value>
<value xml:lang="pt_BR">Incoterm CIP</value>
<value xml:lang="zh">å½é
è´¸æè¿è´¹ãä¿é©è´¹ä»è³</value>
@@ -3208,6 +3253,7 @@
</property>
<property key="TermType.description.DES">
<value xml:lang="en">Incoterm Delivered Ex Ship</value>
+ <value xml:lang="fr">Incoterm : livré sur quai</value>
<value xml:lang="it">Consegnato ex spedizione incoterm</value>
<value xml:lang="pt_BR">Incoterm DES</value>
<value xml:lang="zh">å½é
è´¸æç®ç港è¹ä¸äº¤è´§</value>
@@ -3230,6 +3276,7 @@
</property>
<property key="TermType.description.EXW">
<value xml:lang="en">Incoterm Ex Works</value>
+ <value xml:lang="fr">Incoterm : au départ non chargé, non dédouané</value>
<value xml:lang="it">Ex fabbrica incoterm</value>
<value xml:lang="pt_BR">Incoterm EXW</value>
<value xml:lang="zh">å½é
è´¸æå·¥å交货价</value>
@@ -3237,6 +3284,7 @@
</property>
<property key="TermType.description.FAS">
<value xml:lang="en">Incoterm Free Alongside Ship</value>
+ <value xml:lang="en">Incoterm : sur le quai du port de départ</value>
<value xml:lang="it">Gratis accanto alla spedizione incoterm</value>
<value xml:lang="pt_BR">Incoterm FAS</value>
<value xml:lang="zh">å½é
è´¸æ(å¯è¿å°)è¹è¾¹äº¤è´§ä»·æ ¼</value>
@@ -3244,6 +3292,7 @@
</property>
<property key="TermType.description.FCA">
<value xml:lang="en">Incoterm Free Carrier</value>
+ <value xml:lang="fr">Incoterm : marchandises dédouanées et chargées dans le pays de départ</value>
<value xml:lang="it">Gratis spedizioniere incoterm</value>
<value xml:lang="pt_BR">Incoterm FCA</value>
<value xml:lang="zh">å½é
è´¸æ离岸价</value>
@@ -3409,6 +3458,7 @@
</property>
<property key="TermType.description.FIN_PAY_NETDAYS_1">
<value xml:lang="en">Payment net days, part 1</value>
+ <value xml:lang="fr">Paiement net jours, part 1</value>
<value xml:lang="it">Pagamento netto giorni, parte 1</value>
<value xml:lang="pt_BR">Pagamento em dias corridos, parte 1</value>
<value xml:lang="zh">æ¯ä»å天æ°ï¼ç¬¬ä¸é¨å</value>
@@ -3416,6 +3466,7 @@
</property>
<property key="TermType.description.FIN_PAY_NETDAYS_2">
<value xml:lang="en">Payment net days, part 2</value>
+ <value xml:lang="fr">Paiement net jours, part 2</value>
<value xml:lang="it">Pagamento netto giorni, parte 2</value>
<value xml:lang="pt_BR">Pagamento em dias corridos, parte 2</value>
<value xml:lang="zh">æ¯ä»å天æ°ï¼ç¬¬äºé¨å</value>
@@ -3423,6 +3474,7 @@
</property>
<property key="TermType.description.FIN_PAY_NETDAYS_3">
<value xml:lang="en">Payment net days, part 3</value>
+ <value xml:lang="fr">Paiement net jours, part 3</value>
<value xml:lang="it">Pagamento netto giorni, parte 3</value>
<value xml:lang="pt_BR">Pagamento em dias corridos, parte 3</value>
<value xml:lang="zh">æ¯ä»å天æ°ï¼ç¬¬ä¸é¨å</value>
@@ -3430,6 +3482,7 @@
</property>
<property key="TermType.description.FOB">
<value xml:lang="en">Incoterm Free On Board</value>
+ <value xml:lang="fr">Incoterm chargé sur le bateau</value>
<value xml:lang="it">Gratis a bordo incoterm</value>
<value xml:lang="pt_BR">Incoterm FOB</value>
<value xml:lang="zh">å½é
è´¸æç¦»å²¸ä»·æ ¼</value>
@@ -3452,6 +3505,7 @@
</property>
<property key="TermType.description.INCO_TERM">
<value xml:lang="en">Incoterm</value>
+ <value xml:lang="fr">Incoterm</value>
<value xml:lang="it">Incoterm</value>
<value xml:lang="pt_BR">Incoterm</value>
<value xml:lang="zh">å½é
è´¸æ</value>
@@ -3519,6 +3573,7 @@
</property>
<property key="TermType.description.PURCHASING">
<value xml:lang="en">Purchasing</value>
+ <value xml:lang="fr">Achats</value>
<value xml:lang="hi_IN">à¤à¥à¤°à¤¯</value>
<value xml:lang="it">Acquisto</value>
<value xml:lang="pt_BR">Compra</value>
@@ -3527,6 +3582,7 @@
</property>
<property key="TermType.description.PURCH_FREIGHT">
<value xml:lang="en">Preferred Freight</value>
+ <value xml:lang="fr">Frêt préféré</value>
<value xml:lang="hi_IN">पसà¤à¤¦à¥à¤¦à¤¾ à¤à¤¾à¤¡à¤¼à¤¾</value>
<value xml:lang="it">Spese di trasporto preferite</value>
<value xml:lang="pt_BR">Frete preferido</value>
@@ -3535,6 +3591,7 @@
</property>
<property key="TermType.description.PURCH_VENDOR_ID">
<value xml:lang="en">Vendor Customer ID</value>
+ <value xml:lang="fr">Réf client du vendeur</value>
<value xml:lang="hi_IN">विà¤à¥à¤°à¥à¤¤à¤¾ à¤à¥à¤°à¤¾à¤¹à¤ à¤à¥à¤°à¤®à¤¾à¤à¤</value>
<value xml:lang="it">Cliente fornitore</value>
<value xml:lang="pt_BR">Identificação de cliente fornecedor</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/data/PartyTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/data/PartyTypeData.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/data/PartyTypeData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/data/PartyTypeData.xml Wed Aug 3 16:12:58 2011
@@ -65,6 +65,9 @@ under the License.
<ContactMechPurposeType contactMechPurposeTypeId="SUPPORT_EMAIL" description="Support Email"/>
<ContactMechPurposeType contactMechPurposeTypeId="ORDER_EMAIL" description="Order Notification Email Address"/>
<ContactMechPurposeType contactMechPurposeTypeId="PRIMARY_WEB_URL" description="Primary Website URL"/>
+ <ContactMechPurposeType contactMechPurposeTypeId="TWITTER_URL" description="Twitter Website URL"/>
+ <ContactMechPurposeType contactMechPurposeTypeId="FACEBOOK_URL" description="Facebook Website URL"/>
+ <ContactMechPurposeType contactMechPurposeTypeId="LINKEDIN_URL" description="LinkedIn Website URL"/>
<ContactMechType contactMechTypeId="ELECTRONIC_ADDRESS" description="Electronic Address" hasTable="N" parentTypeId=""/>
<ContactMechType contactMechTypeId="POSTAL_ADDRESS" description="Postal Address" hasTable="Y" parentTypeId=""/>
@@ -106,6 +109,9 @@ under the License.
<ContactMechTypePurpose contactMechPurposeTypeId="FAX_BILLING" contactMechTypeId="TELECOM_NUMBER"/>
<ContactMechTypePurpose contactMechPurposeTypeId="PHONE_ASSISTANT" contactMechTypeId="TELECOM_NUMBER"/>
<ContactMechTypePurpose contactMechPurposeTypeId="PRIMARY_WEB_URL" contactMechTypeId="WEB_ADDRESS"/>
+ <ContactMechTypePurpose contactMechPurposeTypeId="TWITTER_URL" contactMechTypeId="WEB_ADDRESS"/>
+ <ContactMechTypePurpose contactMechPurposeTypeId="FACEBOOK_URL" contactMechTypeId="WEB_ADDRESS"/>
+ <ContactMechTypePurpose contactMechPurposeTypeId="LINKEDIN_URL" contactMechTypeId="WEB_ADDRESS"/>
<!-- communication events -->
<CommunicationEventPrpTyp communicationEventPrpTypId="ACTIVITY_REQUEST" description="Activity Request" hasTable="N" parentTypeId=""/>
@@ -433,6 +439,4 @@ under the License.
<Enumeration description="Organization party" enumCode="" enumId="ORGANIZATION_PARTY" sequenceId="01" enumTypeId="GLOBAL_PREFERENCES"/>
<Enumeration description="Visual Theme" enumCode="" enumId="VISUAL_THEME" sequenceId="02" enumTypeId="GLOBAL_PREFERENCES"/>
- <WebSite webSiteId="PARTY" siteName="Party Manager" visualThemeSetId="BACKOFFICE"/>
-
</entity-engine-xml>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/entitydef/entitymodel.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/entitydef/entitymodel.xml Wed Aug 3 16:12:58 2011
@@ -2465,7 +2465,7 @@ under the License.
</entity>
<view-entity entity-name="PartyRoleAndPartyDetail"
package-name="org.ofbiz.party.party"
- title="Party Role and Party Detail (Person, PartyGroup, etc) View Entity">
+ title="Party Role and Party Detail (Person, PartyGroup, etc.) View Entity">
<member-entity entity-alias="PTY" entity-name="Party"/>
<member-entity entity-alias="PR" entity-name="PartyRole"/>
<member-entity entity-alias="PERSON" entity-name="Person"/>
@@ -2500,7 +2500,7 @@ under the License.
</view-entity>
<view-entity entity-name="PartyRoleDetailAndPartyDetail"
package-name="org.ofbiz.party.party"
- title="Party Role and Party Detail (Person, PartyGroup, etc) View Entity">
+ title="Party Role and Party Detail (Person, PartyGroup, etc.) View Entity">
<member-entity entity-alias="PTY" entity-name="Party"/>
<member-entity entity-alias="PR" entity-name="PartyRole"/>
<member-entity entity-alias="RT" entity-name="RoleType"/>
@@ -2535,7 +2535,7 @@ under the License.
<view-entity entity-name="PartyRoleNameDetail"
package-name="org.ofbiz.party.party"
- title="Party Role and Party Detail (Person, PartyGroup, etc) View Entity">
+ title="Party Role and Party Detail (Person, PartyGroup, etc.) View Entity">
<member-entity entity-alias="PTY" entity-name="Party"/>
<member-entity entity-alias="PR" entity-name="PartyRole"/>
<member-entity entity-alias="PERSON" entity-name="Person"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml Wed Aug 3 16:12:58 2011
@@ -127,4 +127,30 @@ under the License.
<field-to-request field="contentId" request-name="contentId"/>
</simple-method>
+ <!-- GeoLocation services -->
+ <simple-method method-name="editGeoLocation" short-description="Edit GeoLocation">
+ <if-empty field="parameters.geoPointId">
+ <set field="createGeoPointMap.dataSourceId" value="GEOPT_GOOGLE"/>
+ <set field="createGeoPointMap.latitude" from-field="parameters.lat"/>
+ <set field="createGeoPointMap.longitude" from-field="parameters.lng"/>
+ <call-service service-name="createGeoPoint" in-map-name="createGeoPointMap">
+ <result-to-field result-name="geoPointId" field="geoPointId"/>
+ </call-service>
+
+ <now-timestamp field="nowTimestamp"/>
+ <make-value value-field="partyGeoPoint" entity-name="PartyGeoPoint"/>
+ <set field="partyGeoPoint.partyId" from-field="parameters.partyId"/>
+ <set field="partyGeoPoint.geoPointId" from-field="geoPointId"/>
+ <set field="partyGeoPoint.fromDate" from-field="nowTimestamp"/>
+ <create-value value-field="partyGeoPoint"/>
+ <else>
+ <set field="updateGeoPointMap.geoPointId" from-field="parameters.geoPointId"/>
+ <set field="updateGeoPointMap.dataSourceId" value="GEOPT_GOOGLE"/>
+ <set field="updateGeoPointMap.latitude" from-field="parameters.lat"/>
+ <set field="updateGeoPointMap.longitude" from-field="parameters.lng"/>
+ <call-service service-name="updateGeoPoint" in-map-name="updateGeoPointMap"/>
+ </else>
+ </if-empty>
+ </simple-method>
+
</simple-methods>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml Wed Aug 3 16:12:58 2011
@@ -525,7 +525,7 @@ under the License.
<service name="createEmailAddress" engine="simple"
location="component://party/script/org/ofbiz/party/contact/ContactMechServices.xml" invoke="createEmailAddress" auth="true">
<description>Create an Email Address</description>
- <auto-attributes entity-name="ContactMech" include="nonpk" mode="IN" optional="false"/>
+ <auto-attributes entity-name="ContactMech" include="nonpk" mode="IN" optional="true"/>
<auto-attributes entity-name="ContactMech" include="pk" mode="OUT" optional="false"/>
<attribute name="emailAddress" type="String" mode="IN" optional="false"/>
<override name="infoString" optional="true"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java Wed Aug 3 16:12:58 2011
@@ -249,7 +249,6 @@ public class PartyServices {
for(GenericValue userLogin : userLogins) {
if (!"N".equals(userLogin.getString("enabled"))) {
userLogin.set("enabled", "N");
- userLogin.set("disabledDateTime", UtilDateTime.nowTimestamp());
userLogin.store();
}
}
Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy Wed Aug 3 16:12:58 2011
@@ -74,7 +74,7 @@ if (shoppingListId) {
shoppingListItems = shoppingList.getRelatedCache("ShoppingListItem");
if (shoppingListItems) {
shoppingListItemDatas = new ArrayList(shoppingListItems.size());
- shoppingListItemDatas.each { shoppingListItem ->
+ shoppingListItems.each { shoppingListItem ->
shoppingListItemData = [:];
product = shoppingListItem.getRelatedOneCache("Product");
Propchange: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 3 16:12:58 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957
/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1128853
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1153542
Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/controller.xml Wed Aug 3 16:12:58 2011
@@ -1150,6 +1150,17 @@ under the License.
<response name="success" type="view" value="PartyGeoLocation"/>
<response name="error" type="view" value="viewprofile"/>
</request-map>
+ <request-map uri="addGeoLocation">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="addGeoLocation"/>
+ <response name="error" type="view" value="PartyGeoLocation"/>
+ </request-map>
+ <request-map uri="editGeoLocation">
+ <security https="true" auth="true"/>
+ <event type="simple" path="component://party/script/org/ofbiz/party/party/PartySimpleEvents.xml" invoke="editGeoLocation"/>
+ <response name="success" type="view" value="PartyGeoLocation"/>
+ <response name="error" type="view" value="PartyGeoLocation"/>
+ </request-map>
<!-- ProductStoreRole -->
<request-map uri="ViewProductStoreRoles">
@@ -1356,10 +1367,14 @@ under the License.
<view-map name="UpdateCommOrders" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#UpdateCommOrders"/>
<view-map name="UpdateCommProducts" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#UpdateCommProducts"/>
-
+
<view-map name="ViewProductStoreRoles" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#ViewProductStoreRoles"/>
-
+
<!-- Billing Account-->
<view-map name="EditBillingAccount" type="screen" page="component://party/widget/partymgr/PaymentMethodScreens.xml#EditBillingAccount"/>
+
+ <!-- GeoLocation-->
+ <view-map name="addGeoLocation" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditGeoLocation"/>
+
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/web.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/web.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/web.xml Wed Aug 3 16:12:58 2011
@@ -25,11 +25,6 @@ under the License.
<description>Party Manager Module of the Open For Business Project</description>
<context-param>
- <param-name>webSiteId</param-name>
- <param-value>PARTY</param-value>
- <description>A unique ID used to look up the WebSite entity</description>
- </context-param>
- <context-param>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/editShoppingList.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/editShoppingList.ftl Wed Aug 3 16:12:58 2011
@@ -191,6 +191,10 @@ under the License.
<td><a href="/catalog/control/EditProduct?productId=${shoppingListItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}">${shoppingListItem.productId} -
${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")?if_exists}
</td>
+ <form method="post" action="<@o...@ofbizUrl>" name='removeform_${shoppingListItem.shoppingListItemSeqId}'>
+ <input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}" />
+ <input type="hidden" name="shoppingListItemSeqId" value="${shoppingListItem.shoppingListItemSeqId}" />
+ </form>
<form method="post" action="<@o...@ofbizUrl>" name='listform_${shoppingListItem.shoppingListItemSeqId}'>
<input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}" />
<input type="hidden" name="shoppingListItemSeqId" value="${shoppingListItem.shoppingListItemSeqId}" />
@@ -208,7 +212,7 @@ under the License.
<td class="align-float"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></td>
<td class="button-col align-float">
<a href="javascript:document.listform_${shoppingListItem.shoppingListItemSeqId}.submit();">${uiLabelMap.CommonUpdate}</a>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonRemove}</a>
+ <a href="javascript:document.removeform_${shoppingListItem.shoppingListItemSeqId}.submit();">${uiLabelMap.CommonRemove}</a>
</td>
</tr>
<#-- toggle the row color -->
Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/findparty.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/findparty.ftl Wed Aug 3 16:12:58 2011
@@ -16,7 +16,6 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-
<#assign extInfo = parameters.extInfo?default("N")>
<#assign inventoryItemId = parameters.inventoryItemId?default("")>
<#assign serialNumber = parameters.serialNumber?default("")>
@@ -45,19 +44,6 @@ under the License.
<#else>
<li class="expanded"><a href="<@o...@ofbizUrl>" title="${uiLabelMap.CommonHideFields}"> </a></li>
</#if>
- <#if (partyListSize > 0)>
- <#if (partyListSize > highIndex)>
- <li><a class="nav-next" href="<@o...@ofbizUrl>">${uiLabelMap.CommonNext}</a></li>
- <#else>
- <li class="disabled">${uiLabelMap.CommonNext}</li>
- </#if>
- <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize}</li>
- <#if (viewIndex > 0)>
- <li><a class="nav-previous" href="<@o...@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li>
- <#else>
- <li class="disabled">${uiLabelMap.CommonPrevious}</li>
- </#if>
- </#if>
</ul>
<br class="clear"/>
</#if>
@@ -220,6 +206,16 @@ under the License.
<h2>${uiLabelMap.CommonSearchResults}</h2>
</div>
<#if partyList?has_content>
+ <#-- Pagination -->
+ <#include "component://common/webcommon/includes/htmlTemplate.ftl"/>
+ <#assign commonUrl = "findparty?hideFields=" + hideFields + paramList + "&"/>
+ <#assign viewIndexFirst = 0/>
+ <#assign viewIndexPrevious = viewIndex - 1/>
+ <#assign viewIndexNext = viewIndex + 1/>
+ <#assign viewIndexLast = Static["java.lang.Math"].floor(partyListSize/viewSize)/>
+ <#assign messageMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("lowCount", lowIndex, "highCount", highIndex, "total", partyListSize)/>
+ <#assign commonDisplaying = Static["org.ofbiz.base.util.UtilProperties"].getMessage("CommonUiLabels", "CommonDisplaying", messageMap, locale)/>
+ <@nextPrev commonUrl=commonUrl ajaxEnabled=false javaScriptEnabled=false paginateStyle="nav-pager" paginateFirstStyle="nav-first" viewIndex=viewIndex highIndex=highIndex listSize=partyListSize viewSize=viewSize ajaxFirstUrl="" firstUrl="" paginateFirstLabel="" paginatePreviousStyle="nav-previous" ajaxPreviousUrl="" previousUrl="" paginatePreviousLabel="" pageLabel="" ajaxSelectUrl="" selectUrl="" ajaxSelectSizeUrl="" selectSizeUrl="" commonDisplaying=commonDisplaying paginateNextStyle="nav-next" ajaxNextUrl="" nextUrl="" paginateNextLabel="" paginateLastStyle="nav-last" ajaxLastUrl="" lastUrl="" paginateLastLabel="" paginateViewSizeLabel="" />
<table class="basic-table hover-bar" cellspacing="0">
<tr class="header-row-2">
<td>${uiLabelMap.PartyPartyId}</td>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventForms.xml Wed Aug 3 16:12:58 2011
@@ -929,7 +929,7 @@ under the License.
</hyperlink>
</field>
<field name="entryDate">
- <display description="${date:dateTimeStr(entryDate, timeZone, locale)}"/>
+ <display type="date"/>
</field>
<field name="note" widget-area-style="fieldWidth200"><display/></field>
<field name="_rowSubmit" title="${uiLabelMap.CommonYes}"><check/></field>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml Wed Aug 3 16:12:58 2011
@@ -993,7 +993,7 @@ under the License.
</form>
<form name="AddPartyMainRole" type="single" title="${uiLabelMap.PartyAddToMainRole}" target="addrole/viewroles">
<field name="partyId"><hidden value="${parameters.partyId}"/></field>
- <field name="roleTypeId" event="onChange" action="ajaxUpdateArea('addPartySecondaryRole', 'addsecondaryroles', $('AddPartyMainRole').serialize());" entry-name="dummy">
+ <field name="roleTypeId" event="onChange" action="ajaxUpdateArea('addPartySecondaryRole', 'addsecondaryroles', jQuery('#AddPartyMainRole').serialize());" entry-name="dummy">
<drop-down allow-empty="false">
<entity-options entity-name="RoleType" description="${description}">
<entity-constraint name="parentTypeId" value=""/>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyScreens.xml Wed Aug 3 16:12:58 2011
@@ -1124,10 +1124,49 @@ under the License.
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <label>${uiLabelMap.CommonLatitude} ${latestGeoPoint.latitude}</label>
- <label>${uiLabelMap.CommonLongitude} ${latestGeoPoint.longitude}</label>
- <label>${uiLabelMap.CommonElevation} ${latestGeoPoint.elevation} ${elevationUomAbbr}</label>
- <include-screen name="geoChart" location="component://common/widget/CommonScreens.xml"/>
+ <section>
+ <condition>
+ <not><if-empty field="geoChart"/></not>
+ </condition>
+ <widgets>
+ <container style="button-bar">
+ <link target="addGeoLocation" text="${uiLabelMap.CommonUpdate}" style="buttontext">
+ <parameter param-name="partyId" from-field="parameters.partyId"/>
+ </link>
+ </container>
+ <label>${uiLabelMap.CommonLatitude} ${latestGeoPoint.latitude}</label>
+ <label>${uiLabelMap.CommonLongitude} ${latestGeoPoint.longitude}</label>
+ <label>${uiLabelMap.CommonElevation} ${latestGeoPoint.elevation} ${elevationUomAbbr}</label>
+ <include-screen name="geoChart" location="component://common/widget/CommonScreens.xml"/>
+ </widgets>
+ <fail-widgets>
+ <container style="button-bar">
+ <link target="addGeoLocation" text="${uiLabelMap.CommonCreateNew}" style="buttontext create">
+ <parameter param-name="partyId" from-field="parameters.partyId"/>
+ </link>
+ </container>
+ <include-screen name="geoChart" location="component://common/widget/CommonScreens.xml"/>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditGeoLocation">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitlePartyGeoLocation"/>
+ <set field="tabButtonItem" value="PartyGeoLocation"/>
+ <set field="partyId" from-field="parameters.partyId"/>
+ <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <platform-specific>
+ <html><html-template location="component://party/webapp/partymgr/party/editGeoLocation.ftl"/></html>
+ </platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml Wed Aug 3 16:12:58 2011
@@ -1951,6 +1951,9 @@
<value xml:lang="zh">èªå¨æ¹åè¯ä»·</value>
<value xml:lang="zh_TW">èªåæ ¸åè©è«</value>
</property>
+ <property key="FormFieldTitle_automaticExtend">
+ <value xml:lang="en">Automatic Extend</value>
+ </property>
<property key="FormFieldTitle_autoInvoiceDigitalItems">
<value xml:lang="de">Automatische Rechnungsstellung Digitaler Produkte</value>
<value xml:lang="en">Auto Invoice Digital Items</value>
@@ -7597,6 +7600,9 @@
<value xml:lang="en">Find Category</value>
<value xml:lang="th">à¸à¹à¸à¸«à¸²à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value>
</property>
+ <property key="PageTitleFindCatalog">
+ <value xml:lang="en">Find Catalog</value>
+ </property>
<property key="PageTitleFindConfigItems">
<value xml:lang="de">Konfigurationsposition suchen</value>
<value xml:lang="en">Find Config Items</value>
@@ -9243,7 +9249,7 @@
<value xml:lang="zh">å°å</value>
<value xml:lang="zh_TW">å°å</value>
</property>
- <property key="ProductAdvancedSearch">Product
+ <property key="ProductAdvancedSearch">
<value xml:lang="cs">RozÅ¡ÃÅené hledánÃ</value>
<value xml:lang="de">Erweiterte Suche</value>
<value xml:lang="en">Advanced Search</value>
@@ -24360,6 +24366,10 @@
<property key="ProductUpdateSEOContentCategory">
<value xml:lang="en">Update SEO Content for Category</value>
</property>
+ <property key="ProductUpdateDownloadContentCategory">
+ <value xml:lang="en">Update Download Content for Category</value>
+ <value xml:lang="th">à¸à¸±à¸à¹à¸à¸à¸§à¸´à¸à¸µà¹à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value>
+ </property>
<property key="ProductUpdateShipping">
<value xml:lang="de">Lieferung aktualisieren</value>
<value xml:lang="en">Update Shipping</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml Wed Aug 3 16:12:58 2011
@@ -223,6 +223,7 @@ under the License.
<ProductCategoryContentType description="Description" hasTable="N" parentTypeId="" prodCatContentTypeId="DESCRIPTION"/>
<ProductCategoryContentType description="Description - Long" hasTable="N" parentTypeId="" prodCatContentTypeId="LONG_DESCRIPTION"/>
<ProductCategoryContentType description="Alternative URL" hasTable="N" parentTypeId="" prodCatContentTypeId="ALTERNATIVE_URL"/>
+ <ProductCategoryContentType description="Category Image" hasTable="N" parentTypeId="" prodCatContentTypeId="CATEGORY_IMAGE"/>
<ProductCategoryContentType description="Category Image URL" hasTable="N" parentTypeId="" prodCatContentTypeId="CATEGORY_IMAGE_URL"/>
<ProductCategoryContentType description="Category Image Alt Text" hasTable="N" parentTypeId="" prodCatContentTypeId="CATEGORY_IMAGE_ALT"/>
<ProductCategoryContentType description="Link 1 Alt Text" hasTable="N" parentTypeId="" prodCatContentTypeId="LINK1_ALT_TEXT"/>
@@ -232,6 +233,8 @@ under the License.
<ProductCategoryContentType description="Meta Keyword" hasTable="N" parentTypeId="" prodCatContentTypeId="META_KEYWORD"/>
<ProductCategoryContentType description="Meta Description" hasTable="N" parentTypeId="" prodCatContentTypeId="META_DESCRIPTION"/>
<ProductCategoryContentType description="Related URL" hasTable="N" parentTypeId="" prodCatContentTypeId="RELATED_URL"/>
+ <ProductCategoryContentType description="Video" hasTable="N" parentTypeId="" prodCatContentTypeId="VIDEO"/>
+ <ProductCategoryContentType description="Video URL" hasTable="N" parentTypeId="" prodCatContentTypeId="VIDEO_URL"/>
<ProductContentType description="Online Access" hasTable="N" parentTypeId="" productContentTypeId="ONLINE_ACCESS"/>
<ProductContentType description="Digital Download" hasTable="N" parentTypeId="" productContentTypeId="DIGITAL_DOWNLOAD"/>
@@ -597,9 +600,6 @@ under the License.
<!-- product subscription type -->
<SubscriptionType description="Product" hasTable="N" parentTypeId="" subscriptionTypeId="PRODUCT_SUBSCR"/>
- <WebSite webSiteId="PRODCATALOG" siteName="Catalog Manager" visualThemeSetId="BACKOFFICE"/>
- <WebSite webSiteId="FACILITY" siteName="Facility Manager" visualThemeSetId="BACKOFFICE"/>
-
<WebAnalyticsType description="Web Analytics" hasTable="N" parentTypeId="" webAnalyticsTypeId="WEB_ANALYTICS"/>
<WebAnalyticsType webAnalyticsTypeId="GOOGLE_ANALYTICS" parentTypeId="WEB_ANALYTICS" hasTable="N" description="Google Analytics"/>
<WebAnalyticsType webAnalyticsTypeId="BING_ANALYTICS" parentTypeId="WEB_ANALYTICS" hasTable="N" description="Bing Analytics"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml Wed Aug 3 16:12:58 2011
@@ -2061,7 +2061,7 @@ under the License.
<alias entity-alias="IID" name="accountingQuantityTotal" field="accountingQuantityDiff" function="sum"/>
</view-entity>
<view-entity entity-name="InventoryItemDetailForSum" package-name="org.ofbiz.product.inventory"
- title="Inventory Item And Inventory Item Detail for Summation View Entity">
+ title="Inventory Item And Inventory Item Detail for Summation View Entity">
<member-entity entity-alias="II" entity-name="InventoryItem"/>
<member-entity entity-alias="IID" entity-name="InventoryItemDetail"/>
<alias entity-alias="IID" name="quantityOnHandSum" field="quantityOnHandDiff" function="sum"/>
@@ -4192,6 +4192,9 @@ under the License.
<relation type="one-nofk" rel-entity-name="Party">
<key-map field-name="companyPartyId" rel-field-name="partyId"/>
</relation>
+ <relation type="one" rel-entity-name="ShipmentMethodType">
+ <key-map field-name="shipmentMethodTypeId"/>
+ </relation>
<relation type="one-nofk" title="Include" rel-entity-name="Geo">
<key-map field-name="includeGeoId" rel-field-name="geoId"/>
</relation>
@@ -4598,7 +4601,7 @@ under the License.
</entity>
<view-entity entity-name="SubscriptionAndCommEvent"
package-name="org.ofbiz.product.subscription"
- title="Subscription And Communication Event View Entity">
+ title="Subscription And Communication Event View Entity">
<member-entity entity-alias="SC" entity-name="SubscriptionCommEvent"/>
<member-entity entity-alias="CE" entity-name="CommunicationEvent"/>
<alias-all entity-alias="SC"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Wed Aug 3 16:12:58 2011
@@ -523,7 +523,9 @@ under the License.
<simple-method method-name="createMissingCategoryAndProductAltUrls" short-description="create missing category and product alternative urls.">
<now-timestamp field="now"/>
<field-to-result field="parameters.prodCatalogId" result-name="prodCatalogId"/>
+ <set field="categoriesNotUpdated" value="0" type="Integer"/>
<set field="categoriesUpdated" value="0" type="Integer"/>
+ <set field="productsNotUpdated" value="0" type="Integer"/>
<set field="productsUpdated" value="0" type="Integer"/>
<entity-and list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="false">
<field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/>
@@ -543,101 +545,119 @@ under the License.
<iterate entry="productCategoryList" list="parameters.productCategories">
<!-- Create Product Category Alternative URLs -->
- <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
- <condition-list combine="and">
- <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
- <condition-expr field-name="prodCatContentTypeId" value="ALTERNATIVE_URL"/>
- </condition-list>
- <order-by field-name="-fromDate"/>
- </entity-condition>
-
- <if-empty field="productCategoryContentAndInfoList">
- <set field="createSimpleTextContentForCategoryCtx.fromDate" from-field="now"/>
- <set field="createSimpleTextContentForCategoryCtx.prodCatContentTypeId" value="ALTERNATIVE_URL"/>
- <set field="createSimpleTextContentForCategoryCtx.localeString" value="en"/>
- <set field="createSimpleTextContentForCategoryCtx.productCategoryId" from-field="productCategoryList.productCategoryId"/>
-
- <if-empty field="productCategoryList.categoryName">
- <entity-condition list="productCategoryContentList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
- <condition-list combine="and">
- <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
- <condition-expr field-name="prodCatContentTypeId" value="CATEGORY_NAME"/>
- </condition-list>
- <order-by field-name="-fromDate"/>
- </entity-condition>
- <if-not-empty field="productCategoryContentList">
- <first-from-list entry="productCategoryContent" list="productCategoryContentList"/>
- <set field="getContentAndDataResourceCtx.contentId" from-field="productCategoryContent.contentId"/>
- <call-service service-name="getContentAndDataResource" in-map-name="getContentAndDataResourceCtx">
- <result-to-field result-name="resultData" field="resultMap"/>
- </call-service>
-
- <set field="electronicText" from-field="resultMap.electronicText"/>
- <set field="createSimpleTextContentForCategoryCtx.text" from-field="electronicText.textData"/>
+ <if-empty field="category">
+ <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
+ <condition-list combine="and">
+ <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
+ <condition-expr field-name="prodCatContentTypeId" value="ALTERNATIVE_URL"/>
+ </condition-list>
+ <order-by field-name="-fromDate"/>
+ </entity-condition>
+ <if-empty field="productCategoryContentAndInfoList">
+ <set field="createSimpleTextContentForCategoryCtx.fromDate" from-field="now"/>
+ <set field="createSimpleTextContentForCategoryCtx.prodCatContentTypeId" value="ALTERNATIVE_URL"/>
+ <set field="createSimpleTextContentForCategoryCtx.localeString" value="en"/>
+ <set field="createSimpleTextContentForCategoryCtx.productCategoryId" from-field="productCategoryList.productCategoryId"/>
+ <if-empty field="productCategoryList.categoryName">
+ <entity-condition list="productCategoryContentList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
+ <condition-list combine="and">
+ <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
+ <condition-expr field-name="prodCatContentTypeId" value="CATEGORY_NAME"/>
+ </condition-list>
+ <order-by field-name="-fromDate"/>
+ </entity-condition>
+ <if-not-empty field="productCategoryContentList">
+ <first-from-list entry="productCategoryContent" list="productCategoryContentList"/>
+ <set field="getContentAndDataResourceCtx.contentId" from-field="productCategoryContent.contentId"/>
+ <call-service service-name="getContentAndDataResource" in-map-name="getContentAndDataResourceCtx">
+ <result-to-field result-name="resultData" field="resultMap"/>
+ </call-service>
+
+ <set field="electronicText" from-field="resultMap.electronicText"/>
+ <set field="createSimpleTextContentForCategoryCtx.text" from-field="electronicText.textData"/>
+ </if-not-empty>
+ <else>
+ <set field="createSimpleTextContentForCategoryCtx.text" from-field="productCategoryList.categoryName"/>
+ </else>
+ </if-empty>
+ <if-not-empty field="createSimpleTextContentForCategoryCtx.text">
+ <call-service service-name="createSimpleTextContentForCategory" in-map-name="createSimpleTextContentForCategoryCtx"/>
+ <calculate field="categoriesUpdated" type="Integer">
+ <calcop operator="add" field="categoriesUpdated">
+ <number value="1"/>
+ </calcop>
+ </calculate>
</if-not-empty>
+ <check-errors/>
<else>
- <set field="createSimpleTextContentForCategoryCtx.text" from-field="productCategoryList.categoryName"/>
- </else>
- </if-empty>
- <if-not-empty field="createSimpleTextContentForCategoryCtx.text">
- <call-service service-name="createSimpleTextContentForCategory" in-map-name="`Ctx"/>
- <calculate field="$categoriesUpdated">
- <calcop operator="add" field="categoriesUpdated">
- <number value="1"/>
+ <calculate field="categoriesNotUpdated" type="Integer">
+ <calcop operator="add" field="categoriesNotUpdated">
+ <number value="1"/>
</calcop>
</calculate>
- </if-not-empty>
- <check-errors/>
+ </else>
+ </if-empty>
</if-empty>
<!-- Create Product Alternative URLs -->
- <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true">
- <condition-list combine="and">
- <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
- </condition-list>
- <order-by field-name="-fromDate"/>
- </entity-condition>
-
- <iterate entry="productCategoryMember" list="productCategoryMemberList">
- <set field="product.productId" from-field="productCategoryMember.productId"/>
- <entity-condition list="ProductContentAndInfoList" entity-name="ProductContentAndInfo" filter-by-date="true" use-cache="true">
+ <if-empty field="product">
+ <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true">
<condition-list combine="and">
- <condition-expr field-name="productId" from-field="product.productId"/>
- <condition-expr field-name="productContentTypeId" value="ALTERNATIVE_URL"/>
+ <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
</condition-list>
<order-by field-name="-fromDate"/>
</entity-condition>
-
- <if-empty field="ProductContentAndInfoList">
- <entity-one value-field="productMap" entity-name="Product">
- <field-map field-name="productId" from-field="product.productId"/>
- </entity-one>
- <set field="createSimpleTextContentForProductCtx.fromDate" from-field="now"/>
- <set field="createSimpleTextContentForProductCtx.productContentTypeId" value="ALTERNATIVE_URL"/>
- <set field="createSimpleTextContentForProductCtx.localeString" value="en"/>
- <set field="createSimpleTextContentForProductCtx.productId" from-field="product.productId"/>
- <if-empty field="productMap.internalName">
- <set field="createSimpleTextContentForProductCtx.text" from-field="productMap.productName"/>
+ <iterate entry="productCategoryMember" list="productCategoryMemberList">
+ <set field="product.productId" from-field="productCategoryMember.productId"/>
+ <entity-condition list="ProductContentAndInfoList" entity-name="ProductContentAndInfo" filter-by-date="true" use-cache="true">
+ <condition-list combine="and">
+ <condition-expr field-name="productId" from-field="product.productId"/>
+ <condition-expr field-name="productContentTypeId" value="ALTERNATIVE_URL"/>
+ </condition-list>
+ <order-by field-name="-fromDate"/>
+ </entity-condition>
+ <if-empty field="ProductContentAndInfoList">
+ <entity-one value-field="productMap" entity-name="Product">
+ <field-map field-name="productId" from-field="product.productId"/>
+ </entity-one>
+ <set field="createSimpleTextContentForProductCtx.fromDate" from-field="now"/>
+ <set field="createSimpleTextContentForProductCtx.productContentTypeId" value="ALTERNATIVE_URL"/>
+ <set field="createSimpleTextContentForProductCtx.localeString" value="en"/>
+ <set field="createSimpleTextContentForProductCtx.productId" from-field="product.productId"/>
+ <if-empty field="productMap.internalName">
+ <set field="createSimpleTextContentForProductCtx.text" from-field="productMap.productName"/>
+ <else>
+ <set field="createSimpleTextContentForProductCtx.text" from-field="productMap.internalName"/>
+ </else>
+ </if-empty>
+ <if-not-empty field="createSimpleTextContentForProductCtx.text">
+ <call-service service-name="createSimpleTextContentForProduct" in-map-name="createSimpleTextContentForProductCtx"/>
+ <calculate field="productsUpdated" type="Integer">
+ <calcop operator="add" field="productsUpdated">
+ <number value="1"/>
+ </calcop>
+ </calculate>
+ </if-not-empty>
+ <check-errors/>
<else>
- <set field="createSimpleTextContentForProductCtx.text" from-field="productMap.internalName"/>
- </else>
- </if-empty>
- <if-not-empty field="createSimpleTextContentForProductCtx.text">
- <call-service service-name="createSimpleTextContentForProduct" in-map-name="createSimpleTextContentForProductCtx"/>
- <calculate field="$productsUpdated">
- <calcop operator="add" field="productsUpdated">
- <number value="1"/>
+ <calculate field="productsNotUpdated" type="Integer">
+ <calcop operator="add" field="productsNotUpdated">
+ <number value="1"/>
</calcop>
</calculate>
- </if-not-empty>
- <check-errors/>
- </if-empty>
- </iterate>
+ </else>
+ </if-empty>
+ </iterate>
+ </if-empty>
</iterate>
<set field="categoriesUpdatedMessage" value="Categories updated: ${categoriesUpdated}"/>
<field-to-list list="successMessageList" field="categoriesUpdatedMessage"/>
<set field="productsUpdatedMessage" value="Products updated: ${productsUpdated}"/>
<field-to-list list="successMessageList" field="productsUpdatedMessage"/>
+ <field-to-result field="categoriesNotUpdated" result-name="categoriesNotUpdated"/>
+ <field-to-result field="productsNotUpdated" result-name="productsNotUpdated"/>
+ <field-to-result field="categoriesUpdated" result-name="categoriesUpdated"/>
+ <field-to-result field="productsUpdated" result-name="productsUpdated"/>
</simple-method>
<simple-method method-name="createMissingCategoryAltUrlInline" short-description="create missing category alternative inline">
<entity-and list="productCategoryRollups" entity-name="ProductCategoryRollup" filter-by-date="true">