svn commit: r730853 [4/4] - in /ofbiz/trunk/applications: accounting/config/ accounting/webapp/accounting/p
Locked
svn commit: r730853 [4/4] - in /ofbiz/trunk/applications: accounting/config/ accounting/webapp/accounting/p
 
|
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml Fri Jan 2 14:28:35 2009 @@ -41,7 +41,7 @@ <set field="args" from-field="parameters.arguments"/> <if-empty field="args.conversionParameters.productId"> - <add-error> <fail-property property="NoProductSpecifiedForUomConversion" resource="ProductUiLabels"/> </add-error> + <add-error> <fail-property property="ProductNoSpecifiedForUomConversion" resource="ProductUiLabels"/> </add-error> <check-errors/> </if-empty> @@ -49,18 +49,18 @@ <set field="productId" from-field="args.conversionParameters.productId"/> <log level="verbose" message="convertUomProduct: productId=${productId}"/> - <entity-one entity-name="Product" value-name="product" auto-field-map="true"/> + <entity-one entity-name="Product" value-field="product" auto-field-map="true"/> <if-empty field="product"> - <add-error> <fail-property property="NoProductSpecifiedForUomConversion" resource="ProductUiLabels"/> </add-error> + <add-error> <fail-property property="ProductNoSpecifiedForUomConversion" resource="ProductUiLabels"/> </add-error> <check-errors/> </if-empty> <set field="uomId" from-field="args.uomId"/> - <entity-one entity-name="Uom" value-name="fromUom" auto-field-map="true"/> + <entity-one entity-name="Uom" value-field="fromUom" auto-field-map="true"/> <set field="uomId" from-field="args.uomIdTo"/> - <entity-one entity-name="Uom" value-name="toUom" auto-field-map="true"/> + <entity-one entity-name="Uom" value-field="toUom" auto-field-map="true"/> <!-- if the UoM types are the same, just use the uomConversion.conversionFactor (not product based) --> <if-compare-field field="fromUom.uomTypeId" to-field="toUom.uomTypeId" operator="equals"> @@ -151,6 +151,6 @@ <calcop operator="get" field="productFactor"/> </calcop> </calculate> - <field-to-result field-name="totQuantity" result-name="convertedValue"/> + <field-to-result field="totQuantity" result-name="convertedValue"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java Fri Jan 2 14:28:35 2009 @@ -43,8 +43,6 @@ import org.ofbiz.entity.GenericPK; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; -import org.ofbiz.entity.condition.EntityConditionList; -import org.ofbiz.entity.condition.EntityExpr; import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.transaction.GenericTransactionException; import org.ofbiz.entity.transaction.TransactionUtil; @@ -61,7 +59,7 @@ public class ProductEvents { public static final String module = ProductEvents.class.getName(); - public static final String resource = "ProductUiLabels"; + public static final String resource = "ProductErrorUiLabels"; /** * Updates/adds keywords for all products Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java Fri Jan 2 14:28:35 2009 @@ -1579,16 +1579,16 @@ return null; } StringBuilder msgBuf = new StringBuilder(); - msgBuf.append(UtilProperties.getMessage(resource, "ListPriceRange", locale)); + msgBuf.append(UtilProperties.getMessage(resource, "ProductListPriceRange", locale)); msgBuf.append(": "); // NOTE: at this point we know that only one or none are null if (this.lowPrice == null) { - msgBuf.append(UtilProperties.getMessage(resource, "CommonLessThan", locale)); + msgBuf.append(UtilProperties.getMessage(resourceCommon, "CommonLessThan", locale)); msgBuf.append(" "); msgBuf.append(this.highPrice); } else if (this.highPrice == null) { - msgBuf.append(UtilProperties.getMessage(resource, "CommonMoreThan", locale)); + msgBuf.append(UtilProperties.getMessage(resourceCommon, "CommonMoreThan", locale)); msgBuf.append(" "); msgBuf.append(this.lowPrice); } else { Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java Fri Jan 2 14:28:35 2009 @@ -31,7 +31,6 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; @@ -46,10 +45,6 @@ import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.product.product.ProductSearch.ProductSearchContext; import org.ofbiz.product.product.ProductSearch.ResultSortOrder; -import org.ofbiz.service.GenericServiceException; -import org.ofbiz.service.LocalDispatcher; -import org.ofbiz.service.ModelService; -import org.ofbiz.service.ServiceUtil; /** * Product Search Related Events @@ -57,7 +52,7 @@ public class ProductSearchEvents { public static final String module = ProductSearchEvents.class.getName(); - public static final String resource = "ProductUiLabels"; + public static final String resource = "ProductErrorUiLabels"; public static final int DEFAULT_TX_TIMEOUT = 600; /** Removes the results of a search from the specified category @@ -215,7 +210,6 @@ } GenericValue searchResultView = null; - List searchResultList = FastList.newInstance(); int numAdded = 0; while ((searchResultView = (GenericValue) eli.next()) != null) { String productId = searchResultView.getString("mainProductId"); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java Fri Jan 2 14:28:35 2009 @@ -55,7 +55,7 @@ public class ProductServices { public static final String module = ProductServices.class.getName(); - public static final String resource = "ProductUiLabels"; + public static final String resource = "ProductErrorUiLabels"; /** * Creates a Collection of product entities which are variant products from the specified product ID. @@ -289,7 +289,7 @@ } } - Map tree = null; + Map<String, Object> tree = null; try { tree = makeGroup(delegator, features, items, featureOrder, 0); } catch (Exception e) { @@ -1020,7 +1020,7 @@ productContentCtx.put("contentId", contentId); try { - Map<String, Object> productContentResult = dispatcher.runSync("updateProductContent", productContentCtx); + dispatcher.runSync("updateProductContent", productContentCtx); } catch (GenericServiceException e) { Debug.logError(e, module); ServiceUtil.returnError(e.getMessage()); @@ -1050,7 +1050,7 @@ productContentCtx.put("contentId", contentResult.get("contentId")); try { - Map<String, Object> productContentResult = dispatcher.runSync("createProductContent", productContentCtx); + dispatcher.runSync("createProductContent", productContentCtx); } catch (GenericServiceException e) { Debug.logError(e, module); ServiceUtil.returnError(e.getMessage()); @@ -1088,7 +1088,6 @@ } if (UtilValidate.isNotEmpty(productsFound)) { - List<GenericValue> productsList = FastList.newInstance(); // gets the first productId of the List product = EntityUtil.getFirst(productsFound); // remove this productId Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java Fri Jan 2 14:28:35 2009 @@ -39,9 +39,6 @@ import org.ofbiz.entity.GenericPK; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; -import org.ofbiz.entity.condition.EntityConditionList; -import org.ofbiz.entity.condition.EntityExpr; -import org.ofbiz.entity.condition.EntityFieldMap; import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.model.DynamicViewEntity; import org.ofbiz.entity.model.ModelEntity; @@ -59,7 +56,7 @@ public class ProductUtilServices { public static final String module = ProductUtilServices.class.getName(); - public static final String resource = "ProductUiLabels"; + public static final String resource = "ProductErrorUiLabels"; /** First expire all ProductAssocs for all disc variants, then disc all virtuals that have all expired variant ProductAssocs */ public static Map<String, Object> discVirtualsWithDiscVariants(DispatchContext dctx, Map<String, ? extends Object> context) { @@ -488,7 +485,6 @@ */ public static Map<String, Object> setAllProductImageNames(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); - Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); String pattern = (String) context.get("pattern"); Locale locale = (Locale) context.get("locale"); String errMsg = null; Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java Fri Jan 2 14:28:35 2009 @@ -41,7 +41,7 @@ public class VariantEvents { public static final String module = VariantEvents.class.getName(); - public static final String resource = "ProductUiLabels"; + public static final String resource = "ProductErrorUiLabels"; /** Creates variant products from a virtual product and a combination of selectable features *@param request The HTTPRequest object for the current request Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Fri Jan 2 14:28:35 2009 @@ -197,7 +197,7 @@ </script> <div class="screenlet"> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.CategoryUploadImage}</h3> + <h3>${uiLabelMap.ProductCategoryUploadImage}</h3> </div> <div class="screenlet-body"> <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId?if_exists}&upload_file_type=category</@ofbizUrl>" name="imageUploadForm"> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Fri Jan 2 14:28:35 2009 @@ -71,7 +71,7 @@ <tr> <td><h2>${productId?if_exists}<h2></td> <td><input type="text" name="productName" size="40" maxlength="40" value="${product.productName?if_exists}"/></td> - <td><input type="submit" value="${uiLabelMap.UpdateName}"/></td> + <td><input type="submit" value="${uiLabelMap.ProductUpdateName}"/></td> </tr> </table> </form> @@ -80,7 +80,7 @@ <#if (product.isVirtual)?if_exists == "Y"> <div class="screenlet"> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.SelectableFeatures}</h3> + <h3>${uiLabelMap.ProductSelectableFeatures}</h3> </div> <div class="screenlet-body"> <!-- ***************************************************** Selectable features section --> @@ -90,7 +90,7 @@ <tr> <td colspan="2"><span class="label">${uiLabelMap.CommonType}</span> <select name="productFeatureTypeId" onchange="javascript:document.selectableFeatureTypeSelector.submit();"> - <option value="~~any~~">${uiLabelMap.AnyFeatureType}</option> + <option value="~~any~~">${uiLabelMap.ProductAnyFeatureType}</option> <#list featureTypes as featureType> <#if (featureType.productFeatureTypeId)?if_exists == (productFeatureTypeId)?if_exists> <#assign selected="selected"/> @@ -157,7 +157,7 @@ </td> <td align="right"> <table cellspacing="0" class="basic-table"> - <tr><td align="right"><input name="applyToAll" type="submit" value="${uiLabelMap.AddSelectableFeature}"/></td></tr> + <tr><td align="right"><input name="applyToAll" type="submit" value="${uiLabelMap.ProductAddSelectableFeature}"/></td></tr> </table> </td> </tr> @@ -169,7 +169,7 @@ <#if (product.isVariant)?if_exists == "Y"> <div class="screenlet"> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.DistinguishingFeatures}</h3> + <h3>${uiLabelMap.ProductDistinguishingFeatures}</h3> </div> <div class="screenlet-body"> <form action="<@ofbizUrl>updateProductQuickAdminDistFeat</@ofbizUrl>" method="post" style="margin: 0;" name="distFeature"> @@ -202,7 +202,7 @@ <!-- ***************************************************** end Selectable features section --> <div class="screenlet"> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.ShippingDimensionsAndWeights}</h3> + <h3>${uiLabelMap.ProductShippingDimensionsAndWeights}</h3> </div> <div class="screenlet-body"> <!-- ***************************************************** Shipping dimensions section --> @@ -252,8 +252,8 @@ </#if> </#list> <tr> - <td colspan=10 align="right"><input name="applyToAll" type="submit" value="${uiLabelMap.ApplyToAll}"/> - <input name="updateShipping" type="submit" value="${uiLabelMap.UpdateShipping}"/></td> + <td colspan=10 align="right"><input name="applyToAll" type="submit" value="${uiLabelMap.ProductApplyToAll}"/> + <input name="updateShipping" type="submit" value="${uiLabelMap.ProductUpdateShipping}"/></td> </tr> <#else> <tr> @@ -270,7 +270,7 @@ <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${product.productId}</@ofbizUrl>">${thrudate?if_exists}</a></td> </tr> <tr> - <td colspan=10 align="right"><input type="submit" value="${uiLabelMap.UpdateShipping}"></td> + <td colspan=10 align="right"><input type="submit" value="${uiLabelMap.ProductUpdateShipping}"></td> </tr> </#if> @@ -281,7 +281,7 @@ </div> <div class="screenlet"> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.StandardFeatures}</h3> + <h3>${uiLabelMap.ProductStandardFeatures}</h3> </div> <div class="screenlet-body"> <!-- **************************************************** Standard Features section --> @@ -300,7 +300,7 @@ <td align="right">${addedFeatureTypes.get(addedFeatureTypeId).description}</td> <td> <select name="productFeatureId"> - <option value="~~any~~">${uiLabelMap.AnyFeatureType}</option> + <option value="~~any~~">${uiLabelMap.ProductAnyFeatureType}</option> <#list featuresByType.get(addedFeatureTypeId) as feature> <option value="${feature.getString("productFeatureId")}">${feature.description}</option> </#list> @@ -314,7 +314,7 @@ <#assign rowClass = "2"> </#if> </#list> - <tr><td colspan="2" align="right"><input type="submit" value="${uiLabelMap.AddFeatures}"/></td></tr> + <tr><td colspan="2" align="right"><input type="submit" value="${uiLabelMap.ProductAddFeatures}"/></td></tr> </table> </form> </#if> @@ -347,7 +347,7 @@ <input type="hidden" name="productId" value="${product.productId?if_exists}"/> <table cellspacing="0" class="basic-table"> <tr> - <td align="right">${uiLabelMap.FeatureTypes}</td> + <td align="right">${uiLabelMap.ProductFeatureTypes}</td> <td> <select multiple="multiple" name="addFeatureTypeId"> <#list featureTypes as featureType> @@ -355,7 +355,7 @@ </#list> </select> </td> - <td><input type="submit" value="${uiLabelMap.AddFeatureType}"/></td> + <td><input type="submit" value="${uiLabelMap.ProductAddFeatureType}"/></td> </tr> </table> </form> @@ -364,7 +364,7 @@ </div> <div class="screenlet"> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.Categories}</h3> + <h3>${uiLabelMap.ProductCategories}</h3> </div> <div class="screenlet-body"> <!-- **************************************************** Categories section --> @@ -405,7 +405,7 @@ </td> </tr> <tr> - <td colspan="2" align="right"><input type="submit" value="${uiLabelMap.UpdateCategories}"/></td> + <td colspan="2" align="right"><input type="submit" value="${uiLabelMap.ProductUpdateCategories}"/></td> </tr> </table> </form> @@ -414,7 +414,7 @@ </div> <div class="screenlet"> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.PublishAndView}</h3> + <h3>${uiLabelMap.ProductPublishAndView}</h3> </div> <div class="screenlet-body"> <!-- **************************************************** publish section --> @@ -429,7 +429,7 @@ <a href="javascript:call_cal(document.publish.fromDate,'${nowTimestampString}');"> <img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/> </a> - <input type=button value="${uiLabelMap.PublishAndView}" onClick="doPublish();"/> + <input type=button value="${uiLabelMap.ProductPublishAndView}" onClick="doPublish();"/> </td> </tr> </table> @@ -445,7 +445,7 @@ <a href="javascript:call_cal(document.unpublish.thruDate,'${nowTimestampString}');"> <img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/> </a> - <input type="submit" value="${uiLabelMap.RemoveFromSite}"/> + <input type="submit" value="${uiLabelMap.ProductRemoveFromSite}"/> </td> </tr> </table> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Fri Jan 2 14:28:35 2009 @@ -580,8 +580,8 @@ <field name="useRoleTypeId" title="${uiLabelMap.ProductUseRole}"></field> <field name="description" title="${uiLabelMap.ProductDescription}" map-name="content"><text size="40"/></field> <field name="subject" title="${uiLabelMap.ProductSubject}" map-name="emailData"><text size="40"/></field> - <field name="plainBody" title="${uiLabelMap.ContentPlainBody}" map-name="emailData"><textarea cols="60" rows="7"/></field> - <field name="htmlBody" title="${uiLabelMap.ContentHtmlBody}" map-name="emailData"><textarea cols="60" rows="7"/></field> + <field name="plainBody" title="${uiLabelMap.ProductContentPlainBody}" map-name="emailData"><textarea cols="60" rows="7"/></field> + <field name="htmlBody" title="${uiLabelMap.ProductContentHtmlBody}" map-name="emailData"><textarea cols="60" rows="7"/></field> <field use-when="contentId == null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductOptional}"><text maxlength="20"/></field> <field use-when="contentId != null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="productContentData" ><display/></field> <field name="productId"><hidden/></field> Modified: ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl Fri Jan 2 14:28:35 2009 @@ -36,13 +36,13 @@ <input type="hidden" name="statusId" value=""> <div align="right"> <input type="button" value="${uiLabelMap.CommonUpdate}" onClick="javascript:changeReviewStatus('PRR_PENDING')"> - <input type="button" value="${uiLabelMap.PendingReviewUpdateAndApprove}" onClick="javascript:changeReviewStatus('PRR_APPROVED')"> + <input type="button" value="${uiLabelMap.ProductPendingReviewUpdateAndApprove}" onClick="javascript:changeReviewStatus('PRR_APPROVED')"> <input type="button" value="${uiLabelMap.CommonDelete}" onClick="javascript:changeReviewStatus('PRR_DELETED')"> </div> <table cellspacing="0" class="basic-table"> <tr class="header-row"> - <td><b>${uiLabelMap.PendingReviewDate}</b></td> - <td><b>${uiLabelMap.PendingReviewBy}</b></td> + <td><b>${uiLabelMap.ProductPendingReviewDate}</b></td> + <td><b>${uiLabelMap.ProductPendingReviewBy}</b></td> <td><b>${uiLabelMap.CommonIsAnonymous}</b></td> <td><b>${uiLabelMap.ProductProductId}</b></td> <td><b>${uiLabelMap.ProductRating}</b></td> Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Fri Jan 2 14:28:35 2009 @@ -988,15 +988,15 @@ </entity-and> </actions> <field name="productStoreId"><hidden/></field> - <field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}"> + <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}"> <display-entity entity-name="PaymentMethodType" description="${description}"/> </field> <field name="paymentServiceTypeEnumId" title="${uiLabelMap.ProductServiceType}"> <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/> </field> <field name="paymentService" title="${uiLabelMap.ProductServiceName}"><display/></field> - <field name="paymentPropertiesPath" title="${uiLabelMap.AccountingPaymentProps}"><display/></field> - <field name="applyToAllProducts" title="${uiLabelMap.ApplyToAll}"><display/></field> + <field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><display/></field> + <field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll}"><display/></field> <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:security.hasEntityPermission("CATALOG", "_UPDATE", session);}" widget-style="buttontext"> <hyperlink target="EditProductStorePaySetup?productStoreId=${productStoreId}&paymentMethodTypeId=${paymentMethodTypeId}&paymentServiceTypeEnumId=${paymentServiceTypeEnumId}" description="${uiLabelMap.CommonEdit}" also-hidden="false"/> </field> @@ -1015,10 +1015,10 @@ header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="productStorePaymentSetting==null" target="storeCreatePaySetting"/> <field name="productStoreId"><hidden/></field> - <field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}" use-when="productStorePaymentSetting!=null"> + <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}" use-when="productStorePaymentSetting!=null"> <display-entity entity-name="PaymentMethodType" also-hidden="true" description="${description}" key-field-name="paymentMethodTypeId"/> </field> - <field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}" use-when="productStorePaymentSetting==null"> + <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}" use-when="productStorePaymentSetting==null"> <drop-down allow-empty="false"> <entity-options entity-name="PaymentMethodType" description="${description}"> <entity-order-by field-name="description"/> @@ -1037,8 +1037,8 @@ </drop-down> </field> <field name="paymentService" title="${uiLabelMap.ProductServiceName}"><text/></field> - <field name="paymentPropertiesPath" title="${uiLabelMap.AccountingPaymentProps}"><text/></field> - <field name="applyToAllProducts" title="${uiLabelMap.ApplyToAll} ${uiLabelMap.ProductProducts}"> + <field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><text/></field> + <field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll} ${uiLabelMap.ProductProducts}"> <drop-down> <option key="Y" description="${uiLabelMap.CommonY}"/> <option key="N" description="${uiLabelMap.CommonN}"/> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl Fri Jan 2 14:28:35 2009 @@ -43,7 +43,7 @@ <td>${uiLabelMap.ProductAtp}</td> <td>${uiLabelMap.ProductMinimumStock}</td> <td>${uiLabelMap.ProductMoveQuantity}</td> - <td>${uiLabelMap.OrderConfirm}</td> + <td>${uiLabelMap.CommonConfirm}</td> <td align="right"> ${uiLabelMap.ProductSelectAll} <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'moveInfoId_tableRow_', 'selectAllForm');"> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl Fri Jan 2 14:28:35 2009 @@ -145,7 +145,7 @@ <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductQuantityToBin}#</fo:block></fo:table-cell> <#-- Not display details here, just the summary info for the bins - <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderOrderItems}</fo:block></fo:table-cell> + <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductOrderItemss}</fo:block></fo:table-cell> <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductInventoryItems}</fo:block></fo:table-cell> --> </fo:table-row> @@ -221,7 +221,7 @@ <fo:table-column column-width="40pt"/> <fo:table-header> <fo:table-row font-weight="bold"> - <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderOrderItem}</fo:block></fo:table-cell> + <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductOrderItem}</fo:block></fo:table-cell> <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductProductId}</fo:block></fo:table-cell> <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductToPack}</fo:block></fo:table-cell> <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductInventoryItem}</fo:block></fo:table-cell> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl Fri Jan 2 14:28:35 2009 @@ -121,7 +121,7 @@ <table class="basic-table" cellspacing="0"> <tr class="header-row" <td>${uiLabelMap.ProductOrderId}</td> - <td>${uiLabelMap.OrderShipGroup}</td> + <td>${uiLabelMap.ProductOrderShipGroupId}</td> <td>${uiLabelMap.ProductOrderItem}</td> <td>${uiLabelMap.ProductProduct}</td> <td>${uiLabelMap.ProductInventoryItem}</td> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl Fri Jan 2 14:28:35 2009 @@ -146,7 +146,7 @@ <td>${uiLabelMap.ProductChannel}</td> <td>${uiLabelMap.ProductOrderItem}</td> <td>${uiLabelMap.ProductDescription}</td> - <td>${uiLabelMap.OrderShipGroup}</td> + <td>${uiLabelMap.ProductOrderShipGroupId}</td> <td>${uiLabelMap.ProductQuantity}</td> <td>${uiLabelMap.ProductQuantityNotAvailable}</td> </tr> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl Fri Jan 2 14:28:35 2009 @@ -45,7 +45,7 @@ <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductAddItemsShipment}: [${shipmentId?if_exists}]; ${uiLabelMap.OrderFromOrder}: [${orderId?if_exists}], ${uiLabelMap.OrderShipGroup}: [${shipGroupSeqId?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductAddItemsShipment}: [${shipmentId?if_exists}]; ${uiLabelMap.ProductFromAnOrder}: [${orderId?if_exists}], ${uiLabelMap.ProductOrderShipGroupId}: [${shipGroupSeqId?if_exists}]</li> </ul> <br class="clear"/> </div> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Fri Jan 2 14:28:35 2009 @@ -175,7 +175,7 @@ </td> <td> </td> <td valign="top"> - <span class="label">${uiLabelMap.OrderShipping} ${uiLabelMap.ProductInstruction}</span> + <span class="label">${uiLabelMap.ProductShipping} ${uiLabelMap.ProductInstruction}</span> <br/> ${orderItemShipGroup.shippingInstructions?default("(none)")} </td> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Fri Jan 2 14:28:35 2009 @@ -30,7 +30,7 @@ <set field="MainColumnStyle" value="nocolumns" global="true"/> - <set field="layoutSettings.companyName" from-field="uiLabelMap.CatalogCompanyName" global="true"/> + <set field="layoutSettings.companyName" from-field="uiLabelMap.ProductCatalogCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ProductCompanySubtitle" global="true"/> <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set, then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. --> Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Fri Jan 2 14:28:35 2009 @@ -225,7 +225,7 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.SearchFeatureInterAction}"/> + <label text="${uiLabelMap.ProductSearchFeatureInterAction}"/> </container> </container> <container style="screenlet-body"> Modified: ofbiz/trunk/applications/product/widget/catalog/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/Menus.xml?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/Menus.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/Menus.xml Fri Jan 2 14:28:35 2009 @@ -108,13 +108,13 @@ <link target="EditProductStoreTaxSetup?productStoreId=${productStoreId}"/> </menu-item> --> - <menu-item name="EditProductStoreShipSetup" title="${uiLabelMap.OrderShipping}"> + <menu-item name="EditProductStoreShipSetup" title="${uiLabelMap.ProductShipping}"> <link target="EditProductStoreShipSetup?productStoreId=${productStoreId}"/> </menu-item> <menu-item name="EditProductStoreShipmentCostEstimates" title="${uiLabelMap.ProductViewEstimates}"> <link target="EditProductStoreShipmentCostEstimates?productStoreId=${productStoreId}"/> </menu-item> - <menu-item name="EditProductStorePaySetup" title="${uiLabelMap.AccountingPayments}"> + <menu-item name="EditProductStorePaySetup" title="${uiLabelMap.CommonPayments}"> <link target="EditProductStorePaySetup?productStoreId=${productStoreId}"/> </menu-item> <menu-item name="EditProductStoreFinAccountSettings" title="${uiLabelMap.CommonFinAccounts}"> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Fri Jan 2 14:28:35 2009 @@ -1093,7 +1093,7 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.ListFeatureInteractions}"/> + <label text="${uiLabelMap.ProductListFeatureInteractions}"/> </container> </container> <container style="screenlet-body"> @@ -1103,7 +1103,7 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.AddFeatureInteraction}"/> + <label text="${uiLabelMap.ProductAddFeatureInteraction}"/> </container> </container> <container style="screenlet-body"> Modified: ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Fri Jan 2 14:28:35 2009 @@ -26,6 +26,7 @@ <!-- base/top/specific map first, then more common map added for shared labels --> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.FacilityCompanyName" global="true"/> Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original) +++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Fri Jan 2 14:28:35 2009 @@ -86,24 +86,6 @@ <value xml:lang="th">รหัสà¸à¸¥à¸¸à¹à¸¡à¸¥à¸¹à¸à¸à¹à¸²à¸¢</value> <value xml:lang="zh">客æ·ä¼åæ è¯</value> </property> - <property key="FormFieldTitle_comments"> - <value xml:lang="en">Comments</value> - <value xml:lang="fr">Commentaires</value> - <value xml:lang="it">Commenti</value> - <value xml:lang="nl">Opmerkingen</value> - <value xml:lang="ro">Comentarii </value> - <value xml:lang="th">à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸</value> - <value xml:lang="zh">è¯è®º</value> - </property> - <property key="FormFieldTitle_communicationEventId"> - <value xml:lang="en">Communication Event Id </value> - <value xml:lang="fr">Réf. d'évènement de communication </value> - <value xml:lang="it">Codice Evento Comunicazione</value> - <value xml:lang="nl">Communication Event Id</value> - <value xml:lang="ro">Cod Eveniment Comunicatie</value> - <value xml:lang="th">รหัสà¸à¸¥à¸à¸µà¹à¹à¸à¹à¸à¸²à¸à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸ªà¸·à¹à¸à¸ªà¸²à¸£</value> - <value xml:lang="zh">æ²éäºä»¶æ è¯ </value> - </property> <property key="FormFieldTitle_contactMechTypeId"> <value xml:lang="en">Contact Mech Type Id</value> <value xml:lang="fr">Réf. de type de coordonnée</value> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |