svn commit: r1156270 - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1156270 - in /ofbiz/branches/jackrabbit2010
 
|
Author: sascharodekamp
Date: Wed Aug 10 17:26:04 2011 New Revision: 1156270 URL: http://svn.apache.org/viewvc?rev=1156270&view=rev Log: Update the Jackrabbit branch with the current trunk version to keep the branch up to date Added: ofbiz/branches/jackrabbit20100709/svnUpHotdeploy.sh - copied unchanged from r1156267, ofbiz/trunk/svnUpHotdeploy.sh Removed: ofbiz/branches/jackrabbit20100709/framework/base/lib/jakarta-regexp-1.5.jar Modified: ofbiz/branches/jackrabbit20100709/ (props changed) ofbiz/branches/jackrabbit20100709/.gitignore ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jackrabbit20100709/framework/minilang/dtd/simple-methods.xsd ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml (props changed) ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/WidgetWorker.java ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailOrderScreens.xml ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/ProjectMenus.xml Propchange: ofbiz/branches/jackrabbit20100709/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 10 17:26:04 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4:951708-952957 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:962442-1153542 +/ofbiz/trunk:962442-1156267 Modified: ofbiz/branches/jackrabbit20100709/.gitignore URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/.gitignore?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/.gitignore (original) +++ ofbiz/branches/jackrabbit20100709/.gitignore Wed Aug 10 17:26:04 2011 @@ -51,6 +51,7 @@ specialpurpose/oagis/build/ specialpurpose/pos/build/ specialpurpose/projectmgr/build/ specialpurpose/webpos/build/ +specialpurpose/scrum/build/ specialpurpose/shark/build/ ofbiz.jar changelog @@ -87,3 +88,4 @@ debian/ofbiz/ debian/stamps/ debian/orig-work .pc +.DS_Store Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy Wed Aug 10 17:26:04 2011 @@ -1,45 +1,45 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.ofbiz.base.util.*; -import org.ofbiz.common.geo.*; -import org.ofbiz.entity.*; - -uiLabelMap = UtilProperties.getResourceBundleMap("AccountingUiLabels", locale); - -if (fixedAsset) { - latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, "FixedAssetAndGeoPoint", "fixedAssetId", fixedAssetId, null, null); - if (latestGeoPoint) { - context.latestGeoPoint = latestGeoPoint; - - //List geoCenter = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "zoom", "13")); - - if (latestGeoPoint.containsKey("latitude") && latestGeoPoint.containsKey("longitude")) { - List geoPoints = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "fixedAssetId", fixedAssetId, - "link", UtilMisc.toMap("url", "EditFixedAsset?fixedAssetId="+ fixedAssetId, "label", uiLabelMap.AccountingFixedAsset + " " + fixedAsset.fixedAssetName))); - - Map geoChart = UtilMisc.toMap("width", "500px", "height", "450px", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints); - context.geoChart = geoChart; - } - if (latestGeoPoint.elevationUomId) { - elevationUom = delegator.findOne("Uom", [uomId : latestGeoPoint.elevationUomId], false); - context.elevationUomAbbr = elevationUom.abbreviation; - } - } +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.ofbiz.base.util.*; +import org.ofbiz.common.geo.*; +import org.ofbiz.entity.*; + +uiLabelMap = UtilProperties.getResourceBundleMap("AccountingUiLabels", locale); + +if (fixedAsset) { + latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, "FixedAssetAndGeoPoint", "fixedAssetId", fixedAssetId, null, null); + if (latestGeoPoint) { + context.latestGeoPoint = latestGeoPoint; + + //List geoCenter = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "zoom", "13")); + + if (latestGeoPoint.containsKey("latitude") && latestGeoPoint.containsKey("longitude")) { + List geoPoints = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "fixedAssetId", fixedAssetId, + "link", UtilMisc.toMap("url", "EditFixedAsset?fixedAssetId="+ fixedAssetId, "label", uiLabelMap.AccountingFixedAsset + " " + fixedAsset.fixedAssetName))); + + Map geoChart = UtilMisc.toMap("width", "500px", "height", "450px", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints); + context.geoChart = geoChart; + } + if (latestGeoPoint.elevationUomId) { + elevationUom = delegator.findOne("Uom", [uomId : latestGeoPoint.elevationUomId], false); + context.elevationUomAbbr = elevationUom.abbreviation; + } + } } Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy Wed Aug 10 17:26:04 2011 @@ -36,9 +36,9 @@ if (invoiceTypeId) { LESS_THAN(dueDate: UtilDateTime.nowTimestamp()) } if ("PURCHASE_INVOICE".equals(invoiceTypeId)) { - invoiceStatusesCondition = exprBldr.IN(statusId: ["INVOICE_RECEIVED", "INVOICE_IN_PROCESS"]) + invoiceStatusesCondition = exprBldr.IN(statusId: ["INVOICE_RECEIVED", "INVOICE_IN_PROCESS", "INVOICE_READY"]) } else if ("SALES_INVOICE".equals(invoiceTypeId)) { - invoiceStatusesCondition = exprBldr.IN(statusId: ["INVOICE_SENT", "INVOICE_APPROVED"]) + invoiceStatusesCondition = exprBldr.IN(statusId: ["INVOICE_SENT", "INVOICE_APPROVED", "INVOICE_READY"]) } expr = exprBldr.AND([expr, invoiceStatusesCondition]); @@ -53,6 +53,7 @@ if (invoiceTypeId) { } invoicesCond = exprBldr.AND(invoiceStatusesCondition) { + EQUALS(invoiceTypeId: invoiceTypeId) GREATER_THAN_EQUAL_TO(dueDate: UtilDateTime.nowTimestamp()) } EntityFindOptions findOptions = new EntityFindOptions(); Modified: ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml Wed Aug 10 17:26:04 2011 @@ -648,6 +648,10 @@ <value xml:lang="zh">å 容</value> <value xml:lang="zh_TW">å §å®¹</value> </property> + <property key="ContentContents"> + <value xml:lang="en">Contents</value> + <value xml:lang="fr">Contenus</value> + </property> <property key="ContentContentCreatingError"> <value xml:lang="en">Error creating content in ${serviceName}</value> <value xml:lang="fr">Erreur de création du document dans le service ${serviceName}</value> Propchange: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 10 17:26:04 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957 /ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1153542 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1156267 Propchange: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 10 17:26:04 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-1153542 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1156267 Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy Wed Aug 10 17:26:04 2011 @@ -1,59 +1,59 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.ofbiz.common.geo.*; -import org.ofbiz.base.util.*; - -uiLabelMap = UtilProperties.getResourceBundleMap("PartyUiLabels", locale); -uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - -partyId = parameters.partyId ?: parameters.party_id; -userLoginId = parameters.userlogin_id ?: parameters.userLoginId; - -if (!partyId && userLoginId) { - thisUserLogin = delegator.findByPrimaryKey("UserLogin", [userLoginId : userLoginId]); - if (thisUserLogin) { - partyId = thisUserLogin.partyId; - } -} -geoPointId = parameters.geoPointId; -context.partyId = partyId; - -if (!geoPointId) { - latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, "PartyAndGeoPoint", "partyId", partyId, null, null); -} else { - latestGeoPoint = delegator.findByPrimaryKey("GeoPoint", [geoPointId : geoPointId]); -} -if (latestGeoPoint) { - context.latestGeoPoint = latestGeoPoint; - - List geoCenter = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "zoom", "13")); - - if (UtilValidate.isNotEmpty(latestGeoPoint) && latestGeoPoint.containsKey("latitude") && latestGeoPoint.containsKey("longitude")) { - List geoPoints = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "partyId", partyId, - "link", UtilMisc.toMap("url", "viewprofile?partyId="+ partyId, "label", uiLabelMap.PartyProfile + " " + uiLabelMap.CommonOf + " " + partyId))); - - Map geoChart = UtilMisc.toMap("width", "500px", "height", "450px", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints); - context.geoChart = geoChart; - } - if (latestGeoPoint && latestGeoPoint.elevationUomId) { - elevationUom = delegator.findOne("Uom", [uomId : latestGeoPoint.elevationUomId], false); - context.elevationUomAbbr = elevationUom.abbreviation; - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.ofbiz.common.geo.*; +import org.ofbiz.base.util.*; + +uiLabelMap = UtilProperties.getResourceBundleMap("PartyUiLabels", locale); +uiLabelMap.addBottomResourceBundle("CommonUiLabels"); + +partyId = parameters.partyId ?: parameters.party_id; +userLoginId = parameters.userlogin_id ?: parameters.userLoginId; + +if (!partyId && userLoginId) { + thisUserLogin = delegator.findByPrimaryKey("UserLogin", [userLoginId : userLoginId]); + if (thisUserLogin) { + partyId = thisUserLogin.partyId; + } +} +geoPointId = parameters.geoPointId; +context.partyId = partyId; + +if (!geoPointId) { + latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, "PartyAndGeoPoint", "partyId", partyId, null, null); +} else { + latestGeoPoint = delegator.findByPrimaryKey("GeoPoint", [geoPointId : geoPointId]); +} +if (latestGeoPoint) { + context.latestGeoPoint = latestGeoPoint; + + List geoCenter = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "zoom", "13")); + + if (UtilValidate.isNotEmpty(latestGeoPoint) && latestGeoPoint.containsKey("latitude") && latestGeoPoint.containsKey("longitude")) { + List geoPoints = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "partyId", partyId, + "link", UtilMisc.toMap("url", "viewprofile?partyId="+ partyId, "label", uiLabelMap.PartyProfile + " " + uiLabelMap.CommonOf + " " + partyId))); + + Map geoChart = UtilMisc.toMap("width", "500px", "height", "450px", "controlUI" , "small", "dataSourceId", latestGeoPoint.dataSourceId, "points", geoPoints); + context.geoChart = geoChart; + } + if (latestGeoPoint && latestGeoPoint.elevationUomId) { + elevationUom = delegator.findOne("Uom", [uomId : latestGeoPoint.elevationUomId], false); + context.elevationUomAbbr = elevationUom.abbreviation; + } +} Propchange: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 10 17:26:04 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957 /ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:962442-1153542 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:962442-1156267 Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java Wed Aug 10 17:26:04 2011 @@ -338,97 +338,112 @@ public class CatalogUrlFilter extends Co public static String makeCategoryUrl(HttpServletRequest request, String previousCategoryId, String productCategoryId, String productId, String viewSize, String viewIndex, String viewSort, String searchString) { Delegator delegator = (Delegator) request.getAttribute("delegator"); - String url = null; try { GenericValue productCategory = delegator.findOne("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId), true); CategoryContentWrapper wrapper = new CategoryContentWrapper(productCategory, request); - StringWrapper alternativeUrl = wrapper.get("ALTERNATIVE_URL"); - - if (UtilValidate.isNotEmpty(alternativeUrl) && UtilValidate.isNotEmpty(alternativeUrl.toString())) { - StringBuilder urlBuilder = new StringBuilder(); - urlBuilder.append(request.getSession().getServletContext().getContextPath()); - if (urlBuilder.charAt(urlBuilder.length() - 1) != '/') { - urlBuilder.append("/"); - } - // append alternative URL - url = UrlServletHelper.invalidCharacter(alternativeUrl.toString()); - urlBuilder.append(url); - if (UtilValidate.isNotEmpty(productCategoryId)) { - urlBuilder.append("-"); - urlBuilder.append(productCategoryId); - urlBuilder.append("-c"); - } - // append view index - if (UtilValidate.isNotEmpty(viewIndex)) { - if (!urlBuilder.toString().endsWith("?") && !urlBuilder.toString().endsWith("&")) { - urlBuilder.append("?"); - } - urlBuilder.append("viewIndex=" + viewIndex + "&"); - } - // append view size - if (UtilValidate.isNotEmpty(viewSize)) { - if (!urlBuilder.toString().endsWith("?") && !urlBuilder.toString().endsWith("&")) { - urlBuilder.append("?"); - } - urlBuilder.append("viewSize=" + viewSize + "&"); + return makeCategoryUrl(delegator, wrapper, request.getSession().getServletContext().getContextPath(), previousCategoryId, productCategoryId, productId, viewSize, viewIndex, viewSort, searchString); + } catch (GenericEntityException e) { + Debug.logWarning(e, "Cannot create category's URL for: " + productCategoryId, module); + return redirectUrl; + } + } + + public static String makeCategoryUrl(Delegator delegator, CategoryContentWrapper wrapper, String contextPath, String previousCategoryId, String productCategoryId, String productId, String viewSize, String viewIndex, String viewSort, String searchString) { + String url = ""; + StringWrapper alternativeUrl = wrapper.get("ALTERNATIVE_URL"); + + if (UtilValidate.isNotEmpty(alternativeUrl) && UtilValidate.isNotEmpty(alternativeUrl.toString())) { + StringBuilder urlBuilder = new StringBuilder(); + urlBuilder.append(contextPath); + if (urlBuilder.charAt(urlBuilder.length() - 1) != '/') { + urlBuilder.append("/"); + } + // append alternative URL + url = UrlServletHelper.invalidCharacter(alternativeUrl.toString()); + urlBuilder.append(url); + if (UtilValidate.isNotEmpty(productCategoryId)) { + urlBuilder.append("-"); + urlBuilder.append(productCategoryId); + urlBuilder.append("-c"); + } + // append view index + if (UtilValidate.isNotEmpty(viewIndex)) { + if (!urlBuilder.toString().endsWith("?") && !urlBuilder.toString().endsWith("&")) { + urlBuilder.append("?"); } - // append view sort - if (UtilValidate.isNotEmpty(viewSort)) { - if (!urlBuilder.toString().endsWith("?") && !urlBuilder.toString().endsWith("&")) { - urlBuilder.append("?"); - } - urlBuilder.append("viewSort=" + viewSort + "&"); + urlBuilder.append("viewIndex=" + viewIndex + "&"); + } + // append view size + if (UtilValidate.isNotEmpty(viewSize)) { + if (!urlBuilder.toString().endsWith("?") && !urlBuilder.toString().endsWith("&")) { + urlBuilder.append("?"); } - // append search string - if (UtilValidate.isNotEmpty(searchString)) { - if (!urlBuilder.toString().endsWith("?") && !urlBuilder.toString().endsWith("&")) { - urlBuilder.append("?"); - } - urlBuilder.append("searchString=" + searchString + "&"); + urlBuilder.append("viewSize=" + viewSize + "&"); + } + // append view sort + if (UtilValidate.isNotEmpty(viewSort)) { + if (!urlBuilder.toString().endsWith("?") && !urlBuilder.toString().endsWith("&")) { + urlBuilder.append("?"); } - if (urlBuilder.toString().endsWith("&")) { - return urlBuilder.toString().substring(0, urlBuilder.toString().length()-1); + urlBuilder.append("viewSort=" + viewSort + "&"); + } + // append search string + if (UtilValidate.isNotEmpty(searchString)) { + if (!urlBuilder.toString().endsWith("?") && !urlBuilder.toString().endsWith("&")) { + urlBuilder.append("?"); } - - return urlBuilder.toString(); - } else { - return CatalogUrlServlet.makeCatalogUrl(request, productId, productCategoryId, previousCategoryId); + urlBuilder.append("searchString=" + searchString + "&"); } - } catch (GenericEntityException e) { - Debug.logWarning(e, "Cannot create category's URL for: " + productCategoryId, module); - return redirectUrl; + if (urlBuilder.toString().endsWith("&")) { + return urlBuilder.toString().substring(0, urlBuilder.toString().length()-1); + } + + url = urlBuilder.toString(); + } else { + List<String> crumb = FastList.newInstance(); + String currentCategoryId = null; + url = CatalogUrlServlet.makeCatalogUrl(contextPath, crumb, productId, currentCategoryId, previousCategoryId); } + return url; } public static String makeProductUrl(HttpServletRequest request, String previousCategoryId, String productCategoryId, String productId) { Delegator delegator = (Delegator) request.getAttribute("delegator"); String url = null; try { - GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true); - ProductContentWrapper wrapper = new ProductContentWrapper(product, request); - StringWrapper alternativeUrl = wrapper.get("ALTERNATIVE_URL"); - if (UtilValidate.isNotEmpty(alternativeUrl) && UtilValidate.isNotEmpty(alternativeUrl.toString())) { - StringBuilder urlBuilder = new StringBuilder(); - urlBuilder.append(request.getSession().getServletContext().getContextPath()); - if (urlBuilder.charAt(urlBuilder.length() - 1) != '/') { - urlBuilder.append("/"); - } - // append alternative URL - url = UrlServletHelper.invalidCharacter(alternativeUrl.toString()); - urlBuilder.append(url); - if (UtilValidate.isNotEmpty(productId)) { - urlBuilder.append("-"); - urlBuilder.append(productId); - urlBuilder.append("-p"); - } - return urlBuilder.toString(); - } else { - return CatalogUrlServlet.makeCatalogUrl(request, productId, productCategoryId, previousCategoryId); - } + GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), true); + ProductContentWrapper wrapper = new ProductContentWrapper(product, request); + url = makeProductUrl(delegator, wrapper, request.getSession().getServletContext().getContextPath(), previousCategoryId, productCategoryId, productId); } catch (GenericEntityException e) { Debug.logWarning(e, "Cannot create product's URL for: " + productId, module); return redirectUrl; } + return url; + } + + public static String makeProductUrl(Delegator delegator, ProductContentWrapper wrapper, String contextPath, String previousCategoryId, String productCategoryId, String productId) { + String url = ""; + StringWrapper alternativeUrl = wrapper.get("ALTERNATIVE_URL"); + if (UtilValidate.isNotEmpty(alternativeUrl) && UtilValidate.isNotEmpty(alternativeUrl.toString())) { + StringBuilder urlBuilder = new StringBuilder(); + urlBuilder.append(contextPath); + if (urlBuilder.charAt(urlBuilder.length() - 1) != '/') { + urlBuilder.append("/"); + } + // append alternative URL + url = UrlServletHelper.invalidCharacter(alternativeUrl.toString()); + urlBuilder.append(url); + if (UtilValidate.isNotEmpty(productId)) { + urlBuilder.append("-"); + urlBuilder.append(productId); + urlBuilder.append("-p"); + } + url = urlBuilder.toString(); + } else { + List<String> crumb = FastList.newInstance(); + String currentCategoryId = null; + url = CatalogUrlServlet.makeCatalogUrl(contextPath, crumb, productId, currentCategoryId, previousCategoryId); + } + return url; } - } Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java Wed Aug 10 17:26:04 2011 @@ -179,4 +179,29 @@ public class CatalogUrlServlet extends H return urlBuilder.toString(); } + + public static String makeCatalogUrl(String contextPath, List<String> crumb, String productId, String currentCategoryId, String previousCategoryId) { + StringBuilder urlBuilder = new StringBuilder(); + urlBuilder.append(contextPath); + if (urlBuilder.charAt(urlBuilder.length() - 1) != '/') { + urlBuilder.append("/"); + } + urlBuilder.append(CATALOG_URL_MOUNT_POINT); + + if (UtilValidate.isNotEmpty(currentCategoryId)) { + crumb = CategoryWorker.adjustTrail(crumb, currentCategoryId, previousCategoryId); + for (String trailCategoryId: crumb) { + if ("TOP".equals(trailCategoryId)) continue; + urlBuilder.append("/"); + urlBuilder.append(trailCategoryId); + } + } + + if (UtilValidate.isNotEmpty(productId)) { + urlBuilder.append("/p_"); + urlBuilder.append(productId); + } + + return urlBuilder.toString(); + } } Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/OfbizCatalogAltUrlTransform.java Wed Aug 10 17:26:04 2011 @@ -20,12 +20,22 @@ package org.ofbiz.product.category; import java.io.IOException; import java.io.Writer; +import java.util.Locale; import java.util.Map; import javax.servlet.http.HttpServletRequest; +import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.base.util.template.FreeMarkerWorker; +import org.ofbiz.entity.Delegator; +import org.ofbiz.entity.GenericEntityException; +import org.ofbiz.entity.GenericValue; +import org.ofbiz.product.product.ProductContentWrapper; +import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.webapp.control.RequestHandler; + import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.NumberModel; @@ -53,11 +63,27 @@ public class OfbizCatalogAltUrlTransform return null; } + public boolean checkArg(Map args, String key, boolean defaultValue) { + if (!args.containsKey(key)) { + return defaultValue; + } else { + Object o = args.get(key); + if (o instanceof SimpleScalar) { + SimpleScalar s = (SimpleScalar) o; + return "true".equalsIgnoreCase(s.getAsString()); + } + return defaultValue; + } + } + @Override @SuppressWarnings("unchecked") public Writer getWriter(final Writer out, final Map args) throws TemplateModelException, IOException { final StringBuilder buf = new StringBuilder(); + final boolean fullPath = checkArg(args, "fullPath", false); + final boolean secure = checkArg(args, "secure", false); + return new Writer(out) { public void write(char[] cbuf, int off, int len) throws IOException { @@ -70,28 +96,55 @@ public class OfbizCatalogAltUrlTransform public void close() throws IOException { try { - Environment env = Environment.getCurrentEnvironment(); - BeanModel req = (BeanModel) env.getVariable("request"); - if (req != null) { + Environment env = Environment.getCurrentEnvironment(); + BeanModel req = (BeanModel) env.getVariable("request"); String previousCategoryId = getStringArg(args, "previousCategoryId"); String productCategoryId = getStringArg(args, "productCategoryId"); String productId = getStringArg(args, "productId"); - - HttpServletRequest request = (HttpServletRequest) req.getWrappedObject(); String url = ""; - if (UtilValidate.isNotEmpty(productId)) { - url = CatalogUrlFilter.makeProductUrl(request, previousCategoryId, productCategoryId, productId); + + Object prefix = env.getVariable("urlPrefix"); + String viewSize = getStringArg(args, "viewSize"); + String viewIndex = getStringArg(args, "viewIndex"); + String viewSort = getStringArg(args, "viewSort"); + String searchString = getStringArg(args, "searchString"); + if (req != null) { + + HttpServletRequest request = (HttpServletRequest) req.getWrappedObject(); + StringBuilder newURL = new StringBuilder(); + if (UtilValidate.isNotEmpty(productId)) { + url = CatalogUrlFilter.makeProductUrl(request, previousCategoryId, productCategoryId, productId); + } else { + url = CatalogUrlFilter.makeCategoryUrl(request, previousCategoryId, productCategoryId, productId, viewSize, viewIndex, viewSort, searchString); + } + // make the link + if (fullPath){ + String serverRootUrl = RequestHandler.getDefaultServerRootUrl(request, secure); + newURL.append(serverRootUrl); + } + newURL.append(url); + out.write(newURL.toString()); + } else if (prefix != null) { + Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env); + LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env); + Locale locale = (Locale) args.get("locale"); + if (UtilValidate.isNotEmpty(productId)) { + GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false); + ProductContentWrapper wrapper = new ProductContentWrapper(dispatcher, product, locale, "text/html"); + url = CatalogUrlFilter.makeProductUrl(delegator, wrapper, ((StringModel) prefix).getAsString(), previousCategoryId, productCategoryId, productId); + } else { + GenericValue productCategory = delegator.findOne("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId), false); + CategoryContentWrapper wrapper = new CategoryContentWrapper(dispatcher, productCategory, locale, "text/html"); + url = CatalogUrlFilter.makeCategoryUrl(delegator, wrapper, ((StringModel) prefix).getAsString(), previousCategoryId, productCategoryId, productId, viewSize, viewIndex, viewSort, searchString); + } + out.write(url.toString()); } else { - String viewSize = getStringArg(args, "viewSize"); - String viewIndex = getStringArg(args, "viewIndex"); - String viewSort = getStringArg(args, "viewSort"); - String searchString = getStringArg(args, "searchString"); - url = CatalogUrlFilter.makeCategoryUrl(request, previousCategoryId, productCategoryId, productId, viewSize, viewIndex, viewSort, searchString); + out.write(buf.toString()); } - out.write(url); - } } catch (TemplateModelException e) { throw new IOException(e.getMessage()); + } catch (GenericEntityException e) { + throw new IOException(e.getMessage()); } } }; Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/inventory/FindFacilityPhysicalInventory.groovy Wed Aug 10 17:26:04 2011 @@ -1,72 +1,72 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.ofbiz.service.ServiceUtil -import org.ofbiz.entity.condition.* - -facilityId = parameters.facilityId; - -// fields to search by -productId = parameters.productId ? parameters.productId.trim() : null; -internalName = parameters.internalName ? parameters.internalName.trim() : null; - -// build conditions -conditions = [EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId), - EntityCondition.makeCondition("inventoryItemTypeId", EntityOperator.EQUALS, "NON_SERIAL_INV_ITEM") - ]; -if (productId) { - conditions.add(EntityCondition.makeCondition("productId", EntityOperator.LIKE, productId + "%")); -} -if (internalName) { - conditions.add(EntityCondition.makeCondition("internalName", EntityOperator.LIKE, internalName + "%")); -} - -if (conditions.size() > 2) { - ecl = EntityCondition.makeCondition(conditions, EntityOperator.AND); - physicalInventory = delegator.findList("ProductInventoryItem", ecl, null, ['productId'], null, false); - - // also need the overal product QOH and ATP for each product - atpMap = [:]; - qohMap = [:]; - - // build a list of productIds - productIds = [] as Set; - physicalInventory.each { iter -> - productIds.add(iter.productId); - } - - // for each product, call the inventory counting service - productIds.each { productId -> - result = dispatcher.runSync("getInventoryAvailableByFacility", [facilityId : facilityId, productId : productId]); - if (!ServiceUtil.isError(result)) { - atpMap.put(productId, result.availableToPromiseTotal); - qohMap.put(productId, result.quantityOnHandTotal); - } - } - - // associate the quantities to each row and store the combined data as our list - physicalInventoryCombined = []; - physicalInventory.each { iter -> - row = iter.getAllFields(); - row.productATP = atpMap.get(row.productId); - row.productQOH = qohMap.get(row.productId); - physicalInventoryCombined.add(row); - } - context.physicalInventory = physicalInventoryCombined; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.ofbiz.service.ServiceUtil +import org.ofbiz.entity.condition.* + +facilityId = parameters.facilityId; + +// fields to search by +productId = parameters.productId ? parameters.productId.trim() : null; +internalName = parameters.internalName ? parameters.internalName.trim() : null; + +// build conditions +conditions = [EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId), + EntityCondition.makeCondition("inventoryItemTypeId", EntityOperator.EQUALS, "NON_SERIAL_INV_ITEM") + ]; +if (productId) { + conditions.add(EntityCondition.makeCondition("productId", EntityOperator.LIKE, productId + "%")); +} +if (internalName) { + conditions.add(EntityCondition.makeCondition("internalName", EntityOperator.LIKE, internalName + "%")); +} + +if (conditions.size() > 2) { + ecl = EntityCondition.makeCondition(conditions, EntityOperator.AND); + physicalInventory = delegator.findList("ProductInventoryItem", ecl, null, ['productId'], null, false); + + // also need the overal product QOH and ATP for each product + atpMap = [:]; + qohMap = [:]; + + // build a list of productIds + productIds = [] as Set; + physicalInventory.each { iter -> + productIds.add(iter.productId); + } + + // for each product, call the inventory counting service + productIds.each { productId -> + result = dispatcher.runSync("getInventoryAvailableByFacility", [facilityId : facilityId, productId : productId]); + if (!ServiceUtil.isError(result)) { + atpMap.put(productId, result.availableToPromiseTotal); + qohMap.put(productId, result.quantityOnHandTotal); + } + } + + // associate the quantities to each row and store the combined data as our list + physicalInventoryCombined = []; + physicalInventory.each { iter -> + row = iter.getAllFields(); + row.productATP = atpMap.get(row.productId); + row.productQOH = qohMap.get(row.productId); + physicalInventoryCombined.add(row); + } + context.physicalInventory = physicalInventoryCombined; } Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy Wed Aug 10 17:26:04 2011 @@ -1,112 +1,112 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.ofbiz.entity.* -import org.ofbiz.entity.condition.* -import org.ofbiz.entity.transaction.* - -action = request.getParameter("action"); - -inventoryItemTotals = []; -qohGrandTotal = 0.0; -atpGrandTotal = 0.0; -costPriceGrandTotal = 0.0; -retailPriceGrandTotal = 0.0; -totalCostPriceGrandTotal = 0.0; -totalRetailPriceGrandTotal = 0.0; -boolean beganTransaction = false; -if (action) { - conditions = [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INV_DELIVERED")]; - conditions.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, null)); - conditionList = EntityCondition.makeCondition(conditions, EntityOperator.OR); - try { - // create resultMap to stop issue with the first puts in the while loop - resultMap = [:]; - beganTransaction = TransactionUtil.begin(); - invItemListItr = delegator.find("InventoryItem", conditionList, null, null, ['productId'], null); - while ((inventoryItem = invItemListItr.next()) != null) { - productId = inventoryItem.productId; - product = delegator.findOne("Product", [productId : productId], false); - productFacility = delegator.findOne("ProductFacility", [productId : productId, facilityId : facilityId], false); - if (productFacility) { - quantityOnHandTotal = inventoryItem.getDouble("quantityOnHandTotal"); - availableToPromiseTotal = inventoryItem.getDouble("availableToPromiseTotal"); - costPrice = inventoryItem.getDouble("unitCost"); - retailPrice = 0.0; - productPrices = product.getRelated("ProductPrice"); - if (productPrices) { - productPrices.each { productPrice -> - if (("DEFAULT_PRICE").equals(productPrice.productPriceTypeId)) { - retailPrice = productPrice.getDouble("price"); - } - } - } - if (costPrice && quantityOnHandTotal) { - totalCostPrice = costPrice * quantityOnHandTotal; - resultMap.totalCostPrice = totalCostPrice; - totalCostPriceGrandTotal += totalCostPrice; - } - if (retailPrice && quantityOnHandTotal) { - totalRetailPrice = retailPrice * quantityOnHandTotal; - resultMap.totalRetailPrice = totalRetailPrice; - totalRetailPriceGrandTotal += totalRetailPrice; - } - if (quantityOnHandTotal) { - qohGrandTotal += quantityOnHandTotal; - } - if (availableToPromiseTotal) { - atpGrandTotal += availableToPromiseTotal; - } - if (costPrice) { - costPriceGrandTotal += costPrice; - } - if (retailPrice) { - retailPriceGrandTotal += retailPrice; - } - - resultMap = [productId : product.productId, quantityOnHand : quantityOnHandTotal, availableToPromise : availableToPromiseTotal, - costPrice : costPrice, retailPrice : retailPrice]; - inventoryItemTotals.add(resultMap); - } - } - invItemListItr.close(); - } catch (GenericEntityException e) { - errMsg = "Failure in operation, rolling back transaction"; - Debug.logError(e, errMsg, "findInventoryItemsByLabels"); - try { - // only rollback the transaction if we started one... - TransactionUtil.rollback(beganTransaction, errMsg, e); - } catch (GenericEntityException e2) { - Debug.logError(e2, "Could not rollback transaction: " + e2.toString(), "findInventoryItemsByLabels"); - } - // after rolling back, rethrow the exception - throw e; - } finally { - // only commit the transaction if we started one... this will throw an exception if it fails - TransactionUtil.commit(beganTransaction); - } - -} - -inventoryItemGrandTotals = []; -inventoryItemGrandTotals.add([qohGrandTotal : qohGrandTotal, atpGrandTotal : atpGrandTotal, - totalCostPriceGrandTotal : totalCostPriceGrandTotal, totalRetailPriceGrandTotal : totalRetailPriceGrandTotal]); - -context.inventoryItemTotals = inventoryItemTotals; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.ofbiz.entity.* +import org.ofbiz.entity.condition.* +import org.ofbiz.entity.transaction.* + +action = request.getParameter("action"); + +inventoryItemTotals = []; +qohGrandTotal = 0.0; +atpGrandTotal = 0.0; +costPriceGrandTotal = 0.0; +retailPriceGrandTotal = 0.0; +totalCostPriceGrandTotal = 0.0; +totalRetailPriceGrandTotal = 0.0; +boolean beganTransaction = false; +if (action) { + conditions = [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INV_DELIVERED")]; + conditions.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, null)); + conditionList = EntityCondition.makeCondition(conditions, EntityOperator.OR); + try { + // create resultMap to stop issue with the first puts in the while loop + resultMap = [:]; + beganTransaction = TransactionUtil.begin(); + invItemListItr = delegator.find("InventoryItem", conditionList, null, null, ['productId'], null); + while ((inventoryItem = invItemListItr.next()) != null) { + productId = inventoryItem.productId; + product = delegator.findOne("Product", [productId : productId], false); + productFacility = delegator.findOne("ProductFacility", [productId : productId, facilityId : facilityId], false); + if (productFacility) { + quantityOnHandTotal = inventoryItem.getDouble("quantityOnHandTotal"); + availableToPromiseTotal = inventoryItem.getDouble("availableToPromiseTotal"); + costPrice = inventoryItem.getDouble("unitCost"); + retailPrice = 0.0; + productPrices = product.getRelated("ProductPrice"); + if (productPrices) { + productPrices.each { productPrice -> + if (("DEFAULT_PRICE").equals(productPrice.productPriceTypeId)) { + retailPrice = productPrice.getDouble("price"); + } + } + } + if (costPrice && quantityOnHandTotal) { + totalCostPrice = costPrice * quantityOnHandTotal; + resultMap.totalCostPrice = totalCostPrice; + totalCostPriceGrandTotal += totalCostPrice; + } + if (retailPrice && quantityOnHandTotal) { + totalRetailPrice = retailPrice * quantityOnHandTotal; + resultMap.totalRetailPrice = totalRetailPrice; + totalRetailPriceGrandTotal += totalRetailPrice; + } + if (quantityOnHandTotal) { + qohGrandTotal += quantityOnHandTotal; + } + if (availableToPromiseTotal) { + atpGrandTotal += availableToPromiseTotal; + } + if (costPrice) { + costPriceGrandTotal += costPrice; + } + if (retailPrice) { + retailPriceGrandTotal += retailPrice; + } + + resultMap = [productId : product.productId, quantityOnHand : quantityOnHandTotal, availableToPromise : availableToPromiseTotal, + costPrice : costPrice, retailPrice : retailPrice]; + inventoryItemTotals.add(resultMap); + } + } + invItemListItr.close(); + } catch (GenericEntityException e) { + errMsg = "Failure in operation, rolling back transaction"; + Debug.logError(e, errMsg, "findInventoryItemsByLabels"); + try { + // only rollback the transaction if we started one... + TransactionUtil.rollback(beganTransaction, errMsg, e); + } catch (GenericEntityException e2) { + Debug.logError(e2, "Could not rollback transaction: " + e2.toString(), "findInventoryItemsByLabels"); + } + // after rolling back, rethrow the exception + throw e; + } finally { + // only commit the transaction if we started one... this will throw an exception if it fails + TransactionUtil.commit(beganTransaction); + } + +} + +inventoryItemGrandTotals = []; +inventoryItemGrandTotals.add([qohGrandTotal : qohGrandTotal, atpGrandTotal : atpGrandTotal, + totalCostPriceGrandTotal : totalCostPriceGrandTotal, totalRetailPriceGrandTotal : totalRetailPriceGrandTotal]); + +context.inventoryItemTotals = inventoryItemTotals; context.inventoryItemGrandTotals = inventoryItemGrandTotals; Propchange: ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 10 17:26:04 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957 /ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1153542 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1156267 Modified: ofbiz/branches/jackrabbit20100709/framework/minilang/dtd/simple-methods.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/minilang/dtd/simple-methods.xsd?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/minilang/dtd/simple-methods.xsd (original) +++ ofbiz/branches/jackrabbit20100709/framework/minilang/dtd/simple-methods.xsd Wed Aug 10 17:26:04 2011 @@ -2376,6 +2376,7 @@ under the License. <xs:enumeration value="equals"/> <xs:enumeration value="not-equals"/> <xs:enumeration value="in"/> + <xs:enumeration value="not-in"/> <xs:enumeration value="between"/> <xs:enumeration value="like"/> <xs:enumeration value="not-like"/> Propchange: ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 10 17:26:04 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/securityext/data/PasswordSecurityData.xml:951708-952957 /ofbiz/branches/jquery/applications/securityext/data/PasswordSecurityData.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/securityext/data/PasswordSecurityData.xml:921280-927264 -/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:962442-1153542 +/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:962442-1156267 Modified: ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Wed Aug 10 17:26:04 2011 @@ -138,7 +138,7 @@ public class ControlServlet extends Http if (Debug.timingOn()) { timer = new UtilTimer(); timer.setLog(true); - timer.timerString("[" + rname + "(Domain:" + request.getServerName() + ")] Request Begun, encoding=[" + charset + "]", module); + timer.timerString("[" + rname + "(Domain:" + request.getScheme() + "://" + request.getServerName() + ")] Request Begun, encoding=[" + charset + "]", module); } // Setup the CONTROL_PATH for JSP dispatching. @@ -321,7 +321,7 @@ public class ControlServlet extends Http Debug.logError(t, "Error in ControlServlet saving ServerHit/Bin information; the output was successful, but can't save this tracking information. The error was: " + t.toString(), module); } } - if (Debug.timingOn()) timer.timerString("[" + rname + "(Domain:" + request.getServerName() + ")] Request Done", module); + if (Debug.timingOn()) timer.timerString("[" + rname + "(Domain:" + request.getScheme() + "://" + request.getServerName() + ")] Request Done", module); // sanity check 2: make sure there are no user or session infos in the delegator, ie clear the thread GenericDelegator.clearUserIdentifierStack(); Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/WidgetWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/WidgetWorker.java?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/WidgetWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/WidgetWorker.java Wed Aug 10 17:26:04 2011 @@ -279,11 +279,13 @@ public class WidgetWorker { writer.append("\">"); for (Map.Entry<String, String> parameter: parameterMap.entrySet()) { - writer.append("<input name=\""); - writer.append(parameter.getKey()); - writer.append("\" value=\""); - writer.append(parameter.getValue()); - writer.append("\" type=\"hidden\"/>"); + if (parameter.getValue() != null) { + writer.append("<input name=\""); + writer.append(parameter.getKey()); + writer.append("\" value=\""); + writer.append(parameter.getValue()); + writer.append("\" type=\"hidden\"/>"); + } } writer.append("</form>"); Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 10 17:26:04 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957 /ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1153542 +/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1156267 Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Wed Aug 10 17:26:04 2011 @@ -522,7 +522,7 @@ ${virtualVariantJavaScript?if_exists} <#-- show tell a friend details only in ecommerce application --> <div> </div> <div> - <a href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');" class="buttontext">${uiLabelMap.CommonTellAFriend}</a> + <a href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}<#if categoryId?exists>&categoryId=${categoryId}/</#if></@ofbizUrl>','tellafriend');" class="buttontext">${uiLabelMap.CommonTellAFriend}</a> </div> <#if disFeatureList?exists && 0 < disFeatureList.size()> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl Wed Aug 10 17:26:04 2011 @@ -23,13 +23,11 @@ under the License. </head> <body class="ecbody"> <form name="tellafriend" action="<@ofbizUrl>emailFriend</@ofbizUrl>" method="post"> - <#if requestParameters.productId?exists> - <input type="hidden" name="pageUrl" value="<@ofbizUrl fullPath="true" encode="false" secure="false">/product?product_id=${requestParameters.productId}</@ofbizUrl>" /> - <#elseif requestParameters.categoryId?exists> - <input type="hidden" name="pageUrl" value="<@ofbizUrl fullPath="true" encode="false" secure="false">/category?category_id=${requestParameters.categoryId}</@ofbizUrl>" /> - <#else> - <#assign cancel = "Y"> - </#if> + <#if (requestParameters.productId)?exists || (requestParameters.productId)?exists> + <input type="hidden" name="pageUrl" value="<@ofbizCatalogAltUrl fullPath="true" secure="false" productCategoryId=requestParameters.categoryId!"" productId=requestParameters.productId!""/>" /> + <#else> + <#assign cancel = "Y"> + </#if> <#if !cancel?exists> <table> <tr> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl Wed Aug 10 17:26:04 2011 @@ -21,7 +21,7 @@ function submitForm(form) { form.submit(); } </script> -<div class="buttons"> +<div> <a href="<@ofbizUrl>setCustomer</@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Personal Info</a> <#if (enableShippingAddress)?exists> <a href="<@ofbizUrl>setShipping</@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Shipping Address</a> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl Wed Aug 10 17:26:04 2011 @@ -17,6 +17,7 @@ specific language governing permissions under the License. --> +<p> <h3>${uiLabelMap.EcommerceYourNamePhoneAndEmail}</h3> <form id="editCustomerNamePhoneAndEmail" name="${parameters.formNameValue}" method="post" action="<@ofbizUrl>processCustomerSettings</@ofbizUrl>"> <input type="hidden" name="partyId" value="${parameters.partyId?if_exists}"/> @@ -119,8 +120,8 @@ under the License. </select> </span> </div> - </fieldset> <div class="buttons"> <input type="submit" value="${uiLabelMap.CommonContinue}"/> </div> + </fieldset> </form> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Wed Aug 10 17:26:04 2011 @@ -122,7 +122,7 @@ under the License. <#else> <#assign product = orderItem.getRelatedOneCache("Product")?if_exists/> <#-- should always exist because of FK constraint, but just in case --> <td > - <a href="<@ofbizUrl fullPath="true">product?product_id=${orderItem.productId}</@ofbizUrl>" class="linktext">${orderItem.productId} - ${orderItem.itemDescription?default("")}</a> + <a href="<@ofbizCatalogAltUrl fullPath="true" secure="false" productId=orderItem.productId/>" class="linktext">${orderItem.productId} - ${orderItem.itemDescription?default("")}</a> <#if product?has_content> <#if product.piecesIncluded?exists && product.piecesIncluded?long != 0> [${uiLabelMap.OrderPieces}: ${product.piecesIncluded}] Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailOrderScreens.xml?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailOrderScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailOrderScreens.xml Wed Aug 10 17:26:04 2011 @@ -30,7 +30,7 @@ under the License. <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PageTitleOrderConfirmationNotice}"/> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce"/> <set field="title" value="Order"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy"/> </actions> @@ -84,7 +84,7 @@ under the License. <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PageTitleOrderConfirmationNotice}"/> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce"/> <set field="allowAnonymousView" value="Y"/> <!-- this field will instruction OrderStatus.groovy to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work --> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 10 17:26:04 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1153542 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1156267 Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 10 17:26:04 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1153542 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1156267 Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 10 17:26:04 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1153542 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1156267 Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Wed Aug 10 17:26:04 2011 @@ -850,6 +850,14 @@ <value xml:lang="th">à¹à¸à¸£à¹à¸à¸</value> <value xml:lang="zh">项ç®</value> </property> + <property key="ProjectMgrConfirmationClose"> + <value xml:lang="en">Are you sure to close this project?</value> + <value xml:lang="fr">Etes vous sur de vouloir clôturer ce projet ?</value> + </property> + <property key="ProjectMgrConfirmationSchedule"> + <value xml:lang="en">Are you sure to schedule this project?</value> + <value xml:lang="fr">Etes vous sûr de vouloir planifier ce projet ?</value> + </property> <property key="ProjectMgrContentList"> <value xml:lang="de">Projektinhaltsliste</value> <value xml:lang="en">Project Content List</value> @@ -1355,7 +1363,7 @@ <property key="ProjectMgrProjectId"> <value xml:lang="de">Projekt ID</value> <value xml:lang="en">Project Id</value> - <value xml:lang="fr">Réf. de projet</value> + <value xml:lang="fr">N° de projet</value> <value xml:lang="it">Progetto</value> <value xml:lang="nl">ID</value> <value xml:lang="th">รหัสà¹à¸à¸£à¹à¸à¸</value> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/ProjectMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/ProjectMenus.xml?rev=1156270&r1=1156269&r2=1156270&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/ProjectMenus.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/ProjectMenus.xml Wed Aug 10 17:26:04 2011 @@ -261,7 +261,7 @@ <if-compare field="hasUpdatePermission" operator="equals" value="true"/> </and> </condition> - <link target="scheduleProject"> + <link target="scheduleProject" request-confirmation="true" confirmation-message="${uiLabelMap.ProjectMgrConfirmationSchedule}"> <parameter param-name="projectId"/> </link> </menu-item> @@ -288,7 +288,7 @@ <if-compare field="hasUpdatePermission" operator="equals" value="true"/> </and> </condition> - <link target="updateProject" request-confirmation="true" confirmation-message="Are you sure you want to close this project?"> + <link target="updateProject" request-confirmation="true" confirmation-message="${uiLabelMap.ProjectMgrConfirmationClose}"> <parameter param-name="workEffortId" from-field="parameters.projectId"/> <parameter param-name="currentStatusId" value="PRJ_CLOSED"/> </link> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |