svn commit: r744509 - in /ofbiz/trunk/applications: humanres/config/ humanres/widget/ humanres/widget/forms/ marketing/config/ marketing/src/org/ofbiz/market
Locked
 
|
Author: mrisaliti
Date: Sat Feb 14 15:54:35 2009 New Revision: 744509 URL: http://svn.apache.org/viewvc?rev=744509&view=rev Log: A lot of hardcoded labels cleaning and changes some wrong references into humanres and marketing components Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Sat Feb 14 15:54:35 2009 @@ -101,6 +101,10 @@ <value xml:lang="it">Tipo Budget</value> <value xml:lang="th">รหัสà¸à¸£à¸°à¹à¸ à¸à¸à¸à¸à¸£à¸°à¸¡à¸²à¸</value> </property> + <property key="FormFieldTitle_company"> + <value xml:lang="en">Company</value> + <value xml:lang="it">Azienda</value> + </property> <property key="FormFieldTitle_dateModified"> <value xml:lang="en">Date Modified</value> <value xml:lang="fr">Date modifiée</value> @@ -126,6 +130,10 @@ <value xml:lang="it">Codice Posizione Impiegato Gestita Da</value> <value xml:lang="th">à¹à¸à¸¢à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸£à¸«à¸±à¸ªà¸à¸³à¹à¸«à¸à¹à¸à¸à¸à¸±à¸à¸à¸²à¸</value> </property> + <property key="FormFieldTitle_emplPositionIdReportingTo"> + <value xml:lang="en">Empl Position Id Reporting To</value> + <value xml:lang="it">Posizione impiegato gestito da</value> + </property> <property key="FormFieldTitle_employeePartyId"> <value xml:lang="en">Employee Party Id</value> <value xml:lang="fr">Réf. de l'employé</value> @@ -251,6 +259,10 @@ <value xml:lang="it">Rassegna Prestazioni</value> <value xml:lang="th">Perf Review Id</value> </property> + <property key="FormFieldTitle_position"> + <value xml:lang="en">Position</value> + <value xml:lang="it">Posizione</value> + </property> <property key="FormFieldTitle_primaryFlag"> <value xml:lang="en">Primary Flag</value> <value xml:lang="fr">Balise primaire</value> @@ -301,6 +313,10 @@ <value xml:lang="it">Numero Routing</value> <value xml:lang="th">หมายà¹à¸¥à¸ Routing</value> </property> + <property key="FormFieldTitle_salary"> + <value xml:lang="en">Salary</value> + <value xml:lang="it">Salario</value> + </property> <property key="FormFieldTitle_salaryFlag"> <value xml:lang="en">Salary Flag</value> <value xml:lang="fr">Balise de salaire</value> @@ -510,12 +526,21 @@ <property key="HumanResCurrentEmploymentData"> <value xml:lang="en">Current Employment information</value> <value xml:lang="fr">Information actuelles sur l'emploi</value> + <value xml:lang="it">Attuali informazioni impiegato</value> </property> <property key="HumanResEditAgreementEmploymentAppl"> <value xml:lang="en">Edit Agreement Employment Appl</value> <value xml:lang="fr">Modifier l'accord d'application d'emploi</value> <value xml:lang="it">Aggiorna applicazioni contratti impiegato</value> </property> + <property key="HumanResEditEmplLeave"> + <value xml:lang="en">Edit Empl Leave</value> + <value xml:lang="it">Aggiorna licenziamento impiegato</value> + </property> + <property key="HumanResEditEmplLeaveType"> + <value xml:lang="en">Edit Empl Leave Type</value> + <value xml:lang="it">Aggiorna tipo licenziamento impiegato</value> + </property> <property key="HumanResEditEmplPosition"> <value xml:lang="en">Edit Employee Position</value> <value xml:lang="fr">Modifier la position de l'employé</value> @@ -649,6 +674,10 @@ <value xml:lang="fr">Responsabilités</value> <value xml:lang="it">Responsibilità </value> </property> + <property key="HumanResEmplPositionSummary"> + <value xml:lang="en">Empl Position Summary</value> + <value xml:lang="it">Sommario posizione impiegato</value> + </property> <property key="HumanResEmplPositionType"> <value xml:lang="de">Stellenarten</value> <value xml:lang="en">Position Types</value> Modified: ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml Sat Feb 14 15:54:35 2009 @@ -58,7 +58,7 @@ <screen name="NewEmplLeave"> <section> <actions> - <set field="titleProperty" value="HumanResNewEmplLeave"/> + <set field="titleProperty" value="HumanResAddEmplLeave"/> <set field="headerItem" value="Leave"/> <set field="emplLeaveCtx" from-field="parameters.PartyId"/> </actions> Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Sat Feb 14 15:54:35 2009 @@ -181,7 +181,7 @@ <section> <widgets> <container> - <link target="EditValidResponsibility" text="${uiLabelMap.HumanResNewValidResponsibility}" style="buttontext"/> + <link target="EditValidResponsibility" text="${uiLabelMap.HumanResAddValidResponsibility}" style="buttontext"/> </container> <include-form name="ListValidResponsibilities" location="component://humanres/widget/forms/EmplPositionForms.xml"/> </widgets> @@ -211,7 +211,7 @@ <section> <widgets> <container> - <link target="EditValidResponsibility" text="${uiLabelMap.HumanResNewValidResponsibility}" style="buttontext"/> + <link target="EditValidResponsibility" text="${uiLabelMap.HumanResAddValidResponsibility}" style="buttontext"/> </container> <include-form name="AddValidResponsibility" location="component://humanres/widget/forms/EmplPositionForms.xml"/> </widgets> Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Sat Feb 14 15:54:35 2009 @@ -167,7 +167,7 @@ <screen name="EditEmployeeQuals"> <section> <actions> - <set field="titleProperty" value="HumanResViewPartyQual"/> + <set field="titleProperty" value="HumanResEditPartyQual"/> <set field="headerItem" value="Employee"/> <set field="tabButtonItem" value="EditEmployeeQuals"/> <set field="partyId" from-field="parameters.partyId"/> @@ -253,7 +253,7 @@ <screen name="EditEmployeePerformanceNotes"> <section> <actions> - <set field="titleProperty" value="HumanResEditPerfNote"/> + <set field="titleProperty" value="HumanResPerfNote"/> <set field="tabButtonItem" value="EditEmployeePerformanceNotes"/> <set field="partyId" from-field="parameters.partyId"/> </actions> Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Sat Feb 14 15:54:35 2009 @@ -209,7 +209,7 @@ <screen name="EditPerformanceNotes"> <section> <actions> - <set field="titleProperty" value="HumanResEditPerfNote"/> + <set field="titleProperty" value="HumanResPerfNote"/> <set field="headerItem" value="Employee"/> <set field="tabButtonItem" value="EditPerformanceNotes"/> <set field="partyId" from-field="parameters.partyId"/> Modified: ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml Sat Feb 14 15:54:35 2009 @@ -113,7 +113,7 @@ <screen name="EditEmplPositionTypes"> <section> <actions> - <set field="titleProperty" value="${uiLabelMap.HumanResEditFindPositionTypes}"/> + <set field="titleProperty" value="HumanResFindPositionTypes"/> <set field="headerItem" value="EmplPositionTypes"/> <set field="tabButtonItem" value="EmplPositionTypes"/> <set field="tabButtonItem2" value="EditEmplPositionType"/> @@ -148,7 +148,7 @@ <screen name="EditEmplPositionTypeRates"> <section> <actions> - <set field="titleProperty" value="EditEmplPositionTypeRate"/> + <set field="titleProperty" value="HumanResEmplPositionTypeRate"/> <set field="headerItem" value="EmplPositionTypes"/> <set field="tabButtonItem" value="EmplPositionTypes"/> <set field="tabButtonItem2" value="EditEmplPositionTypeRate"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Sat Feb 14 15:54:35 2009 @@ -212,9 +212,9 @@ <entity-condition entity-name="EmplPositionResponsibility"/> </actions> <auto-fields-service service-name="updateValidResponsibility"/> - <field name="emplPositionTypeId" title="${uiLabelMap.HumanResEmplPositionTypeId}"><display /></field> - <field name="responsibilityTypeId" title="${uiLabelMap.ResponsibilityTypeId}"><display /></field> - <field name="fromDate" title="fromDates"><display /></field> + <field name="emplPositionTypeId" title="${uiLabelMap.HumanResEmployeePositionTypeId}"><display /></field> + <field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><display /></field> + <field name="fromDate"><display /></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> <hyperlink target="deleteValidResponsibility?emplPositionTypeId=${emplPositionId}&responsibilityTypeId=${responsibilityTypeId}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Sat Feb 14 15:54:35 2009 @@ -219,15 +219,15 @@ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> </form> <form name="CurrentEmploymentData" default-map-name="employmentData" type="single"> - <field name="Company" entry-name="employment.partyIdFrom"> + <field name="company" entry-name="employment.partyIdFrom"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} "> <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${employmentData.employment.partyIdFrom}" description="[${employmentData.employment.partyIdFrom}]" target-type="inter-app"/> </display-entity> </field> - <field name="Position" entry-name="emplPositionType.emplPositionTypeId"> + <field name="position" entry-name="emplPositionType.emplPositionTypeId"> <hyperlink target="emplPositionView?emplPositionId=${employmentData.emplPosition.emplPositionId}" description="${employmentData.emplPositionType.description} [${employmentData.emplPosition.emplPositionId}]"/> </field> - <field name="Salary" entry-name="emplPositionRateAmount.rateAmount"> + <field name="salary" entry-name="emplPositionRateAmount.rateAmount"> <display type="currency" currency="${employmentData.emplPositionRateAmount.rateCurrencyUomId}"/> </field> </form> Modified: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Sat Feb 14 15:54:35 2009 @@ -142,7 +142,7 @@ <field name="rateTypeId"><display-entity entity-name="RateType" description="${description}"/></field> <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field> <field name="payGradeId"><display-entity entity-name="PayGrade" description="${description}"/></field> - <field name="salaryStepSeqId"><display/></field> + <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field> <field name="rateAmount"><display type="currency" currency="${rateCurrencyUomId}"/></field> <field name="deleteButton" widget-style="buttontext"><submit/></field> </form> @@ -167,7 +167,7 @@ </entity-options> </drop-down> </field> - <field name="salaryStepSeqId" position="2"><lookup target-form-name="LookupSalaryStep"/></field> + <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}" position="2"><lookup target-form-name="LookupSalaryStep"/></field> <field name="rateAmount"><text/></field> <field name="rateCurrencyUomId" position="2"> <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}"> Modified: ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml Sat Feb 14 15:54:35 2009 @@ -252,7 +252,7 @@ <form name="LookupPartyResume" type="single" target="LookupPartyResume" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="PartyResume" default-field-type="hidden"/> - <field name="resumeId" title="${uiLabelMap.HumanResLookupPartyResumeId}"><text-find/></field> + <field name="resumeId" title="${uiLabelMap.HumanResLookupPartyResume}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original) +++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Sat Feb 14 15:54:35 2009 @@ -27,6 +27,10 @@ <value xml:lang="th">ราà¸à¸²à¸à¸£à¸´à¸</value> <value xml:lang="zh">å®é è´¹ç¨</value> </property> + <property key="FormFieldTitle_bestCaseAmount"> + <value xml:lang="en">Best Case Amount</value> + <value xml:lang="it">Importo migliore caso</value> + </property> <property key="FormFieldTitle_budgetedCost"> <value xml:lang="en">Budgeted Cost</value> <value xml:lang="fr">Coût budgetisé</value> @@ -35,6 +39,14 @@ <value xml:lang="th">à¸à¸à¸à¸£à¸°à¸¡à¸²à¸</value> <value xml:lang="zh">å·²é¢ç®çè´¹ç¨</value> </property> + <property key="FormFieldTitle_changeNote"> + <value xml:lang="en">Change Note</value> + <value xml:lang="it">Nota per variazione</value> + </property> + <property key="FormFieldTitle_closedAmount"> + <value xml:lang="en">Closed Amount</value> + <value xml:lang="it">Importo chiuso</value> + </property> <property key="FormFieldTitle_convertedLeads"> <value xml:lang="en">Converted Leads</value> <value xml:lang="fr">Prospects convertis</value> @@ -58,11 +70,35 @@ <value xml:lang="fr">Revenu prévu</value> <value xml:lang="it">Entrate aspettata</value> </property> + <property key="FormFieldTitle_forecastAmount"> + <value xml:lang="en">Forecast Amount</value> + <value xml:lang="it">Importo previsione di vendita</value> + </property> + <property key="FormFieldTitle_internalPartyId"> + <value xml:lang="en">Internal Party Id</value> + <value xml:lang="it">Soggetto interno</value> + </property> <property key="FormFieldTitle_numSent"> <value xml:lang="en">Num Sent</value> <value xml:lang="fr">N° envoyé</value> <value xml:lang="it">Num. Invio</value> </property> + <property key="FormFieldTitle_parentSalesForecastId"> + <value xml:lang="en">Parent Sales Forecast Id</value> + <value xml:lang="it">Previsione di vendita padre</value> + </property> + <property key="FormFieldTitle_percentOfQuotaClosed"> + <value xml:lang="en">Percent Of Quota Closed</value> + <value xml:lang="it">Quota di percentuale chiusa</value> + </property> + <property key="FormFieldTitle_percentOfQuotaForecast"> + <value xml:lang="en">Percent Of Quota Forecast</value> + <value xml:lang="it">Quota percentuale della previsione di vendita</value> + </property> + <property key="FormFieldTitle_pipelineAmount"> + <value xml:lang="en">Pipeline Amount</value> + <value xml:lang="it">Importo di passaggio</value> + </property> <property key="FormFieldTitle_prodCatalogId"> <value xml:lang="en">Product Catalog Id</value> <value xml:lang="fr">Réf. de catalogue</value> @@ -71,6 +107,18 @@ <value xml:lang="th">รหัสหมวà¸à¸«à¸¡à¸¹à¹à¸ªà¸´à¸à¸à¹à¸²</value> <value xml:lang="zh">产åç®å½æ è¯</value> </property> + <property key="FormFieldTitle_quotaAmount"> + <value xml:lang="en">Quota Amount</value> + <value xml:lang="it">Importo quota</value> + </property> + <property key="FormFieldTitle_salesForecastDetailId"> + <value xml:lang="en">Sales Forecast Detail Id</value> + <value xml:lang="it">Dettaglio previsione di vendita</value> + </property> + <property key="FormFieldTitle_salesForecastId"> + <value xml:lang="en">Sales Forecast Id</value> + <value xml:lang="it">Previsione di vendita</value> + </property> <property key="MarketingCampaign"> <value xml:lang="en">Marketing Campaign</value> <value xml:lang="es">Campañas</value> @@ -1515,6 +1563,10 @@ <value xml:lang="fr">Convertir le prospect</value> <value xml:lang="it">Converti lead</value> </property> + <property key="SfaCreateAccountForLead"> + <value xml:lang="en">Create Account For Lead</value> + <value xml:lang="it">Crea utenza per leader</value> + </property> <property key="SfaCreateContactForLead"> <value xml:lang="en">Create contact for lead</value> <value xml:lang="es">Crear contacto para lead</value> @@ -1647,6 +1699,10 @@ <value xml:lang="fr">Fusionner les prospects</value> <value xml:lang="it">Merge Leads</value> </property> + <property key="SfaMergingFollowing"> + <value xml:lang="en">Merging Following</value> + <value xml:lang="it">Merge seguendo i</value> + </property> <property key="SfaNextStep"> <value xml:lang="en">Next Step</value> <value xml:lang="fr">Prochaine étape</value> Modified: ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java (original) +++ ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java Sat Feb 14 15:54:35 2009 @@ -18,9 +18,9 @@ *******************************************************************************/ package org.ofbiz.marketing.marketing; +import java.sql.Timestamp; import java.util.Locale; import java.util.Map; -import java.sql.Timestamp; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; @@ -30,7 +30,10 @@ import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; -import org.ofbiz.service.*; +import org.ofbiz.service.DispatchContext; +import org.ofbiz.service.GenericServiceException; +import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.service.ServiceUtil; /** * MarketingServices contains static service methods for Marketing Campaigns and Contact Lists. @@ -53,7 +56,7 @@ String email = (String) context.get("email"); if (!UtilValidate.isEmail(email)) { - String error = UtilProperties.getMessage(resourceMarketing, "MarketingInvalidEmailInput", locale); + String error = UtilProperties.getMessage(resourceMarketing, "MarketingCampaignInvalidEmailInput", locale); return ServiceUtil.returnError(error); } Modified: ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml Sat Feb 14 15:54:35 2009 @@ -24,6 +24,7 @@ <screen name="FindOpportunity"> <section> <actions> + <set field="titleProperty" value="SfaFindOpportunities"/> <set field="headerItem" value="Opportunities"/> </actions> <widgets> @@ -69,8 +70,8 @@ <screen name="EditOpportunity"> <section> <actions> - <set field="titleProperty" value="Opportunities"/> - <set field="tabButtonItem" value="EditOpportunity"/> + <set field="titleProperty" value="SfaEditOpportunity"/> + <set field="tabButtonItem" value="EditOpportunity"/> <set field="salesOpportunityId" from-field="parameters.salesOpportunityId"/> <entity-one entity-name="SalesOpportunity" value-field="salesOpportunity"/> </actions> @@ -100,8 +101,8 @@ <screen name="ViewOpportunity"> <section> <actions> - <set field="titleProperty" value="Opportunities"/> - <set field="tabButtonItem" value="ViewOpportunity"/> + <set field="titleProperty" value="SfaOpportunityInfo"/> + <set field="tabButtonItem" value="ViewOpportunity"/> <set field="salesOpportunityId" from-field="parameters.salesOpportunityId"/> <entity-one entity-name="SalesOpportunity" value-field="salesOpportunity"/> </actions> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Sat Feb 14 15:54:35 2009 @@ -37,7 +37,7 @@ <field name="groupName" title="${uiLabelMap.PartyGroupName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> <text size="30" maxlength="60"/> </field> - <field name="numEmployees" title="${uiLabelMap.MarketingEmployees}"><text size="30"/></field> + <field name="numEmployees" title="${uiLabelMap.MarketingNoOfEmployees}"><text size="30"/></field> <field name="siteName" title="${uiLabelMap.FormFieldTitle_officeSiteName}"><text size="30" maxlength="60"/></field> <field name="postalAddressTitle" title="${uiLabelMap.PartyGeneralCorrespondenceAddress}" title-area-style="group-label"> <display description=" " also-hidden="false"/> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=744509&r1=744508&r2=744509&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Sat Feb 14 15:54:35 2009 @@ -115,7 +115,7 @@ <list-options list-name="partyList" key-name="lead.partyId" list-entry-name="lead" description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "${lead.partyId}", false)} [${lead.partyId}]"/> </drop-down> </field> - <field name="submitButton" position="3" title="${uiLabelMap.SfaMergeleads}" widget-style="buttontext" tooltip-style="button-text"><submit button-type="text-link"/></field> + <field name="submitButton" position="3" title="${uiLabelMap.SfaMergeLeads}" widget-style="buttontext" tooltip-style="button-text"><submit button-type="text-link"/></field> </form> <form name="CreateLeadFromVCard" type="upload" target="createLeadFromVCard" header-row-style="header-row" default-table-style="basic-table"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |