svn commit: r762648 [4/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entity
Locked
svn commit: r762648 [4/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entity
 
|
Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Tue Apr 7 08:27:15 2009 @@ -36,7 +36,7 @@ </actions> <widgets> <container> - <link target="NewEmployee" text="${uiLabelMap.HumanResNewEmployee}" style="buttontext" /> + <link target="NewEmployee" text="${uiLabelMap.HumanResNewEmployee}" style="buttontext"/> </container> <section> <widgets> @@ -240,15 +240,15 @@ <set field="headerItem" value="PartyResume"></set> <set field="tabButtonItem" value="EditEmployeeResumes"/> <set field="resumeId" from-field="parameters.resumeId"/> - <set field="partyId" from-field="parameters.partyId" /> - <entity-one entity-name="PartyResume" value-field="partyResume" /> + <set field="partyId" from-field="parameters.partyId"/> + <entity-one entity-name="PartyResume" value-field="partyResume"/> </actions> <widgets> <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyResumeForms.xml"/> <screenlet id="AddEmploymentAppPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEditPartyResume}" collapsible="true"> - <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyResumeForms.xml" /> + <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyResumeForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Tue Apr 7 08:27:15 2009 @@ -166,7 +166,7 @@ <set field="payrollPreferenceSeqId" from-field="parameters.payrollPreferenceSeqId"/> <set field="partyId" from-field="parameters.partyIdTo"/> <set field="roleTypeId" from-field="parameters.roleTypeIdTo"/> - <entity-one entity-name="PayrollPreference" value-field="payrollPreference" /> + <entity-one entity-name="PayrollPreference" value-field="payrollPreference"/> </actions> <widgets> <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> @@ -186,13 +186,13 @@ <set field="titleProperty" value="HumanResAddUnemploymentClaim"/> <set field="headerItem" value="Employment"/> <set field="tabButtonItem" value="EditUnemploymentClaims"/> - <set field="unemploymentClaimId" from-field="parameters.unemploymentClaimId" /> + <set field="unemploymentClaimId" from-field="parameters.unemploymentClaimId"/> <set field="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/> <set field="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/> <set field="partyIdTo" from-field="parameters.partyIdTo"/> <set field="partyIdFrom" from-field="parameters.partyIdFrom"/> <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/> - <entity-one entity-name="UnemploymentClaim" value-field="unemploymentClaim" /> + <entity-one entity-name="UnemploymentClaim" value-field="unemploymentClaim"/> </actions> <widgets> <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml Tue Apr 7 08:27:15 2009 @@ -26,7 +26,7 @@ <set field="headerItem" value="SkillType"/> <set field="titleProperty" value="PageTitleListSkillTypes"/> <set field="skillTypeId" from-field="parameters.skillTypeId"/> - <entity-one entity-name="SkillType" value-field="skillType" /> + <entity-one entity-name="SkillType" value-field="skillType"/> </actions> <widgets> <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> @@ -66,7 +66,7 @@ <set field="tabButtonItem" value="TerminationType"/> <set field="titleProperty" value="HumanResTerminationTypes"/> <set field="terminationTypeId" from-field="parameters.terminationTypeId"/> - <entity-one entity-name="TerminationType" value-field="terminationType" /> + <entity-one entity-name="TerminationType" value-field="terminationType"/> </actions> <widgets> <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> @@ -173,8 +173,8 @@ <actions> <set field="titleProperty" value="HumanResAddTerminationReason"/> <set field="tabButtonItem" value="TerminationReason"/> - <set field="terminationReasonId" from-field="parameters.terminationReasonId" /> - <entity-one entity-name="TerminationReason" value-field="terminationReason" /> + <set field="terminationReasonId" from-field="parameters.terminationReasonId"/> + <entity-one entity-name="TerminationReason" value-field="terminationReason"/> </actions> <widgets> <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml Tue Apr 7 08:27:15 2009 @@ -59,8 +59,8 @@ <set field="headerItem" value="PartyResume"></set> <set field="tabButtonItem" value="EditPartySkill"/> <set field="resumeId" from-field="parameters.resumeId"/> - <set field="partyId" from-field="parameters.partyId" /> - <entity-one entity-name="PartyResume" value-field="partyResume" /> + <set field="partyId" from-field="parameters.partyId"/> + <entity-one entity-name="PartyResume" value-field="partyResume"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -68,7 +68,7 @@ <screenlet title="${uiLabelMap.HumanResEditPartyResume}"> <section> <widgets> - <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyResumeForms.xml" /> + <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyResumeForms.xml"/> </widgets> </section> </screenlet> Modified: ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml Tue Apr 7 08:27:15 2009 @@ -46,7 +46,7 @@ <include-form name="FindPayGrades" location="component://humanres/widget/forms/PayGradeForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListPayGrades" location="component://humanres/widget/forms/PayGradeForms.xml" /> + <include-form name="ListPayGrades" location="component://humanres/widget/forms/PayGradeForms.xml"/> </decorator-section> </decorator-screen> </decorator-section> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Tue Apr 7 08:27:15 2009 @@ -271,7 +271,7 @@ </form> <form name="AddPayrollPreference" type="single" target="createPayrollPreference" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createPayrollPreference" /> + <auto-fields-service service-name="createPayrollPreference"/> <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPayRollPreference"/></field> <field name="partyId"><hidden/></field> <field name="roleTypeId"><hidden/></field> Modified: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Tue Apr 7 08:27:15 2009 @@ -157,7 +157,7 @@ <form name="AddEmplPositionTypeRate" type="single" target="updateEmplPositionTypeRate" default-map-name="emplPositionTypeRate" paginate-target="EditEmplPositionTypeRates" header-row-style="header-row" default-table-style="basic-table"> <actions> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> <field name="emplPositionTypeId"><hidden value="${parameters.emplPositionTypeId}"/></field> <field name="rateTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> Modified: ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml (original) +++ ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml Tue Apr 7 08:27:15 2009 @@ -53,6 +53,6 @@ <CustomMethod customMethodId="STR_LINE_DEP_FORMULA" customMethodTypeId="DEPRECIATION_FORMULA" customMethodName="straightLineDepreciation" description="Straight Line depreciatiion algorithm for fixed asset((purchaseCost - salvageCost)/expectedLifeInYears)"/> <CustomMethod customMethodId="DBL_DECL_DEP_FORMULA" customMethodTypeId="DEPRECIATION_FORMULA" customMethodName="doubleDecliningBalanceDepreciation" description="Double decline depreciatiion algorithm for fixed asset((NetBookValue - salvageCost)*2/remainingLifeInYears)"/> - <WebSite webSiteId="MANUFACTURING" siteName="Manufacturing Manager" visualThemeSetId="BACKOFFICE" /> + <WebSite webSiteId="MANUFACTURING" siteName="Manufacturing Manager" visualThemeSetId="BACKOFFICE"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml Tue Apr 7 08:27:15 2009 @@ -42,8 +42,8 @@ <if-empty field="routingGS"> <entity-condition entity-name="ProductAssoc" list="virtualProductAssocList" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="productIdTo" from-field="parameters.productId" /> - <condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" /> + <condition-expr field-name="productIdTo" from-field="parameters.productId"/> + <condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT"/> </condition-list> </entity-condition> <first-from-list list="virtualProductAssocList" entry="virtualProductAssoc"/> @@ -67,8 +67,8 @@ <if-empty field="routingGS"> <entity-condition entity-name="ProductAssoc" list="virtualProductAssocList"> <condition-list combine="and"> - <condition-expr field-name="productIdTo" from-field="parameters.productId" /> - <condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" /> + <condition-expr field-name="productIdTo" from-field="parameters.productId"/> + <condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT"/> </condition-list> </entity-condition> <filter-list-by-date list="virtualProductAssocList" valid-date="filterDate"/> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml Tue Apr 7 08:27:15 2009 @@ -66,7 +66,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcDay" list="relatedResultList" /> + <get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcDay" list="relatedResultList"/> <first-from-list entry="relatedResult" list="relatedResultList"/> <if-not-empty field="relatedResult"> <add-error> @@ -74,7 +74,7 @@ </add-error> <check-errors/> </if-not-empty> - <get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcWeek" list="relatedResultList" /> + <get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcWeek" list="relatedResultList"/> <first-from-list entry="relatedResult" list="relatedResultList"/> <if-not-empty field="relatedResult"> <add-error> @@ -123,7 +123,7 @@ <check-errors/> <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <get-related value-field="lookupPKMap" relation-name="TechDataCalendar" list="relatedResultList" /> + <get-related value-field="lookupPKMap" relation-name="TechDataCalendar" list="relatedResultList"/> <first-from-list entry="relatedResult" list="relatedResultList"/> <if-not-empty field="relatedResult"> <add-error> @@ -131,7 +131,7 @@ </add-error> <check-errors/> </if-not-empty> - <get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcWeek" list="relatedResultList" /> + <get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcWeek" list="relatedResultList"/> <first-from-list entry="relatedResult" list="relatedResultList"/> <if-not-empty field="relatedResult"> <add-error> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Tue Apr 7 08:27:15 2009 @@ -146,7 +146,7 @@ <set field="estimatedTotalMilliSeconds" value="${bsh:estimatedMilliSeconds * quantity}" type="BigDecimal"/> </row-actions> <field name="priority" title="${uiLabelMap.CommonSequenceNum}"><display/></field> - <field name="workEffortId" title="${uiLabelMap.ManufacturingTaskName}"><display description="${workEffortName} [${workEffortId}]" /></field> + <field name="workEffortId" title="${uiLabelMap.ManufacturingTaskName}"><display description="${workEffortName} [${workEffortId}]"/></field> <field name="fixedAssetId" title="${uiLabelMap.ManufacturingMachine}"><display/></field> <field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><display/></field> <field name="estimatedCompletionDate" title="${uiLabelMap.ManufacturingEstimatedCompletionDate}"><display/></field> @@ -160,7 +160,7 @@ <set field="estimatedTotalMilliSeconds" value="${bsh:estimatedMilliSeconds * quantity}" type="BigDecimal"/> </row-actions> <field name="priority" title="${uiLabelMap.CommonSequenceNum}"><display/></field> - <field name="workEffortId" title="${uiLabelMap.ManufacturingTaskName}"><display description="${workEffortName} [${workEffortId}]" /></field> + <field name="workEffortId" title="${uiLabelMap.ManufacturingTaskName}"><display description="${workEffortName} [${workEffortId}]"/></field> <field name="fixedAssetId" title="${uiLabelMap.ManufacturingMachine}"><display/></field> <field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><display/></field> <field name="estimatedCompletionDate" title="${uiLabelMap.ManufacturingEstimatedCompletionDate}"><display/></field> @@ -328,7 +328,7 @@ <field name="productionRunId"><hidden value="${workEffortParentId}"/></field> <field name="routingTaskId"><hidden value="${workEffortId}"/></field> <field name="priority" title="${uiLabelMap.CommonSequenceNum}"><display/></field> - <field name="workEffortId" title="${uiLabelMap.ManufacturingTaskName}"><display description="${workEffortName} [${workEffortId}]" /></field> + <field name="workEffortId" title="${uiLabelMap.ManufacturingTaskName}"><display description="${workEffortName} [${workEffortId}]"/></field> <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> @@ -529,13 +529,13 @@ </form> <form name="ProductionRunTaskFixedAssets" type="list" target="updateWorkEffortFixedAssetAssign" paginate-target="" title="" list-name="records" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <auto-fields-entity entity-name="WorkEffortFixedAssetAssign" default-field-type="edit" /> + <auto-fields-entity entity-name="WorkEffortFixedAssetAssign" default-field-type="edit"/> <field name="productionRunId"><hidden/></field> <field name="workEffortId"><hidden/></field> <field name="statusId"><hidden/></field> <field name="fromDate"><display/></field> <field name="fixedAssetId"> - <display-entity entity-name="FixedAsset" description="${fixedAssetName} [${fixedAssetId}]" /> + <display-entity entity-name="FixedAsset" description="${fixedAssetName} [${fixedAssetId}]"/> </field> <field name="availabilityStatusId"> <drop-down no-current-selected-key="WEFA_IN_USE"> @@ -558,20 +558,20 @@ </form> <form name="ListProductionRunTaskFixedAssets" type="list" title="" list-name="productionRunFixedAssetsData" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <auto-fields-entity entity-name="WorkEffortFixedAssetAssign" default-field-type="display" /> + <auto-fields-entity entity-name="WorkEffortFixedAssetAssign" default-field-type="display"/> <field name="workEffortId"> - <display-entity entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]" /> + <display-entity entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]"/> </field> <field name="fixedAssetId"> - <display-entity entity-name="FixedAsset" description="${fixedAssetName}" /> + <display-entity entity-name="FixedAsset" description="${fixedAssetName}"/> </field> <field name="statusId"> - <display-entity entity-name="StatusItem" /> + <display-entity entity-name="StatusItem"/> </field> </form> <form name="ListProductionRunNotes" type="list" title="" list-name="productionRunNoteData" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <auto-fields-entity entity-name="WorkEffortNoteAndData" default-field-type="display" /> + <auto-fields-entity entity-name="WorkEffortNoteAndData" default-field-type="display"/> <field name="workEffortId"><hidden/></field> <field name="internalNote"><hidden/></field> <field name="noteId"><hidden/></field> @@ -580,27 +580,27 @@ </form> <form name="EditProductionRunTaskFixedAsset" type="single" target="EditProductionRun" title="" default-map-name="fixedAssetData" header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="declarationScreen.equals("Y")" target="ProductionRunDeclaration" /> - <auto-fields-entity entity-name="WorkEffortFixedAssetAssign" /> - <field name="actionForm"><hidden value="${actionForm}" /></field> + <alt-target use-when="declarationScreen.equals("Y")" target="ProductionRunDeclaration"/> + <auto-fields-entity entity-name="WorkEffortFixedAssetAssign"/> + <field name="actionForm"><hidden value="${actionForm}"/></field> <field name="productionRunId"><hidden /></field> <field name="workEffortId" use-when="${actionIsAdd}!=null"> <drop-down allow-empty="false"> <entity-options entity-name="WorkEffort" description="[${workEffortId}] ${workEffortName}"> - <entity-constraint name="workEffortParentId" value="${productionRunId}" /> + <entity-constraint name="workEffortParentId" value="${productionRunId}"/> </entity-options> </drop-down> </field> <field name="workEffortId" use-when="${actionIsAdd}==null"> - <display-entity entity-name="WorkEffort" description="[${workEffortId}] ${workEffortName}" /> + <display-entity entity-name="WorkEffort" description="[${workEffortId}] ${workEffortName}"/> </field> <field name="fixedAssetId" use-when="${actionIsAdd}!=null"> <drop-down allow-empty="false"> - <entity-options entity-name="FixedAsset" description="${fixedAssetName}" /> + <entity-options entity-name="FixedAsset" description="${fixedAssetName}"/> </drop-down> </field> <field name="fixedAssetId" use-when="${actionIsAdd}==null"> - <display-entity entity-name="FixedAsset" description="${fixedAssetName}" /> + <display-entity entity-name="FixedAsset" description="${fixedAssetName}"/> </field> <field name="fromDate" use-when="${actionIsAdd}==null"> <display /> @@ -610,29 +610,29 @@ so this field will be hidden meanwhile <drop-down> <entity-options entity-name="StatusItem" description="${description}"> - <entity-constraint name="statusTypeId" value="WORK_EFF_ASSET_STTS" /> + <entity-constraint name="statusTypeId" value="WORK_EFF_ASSET_STTS"/> </entity-options> </drop-down> --> <hidden /> </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}"> - <submit button-type="button" /> + <submit button-type="button"/> </field> </form> <form name="AddProductionRunTaskFixedAsset" type="single" target="createWorkEffortFixedAssetAssign" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createWorkEffortFixedAssetAssign" /> + <auto-fields-service service-name="createWorkEffortFixedAssetAssign"/> <field name="productionRunId"><hidden /></field> <field name="workEffortId" title="${uiLabelMap.ManufacturingRoutingTask}"> <drop-down allow-empty="false"> <entity-options entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]"> - <entity-constraint name="workEffortParentId" value="${productionRunId}" /> + <entity-constraint name="workEffortParentId" value="${productionRunId}"/> </entity-options> </drop-down> </field> <field name="fixedAssetId" title="${uiLabelMap.ManufacturingMachine}"> <drop-down allow-empty="false"> - <entity-options entity-name="FixedAsset" description="${fixedAssetName} [${fixedAssetId}]" /> + <entity-options entity-name="FixedAsset" description="${fixedAssetName} [${fixedAssetId}]"/> </drop-down> </field> <field name="statusId"> @@ -640,7 +640,7 @@ so this field will be hidden meanwhile <drop-down> <entity-options entity-name="StatusItem" description="${description}"> - <entity-constraint name="statusTypeId" value="WORK_EFF_ASSET_STTS" /> + <entity-constraint name="statusTypeId" value="WORK_EFF_ASSET_STTS"/> </entity-options> </drop-down> --> <hidden /> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml Tue Apr 7 08:27:15 2009 @@ -357,13 +357,13 @@ <!-- RoutingTask-FixedAsset association (WorkEffortFixedAssetStd) --> <form name="ListRoutingTaskFixedAssets" type="list" title="" target="updateRoutingTaskFixedAsset" list-name="allFixedAssets" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <auto-fields-entity entity-name="WorkEffortFixedAssetStd" /> + <auto-fields-entity entity-name="WorkEffortFixedAssetStd"/> <field name="workEffortId"><hidden/></field> <field name="fixedAssetTypeId"> - <display-entity entity-name="FixedAssetType" /> + <display-entity entity-name="FixedAssetType"/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"> - <submit button-type="button" /> + <submit button-type="button"/> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="removeRoutingTaskFixedAsset" description="${uiLabelMap.CommonDelete}" also-hidden="false" > @@ -374,15 +374,15 @@ </form> <form name="EditRoutingTaskFixedAsset" type="single" title="" target="createRoutingTaskFixedAsset" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-entity entity-name="WorkEffortFixedAssetStd" default-field-type="edit" /> + <auto-fields-entity entity-name="WorkEffortFixedAssetStd" default-field-type="edit"/> <field name="workEffortId"><hidden /></field> <field name="fixedAssetTypeId"> <drop-down allow-empty="false"> - <entity-options entity-name="FixedAssetType" description="${description}" /> + <entity-options entity-name="FixedAssetType" description="${description}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"> - <submit button-type="button" /> + <submit button-type="button"/> </field> </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml Tue Apr 7 08:27:15 2009 @@ -27,7 +27,7 @@ <set field="headerItem" value="costs"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> + <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <entity-condition entity-name="CostComponentCalc" list="allCostComponentCalcs"/> <entity-one entity-name="CostComponentCalc" value-field="costComponentCalc"/> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml Tue Apr 7 08:27:15 2009 @@ -40,10 +40,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupRouting" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" /> + <include-form name="lookupRouting" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupRouting" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" /> + <include-form name="listLookupRouting" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -69,10 +69,10 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupRoutingTask" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" /> + <include-form name="lookupRoutingTask" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupRoutingTask" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml" /> + <include-form name="listLookupRoutingTask" location="component://manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Tue Apr 7 08:27:15 2009 @@ -451,12 +451,12 @@ <screen name="EditRoutingTaskFixedAssets"> <section> <actions> - <set field="titleProperty" value="PageTitleEditRoutingTaskFixedAsset" /> - <set field="tabButtonItem" value="editRoutingTaskFixedAssets" /> - <set field="headerItem" value="routingTask" /> - <set field="workEffortId" from-field="parameters.workEffortId" /> + <set field="titleProperty" value="PageTitleEditRoutingTaskFixedAsset"/> + <set field="tabButtonItem" value="editRoutingTaskFixedAssets"/> + <set field="headerItem" value="routingTask"/> + <set field="workEffortId" from-field="parameters.workEffortId"/> <entity-and entity-name="WorkEffortFixedAssetStd" list="allFixedAssets"> - <field-map field-name="workEffortId" from-field="workEffortId" /> + <field-map field-name="workEffortId" from-field="workEffortId"/> </entity-and> </actions> <widgets> Modified: ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml (original) +++ ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml Tue Apr 7 08:27:15 2009 @@ -72,7 +72,7 @@ <StatusValidChange condition="" statusId="LEAD_ASSIGNED" statusIdTo="LEAD_QUALIFIED" transitionName="Qualified"/> <StatusValidChange condition="" statusId="LEAD_ASSIGNED" statusIdTo="PARTY_DISABLED" transitionName="Disabled"/> - <WebSite webSiteId="MARKETING" siteName="Marketing Manager" visualThemeSetId="BACKOFFICE" /> - <WebSite webSiteId="SFA" siteName="SFA Manager" visualThemeSetId="BACKOFFICE" /> + <WebSite webSiteId="MARKETING" siteName="Marketing Manager" visualThemeSetId="BACKOFFICE"/> + <WebSite webSiteId="SFA" siteName="SFA Manager" visualThemeSetId="BACKOFFICE"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Tue Apr 7 08:27:15 2009 @@ -80,7 +80,7 @@ </and> </condition> <then> - <set field="parameters.statusId" value="CLPT_ACCEPTED" /> + <set field="parameters.statusId" value="CLPT_ACCEPTED"/> </then> </if> </simple-method> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Tue Apr 7 08:27:15 2009 @@ -134,14 +134,14 @@ OR SegmentGroup -> SegmentGroupClassification -> PartyClassificationGroup -> PartyClassification -> Party --> - <set field="securityAction" value="_VIEW" /> + <set field="securityAction" value="_VIEW"/> <check-permission permission="MARKETING" action="${securityAction}"><fail-message message="Security Error\: to run ${methodShortDescription} you must have the MARKETING${securityAction} or MARKETING_ADMIN permission"/></check-permission> <check-errors/> </simple-method> <simple-method method-name="findSegmentGroupsOfParty" short-description="Find SegmentGroups Of a Party (that a Party is In)"> <!-- Follows same path as findPartiesInSegmentGroup, but in reverse... --> - <set field="securityAction" value="_VIEW" /> + <set field="securityAction" value="_VIEW"/> <check-permission permission="MARKETING" action="${securityAction}"><fail-message message="Security Error\: to run ${methodShortDescription} you must have the MARKETING${securityAction} or MARKETING_ADMIN permission"/></check-permission> <check-errors/> @@ -156,7 +156,7 @@ OR Party -> SegmentGroupRole -> SegmentGroup -> SegmentGroupClassification -> PartyClassificationGroup -> PartyClassification -> Party --> - <set field="securityAction" value="_VIEW" /> + <set field="securityAction" value="_VIEW"/> <check-permission permission="MARKETING" action="${securityAction}"><fail-message message="Security Error\: to run ${methodShortDescription} you must have the MARKETING${securityAction} or MARKETING_ADMIN permission"/></check-permission> <check-errors/> @@ -191,7 +191,7 @@ </and> </condition> <then> - <set field="areRelated" value="N" /> + <set field="areRelated" value="N"/> <field-to-result field="areRelated"/> </then> <else> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml Tue Apr 7 08:27:15 2009 @@ -144,7 +144,7 @@ <simple-method method-name="createTrackingCodeOrderReturns" short-description="Create TrackingCodeOrderReturn for all the Return Items with Orders that have trackingCodeOrder entry"> <if-not-empty field="parameters.returnId"> - <set field="returnHeaderFindContext.returnId" from-field="parameters.returnId" /> + <set field="returnHeaderFindContext.returnId" from-field="parameters.returnId"/> <find-by-primary-key entity-name="ReturnHeader" value-field="returnHeader" map="returnHeaderFindContext"/> <get-related list="returnItems" relation-name="ReturnItem" value-field="returnHeader"/> <log level="info" message="Return items lists are : ${returnItems}"/> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml Tue Apr 7 08:27:15 2009 @@ -56,7 +56,7 @@ <set field="partyId" from-field="parameters.partyId"/> <set field="partyRelationCtx.partyIdFrom" from-field="userLogin.partyId"/> - <set field="partyRelationCtx.partyIdTo" from-field="partyId" /> + <set field="partyRelationCtx.partyIdTo" from-field="partyId"/> <set field="partyRelationCtx.roleTypeIdTo" from-field="parameters.roleTypeId"/> <set field="partyRelationCtx.roleTypeIdFrom" value="_NA_"/> <set field="partyRelationCtx.partyRelationshipTypeId" value="CONTACT_REL"/> Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/servicedef/services.xml (original) +++ ofbiz/trunk/applications/marketing/servicedef/services.xml Tue Apr 7 08:27:15 2009 @@ -397,7 +397,7 @@ <auto-attributes entity-name="TelecomNumber" mode="IN" optional="true"> <exclude field-name="contactMechId"/> </auto-attributes> - <attribute name="partyId" type="String" mode="OUT" /> + <attribute name="partyId" type="String" mode="OUT"/> <attribute name="emailAddress" type="String" mode="IN" optional="true"/> <attribute name="groupName" type="String" mode="IN" optional="true"/> <attribute name="title" type="String" mode="IN" optional="true"/> @@ -421,7 +421,7 @@ <auto-attributes entity-name="TelecomNumber" mode="IN" optional="true"> <exclude field-name="contactMechId"/> </auto-attributes> - <attribute name="partyId" type="String" mode="OUT" /> + <attribute name="partyId" type="String" mode="OUT"/> <attribute name="emailAddress" type="String" mode="IN" optional="true"/> <attribute name="partyIdFrom" type="String" mode="IN" optional="true"/> <attribute name="quickAdd" type="String" mode="IN" optional="true"/> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml Tue Apr 7 08:27:15 2009 @@ -91,7 +91,7 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="MarketingCampaignRole"> - <field-map field-name="marketingCampaignId" from-field="marketingCampaignId" /> + <field-map field-name="marketingCampaignId" from-field="marketingCampaignId"/> </entity-and> </actions> <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml Tue Apr 7 08:27:15 2009 @@ -50,7 +50,7 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="SegmentGroupClassification"> - <field-map field-name="segmentGroupId" /> + <field-map field-name="segmentGroupId"/> </entity-and> </actions> <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"> Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Tue Apr 7 08:27:15 2009 @@ -431,7 +431,7 @@ <set field="titleProperty" value="PageTitleLookupContactList"/> <set field="contactListTabButtonItem" value="ContactListCommEvent"/> <set field="labelTitleProperty" value="PageTitleLookupContactList"/> - <set field="title" value="${uiLabelMap.PageTitleLookupContactList}" /> + <set field="title" value="${uiLabelMap.PageTitleLookupContactList}"/> </actions> <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> @@ -452,7 +452,7 @@ <set field="titleProperty" value="PageTitlePreferredContactMech"/> <set field="contactListTabButtonItem" value="ContactListCommEvent"/> <set field="labelTitleProperty" value="PageTitlePreferredContactMech"/> - <set field="title" value="${uiLabelMap.PageTitlePreferredContactMech}" /> + <set field="title" value="${uiLabelMap.PageTitlePreferredContactMech}"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactLists"/> <set field="partyId" from-field="parameters.parm0"/> Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Tue Apr 7 08:27:15 2009 @@ -59,7 +59,7 @@ <screen name="EditMarketingCampaign"> <section> <actions> - <property-map resource="OrderUiLabels" map-name="uiLabelMap" /> + <property-map resource="OrderUiLabels" map-name="uiLabelMap"/> <set field="titleProperty" value="PageTitleEditMarketingCampaign"/> <set field="campaignTabButtonItem" value="MarketingCampaign"/> <set field="labelTitleProperty" value="PageTitleEditMarketingCampaign"/> Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml Tue Apr 7 08:27:15 2009 @@ -400,7 +400,7 @@ <set field="titleProperty" value="PageTitleLookupVisit"/> <set field="trackingCodeTabButtonItem" value="TrackingCode"/> <set field="labelTitleProperty" value="PageTitleLookupVisit"/> - <set field="title" value="${uiLabelMap.PageTitleLookupVisit}" /> + <set field="title" value="${uiLabelMap.PageTitleLookupVisit}"/> <set field="entityName" value="CommunicationEvent"/> </actions> <widgets> @@ -421,7 +421,7 @@ <set field="titleProperty" value="PageTitleLookupTrackingCode"/> <set field="trackingCodeTabButtonItem" value="TrackingCode"/> <set field="labelTitleProperty" value="PageTitleLookupTrackingCode"/> - <set field="title" value="${uiLabelMap.PageTitleLookupTrackingCode}" /> + <set field="title" value="${uiLabelMap.PageTitleLookupTrackingCode}"/> <set field="entityName" value="TrackingCode"/> </actions> <widgets> @@ -542,7 +542,7 @@ <set field="titleProperty" value="PageTitleLookupTrackingCodeType"/> <set field="trackingCodeTabButtonItem" value="TrackingCodeType"/> <set field="labelTitleProperty" value="PageTitleLookupTrackingCodeType"/> - <set field="title" value="${uiLabelMap.PageTitleLookupTrackingCodeType}" /> + <set field="title" value="${uiLabelMap.PageTitleLookupTrackingCodeType}"/> <set field="entityName" value="TrackingCodeType"/> </actions> <widgets> Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Tue Apr 7 08:27:15 2009 @@ -336,13 +336,13 @@ <container style="profile-right"> <section> <actions> - <set field="parameters.partyId" from-field="partyId" /> + <set field="parameters.partyId" from-field="partyId"/> </actions> <widgets> <include-screen name="Content" - location="component://party/widget/partymgr/ProfileScreens.xml" /> + location="component://party/widget/partymgr/ProfileScreens.xml"/> <include-screen name="Notes" - location="component://party/widget/partymgr/ProfileScreens.xml" /> + location="component://party/widget/partymgr/ProfileScreens.xml"/> </widgets> </section> </container> Modified: ofbiz/trunk/applications/order/data/OrderPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderPortletData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/order/data/OrderPortletData.xml (original) +++ ofbiz/trunk/applications/order/data/OrderPortletData.xml Tue Apr 7 08:27:15 2009 @@ -25,17 +25,17 @@ portletName="Incoming Cust.Requests" screenName="IncomingCustRequests" screenLocation="component://order/widget/ordermgr/RequestScreens.xml" - description="List Request List for a request taker" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> + description="List Request List for a request taker" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW"/> <PortletPortletCategory portalPortletId="INCOM_CUST_REQUESTS" portletCategoryId="CUST_REQUEST"/> - <PortletCategory portletCategoryId="LIST_CUSTOMER" description="List(s) available to a Customer" /> + <PortletCategory portletCategoryId="LIST_CUSTOMER" description="List(s) available to a Customer"/> <PortalPortlet portalPortletId="ListCustRequests" portletName="List Cust Requests" screenName="ListCustRequests" screenLocation="component://order/widget/ordermgr/RequestScreens.xml" description="List Cust Requests to the customer" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" editFormName="EditCustReqStatusId" - editFormLocation="component://order/webapp/ordermgr/request/RequestForms.xml" /> + editFormLocation="component://order/webapp/ordermgr/request/RequestForms.xml"/> <PortletPortletCategory portalPortletId="ListCustRequests" portletCategoryId="LIST_CUSTOMER"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Tue Apr 7 08:27:15 2009 @@ -851,7 +851,7 @@ <iterate entry="returnItem" list="returnItems"> <set field="returnItemMap.returnId" from-field="parameters.returnId"/> <set field="returnItemMap.returnItemSeqId" from-field="returnItem.returnItemSeqId"/> - <set field="returnItemMap.statusId" value="RETURN_CANCELLED" /> + <set field="returnItemMap.statusId" value="RETURN_CANCELLED"/> <call-service service-name="updateReturnItem" in-map-name="returnItemMap"/> </iterate> </simple-method> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml Tue Apr 7 08:27:15 2009 @@ -50,7 +50,7 @@ <or> <!-- Compaire MimeType between upload file and selected MimeType --> <if-compare-field field="formInput.uploadMimeType" operator="equals" to-field="formInput.formInput.mimeTypeId"/> - <if-compare field="formInput.formInput.mimeTypeId" operator="equals" value="application/octet-stream" /> + <if-compare field="formInput.formInput.mimeTypeId" operator="equals" value="application/octet-stream"/> <if-compare field="formInput.formInput.mimeTypeId" operator="equals" value=""/> </or> </condition> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Tue Apr 7 08:27:15 2009 @@ -183,17 +183,17 @@ <simple-method method-name="addDistinctShoppingListItem" short-description="Adds a shopping list item if one with the same productId does not exist"> <entity-condition entity-name="ShoppingListItem" list="shoppingListItemList"> - <condition-expr field-name="shoppingListId" from-field="parameters.shoppingListId" /> + <condition-expr field-name="shoppingListId" from-field="parameters.shoppingListId"/> </entity-condition> <iterate list="shoppingListItemList" entry="shoppingListItem"> <if-compare-field field="parameters.productId" to-field="shoppingListItem.productId" operator="equals"> - <field-to-result field="shoppingListItem.shoppingListItemSeqId" result-name="shoppingListItemSeqId" /> + <field-to-result field="shoppingListItem.shoppingListItemSeqId" result-name="shoppingListItemSeqId"/> <return /> </if-compare-field> </iterate> <call-service service-name="createShoppingListItem" in-map-name="parameters"> - <result-to-result result-name="shoppingListItemSeqId" /> + <result-to-result result-name="shoppingListItemSeqId"/> </call-service> </simple-method> @@ -296,74 +296,74 @@ <entity-condition entity-name="OrderRole" list="orderRoleList"> <condition-list combine="and"> - <condition-expr field-name="orderId" from-field="parameters.orderId" /> - <condition-expr field-name="roleTypeId" value="PLACING_CUSTOMER" /> + <condition-expr field-name="orderId" from-field="parameters.orderId"/> + <condition-expr field-name="roleTypeId" value="PLACING_CUSTOMER"/> </condition-list> </entity-condition> - <first-from-list list="orderRoleList" entry="orderRole" /> + <first-from-list list="orderRoleList" entry="orderRole"/> <entity-condition entity-name="ShoppingList" list="shoppingListList"> <condition-list combine="and"> - <condition-expr field-name="partyId" from-field="orderRole.partyId" /> - <condition-expr field-name="listName" value="Auto Suggestions" /> + <condition-expr field-name="partyId" from-field="orderRole.partyId"/> + <condition-expr field-name="listName" value="Auto Suggestions"/> </condition-list> </entity-condition> - <first-from-list list="shoppingListList" entry="shoppingList" /> + <first-from-list list="shoppingListList" entry="shoppingList"/> <if-empty field="shoppingList"> - <set field="createShoppingListInMap.partyId" from-field="orderRole.partyId" /> - <set field="createShoppingListInMap.listName" value="Auto Suggestions" /> - <set field="createShoppingListInMap.shoppingListTypeId" value="SLT_WISH_LIST" /> + <set field="createShoppingListInMap.partyId" from-field="orderRole.partyId"/> + <set field="createShoppingListInMap.listName" value="Auto Suggestions"/> + <set field="createShoppingListInMap.shoppingListTypeId" value="SLT_WISH_LIST"/> <call-service service-name="createShoppingList" in-map-name="createShoppingListInMap"> - <result-to-field result-name="shoppingListId" /> + <result-to-field result-name="shoppingListId"/> </call-service> <else> - <set field="shoppingListId" from-field="shoppingList.shoppingListId" /> + <set field="shoppingListId" from-field="shoppingList.shoppingListId"/> </else> </if-empty> <entity-condition entity-name="OrderItem" list="orderItemList"> - <condition-expr field-name="orderId" from-field="parameters.orderId" /> - <order-by field-name="orderItemSeqId" /> + <condition-expr field-name="orderId" from-field="parameters.orderId"/> + <order-by field-name="orderItemSeqId"/> </entity-condition> <iterate list="orderItemList" entry="orderItem"> <if-not-empty field="orderItem.productId"> <entity-condition entity-name="ProductAssoc" list="compProductAssocList" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="productId" from-field="orderItem.productId" /> - <condition-expr field-name="productAssocTypeId" value="PRODUCT_COMPLEMENT" /> + <condition-expr field-name="productId" from-field="orderItem.productId"/> + <condition-expr field-name="productAssocTypeId" value="PRODUCT_COMPLEMENT"/> </condition-list> </entity-condition> <iterate list="compProductAssocList" entry="compProductAssoc"> - <clear-field field="shoppingListParameters" /> - <set field="shoppingListParameters.productId" from-field="compProductAssoc.productIdTo" /> - <set field="shoppingListParameters.shoppingListId" from-field="shoppingListId" /> - <set field="shoppingListParameters.quantity" value="1" type="BigDecimal" /> - <call-service service-name="addDistinctShoppingListItem" in-map-name="shoppingListParameters" /> + <clear-field field="shoppingListParameters"/> + <set field="shoppingListParameters.productId" from-field="compProductAssoc.productIdTo"/> + <set field="shoppingListParameters.shoppingListId" from-field="shoppingListId"/> + <set field="shoppingListParameters.quantity" value="1" type="BigDecimal"/> + <call-service service-name="addDistinctShoppingListItem" in-map-name="shoppingListParameters"/> </iterate> <entity-one entity-name="Product" value-field="product" auto-field-map="false" > - <field-map field-name="productId" from-field="orderItem.productId" /> + <field-map field-name="productId" from-field="orderItem.productId"/> </entity-one> <if-compare field="product.isVariant" operator="equals" value="Y"> <entity-condition entity-name="ProductAssoc" list="virtualProductAssocList" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="productIdTo" from-field="orderItem.productId" /> - <condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" /> + <condition-expr field-name="productIdTo" from-field="orderItem.productId"/> + <condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT"/> </condition-list> </entity-condition> - <first-from-list list="virtualProductAssocList" entry="virtualProductAssoc" /> + <first-from-list list="virtualProductAssocList" entry="virtualProductAssoc"/> <if-not-empty field="virtualProductAssoc"> <entity-condition entity-name="ProductAssoc" list="compProductAssocList" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="productId" from-field="virtualProductAssoc.productId" /> - <condition-expr field-name="productAssocTypeId" value="PRODUCT_COMPLEMENT" /> + <condition-expr field-name="productId" from-field="virtualProductAssoc.productId"/> + <condition-expr field-name="productAssocTypeId" value="PRODUCT_COMPLEMENT"/> </condition-list> </entity-condition> <iterate list="compProductAssocList" entry="compProductAssoc"> - <clear-field field="shoppingListParameters" /> - <set field="shoppingListParameters.productId" from-field="compProductAssoc.productIdTo" /> - <set field="shoppingListParameters.shoppingListId" from-field="shoppingListId" /> - <set field="shoppingListParameters.quantity" value="1" type="BigDecimal" /> - <call-service service-name="addDistinctShoppingListItem" in-map-name="shoppingListParameters" /> + <clear-field field="shoppingListParameters"/> + <set field="shoppingListParameters.productId" from-field="compProductAssoc.productIdTo"/> + <set field="shoppingListParameters.shoppingListId" from-field="shoppingListId"/> + <set field="shoppingListParameters.quantity" value="1" type="BigDecimal"/> + <call-service service-name="addDistinctShoppingListItem" in-map-name="shoppingListParameters"/> </iterate> </if-not-empty> </if-compare> Modified: ofbiz/trunk/applications/order/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/secas.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/order/servicedef/secas.xml (original) +++ ofbiz/trunk/applications/order/servicedef/secas.xml Tue Apr 7 08:27:15 2009 @@ -91,7 +91,7 @@ <!-- DISABLED FOR NOW <eca service="changeOrderStatus" event="commit" run-on-error="false"> <condition field-name="statusId" operator="equals" value="ORDER_PROCESSING"/> - <action service="processOrderWf" mode="async" persist="true" /> + <action service="processOrderWf" mode="async" persist="true"/> </eca> --> @@ -318,7 +318,7 @@ <!-- WorkEffort --> <eca service="createQuoteWorkEffort" event="invoke"> - <condition field-name="workEffortId" operator="is-empty" /> + <condition field-name="workEffortId" operator="is-empty"/> <action service="createWorkEffort" mode="sync"/> </eca> </service-eca> Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/order/servicedef/services_request.xml (original) +++ ofbiz/trunk/applications/order/servicedef/services_request.xml Tue Apr 7 08:27:15 2009 @@ -183,9 +183,9 @@ invoke="createCustRequestContent" default-entity-name="CustRequestContent" auth="true"> <description>Create a Customer Request Content</description> - <auto-attributes include="pk" mode="IN" optional="false" /> - <auto-attributes include="nonpk" mode="IN" optional="true" /> - <override name="fromDate" optional="true" /> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + <override name="fromDate" optional="true"/> </service> <service name="deleteCustRequestContent" engine="simple" location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" Modified: ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml Tue Apr 7 08:27:15 2009 @@ -276,7 +276,7 @@ <auto-fields-entity entity-name="CustRequestItem" default-field-type="hidden"/> <field name="custRequestId"><display/></field> <field name="custRequestItemSeqId" widget-style="buttontext" > - <hyperlink also-hidden="false" target-type="plain" description="${custRequestItemSeqId}" target="javascript:set_value('${custRequestItemSeqId}')" /> + <hyperlink also-hidden="false" target-type="plain" description="${custRequestItemSeqId}" target="javascript:set_value('${custRequestItemSeqId}')"/> </field> <field name="priority"><display/></field> <field name="custRequestResolutionId"><display-entity also-hidden="false" entity-name="CustRequestResolution"/></field> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml Tue Apr 7 08:27:15 2009 @@ -28,7 +28,7 @@ </entity-one> </actions> <alt-target target="createOrderHeader" use-when="orderHeader==null"/> - <auto-fields-entity entity-name="OrderHeader" /> + <auto-fields-entity entity-name="OrderHeader"/> <field name="orderId" use-when="orderHeader!=null" ><display/></field> <field name="orderId" use-when="orderHeader==null" ><ignored/></field> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderShopListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderShopListForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderShopListForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderShopListForms.xml Tue Apr 7 08:27:15 2009 @@ -22,7 +22,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="EditShopList" type="single" target="" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-entity entity-name="ShoppingList" /> + <auto-fields-entity entity-name="ShoppingList"/> <field name="shoppingListTypeId"> <drop-down> <entity-options entity-name="ShoppingListType" description="${description}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |