svn commit: r996123 - in /ofbiz/branches/jquery: ./ applications/accounting/widget
Locked
svn commit: r996123 - in /ofbiz/branches/jquery: ./ applications/accounting/widget
 
|
Author: jleroux
Date: Sat Sep 11 11:34:47 2010 New Revision: 996123 URL: http://svn.apache.org/viewvc?rev=996123&view=rev Log: Merges the trunk at r996090 Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml ofbiz/branches/jquery/applications/accounting/widget/InvoiceScreens.xml ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml ofbiz/branches/jquery/applications/accounting/widget/ar/CommonScreens.xml ofbiz/branches/jquery/applications/commonext/widget/SystemInfoScreens.xml ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/ContentDocument.java ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchWorker.java ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportScreens.xml ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventScreens.xml ofbiz/branches/jquery/applications/party/widget/partymgr/ProfileScreens.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml ofbiz/branches/jquery/applications/workeffort/widget/CalendarScreens.xml ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilXml.java ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoTemplateData.xml ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogScreens.xml ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/branches/jquery/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 11 11:34:47 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-995991 +/ofbiz/trunk:951708-996122 Modified: ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/FinAccountScreens.xml Sat Sep 11 11:34:47 2010 @@ -280,6 +280,7 @@ under the License. <screen name="ListBankAccount"> <section> <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="parameters.finAccountTypeId" value="BANK_ACCOUNT"/> </actions> <widgets> Modified: ofbiz/branches/jquery/applications/accounting/widget/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/InvoiceScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/InvoiceScreens.xml Sat Sep 11 11:34:47 2010 @@ -540,6 +540,7 @@ under the License. <screen name="ListCustomerInvoices"> <section> <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/> <entity-condition list="invoices" entity-name="Invoice"> <condition-list combine="and"> Modified: ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ap/CommonScreens.xml Sat Sep 11 11:34:47 2010 @@ -66,6 +66,7 @@ under the License. <screen name="ApPastDueInvoices"> <section> <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="invoices" from-field="PastDueInvoices"/> </actions> <widgets> @@ -78,6 +79,7 @@ under the License. <screen name="ApInvoicesDueSoon"> <section> <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="invoices" from-field="InvoicesDueSoon"/> </actions> <widgets> Modified: ofbiz/branches/jquery/applications/accounting/widget/ar/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/ar/CommonScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/ar/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/ar/CommonScreens.xml Sat Sep 11 11:34:47 2010 @@ -68,6 +68,7 @@ under the License. <screen name="ArPastDueInvoices"> <section> <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="invoices" from-field="PastDueInvoices"/> </actions> <widgets> @@ -80,6 +81,7 @@ under the License. <screen name="ArInvoicesDueSoon"> <section> <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="invoices" from-field="InvoicesDueSoon"/> </actions> <widgets> Modified: ofbiz/branches/jquery/applications/commonext/widget/SystemInfoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/SystemInfoScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/SystemInfoScreens.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/SystemInfoScreens.xml Sat Sep 11 11:34:47 2010 @@ -24,8 +24,8 @@ under the License. <screen name="SystemInfoNotes"> <section> <actions> - <service service-name="getSystemInfoNotes" - result-map="resultMap"/> + <property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/> + <service service-name="getSystemInfoNotes" result-map="resultMap"/> <set field="systemInfoNotes" from-field="resultMap.systemInfoNotes"/> </actions> <widgets> @@ -55,6 +55,7 @@ under the License. <screen name="SystemInfoStatus"> <section> <actions> + <property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/> <service service-name="getSystemInfoStatus" result-map="resultMap"/> <set field="systemInfoStatus" from-field="resultMap.systemInfoStatus"/> </actions> Modified: ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/content/ContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original) +++ ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/content/ContentServices.xml Sat Sep 11 11:34:47 2010 @@ -979,6 +979,7 @@ <call-object-method method-name="length" obj-field="parameters.textData" ret-field="textDataLen"/> <log level="info" message="textDataLen:${textDataLen}"/> <property-to-field resource="forum" property="descriptLen" field="descriptLen"/> + <set field="descriptLen" from-field="descriptLen" type="Integer"/> <log level="info" message="descriptLen:${descriptLen}"/> <call-class-method method-name="min" class-name="java.lang.Math" ret-field="subStringLen"> <field field="textDataLen" type="int"/> Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java Sat Sep 11 11:34:47 2010 @@ -944,7 +944,7 @@ public class ContentWorker implements or } } - public static void getContentAncestryAll(Delegator delegator, String contentId, String passedContentTypeId, String direction, List contentAncestorList) { + public static void getContentAncestryAll(Delegator delegator, String contentId, String passedContentTypeId, String direction, List<String> contentAncestorList) { String contentIdField = null; String contentIdOtherField = null; if (direction != null && direction.equalsIgnoreCase("to")) { Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Sat Sep 11 11:34:47 2010 @@ -870,7 +870,7 @@ public class DataResourceWorker impleme } else { out.append(textData); } - } else if ("text/plain".equals(targetMimeTypeId)) { + } else { out.append(textData); } } Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/ContentDocument.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/ContentDocument.java?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/ContentDocument.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/ContentDocument.java Sat Sep 11 11:34:47 2010 @@ -31,6 +31,7 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.StringUtil; +import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.content.content.ContentWorker; @@ -65,12 +66,12 @@ public class ContentDocument { return doc; } - Map map = FastMap.newInstance(); + Map<String, Object> map = FastMap.newInstance(); doc = Document(content, map, dispatcher); return doc; } - public static Document Document(GenericValue content, Map context, LocalDispatcher dispatcher) throws InterruptedException { + public static Document Document(GenericValue content, Map<String, Object> context, LocalDispatcher dispatcher) throws InterruptedException { Document doc; // make a new, empty document @@ -95,7 +96,7 @@ public class ContentDocument { String description = content.getString("description"); if (UtilValidate.isNotEmpty(description)) doc.add(new Field("description", description, Store.YES, Index.ANALYZED, TermVector.NO)); - List ancestorList = FastList.newInstance(); + List<String> ancestorList = FastList.newInstance(); Delegator delegator = content.getDelegator(); ContentWorker.getContentAncestryAll(delegator, contentId, "WEB_SITE_PUB_PT", "TO", ancestorList); String ancestorString = StringUtil.join(ancestorList, " "); @@ -115,7 +116,7 @@ public class ContentDocument { return doc; } - public static boolean indexDataResource(GenericValue content, Document doc, Map context, LocalDispatcher dispatcher) { + public static boolean indexDataResource(GenericValue content, Document doc, Map<String, Object> context, LocalDispatcher dispatcher) { Delegator delegator = content.getDelegator(); String contentId = content.getString("contentId"); //Debug.logInfo("in ContentDocument, contentId:" + contentId, @@ -127,13 +128,13 @@ public class ContentDocument { dataResource = delegator.findByPrimaryKeyCache("DataResource", UtilMisc.toMap("dataResourceId", dataResourceId)); } catch (GenericEntityException e) { Debug.logError(e, module); - List badIndexList = (List) context.get("badIndexList"); + List<String> badIndexList = UtilGenerics.checkList(context.get("badIndexList")); badIndexList.add(contentId + " - " + e.getMessage()); //Debug.logInfo("in DataResourceDocument, badIndexList:" + badIndexList, module); return false; } if (dataResource == null) { - List badIndexList = (List) context.get("badIndexList"); + List<String> badIndexList = UtilGenerics.checkList(context.get("badIndexList")); badIndexList.add(contentId + " - dataResource is null."); //Debug.logInfo("in DataResourceDocument, badIndexList:" + badIndexList, module); return false; @@ -152,13 +153,13 @@ public class ContentDocument { text = ContentWorker.renderContentAsText(dispatcher, delegator, contentId, context, locale, mimeTypeId, true); } catch (GeneralException e) { Debug.logError(e, module); - List badIndexList = (List) context.get("badIndexList"); + List<String> badIndexList = UtilGenerics.checkList(context.get("badIndexList")); badIndexList.add(contentId + " - " + e.getMessage()); //Debug.logInfo("in DataResourceDocument, badIndexList:" + badIndexList, module); return false; } catch (IOException e2) { Debug.logError(e2, module); - List badIndexList = (List) context.get("badIndexList"); + List<String> badIndexList = UtilGenerics.checkList(context.get("badIndexList")); badIndexList.add(contentId + " - " + e2.getMessage()); //Debug.logInfo("in DataResourceDocument, badIndexList:" + badIndexList, module); return false; @@ -169,19 +170,19 @@ public class ContentDocument { //Debug.logInfo("in ContentDocument, field:" + field.stringValue(), module); doc.add(field); } - List featureDataResourceList; + List<GenericValue> featureDataResourceList; try { featureDataResourceList = content.getRelatedCache("ProductFeatureDataResource"); } catch (GenericEntityException e) { Debug.logError(e, module); - List badIndexList = (List) context.get("badIndexList"); + List<String> badIndexList = UtilGenerics.checkList(context.get("badIndexList")); badIndexList.add(contentId + " - " + e.getMessage()); return false; } - List featureList = FastList.newInstance(); - Iterator iter = featureDataResourceList.iterator(); + List<String> featureList = FastList.newInstance(); + Iterator<GenericValue> iter = featureDataResourceList.iterator(); while (iter.hasNext()) { - GenericValue productFeatureDataResource = (GenericValue) iter .next(); + GenericValue productFeatureDataResource = iter .next(); String feature = productFeatureDataResource.getString("productFeatureId"); featureList.add(feature); } Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchWorker.java?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchWorker.java (original) +++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchWorker.java Sat Sep 11 11:34:47 2010 @@ -58,14 +58,14 @@ public class SearchWorker { Map<String, Object> results = FastMap.newInstance(); GenericValue content = delegator.makeValue("Content", UtilMisc.toMap("contentId", siteId)); if (Debug.infoOn()) Debug.logInfo("in indexTree, siteId:" + siteId + " content:" + content, module); - List<GenericValue> siteList = ContentWorker.getAssociatedContent(content, "From", UtilMisc.toList("SUBSITE", "PUBLISH_LINK"), null, UtilDateTime.nowTimestamp().toString(), null); + List<GenericValue> siteList = ContentWorker.getAssociatedContent(content, "To", UtilMisc.toList("SUBSITE", "PUBLISH_LINK", "SUB_CONTENT"), null, UtilDateTime.nowTimestamp().toString(), null); if (siteList != null) { Iterator<GenericValue> iter = siteList.iterator(); while (iter.hasNext()) { GenericValue siteContent = iter.next(); String siteContentId = siteContent.getString("contentId"); - List<GenericValue> subContentList = ContentWorker.getAssociatedContent(siteContent, "From", UtilMisc.toList("SUBSITE", "PUBLISH_LINK", "SUB_CONTENT"), null, UtilDateTime.nowTimestamp().toString(), null); + List<GenericValue> subContentList = ContentWorker.getAssociatedContent(siteContent, "To", UtilMisc.toList("SUBSITE", "PUBLISH_LINK", "SUB_CONTENT"), null, UtilDateTime.nowTimestamp().toString(), null); if (subContentList != null) { List<String> contentIdList = FastList.newInstance(); Modified: ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy (original) +++ ofbiz/branches/jquery/applications/content/webapp/content/WEB-INF/actions/cms/Search.groovy Sat Sep 11 11:34:47 2010 @@ -26,6 +26,7 @@ import org.apache.lucene.index.IndexRead import org.apache.lucene.search.Query import org.apache.lucene.search.TermQuery import org.apache.lucene.search.BooleanQuery +import org.apache.lucene.search.BooleanClause; import org.apache.lucene.index.Term import org.apache.lucene.search.Hits import org.apache.lucene.queryParser.QueryParser @@ -63,6 +64,7 @@ try { } catch (java.io.FileNotFoundException e) { request.setAttribute("errorMsgReq", "No index file exists."); Debug.logError("in search, error:" + e.getMessage(), ""); + return; } if (queryLine || siteId) { @@ -70,13 +72,13 @@ if (queryLine || siteId) { if (queryLine) { queryParser = new QueryParser("content", analyzer); query = queryParser.parse(queryLine); - combQuery.add(query, true, false); + combQuery.add(query, BooleanClause.Occur.MUST); } Debug.logInfo("in search, combQuery(0):" + combQuery, ""); if (siteId) { termQuery = new TermQuery(new Term("site", siteId)); - combQuery.add(termQuery, true, false); + combQuery.add(termQuery, BooleanClause.Occur.MUST); Debug.logInfo("in search, termQuery:" + termQuery.toString(), ""); } Debug.logInfo("in search, combQuery(1):" + combQuery, ""); @@ -84,28 +86,26 @@ if (queryLine || siteId) { if (searchFeature1 || searchFeature2 || searchFeature3 || !featureIdByType.isEmpty()) { featureQuery = new BooleanQuery(); - anyOrAll = paramMap.any_or_all; - featuresRequired = true; - - if (anyOrAll && "any".equals(anyOrAll)) { - featuresRequired = false; + featuresRequired = BooleanClause.Occur.MUST; + if ("any".equals(paramMap.any_or_all)) { + featuresRequired = BooleanClause.Occur.SHOULD; } if (searchFeature1) { termQuery = new TermQuery(new Term("feature", searchFeature1)); - featureQuery.add(termQuery, featuresRequired, false); + featureQuery.add(termQuery, featuresRequired); Debug.logInfo("in search searchFeature1, termQuery:" + termQuery.toString(), ""); } if (searchFeature2) { termQuery = new TermQuery(new Term("feature", searchFeature2)); - featureQuery.add(termQuery, featuresRequired, false); + featureQuery.add(termQuery, featuresRequired); Debug.logInfo("in search searchFeature2, termQuery:" + termQuery.toString(), ""); } if (searchFeature3) { termQuery = new TermQuery(new Term("feature", searchFeature3)); - featureQuery.add(termQuery, featuresRequired, false); + featureQuery.add(termQuery, featuresRequired); Debug.logInfo("in search searchFeature3, termQuery:" + termQuery.toString(), ""); } @@ -113,28 +113,28 @@ if (searchFeature1 || searchFeature2 || values = featureIdByType.values(); values.each { val -> termQuery = new TermQuery(new Term("feature", val)); - featureQuery.add(termQuery, featuresRequired, false); + featureQuery.add(termQuery, featuresRequired); Debug.logInfo("in search searchFeature3, termQuery:" + termQuery.toString(), ""); } - combQuery.add(featureQuery, featuresRequired, false); + combQuery.add(featureQuery, featuresRequired); } - - if (searcher) { - Debug.logInfo("in search searchFeature3, combQuery:" + combQuery.toString(), ""); - Hits hits = searcher.search(combQuery); - Debug.logInfo("in search, hits:" + hits.length(), ""); - - contentList = [] as ArrayList; - hitSet = [:] as HashSet; - for (int start = 0; start < hits.length(); start++) { - doc = hits.doc(start); - contentId = doc.contentId; - content = delegator.findOne("Content", [contentId : contentId], true); - if (!hitSet.contains(contentId)) { - contentList.add(content); - hitSet.add(contentId); - } - } - context.queryResults = contentList; +} +if (searcher) { + Debug.logInfo("in search searchFeature3, combQuery:" + combQuery.toString(), ""); + Hits hits = searcher.search(combQuery); + Debug.logInfo("in search, hits:" + hits.length(), ""); + + contentList = [] as ArrayList; + hitSet = [:] as HashSet; + for (int start = 0; start < hits.length(); start++) { + doc = hits.doc(start); + contentId = doc.contentId; + content = delegator.findOne("Content", [contentId : contentId], true); + if (!hitSet.contains(contentId)) { + contentList.add(content); + hitSet.add(contentId); + } } + context.queryResults = contentList; } + Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 11 11:34:47 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087 /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:951708-995991 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-996122 Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml Sat Sep 11 11:34:47 2010 @@ -490,6 +490,7 @@ under the License. <screen name="IncomingCustRequests"> <section> <actions> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <entity-condition list="custRequests" entity-name="CustReqAndTypeAndPartyRel"> <condition-list combine="and"> <condition-expr field-name="statusId" operator="equals" value="CRQ_SUBMITTED"/> @@ -520,6 +521,7 @@ under the License. <screen name="ListCustRequests"> <section> <actions> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/> <set field="fromPartyId" from-field="userLogin.partyId"/> </actions> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml Sat Sep 11 11:34:47 2010 @@ -475,6 +475,7 @@ under the License. <screen name="ListCustomerOrders"> <section> <actions> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/> <set field="partyId" from-field="userLogin.partyId"/> <set field="statusId" from-field="statusId"/> @@ -493,6 +494,7 @@ under the License. <screen name="ListSalesOrders"> <section> <actions> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="filterDate" type="Timestamp" value="${nowTimestamp}"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy"/> </actions> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportScreens.xml Sat Sep 11 11:34:47 2010 @@ -42,6 +42,11 @@ under the License. <screen name="OrderReportSalesByStore"> <section> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + </actions> <widgets> <screenlet title="${uiLabelMap.OrderReportSalesByStore}"> <include-form name="SalesByStoreReport" location="component://order/widget/ordermgr/ReportForms.xml"/> @@ -52,6 +57,10 @@ under the License. <screen name="OrderReportOpenOrderItems"> <section> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + </actions> <widgets> <screenlet title="${uiLabelMap.OrderReportOpenOrderItems}"> <include-form name="OpenOrderItemsReport" location="component://order/widget/ordermgr/ReportForms.xml"/> @@ -62,6 +71,10 @@ under the License. <screen name="OrderReportPurchasesByOrganization"> <section> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + </actions> <widgets> <screenlet title="${uiLabelMap.OrderReportPurchasesByOrganization}"> <include-form name="PurchasesByOrganizationReport" location="component://order/widget/ordermgr/ReportForms.xml"/> @@ -72,6 +85,10 @@ under the License. <screen name="OrderReportPurchasesByProduct"> <section> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + </actions> <widgets> <screenlet title="${uiLabelMap.OrderReportPurchasesByProduct}"> <include-form name="OrderPurchaseProductOptions" location="component://order/widget/ordermgr/ReportForms.xml"/> @@ -82,6 +99,10 @@ under the License. <screen name="OrderReportPurchasesByPaymentMethod"> <section> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + </actions> <widgets> <screenlet title="${uiLabelMap.OrderReportPurchasesByPaymentMethod}"> <include-form name="OrderPurchasePaymentOptions" location="component://order/widget/ordermgr/ReportForms.xml"/> @@ -93,6 +114,9 @@ under the License. <!--New Screen--> <screen name="SalesReport"> <section> + <actions> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + </actions> <widgets> <screenlet title="Sales Report"> <include-form name="SalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/> @@ -103,6 +127,9 @@ under the License. <screen name="NetBeforeOverheadReport"> <section> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + </actions> <widgets> <screenlet title="Net Before Overhead Report"> <include-form name="NetBeforeOverheadReport" location="component://order/widget/ordermgr/ReportForms.xml"/> @@ -113,6 +140,9 @@ under the License. <screen name="ProductDemandReport"> <section> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + </actions> <widgets> <screenlet title="Product Demand Report"> <include-form name="ProductDemandReport" location="component://order/widget/ordermgr/ReportForms.xml"/> Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 11 11:34:47 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 /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:951708-995991 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-996122 Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventScreens.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/CommunicationEventScreens.xml Sat Sep 11 11:34:47 2010 @@ -838,6 +838,7 @@ under the License. <screen name="MyCommunicationEvents"> <section> <actions> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/> <set field="internalNotesOnly" from-field="internalNotesOnly" default-value="false"/> <set field="partyId" from-field="communicationPartyId" default-value="${userLogin.partyId}"/> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/ProfileScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/ProfileScreens.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/ProfileScreens.xml Sat Sep 11 11:34:47 2010 @@ -159,6 +159,7 @@ <section> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetPaymentMethods.groovy"/> </actions> <widgets> @@ -499,6 +500,7 @@ <screen name="partyRelContacts"> <section> <actions> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <entity-one entity-name="Party" value-field="party"></entity-one> <entity-and list="contacts" entity-name="PartyRelationship" filter-by-date="true"> <field-map field-name="partyIdFrom" from-field="parameters.partyId"/> Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 11 11:34:47 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087 /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:951708-995991 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-996122 Modified: ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/ProductScreens.xml Sat Sep 11 11:34:47 2010 @@ -1215,6 +1215,7 @@ under the License. <screen name="BestSellingProducts"> <section> <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <set field="filterDate" type="Timestamp" from-field="nowTimestamp"/> <script location="component://product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy"/> </actions> Modified: ofbiz/branches/jquery/applications/workeffort/widget/CalendarScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/widget/CalendarScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/widget/CalendarScreens.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/widget/CalendarScreens.xml Sat Sep 11 11:34:47 2010 @@ -24,6 +24,7 @@ under the License. <screen name="Calendar"> <section> <actions> + <property-map resource="WorkeffortUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/> <set field="parameters.period" from-field="parameters.period" default-value="${initialView}"/> <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy"/> Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilXml.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilXml.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilXml.java Sat Sep 11 11:34:47 2010 @@ -803,7 +803,7 @@ public class UtilXml { if (node != null) { do { if (node.getNodeType() == Node.ELEMENT_NODE && (childElementName == null || - childElementName.equals(node.getNodeName()))) { + childElementName.equals(node.getLocalName()))) { Element childElement = (Element) node; return childElement; } Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 11 11:34:47 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-995991 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-996122 Modified: ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml Sat Sep 11 11:34:47 2010 @@ -315,28 +315,27 @@ under the License. </form> - <!-- Lookup Layer Example --> + <!-- Lookup Examples --> <form name="ExampleLookupFields" type="single" title=""> <!-- Old style lookup (in a popup window) --> - <!-- Using separated labels is not recommended (it's better using sentences than words for translation) --> - <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><!-- we use partyIdFrom here only to differentiate from the other partyId field we use below, ie partyIdTo--> - <lookup target-form-name="LookupPartyExample" presentation="window"/> + <field name="partyIdTo"><!-- we use partyIdTo here only to differentiate from the other partyId field we use below--> + <lookup target-form-name="LookupPartyName" presentation="window"/> </field> <!-- Standard lookup (in a layer)--> - <!-- passes the name in one and the id in another field --> + <!-- passes the name in one field and the id in another --> <field name="partyName" title="${uiLabelMap.CommonName}"> - <lookup target-form-name="LookupPartyExampleByName" description-field-name="partyIdTo"/> + <lookup target-form-name="LookupPartyGroupByName" description-field-name="partyId"/> </field> - <!-- This field may be hidden and the name rendered in partyName using default-value if partyIdTo exists--> - <field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><text/></field><!-- the text field is only used for rendering. In the "real life" you would use the hidden fiels commented below to pass the data to the request --> - <!--field name="partyIdTo"><hidden/></field--> + <!-- This field may be hidden and the name rendered in partyName using default-value if partyId is known when loading the form--> + <field name="partyId" title="${uiLabelMap.CommonPartyID}"><text/></field><!-- the text field is only used for rendering. In the "real life" you would use the hidden fiels commented below to pass the data to the request --> + <!--field name="partyId"><hidden/></field--> <sort-order> <field-group> - <sort-field name="partyIdFrom"/> + <sort-field name="partyIdTo"/> </field-group> <field-group> <sort-field name="partyName"/> - <sort-field name="partyIdTo"/> + <sort-field name="partyId"/> </field-group> </sort-order> </form> Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 11 11:34:47 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-995991 +/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-996122 Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoTemplateData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoTemplateData.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoTemplateData.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoTemplateData.xml Sat Sep 11 11:34:47 2010 @@ -19,5 +19,5 @@ under the License. --> <entity-engine-xml> - <DataResource dataResourceId="TPL_XML_MB" dataResourceTypeId="OFBIZ_FILE" dataTemplateTypeId="FTL" objectInfo="component://ecommerce/webapp/ecommerce/content/tpl_mb_content.ftl" createdDate="2004-06-14 11:40:15.818" createdByUserLogin="admin" lastModifiedDate="2004-06-14 11:40:15.818" lastModifiedByUserLogin="admin" lastUpdatedStamp="2003-12-31 11:40:15.819"/> + <DataResource dataResourceId="TPL_XML_MB" dataResourceTypeId="LOCAL_FILE" dataTemplateTypeId="FTL" objectInfo="component://ecommerce/webapp/ecommerce/content/tpl_mb_content.ftl" createdDate="2004-06-14 11:40:15.818" createdByUserLogin="admin" lastModifiedDate="2004-06-14 11:40:15.818" lastModifiedByUserLogin="admin" lastUpdatedStamp="2003-12-31 11:40:15.819"/> </entity-engine-xml> Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogScreens.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogScreens.xml Sat Sep 11 11:34:47 2010 @@ -56,7 +56,7 @@ </link> </widgets> </section> - <link target="ViewBlogRss=" target-window="_blank"> + <link target="ViewBlogRss" target-window="_blank" link-type="anchor"> <parameter param-name="blogContentId" from-field="blogContent.contentId"/> <parameter param-name="mainLinkReq" value="MainBlog"/> <parameter param-name="entryLinkReq" value="ViewBlogArticle"/> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 11 11:34:47 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 /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:951708-995991 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-996122 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 11 11:34:47 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 /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:951708-995991 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-996122 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 11 11:34:47 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 /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:951708-995991 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-996122 Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/branches/jquery/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Sep 11 11:34:47 2010 @@ -1029,6 +1029,7 @@ under the License. <screen name="ListCustomerProjects"> <section> <actions> + <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/jsgantt.js" global="true"/> <set field="layoutSettings.styleSheets[]" value="/images/jsgantt.css" global="true"/> <entity-condition list="projects" entity-name="WorkEffortPartyAssignByGroup" filter-by-date="true"> Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/widget/TimeSheetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=996123&r1=996122&r2=996123&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original) +++ ofbiz/branches/jquery/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Sat Sep 11 11:34:47 2010 @@ -203,6 +203,7 @@ under the License. <screen name="CurrentTimesheet"> <section> <actions> + <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy"/> </actions> <widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |