Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml Mon Jan 12 14:36:38 2009 @@ -83,7 +83,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.TrackingCodeCreate}" target="/EditTrackingCode?DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode?DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="EditTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> </widgets> </section> @@ -135,7 +135,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.TrackingCodeCreate}" target="/EditTrackingCode?DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode?DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="ListTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> </widgets> </section> @@ -231,7 +231,7 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.PageTitleListTrackingCodeOrdersFor} ${uiLabelMap.TrackingCodeTrackingCodeId}=${trackingCodeId}"/> + <label text="${uiLabelMap.PageTitleListTrackingCodeOrdersFor} ${uiLabelMap.MarketingTrackingCodeTrackingCodeId}=${trackingCodeId}"/> </container> </container> <container style="screenlet-body"> @@ -336,7 +336,7 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.PageTitleListTrackingCodeFor} ${uiLabelMap.TrackingCodeTrackingCodeId}=${trackingCodeId}"/> + <label text="${uiLabelMap.PageTitleListTrackingCodeFor} ${uiLabelMap.MarketingTrackingCodeTrackingCodeId}=${trackingCodeId}"/> </container> </container> <container style="screenlet-body"> @@ -455,7 +455,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.TrackingCodeTypeCreate}" target="/EditTrackingCodeType?DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingTrackingCodeTypeCreate}" target="/EditTrackingCodeType?DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="EditTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> </widgets> </section> @@ -508,7 +508,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.TrackingCodeTypeCreate}" target="/EditTrackingCodeType?DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingTrackingCodeTypeCreate}" target="/EditTrackingCodeType?DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="ListTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> </widgets> </section>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Mon Jan 12 14:36:38 2009 @@ -102,7 +102,7 @@ </drop-down> </field> <field name="estimatedProbability" position="1" title="${uiLabelMap.SfaProbability}"><text size="25"/></field> - <field name="dataSourceId" position="2" title="${uiLabelMap.DataSourceLabel}"> + <field name="dataSourceId" position="2" title="${uiLabelMap.SfaDataSourceLabel}"> <drop-down allow-empty="true"> <entity-options key-field-name="dataSourceId" description="${description}" entity-name="DataSource"> <entity-constraint name="dataSourceTypeId" operator="equals" value="SLSOPP_SRC"/> @@ -115,7 +115,7 @@ </entity-options> </drop-down> </field> - <field name="description" title="${uiLabelMap.SegmentGroupDescription}"><textarea/></field> + <field name="description" title="${uiLabelMap.MarketingSegmentGroupDescription}"><textarea/></field> <field name="nextStep" title="${uiLabelMap.SfaNextStep}"><textarea/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" use-when="salesOpportunity==null"><submit button-type="button"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" use-when="salesOpportunity!=null"><submit button-type="button"/></field> @@ -131,9 +131,9 @@ <field name="estimatedCloseDate" position="1" title="${uiLabelMap.SfaCloseDate}"><display/></field> <field name="opportunityStageId" position="2" title="${uiLabelMap.SfaInitialStage}"><display/></field> <field name="estimatedProbability" position="1" title="${uiLabelMap.SfaProbability}"><display/></field> - <field name="dataSourceId" position="2" title="${uiLabelMap.DataSourceLabel}"><display/></field> + <field name="dataSourceId" position="2" title="${uiLabelMap.SfaDataSourceLabel}"><display/></field> <field name="marketingCampaignId" position="1" title="${uiLabelMap.MarketingCampaign}"><display/></field> - <field name="description" position="1" title="${uiLabelMap.SegmentGroupDescription}"><display/></field> + <field name="description" position="1" title="${uiLabelMap.MarketingSegmentGroupDescription}"><display/></field> <field name="nextStep" position="1" title="${uiLabelMap.SfaNextStep}"><display/></field> </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml Mon Jan 12 14:36:38 2009 @@ -318,7 +318,7 @@ <form name="LookupCommEvent" type="single" target="LookupCommEvent" header-row-style="header-row" default-table-style="basic-table"> - <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}"><text-find/></field> + <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><text-find/></field> <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field> <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup target-form-name="LookupPartyName"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> @@ -328,7 +328,7 @@ </entity-options> </drop-down> </field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"> <entity-order-by field-name="description"/> @@ -366,7 +366,7 @@ <field-map field-name="entityName" value="CommunicationEvent"/> </service> </actions> - <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}" widget-style="smallSubmit"> + <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="smallSubmit"> <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/> </field> <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"> @@ -376,7 +376,7 @@ <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field> <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field> <field name="custRequestId" position="1" title="${uiLabelMap.PartyServicemgntCustRequestId}"><display/></field>
