svn commit: r1806326 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/widget
Locked
svn commit: r1806326 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/widget
 
|
Author: deepak
Date: Sat Aug 26 20:23:40 2017 New Revision: 1806326 URL: http://svn.apache.org/viewvc?rev=1806326&view=rev Log: Improved:Use from-field pattern instead of value=dollor pattern in 'set' element Apply slightly modified patch from jira issue, fixed some typo (OFBIZ-9607) Thanks Suraj Khurana and Rohit Rai for your contribution. Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/commonext/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/forum/ForumScreens.xml ofbiz/ofbiz-framework/trunk/applications/humanres/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/humanres/widget/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/MarketingReportScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/ReportScreens.xml ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortScreens.xml ofbiz/ofbiz-framework/trunk/framework/common/widget/LookupScreens.xml ofbiz/ofbiz-framework/trunk/framework/webtools/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/framework/webtools/widget/EntityScreens.xml ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml ofbiz/ofbiz-framework/trunk/framework/webtools/widget/MiscScreens.xml ofbiz/ofbiz-framework/trunk/framework/webtools/widget/TempExprScreens.xml ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlSetupScreens.xml Sat Aug 26 20:23:40 2017 @@ -54,7 +54,7 @@ under the License. <actions> <set field="titleProperty" value="AccountingAvailableInternalOrganizations"/> <set field="headerItem" value="companies"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingAvailableInternalOrganizations}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingAvailableInternalOrganizations"/> <entity-condition entity-name="PartyAcctgPreference" list="parties"/> <service service-name="acctgPrefPermissionCheck" result-map="permResult"> <field-map field-name="mainAction" value="UPDATE"/> @@ -137,7 +137,7 @@ under the License. <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingChartOfAcctsMenu"/> <set field="tabButtonItem" value="ListGlAccountOrganization"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingChartOfAcctsMenu}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingChartOfAcctsMenu"/> </actions> <widgets> <decorator-screen name="CommonGlSetupDecorator" location="${parameters.commonGlSetupDecoratorLocation}"> @@ -162,7 +162,7 @@ under the License. <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingTimePeriod"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingTimePeriod}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingTimePeriod"/> <set field="tabButtonItem" value="TimePeriods"/> <entity-condition entity-name="CustomTimePeriod" list="openTimePeriods"> <condition-list> @@ -203,7 +203,7 @@ under the License. <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingPreference"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingPreference}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingPreference"/> <set field="tabButtonItem" value="PartyAcctgPreference"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <set field="organizationPartyId" value="${groovy:if(parameters.organizationPartyId!=null) return parameters.organizationPartyId else return parameters.get('ApplicationDecorator|organizationPartyId')}"/> @@ -226,7 +226,7 @@ under the License. <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingGlJournals"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingGlJournals}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingGlJournals"/> <set field="tabButtonItem" value="SetupGlJournals"/> <entity-one entity-name="GlJournal" value-field="glJournal"/> </actions> @@ -247,7 +247,7 @@ under the License. <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingGlAccountTypeDefaults"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingGlAccountTypeDefaults}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingGlAccountTypeDefaults"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountTypeDefaults"/> </actions> @@ -268,7 +268,7 @@ under the License. <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingInvoiceSales"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingInvoiceSales}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingInvoiceSales"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="GlAccountSalInvoice"/> </actions> @@ -349,7 +349,7 @@ under the License. <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingProductGlAccount"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingProductGlAccount}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingProductGlAccount"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="ProductGlAccounts"/> @@ -375,7 +375,7 @@ under the License. <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingFinAccountTypeGlAccount"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingFinAccountTypeGlAccount}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingFinAccountTypeGlAccount"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="FinAccountTypeGlAccounts"/> @@ -405,7 +405,7 @@ under the License. <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingProductCategoryGlAccount"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingProductCategoryGlAccount}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingProductCategoryGlAccount"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="ProductCategoryGlAccounts"/> @@ -433,7 +433,7 @@ under the License. <set field="titleProperty" value="AccountingVarianceReasonGlAccounts"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="VarianceReasonGlAccounts"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingVarianceReasonGlAccounts}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingVarianceReasonGlAccounts"/> <entity-condition entity-name="VarianceReasonGlAccount" list="varianceReasonGlAccounts"> <condition-expr field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/> @@ -459,7 +459,7 @@ under the License. <set field="titleProperty" value="AccountingCreditCardTypeGlAccount"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="CreditCardTypeGlAccount"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingCreditCardTypeGlAccount}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingCreditCardTypeGlAccount"/> <entity-condition entity-name="CreditCardTypeGlAccount" list="creditCardTypeGlAccounts"> <condition-expr field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/> </entity-condition> @@ -483,7 +483,7 @@ under the License. <set field="titleProperty" value="PageTitleEditTaxAuthorityGlAccounts"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="TaxAuthorityGlAccounts"/> - <set field="labelTitleProperty" value="${uiLabelMap.PageTitleEditTaxAuthorityGlAccounts}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.PageTitleEditTaxAuthorityGlAccounts"/> <entity-condition entity-name="TaxAuthorityGlAccount" list="taxAuthorityGlAccounts"> <condition-expr field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/> <order-by field-name="taxAuthGeoId"/> @@ -508,7 +508,7 @@ under the License. <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="PageTitleEditPartyGlAccounts"/> - <set field="labelTitleProperty" value="${uiLabelMap.PageTitleEditPartyGlAccounts}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.PageTitleEditPartyGlAccounts"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="PartyGlAccounts"/> <entity-condition entity-name="PartyGlAccount" list="partyGlAccounts"> @@ -533,7 +533,7 @@ under the License. <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="FixedAssetTypeGlAccounts"/> - <set field="labelTitleProperty" value="${uiLabelMap.FixedAssetTypeGlAccounts}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.FixedAssetTypeGlAccounts"/> <set field="tabButtonItem" value="GlAccountAssignment"/> <set field="tabButtonItem2" value="FixedAssetTypeGlAccounts"/> </actions> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Sat Aug 26 20:23:40 2017 @@ -298,7 +298,7 @@ under the License. <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingRateAmounts"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingRateAmounts}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingRateAmounts"/> <set field="tabButtonItem" value="ViewRateAmounts"/> </actions> <widgets> @@ -319,7 +319,7 @@ under the License. <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="AccountingFX"/> - <set field="labelTitleProperty" value="${uiLabelMap.AccountingFX}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.AccountingFX"/> <set field="tabButtonItem" value="ViewFXConversions"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <!-- TODO: If UomConversionDated is ever used for another type of conversion besides currencies or if some currencies are Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -29,7 +29,7 @@ under the License. <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.AccountingCompanySubtitle" global="true"/> <set field="applicationMenuName" value="ApAppBar" global="true"/> <set field="applicationMenuLocation" value="component://accounting/widget/ap/ApMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.AccountingApManagerApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.AccountingApManagerApplication" global="true"/> <set field="invoiceMenuLocation" value="component://accounting/widget/ap/ApInvoiceMenus.xml" global="true"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/InvoiceScreens.xml Sat Aug 26 20:23:40 2017 @@ -177,7 +177,7 @@ under the License. <set field="asm_listItemPercentOfForm" value="95"/> <set field="asm_sortable" value="false"/> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="asm_title" value="${uiLabelMap.AccountingSelectPartiesForCommissionInvoice}"/> + <set field="asm_title" from-field="uiLabelMap.AccountingSelectPartiesForCommissionInvoice"/> </actions> <widgets> <decorator-screen name="CommonInvoiceDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -28,7 +28,7 @@ under the License. </condition> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.AccountingLookupInvoices}"/> + <set field="title" from-field="uiLabelMap.AccountingLookupInvoices"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -56,7 +56,7 @@ under the License. </condition> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.AccountingLookupPayment}"/> + <set field="title" from-field="uiLabelMap.AccountingLookupPayment"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -32,7 +32,7 @@ under the License. <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.AccountingCompanySubtitle" global="true"/> <set field="applicationMenuName" value="ArAppBar" global="true"/> <set field="applicationMenuLocation" value="component://accounting/widget/ar/ArMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.AccountingArManagerApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.AccountingArManagerApplication" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -28,7 +28,7 @@ under the License. </condition> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.AccountingLookupInvoices}"/> + <set field="title" from-field="uiLabelMap.AccountingLookupInvoices"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -56,7 +56,7 @@ under the License. </condition> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.AccountingLookupPayment}"/> + <set field="title" from-field="uiLabelMap.AccountingLookupPayment"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> Modified: ofbiz/ofbiz-framework/trunk/applications/commonext/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/widget/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/commonext/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/commonext/widget/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -79,10 +79,10 @@ under the License. <set field="defaultOrganizationPartyGroupName" from-field="orgParty.groupName" global="true"/> <set field="dropdown.hiddenFieldList" from-field="hiddenFields" global="true"/> <set field="dropdown.action" value="setUserPreference"/> - <set field="dropdown.textBegin" value="${uiLabelMap.CommonDefaultOrganizationPartyId} :"/> + <set field="dropdown.textBegin" from-field="uiLabelMap.CommonDefaultOrganizationPartyId"/> <set field="dropdown.dropDownList" from-field="PartyAcctgPrefAndGroupList"/> <set field="dropdown.selectionName" value="userPrefValue"/> - <set field="dropdown.selectedKey" value="${defaultOrganizationPartyId}"/> + <set field="dropdown.selectedKey" from-field="defaultOrganizationPartyId"/> <set field="dropdown.textEnd" value="[${defaultOrganizationPartyId}]"/> <set field="layoutSettings.topLines[]" from-field="dropdown" global="true"/> </actions> Modified: ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -40,7 +40,7 @@ <set field="activeApp" value="ofbizsetup" global="true"/> <set field="applicationMenuName" value="SetupAppBar" global="true"/> <set field="applicationMenuLocation" value="component://commonext/widget/ofbizsetup/Menus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.SetupApp}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.SetupApp" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -37,7 +37,7 @@ under the License. <set field="activeApp" value="contentmgr" global="true"/> <set field="applicationMenuName" value="ContentAppBar" global="true"/> <set field="applicationMenuLocation" value="component://content/widget/content/ContentMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.ContentContentManagerApplication}"/> + <set field="applicationTitle" from-field="uiLabelMap.ContentContentManagerApplication`"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -27,7 +27,7 @@ under the License. </condition> <actions> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupListLayout}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupListLayout"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -49,7 +49,7 @@ under the License. </condition> <actions> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupSubContent}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupSubContent"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml Sat Aug 26 20:23:40 2017 @@ -442,7 +442,7 @@ under the License. <section> <actions> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupContent}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupContent"/> <set field="entityName" value="Content"/> <set field="searchFields" value="[contentId, contentName]"/> <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/> @@ -490,7 +490,7 @@ under the License. <actions> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupContent}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupContent"/> <set field="tabButtonItem" value="LookupContentTree"/> <set field="labelTitleProperty" value="PageTitleNavigateContent"/> <entity-and entity-name="ContentAssoc" list="contentAssoc"> @@ -528,7 +528,7 @@ under the License. <actions> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupContent}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupContent"/> <set field="tabButtonItem" value="LookupDetailContentTree"/> <set field="labelTitleProperty" value="PageTitleNavigateContent"/> <entity-and entity-name="ContentAssoc" list="contentAssoc"> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/content/DataResourceScreens.xml Sat Aug 26 20:23:40 2017 @@ -132,7 +132,7 @@ under the License. <section> <actions> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupDataResource}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupDataResource"/> <set field="entityName" value="DataResource"/> <set field="searchFields" value="[dataResourceId, dataResourceName]"/> <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/forum/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/forum/ForumScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/forum/ForumScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/forum/ForumScreens.xml Sat Aug 26 20:23:40 2017 @@ -220,7 +220,7 @@ under the License. <set field="trail" from-field="threadContentId"/> <set field="enableEdit" value="false"/> <set field="webPutPt" from-field="parameters.forumGroupId"/> - <set field="rsp.contentName" value="${content.contentName}"/> + <set field="rsp.contentName" from-field="content.contentName"/> <set field="titleProperty" value="PageTitleFindForumMessages"/> <set field="headerItem" value="ForumMessages"/> <set field="tabBar" value="ForumMessagesTabBar"/> Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -42,7 +42,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/> <set field="applicationMenuName" value="HumanResAppBar" global="true"/> <set field="applicationMenuLocation" value="component://humanres/widget/HumanresMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.HumanResManagerApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.HumanResManagerApplication" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -24,7 +24,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.HumanResLookupBudgetByName}"/> + <set field="title" from-field="uiLabelMap.HumanResLookupBudgetByName"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -46,7 +46,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.HumanResLookupBudgetItemByName}"/> + <set field="title" from-field="uiLabelMap.HumanResLookupBudgetItemByName"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -68,7 +68,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.HumanResLookupEmplPositionByName}"/> + <set field="title" from-field="uiLabelMap.HumanResLookupEmplPositionByName"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -92,7 +92,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.HumanResLookupTerminationReason}"/> + <set field="title" from-field="uiLabelMap.HumanResLookupTerminationReason"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -115,7 +115,7 @@ <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.HumanResLookupSalaryStepSeqId}"/> + <set field="title" from-field="uiLabelMap.HumanResLookupSalaryStepSeqId"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -137,7 +137,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.HumanResLookupPayGrade}"/> + <set field="title" from-field="uiLabelMap.HumanResLookupPayGrade"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -159,7 +159,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.HumanResLookupPayRollPreference}"/> + <set field="title" from-field="uiLabelMap.HumanResLookupPayRollPreference"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -181,7 +181,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.HumanResLookupUnemploymentClaim}"/> + <set field="title" from-field="uiLabelMap.HumanResLookupUnemploymentClaim"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -204,7 +204,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.HumanResLookupAgreementEmploymentAppl}"/> + <set field="title" from-field="uiLabelMap.HumanResLookupAgreementEmploymentAppl"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -226,7 +226,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.HumanResLookupPerfReview}"/> + <set field="title" from-field="uiLabelMap.HumanResLookupPerfReview"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -248,7 +248,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.HumanResLookupPartyResume}"/> + <set field="title" from-field="uiLabelMap.HumanResLookupPartyResume"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -270,7 +270,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.HumanResLookupEmploymentApp}"/> + <set field="title" from-field="uiLabelMap.HumanResLookupEmploymentApp"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -292,7 +292,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.LookupJobReq}"/> + <set field="title" from-field="uiLabelMap.LookupJobReq"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -330,7 +330,7 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.LookupTraining}"/> + <set field="title" from-field="uiLabelMap.LookupTraining"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -42,7 +42,7 @@ under the License. <set field="activeApp" value="manufacturing" global="true"/> <set field="applicationMenuName" value="ManufacturingAppBar" global="true"/> <set field="applicationMenuLocation" value="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.ManufacturingManagerApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.ManufacturingManagerApplication" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -27,7 +27,7 @@ under the License. </condition> <actions> <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupRouting}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupRouting"/> <set field="entityName" value="WorkEffort"/> <set field="requestParameters.workEffortTypeId" to-scope="screen" default-value="ROUTING"/> <set field="requestParameters.fixedAssetId" to-scope="screen" default-value=""/> @@ -56,7 +56,7 @@ under the License. </condition> <actions> <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupRoutingTask}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupRoutingTask"/> <set field="entityName" value="WorkEffort"/> <set field="requestParameters.workEffortTypeId" to-scope="screen" default-value="ROU_TASK"/> <set field="requestParameters.fixedAssetId" to-scope="screen" default-value=""/> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml Sat Aug 26 20:23:40 2017 @@ -257,8 +257,8 @@ under the License. <!-- get the contact list owner's marketing email --> <script location="component://marketing/groovyScripts/marketing/contact/GetContactListMarketingEmail.groovy"/> - <set field="contactMechIdFrom" value="${marketingEmail.contactMechId}"/> - <set field="partyIdFrom" value="${contactList.ownerPartyId}"/> + <set field="contactMechIdFrom" from-field="marketingEmail.contactMechId"/> + <set field="partyIdFrom" from-field="contactList.ownerPartyId"/> </actions> <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> @@ -373,7 +373,7 @@ under the License. <set field="titleProperty" value="PageTitleLookupContactList"/> <set field="contactListTabButtonItem" value="ContactListCommEvent"/> <set field="labelTitleProperty" value="PageTitleLookupContactList"/> - <set field="title" value="${uiLabelMap.PageTitleLookupContactList}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupContactList"/> <set field="entityName" value="ContactList"/> <set field="searchFields" value="[contactListId, contactListName, description]"/> </actions> @@ -397,7 +397,7 @@ under the License. <set field="titleProperty" value="PageTitlePreferredContactMech"/> <set field="contactListTabButtonItem" value="ContactListCommEvent"/> <set field="labelTitleProperty" value="PageTitlePreferredContactMech"/> - <set field="title" value="${uiLabelMap.PageTitlePreferredContactMech}"/> + <set field="title" from-field="uiLabelMap.PageTitlePreferredContactMech"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactLists"/> <set field="partyId" from-field="parameters.parm0"/> <set field="entityName" value="PartyAndContactMech"/> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -30,7 +30,7 @@ under the License. <actions> <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupSegmentGroup}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupSegmentGroup"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -57,7 +57,7 @@ under the License. <actions> <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupSalesForecast}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupSalesForecast"/> <set field="queryString" from-field="result.queryString"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/MarketingReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/MarketingReportScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/MarketingReportScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/MarketingReportScreens.xml Sat Aug 26 20:23:40 2017 @@ -103,7 +103,7 @@ under the License. <screen name="MarketingCampaignReport"> <section> <actions> - <set field="title" value="${uiLabelMap.MarketingTrackingCodeReportTitle}"/> + <set field="title" from-field="uiLabelMap.MarketingTrackingCodeReportTitle"/> <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="fromDate" from-field="requestParameters.fromDate" type="Timestamp"/> @@ -124,7 +124,7 @@ under the License. <screen name= "EmailStatusReport"> <section> <actions> - <set field="title" value="${uiLabelMap.MarketingEmailStatusReport}"/> + <set field="title" from-field="uiLabelMap.MarketingEmailStatusReport"/> <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/> <set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/> <set field="statusId" from-field="parameters.statusId" type="String"/> @@ -147,7 +147,7 @@ under the License. <screen name= "PartyStatusReport"> <section> <actions> - <set field="title" value="${uiLabelMap.MarketingPartyStatusReport}"/> + <set field="title" from-field="uiLabelMap.MarketingPartyStatusReport"/> <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/> <set field="statusDate" from-field="parameters.statusDate" type="Timestamp"/> <set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml Sat Aug 26 20:23:40 2017 @@ -302,7 +302,7 @@ under the License. <set field="titleProperty" value="PageTitleLookupVisit"/> <set field="trackingCodeTabButtonItem" value="TrackingCode"/> <set field="labelTitleProperty" value="PageTitleLookupVisit"/> - <set field="title" value="${uiLabelMap.PageTitleLookupVisit}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupVisit"/> <set field="entityName" value="CommunicationEvent"/> </actions> <widgets> @@ -323,7 +323,7 @@ under the License. <set field="titleProperty" value="PageTitleLookupTrackingCode"/> <set field="trackingCodeTabButtonItem" value="TrackingCode"/> <set field="labelTitleProperty" value="PageTitleLookupTrackingCode"/> - <set field="title" value="${uiLabelMap.PageTitleLookupTrackingCode}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupTrackingCode"/> <set field="entityName" value="TrackingCode"/> </actions> <widgets> @@ -411,7 +411,7 @@ under the License. <set field="titleProperty" value="PageTitleLookupTrackingCodeType"/> <set field="trackingCodeTabButtonItem" value="TrackingCodeType"/> <set field="labelTitleProperty" value="PageTitleLookupTrackingCodeType"/> - <set field="title" value="${uiLabelMap.PageTitleLookupTrackingCodeType}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupTrackingCodeType"/> <set field="entityName" value="TrackingCodeType"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -38,7 +38,7 @@ under the License. <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.MarketingCompanySubtitle" global="true"/> <set field="applicationMenuName" value="SfaAppBar" global="true"/> <set field="applicationMenuLocation" value="component://marketing/widget/sfa/SfaMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.SfaManagerApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.SfaManagerApplication" global="true"/> <set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="SFA" global="true"/> <script location="component://common/groovyScripts/GetParentPortalPageId.groovy"/> </actions> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -30,7 +30,7 @@ under the License. <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="queryString" from-field="result.queryString"/> <set field="partyRelationshipTypeId" value="LEAD_OWNER"/> - <set field="title" value="${uiLabelMap.SfaFindLeads}"/> + <set field="title" from-field="uiLabelMap.SfaFindLeads"/> <set field="partyTypeId" value="PERSON"/> <set field="currentUrl" value="LookupLeads"/> <set field="entityName" value="PartyRoleAndContactMechDetail"/> @@ -59,7 +59,7 @@ under the License. <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="queryString" from-field="result.queryString"/> <set field="partyRelationshipTypeId" value="ACCOUNT"/> - <set field="title" value="${uiLabelMap.SfaFindAccounts}"/> + <set field="title" from-field="uiLabelMap.SfaFindAccounts"/> <set field="partyTypeId" value="PARTY_GROUP"/> <set field="currentUrl" value="LookupAccounts"/> <set field="entityName" value="PartyRoleAndContactMechDetail"/> @@ -88,7 +88,7 @@ under the License. <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="queryString" from-field="result.queryString"/> <set field="partyRelationshipTypeId" value="ACCOUNT"/> - <set field="title" value="${uiLabelMap.SfaFindAccountLeads}"/> + <set field="title" from-field="uiLabelMap.SfaFindAccountLeads"/> <set field="partyTypeId" value="PARTY_GROUP"/> <set field="currentUrl" value="LookupAccountLeads"/> <set field="entityName" value="PartyRoleAndContactMechDetail"/> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -44,7 +44,7 @@ under the License. <set field="activeApp" value="ordermgr" global="true"/> <set field="applicationMenuName" value="OrderAppBar" global="true"/> <set field="applicationMenuLocation" value="component://order/widget/ordermgr/OrderMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.OrderManagerApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.OrderManagerApplication" global="true"/> <!-- globally parameterize the link to a customer's detail information, to help with cases when such details are accessed via external application. --> <set field="customerDetailLink" value="/partymgr/control/viewprofile?partyId=" global="true"/> </actions> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -30,7 +30,7 @@ under the License. <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupOrderHeader}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupOrderHeader"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -57,7 +57,7 @@ under the License. </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupOrderHeaderAndShipInfo}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupOrderHeaderAndShipInfo"/> <set field="parameters.roleTypeId" to-scope="screen" default-value="SHIP_TO_CUSTOMER"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> @@ -86,7 +86,7 @@ under the License. </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupPurchaseOrderHeaderAndShipInfo}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupPurchaseOrderHeaderAndShipInfo"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -116,7 +116,7 @@ under the License. <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupCustomerRequest}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupCustomerRequest"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -143,7 +143,7 @@ under the License. </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupCustomerRequestItem}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupCustomerRequestItem"/> <set field="custRequestId" from-field="parameters.custRequestId" default-value="${parameters.parm0}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> @@ -171,7 +171,7 @@ under the License. </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupQuote}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupQuote"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -198,7 +198,7 @@ under the License. </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupQuoteItem}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupQuoteItem"/> <set field="quoteId" from-field="parameters.quoteId" default-value="${parameters.parm0}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> @@ -226,7 +226,7 @@ under the License. </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupRequirement}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupRequirement"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -253,7 +253,7 @@ under the License. </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupShoppingList}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupShoppingList"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml Sat Aug 26 20:23:40 2017 @@ -54,7 +54,7 @@ under the License. <screen name="RequirementsForSupplier"> <section> <actions> - <set field="title" value="${uiLabelMap.OrderFindRequirementsForSupplier}"/> + <set field="title" from-field="uiLabelMap.OrderFindRequirementsForSupplier"/> <set field="entityName" value="Requirement"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -92,7 +92,7 @@ under the License. <screen name="FindQuoteForCart"> <section> <actions> - <set field="title" value="${uiLabelMap.OrderFindQuotes}"/> + <set field="title" from-field="uiLabelMap.OrderFindQuotes"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> @@ -119,7 +119,7 @@ under the License. <screen name="ViewShoppingLists"> <section> <actions> - <set field="title" value="${uiLabelMap.PageTitleShoppingList}"/> + <set field="title" from-field="uiLabelMap.PageTitleShoppingList"/> <set field="partyId" from-field="requestParameters.partyId"/> <entity-and entity-name="ShoppingList" list="customershoppinglists"> <field-map field-name="partyId" from-field="partyId"/> @@ -139,7 +139,7 @@ under the License. <screen name="AddFromShoppingList"> <section> <actions> - <set field="title" value="${uiLabelMap.PageTitleShoppingListItem}"/> + <set field="title" from-field="uiLabelMap.PageTitleShoppingListItem"/> <set field="shoppingListId" from-field="requestParameters.shoppingListId"/> <entity-and entity-name="ShoppingListItem" list="shoppinglistitems"> <field-map field-name="shoppingListId" from-field="shoppingListId"/> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Sat Aug 26 20:23:40 2017 @@ -255,7 +255,7 @@ under the License. <set field="asm_asmListItemPercentOfForm" value="95"/> <set field="asm_sortable" value="false"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="asm_title" value="${uiLabelMap.OrderPartySelectRoleForParty}"/> + <set field="asm_title" from-field="uiLabelMap.OrderPartySelectRoleForParty"/> </actions> <widgets> <decorator-screen name="CommonOrderViewDecorator"> @@ -368,7 +368,7 @@ under the License. <set field="headerItem" value="findorders"/> <script location="component://order/groovyScripts/order/ReceivePayment.groovy"/> <entity-and entity-name="OrderRole" list="orderRoles"> - <field-map field-name="orderId" value="${parameters.orderId}"/> + <field-map field-name="orderId" from-field="parameters.orderId"/> <field-map field-name="roleTypeId" value="BILL_FROM_VENDOR"/> </entity-and> <entity-and entity-name="PaymentMethod" list="paymentMethods"> @@ -563,7 +563,7 @@ under the License. <section> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="filterDate" type="Timestamp" value="${nowTimestamp}"/> + <set field="filterDate" type="Timestamp" from-field="nowTimestamp"/> <script location="component://order/groovyScripts/order/OrderList.groovy"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Sat Aug 26 20:23:40 2017 @@ -766,7 +766,7 @@ under the License. <screen name="EditQuoteTerm"> <section> <actions> - <set field="titleProperty" value="${uiLabelMap.OrderOrderQuoteEditTerm}"/> + <set field="titleProperty" from-field="uiLabelMap.OrderOrderQuoteEditTerm"/> <set field="tabButtonItem" value="QuoteTerms"/> <set field="quoteId" from-field="parameters.quoteId"/> <set field="termTypeId" from-field="parameters.termTypeId"/> @@ -789,7 +789,7 @@ under the License. <screen name="EditQuoteTermItem"> <section> <actions> - <set field="titleProperty" value="${uiLabelMap.OrderOrderQuoteEditTerm}"/> + <set field="titleProperty" from-field="uiLabelMap.OrderOrderQuoteEditTerm"/> <set field="tabButtonItem" value="ListQuoteItems"/> <set field="quoteId" from-field="parameters.quoteId"/> <set field="termTypeId" from-field="parameters.termTypeId"/> @@ -812,7 +812,7 @@ under the License. <screen name="ListQuoteTerms"> <section> <actions> - <set field="titleProperty" value="${uiLabelMap.OrderOrderQuoteEditTerm}"/> + <set field="titleProperty" from-field="uiLabelMap.OrderOrderQuoteEditTerm"/> <set field="tabButtonItem" value="QuoteTerms"/> <set field="quoteId" from-field="parameters.quoteId"/> <set field="termTypeId" from-field="parameters.termTypeId"/> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/ReportScreens.xml Sat Aug 26 20:23:40 2017 @@ -244,8 +244,8 @@ under the License. <actions> <set field="titleProperty" value="OrderReportOpenOrderItems"/> <set field="headerItem" value="reports"/> - <set field="viewSize" value="${parameters.VIEW_SIZE}" default-value="20" type="Integer"/> - <set field="viewIndex" value="${parameters.VIEW_INDEX}" default-value="0" type="Integer"/> + <set field="viewSize" from-field="parameters.VIEW_SIZE" default-value="20" type="Integer"/> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" default-value="0" type="Integer"/> <set field="fromOrderDate" from-field="parameters.fromOrderDate" type="Timestamp"/> <set field="thruOrderDate" from-field="parameters.thruOrderDate" type="Timestamp"/> <script location="component://order/groovyScripts/reports/OpenOrderItemsReport.groovy"/> Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -49,7 +49,7 @@ under the License. <set field="activeApp" value="partymgr" global="true"/> <set field="applicationMenuName" value="PartyAppBar" global="true"/> <set field="applicationMenuLocation" value="component://party/widget/partymgr/PartyMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.PartyManagerApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.PartyManagerApplication" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Sat Aug 26 20:23:40 2017 @@ -92,9 +92,9 @@ under the License. <set field="titleProperty" value="PageTitlePendingCommunications"/> <set field="headerItem" value="comm"/> <set field="tabButtonItem" value="pending"/> - <set field="partyId" value="${parameters.partyId}"/> - <set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyIdFrom}"/> - <set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyIdTo}"/> + <set field="partyId" from-field="parameters.partyId"/> + <set default-value="${userLogin.partyId}" field="partyIdFrom" from-field="parameters.partyIdFrom"/> + <set default-value="${userLogin.partyId}" field="partyIdTo" from-field="parameters.partyIdTo"/> <set field="entityName" value="CommunicationEvent"/> </actions> <widgets> @@ -543,9 +543,9 @@ under the License. <set field="tabButtonItem" value="UpdateCommRoles"/> <set field="communicationEventId" from-field="parameters.communicationEventId"/> <set field="parentCommEventId" from-field="parameters.parentCommEventId"/> - <set field="partyId" value="${parameters.partyId}"/> - <set field="partyIdFrom" value="${parameters.partyId}"/> - <set field="partyIdTo" value="${parameters.partyId}"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="partyIdFrom" from-field="parameters.partyId"/> + <set field="partyIdTo" from-field="parameters.partyId"/> <entity-one entity-name="Party" use-cache="true" value-field="party"/> <entity-one entity-name="Person" use-cache="true" value-field="lookupPerson"/> <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> @@ -576,9 +576,9 @@ under the License. <set field="communicationEventId" from-field="parameters.communicationEventId"/> <set field="parentCommEventId" from-field="parameters.parentCommEventId"/> - <set field="partyId" value="${parameters.partyId}"/> - <set field="partyIdFrom" value="${parameters.partyId}"/> - <set field="partyIdTo" value="${parameters.partyId}"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="partyIdFrom" from-field="parameters.partyId"/> + <set field="partyIdTo" from-field="parameters.partyId/> <entity-one entity-name="Party" use-cache="true" value-field="party"/> <entity-one entity-name="Person" use-cache="true" value-field="lookupPerson"/> <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> @@ -601,9 +601,9 @@ under the License. <set field="titleProperty" value="PageTitleListCommWorkEfforts"/> <set field="tabButtonItem" value="UpdateCommWorkEfforts"/> <set field="communicationEventId" from-field="parameters.communicationEventId"/> - <set field="partyId" value="${parameters.partyId}"/> - <set field="partyIdFrom" value="${parameters.partyIdFrom}"/> - <set field="partyIdTo" value="${parameters.partyIdTo}"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="partyIdFrom" from-field="parameters.partyIdFrom"/> + <set field="partyIdTo" from-field="parameters.partyIdTo"/> <set field="entityName" value="CommunicationEvent"/> <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> </actions> @@ -673,10 +673,10 @@ under the License. <set field="titleProperty" value="PartyCommContent"/> <set field="headerItem" value="comm"/> <set field="tabButtonItem" value="CommContent"/> - <set field="parameters.partyId" value="${parameters.partyId}" default-value="${userLogin.partyId}"/> - <set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyIdFrom}"/> - <set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyIdTo}"/> - <set field="communicationEventId" value="${parameters.communicationEventId}"/> + <set field="parameters.partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/> + <set default-value="${userLogin.partyId}" field="partyIdFrom" from-field="parameters.partyIdFrom"/> + <set default-value="${userLogin.partyId}" field="partyIdTo" from-field="parameters.partyIdTo"/> + <set field="communicationEventId" from-field="parameters.communicationEventId"/> <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> </actions> <widgets> @@ -713,9 +713,9 @@ under the License. <set field="headerItem" value="comm"/> <set field="tabButtonItem" value="CommContent"/> <set field="partyId" from-field="parameters.partyId"/> - <set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyIdFrom}"/> - <set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyIdTo}"/> - <set field="communicationEventId" value="${parameters.communicationEventId}"/> + <set default-value="${userLogin.partyId}" field="partyIdFrom" from-field="parameters.partyIdFrom"/> + <set default-value="${userLogin.partyId}" field="partyIdTo" from-field="parameters.partyIdTo"/> + <set field="communicationEventId" from-field="parameters.communicationEventId"/> <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> </actions> <widgets> @@ -744,10 +744,10 @@ under the License. <actions> <set field="titleProperty" value="PageTitleCommEvents"/> <set field="tabButtonItem" value="CommContent"/> - <set field="partyId" value="${parameters.partyId}"/> - <set default-value="${userLogin.partyId}" field="partyIdFrom" value="${parameters.partyIdFrom}"/> - <set default-value="${userLogin.partyId}" field="partyIdTo" value="${parameters.partyIdTo}"/> - <set field="communicationEventId" value="${parameters.communicationEventId}"/> + <set field="partyId" from-field="parameters.partyId"/> + <set default-value="${userLogin.partyId}" field="partyIdFrom" from-field="parameters.partyIdFrom"/> + <set default-value="${userLogin.partyId}" field="partyIdTo" from-field="parameters.partyIdTo"/> + <set field="communicationEventId" from-field="parameters.communicationEventId"/> <entity-one entity-name="CommEventContentDataResource" value-field="commEventContentDataResource"> <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/> <field-map field-name="contentId" from-field="parameters.contentId"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |