svn commit: r1768235 - in /ofbiz/trunk: applications/accounting/minila
Locked
svn commit: r1768235 - in /ofbiz/trunk: applications/accounting/minila
 
|
Author: diveshdutta
Date: Sat Nov 5 16:11:36 2016 New Revision: 1768235 URL: http://svn.apache.org/viewvc?rev=1768235&view=rev Log: Improvement: Minilang code readability and consistency improvements. (OFBIZ-8926) (OFBIZ-8927) Thanks: Ankush Upadhyay for the patch. Modified: ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml ofbiz/trunk/applications/content/minilang/content/ContentServices.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml ofbiz/trunk/applications/content/widget/content/ContentScreens.xml ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml ofbiz/trunk/applications/party/minilang/party/PartyServices.xml ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml Modified: ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml Sat Nov 5 16:11:36 2016 @@ -27,7 +27,7 @@ under the License. <!-- check that the party is an INTERNAL_ORGANIZATION, as defined in PartyRole --> <set from-field="parameters.partyId" field="lookupParams.partyId"/> <set value="INTERNAL_ORGANIZATIO" field="lookupParams.roleTypeId"/> - <find-by-primary-key use-cache="true" entity-name="PartyRole" value-field="partyRole" map="lookupParams"/> + <<find-by-primary-key entity-name="PartyRole" map="lookupParams" value-field="partyRole" use-cache="true"/> <if-empty field="partyRole"> <add-error><fail-property resource="AccountingUiLabels" property="AccountingPartyMustBeInternalOrganization"/></add-error> <check-errors/> Modified: ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml Sat Nov 5 16:11:36 2016 @@ -131,7 +131,7 @@ under the License. <call-service service-name="updateWorkEffort" in-map-name="updateWorkEffortCtx"/> <check-errors/> <entity-condition entity-name="WorkEffortPartyAssignment" list="wepas" filter-by-date="true"> - <condition-expr field-name="workEffortId" from-field="workEffortId" operator="equals"/> + <condition-expr field-name="workEffortId" operator="equals" from-field="workEffortId"/> </entity-condition> <iterate list="wepas" entry="wepa"> <set field="wepa.thruDate" from-field="nowTimestamp"/> Modified: ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml Sat Nov 5 16:11:36 2016 @@ -1045,10 +1045,10 @@ under the License. <entity-condition entity-name="Payment" list="payments"> <condition-list combine="and"> <condition-expr field-name="statusId" value="PMNT_CONFIRMED" operator="not-equals"/> - <condition-expr field-name="partyIdFrom" from-field="invoice.partyId" operator="equals"/> - <condition-expr field-name="partyIdTo" from-field="invoice.partyIdFrom" operator="equals"/> - <condition-expr field-name="actualCurrencyAmount" from-field="invoiceTotal" operator="equals"/> - <condition-expr field-name="actualCurrencyUomId" from-field="invoice.currencyUomId" operator="equals"/> + <condition-expr field-name="partyIdFrom" operator="equals" from-field="invoice.partyId"/> + <condition-expr field-name="partyIdTo" operator="equals" from-field="invoice.partyIdFrom"/> + <condition-expr field-name="actualCurrencyAmount" operator="equals" from-field="invoiceTotal"/> + <condition-expr field-name="actualCurrencyUomId" operator="equals" from-field="invoice.currencyUomId"/> </condition-list> <order-by field-name="effectiveDate"/> </entity-condition> @@ -1056,10 +1056,10 @@ under the License. <entity-condition entity-name="Payment" list="payments"> <condition-list combine="and"> <condition-expr field-name="statusId" value="PMNT_CONFIRMED" operator="not-equals"/> - <condition-expr field-name="partyIdFrom" from-field="invoice.partyId" operator="equals"/> - <condition-expr field-name="partyIdTo" from-field="invoice.partyIdFrom" operator="equals"/> - <condition-expr field-name="amount" from-field="invoiceTotal" operator="equals"/> - <condition-expr field-name="currencyUomId" from-field="invoice.currencyUomId" operator="equals"/> + <condition-expr field-name="partyIdFrom" operator="equals" from-field="invoice.partyId"/> + <condition-expr field-name="partyIdTo" operator="equals" from-field="invoice.partyIdFrom"/> + <condition-expr field-name="amount" operator="equals" from-field="invoiceTotal"/> + <condition-expr field-name="currencyUomId" operator="equals" from-field="invoice.currencyUomId"/> </condition-list> <order-by field-name="effectiveDate"/> </entity-condition> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Sat Nov 5 16:11:36 2016 @@ -97,8 +97,8 @@ under the License. <entity-condition entity-name="InvoiceExport"> <condition-list combine="and"> <condition-list combine="or"> - <condition-expr field-name="partyIdFrom" from-field="organizationPartyId" operator="equals"/> - <condition-expr field-name="partyId" from-field="organizationPartyId" operator="equals"/> + <condition-expr field-name="partyIdFrom" operator="equals" from-field="organizationPartyId"/> + <condition-expr field-name="partyId" operator="equals" from-field="organizationPartyId"/> </condition-list> <condition-expr field-name="invoiceDate" operator="greater-equals" from-field="parameters.startDate" ignore-if-empty="true"/> <condition-expr field-name="invoiceId" operator="equals" from-field="parameters.invoiceId" ignore-if-empty="true"/> Modified: ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml (original) +++ ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml Sat Nov 5 16:11:36 2016 @@ -378,9 +378,9 @@ under the License. <simple-method method-name="getRevisionDataResource" short-description="Get version of DataResource that fits overall revision"> <entity-condition entity-name="ContentRevisionItem" list="contentRevisionItems" use-cache="true"> <condition-list combine="and"> - <condition-expr field-name="contentId" from-field="parameters.contentId" operator="equals"/> - <condition-expr field-name="itemContentId" from-field="parameters.itemContentId" operator="equals"/> - <condition-expr field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId" operator="less-equals"/> + <condition-expr field-name="contentId" operator="equals" from-field="parameters.contentId"/> + <condition-expr field-name="itemContentId" operator="equals" from-field="parameters.itemContentId"/> + <condition-expr field-name="contentRevisionSeqId" operator="less-equals" from-field="parameters.contentRevisionSeqId"/> </condition-list> <order-by field-name="-contentRevisionSeqId"/> </entity-condition> @@ -423,8 +423,8 @@ under the License. --> <entity-condition entity-name="MaxContentApprovalView" list="instanceApprovalList" use-cache="false"> <condition-list> - <condition-expr field-name="contentId" from-field="parameters.rootContentId" operator="equals"/> - <condition-expr field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId" operator="less-equals"/> + <condition-expr field-name="contentId" operator="equals" from-field="parameters.rootContentId"/> + <condition-expr field-name="contentRevisionSeqId" operator="less-equals" from-field="parameters.contentRevisionSeqId"/> </condition-list> <select-field field-name="contentId"/> <select-field field-name="partyId"/> @@ -440,10 +440,10 @@ under the License. <log level="info" message="maxContentApproval: ${maxContentApproval}"/> <entity-condition entity-name="ContentApproval" list="contentApprovalList2" use-cache="false"> <condition-list> - <condition-expr field-name="contentId" from-field="maxContentApproval.contentId" operator="equals"/> - <condition-expr field-name="contentRevisionSeqId" from-field="maxContentApproval.maxContentRevisionSeqId" operator="equals"/> - <condition-expr field-name="partyId" from-field="maxContentApproval.partyId" operator="equals" ignore-if-empty="true"/> - <condition-expr field-name="roleTypeId" from-field="maxContentApproval.roleTypeId" operator="equals" ignore-if-empty="true"/> + <condition-expr field-name="contentId" operator="equals" from-field="maxContentApproval.contentId"/> + <condition-expr field-name="contentRevisionSeqId" operator="equals" from-field="maxContentApproval.maxContentRevisionSeqId"/> + <condition-expr field-name="partyId" operator="equals" from-field="maxContentApproval.partyId" ignore-if-empty="true"/> + <condition-expr field-name="roleTypeId" operator="equals" from-field="maxContentApproval.roleTypeId" ignore-if-empty="true"/> </condition-list> <order-by field-name="-sequenceNum"/> </entity-condition> @@ -528,7 +528,7 @@ under the License. <log level="info" message="rootTemplateContentId 0aa: ${rootTemplateContentId}"/> <entity-condition entity-name="ContentRevision" list="templateContentRevisionList" use-cache="true"> <condition-list> - <condition-expr field-name="contentId" from-field="rootTemplateContentId" operator="equals"/> + <condition-expr field-name="contentId" operator="equals" from-field="rootTemplateContentId"/> </condition-list> <order-by field-name="-contentRevisionSeqId"/> </entity-condition> @@ -620,7 +620,7 @@ under the License. <log level="info" message="rootTemplateContentId 0aa: ${rootTemplateContentId}"/> <entity-condition entity-name="ContentRevision" list="templateContentRevisionList" use-cache="true"> <condition-list> - <condition-expr field-name="contentId" from-field="rootTemplateContentId" operator="equals"/> + <condition-expr field-name="contentId" operator="equals" from-field="rootTemplateContentId"/> </condition-list> <order-by field-name="-contentRevisionSeqId"/> </entity-condition> @@ -672,11 +672,11 @@ under the License. <now-timestamp field="nowTimestamp"/> <entity-condition entity-name="ContentRole" list="contentRoleList"> <condition-list combine="and"> - <condition-expr field-name="contentId" from-field="contentId" operator="equals"/> - <condition-expr field-name="partyId" from-field="partyId" operator="equals"/> - <condition-expr field-name="fromDate" from-field="nowTimestamp" operator="less-equals"/> + <condition-expr field-name="contentId" operator="equals" from-field="contentId"/> + <condition-expr field-name="partyId" operator="equals" from-field="partyId"/> + <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/> <condition-list combine="or"> - <condition-expr field-name="thruDate" from-field="nowTimestamp" operator="greater"/> + <condition-expr field-name="thruDate" operator="greater" from-field="nowTimestamp"/> <condition-expr field-name="thruDate" value="" operator="equals"/> </condition-list> </condition-list> @@ -776,7 +776,7 @@ under the License. <!-- find approvals belonging to roles that the user has or to the user --> <entity-condition entity-name="MaxContentApprovalView" list="compdocApprovalList" use-cache="false"> <condition-list> - <condition-expr field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/> + <condition-expr field-name="contentRevisionSeqId" operator="less-equals" from-field="parameters.contentRevisionSeqId" ignore-if-empty="true"/> <condition-expr field-name="contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/> <condition-list combine="or"> <condition-expr field-name="partyId" operator="equals" from-field="partyId"/> @@ -795,10 +795,10 @@ under the License. <log level="info" message="maxContentApproval: ${maxContentApproval}"/> <entity-condition entity-name="ContentApproval" list="contentApprovalList2" use-cache="false"> <condition-list> - <condition-expr field-name="contentId" from-field="maxContentApproval.contentId" operator="equals"/> - <condition-expr field-name="contentRevisionSeqId" from-field="maxContentApproval.maxContentRevisionSeqId" operator="equals"/> - <condition-expr field-name="partyId" from-field="maxContentApproval.partyId" operator="equals" ignore-if-empty="true"/> - <condition-expr field-name="roleTypeId" from-field="maxContentApproval.roleTypeId" operator="equals" ignore-if-empty="true"/> + <condition-expr field-name="contentId" operator="equals" from-field="maxContentApproval.contentId"/> + <condition-expr field-name="contentRevisionSeqId" operator="equals" from-field="maxContentApproval.maxContentRevisionSeqId"/> + <condition-expr field-name="partyId" operator="equals" from-field="maxContentApproval.partyId" ignore-if-empty="true"/> + <condition-expr field-name="roleTypeId" operator="equals" from-field="maxContentApproval.roleTypeId" ignore-if-empty="true"/> </condition-list> <order-by field-name="-sequenceNum"/> </entity-condition> @@ -823,7 +823,7 @@ under the License. <simple-method method-name="getMostRecentRevision" short-description="Look for most recent revision for contentId"> <entity-condition entity-name="ContentRevision" list="contentRevisions" use-cache="true"> <condition-list combine="and"> - <condition-expr field-name="contentId" from-field="parameters.contentId" operator="equals"/> + <condition-expr field-name="contentId" operator="equals" from-field="parameters.contentId"/> </condition-list> <order-by field-name="-contentRevisionSeqId"/> </entity-condition> Modified: ofbiz/trunk/applications/content/minilang/content/ContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/content/ContentServices.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/content/minilang/content/ContentServices.xml (original) +++ ofbiz/trunk/applications/content/minilang/content/ContentServices.xml Sat Nov 5 16:11:36 2016 @@ -572,7 +572,7 @@ <simple-method method-name="updateCommEventContentAssoc" short-description="Update CommEventContentAssoc"> <make-value entity-name="CommEventContentAssoc" value-field="pkCommEventContentAssoc"/> <set-pk-fields value-field="pkCommEventContentAssoc" map="parameters"/> - <find-by-primary-key value-field="commEventContentAssoc" map="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/> + <find-by-primary-key entity-name="CommEventContentAssoc" map="pkCommEventContentAssoc" value-field="commEventContentAssoc"/> <if-empty field="commEventContentAssoc"> <add-error> <fail-property resource="ContentUiLabels" property="ContenCommEventContentAssocNotFoundForUpdate"/> @@ -585,7 +585,7 @@ <simple-method method-name="removeCommEventContentAssoc" short-description="Delete CommEventContentAssoc"> <make-value entity-name="CommEventContentAssoc" value-field="pkCommEventContentAssoc"/> <set-pk-fields value-field="pkCommEventContentAssoc" map="parameters"/> - <find-by-primary-key value-field="commEventContentAssoc" map="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/> + <find-by-primary-key entity-name="CommEventContentAssoc" map="pkCommEventContentAssoc" value-field="commEventContentAssoc"/> <if-empty field="commEventContentAssoc"> <add-error> <fail-property resource="ContentUiLabels" property="ContenCommEventContentAssocNotFoundForDelete"/> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Sat Nov 5 16:11:36 2016 @@ -410,7 +410,7 @@ under the License. <set from-field="content.contentTypeId" field="contentTypeId"/> <entity-condition entity-name="ContentRevision" list="contentRevisions" use-cache="true"> <condition-list combine="and"> - <condition-expr field-name="contentId" from-field="rootContentId" operator="equals"/> + <condition-expr field-name="contentId" operator="equals" from-field="rootContentId"/> </condition-list> <order-by field-name="-contentRevisionSeqId"/> </entity-condition> @@ -510,7 +510,7 @@ under the License. <condition-list combine="and"> <condition-expr field-name="contentId" from-field="rootContentId"/> <condition-expr field-name="itemContentId" from-field="contentId"/> - <condition-expr field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/> + <condition-expr field-name="contentRevisionSeqId" operator="less-equals" from-field="parameters.contentRevisionSeqId" ignore-if-empty="true"/> </condition-list> <order-by field-name="-contentRevisionSeqId"/> </entity-condition> @@ -856,7 +856,7 @@ under the License. <set value="COMPDOC_INSTANCE" field="contentTypeId"/> <entity-condition entity-name="ContentRevision" list="contentRevisions" use-cache="true"> <condition-list combine="and"> - <condition-expr field-name="contentId" from-field="rootContentId" operator="equals"/> + <condition-expr field-name="contentId" operator="equals" from-field="rootContentId"/> </condition-list> <order-by field-name="-contentRevisionSeqId"/> </entity-condition> @@ -1024,7 +1024,7 @@ under the License. <set from-field="instanceContent.instanceOfContentId" field="templateContentId"/> <entity-condition entity-name="ContentRevision" list="contentTemplateRevisions" use-cache="true"> <condition-list combine="and"> - <condition-expr field-name="contentId" from-field="templateContentId" operator="equals"/> + <condition-expr field-name="contentId" operator="equals" from-field="templateContentId"/> </condition-list> <order-by field-name="-contentRevisionSeqId"/> </entity-condition> Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Sat Nov 5 16:11:36 2016 @@ -154,7 +154,7 @@ under the License. <set field="viewSize" value="${parameters.VIEW_SIZE}" default-value="30" type="Integer"/> <set field="viewIndex" value="${parameters.VIEW_INDEX}" default-value="0" type="Integer"/> <!-- <entity-condition entity-name="ContentAssocViewTo" list="contentAssoc"> - <condition-expr field-name="contentIdStart" from-field="contentId" operator="equals"/> + <condition-expr field-name="contentIdStart" operator="equals" from-field="contentId"/> </entity-condition>--> <script location="component://content/groovyScripts/content/GetContentLookupList.groovy"/> </actions> Modified: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Sat Nov 5 16:11:36 2016 @@ -138,14 +138,14 @@ under the License. <set field="nowDate" value="${groovy:org.apache.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> <entity-condition entity-name="EmplPositionTypeRateAndAmount" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId" operator="equals"/> + <condition-expr field-name="emplPositionTypeId" operator="equals" from-field="parameters.emplPositionTypeId"/> <condition-list combine="or"> - <condition-expr field-name="rateAmountFromDate" from-field="null" operator="equals"/> - <condition-expr field-name="rateAmountFromDate" from-field="nowDate" operator="less"/> + <condition-expr field-name="rateAmountFromDate" operator="equals" from-field="null"/> + <condition-expr field-name="rateAmountFromDate" operator="less" from-field="nowDate"/> </condition-list> <condition-list combine="or"> - <condition-expr field-name="rateAmountThruDate" from-field="null" operator="equals"/> - <condition-expr field-name="rateAmountThruDate" from-field="nowDate" operator="greater"/> + <condition-expr field-name="rateAmountThruDate" operator="equals" from-field="null"/> + <condition-expr field-name="rateAmountThruDate" operator="greater" from-field="nowDate"/> </condition-list> </condition-list> <order-by field-name="rateTypeId"/> Modified: ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml Sat Nov 5 16:11:36 2016 @@ -79,7 +79,7 @@ under the License. <entity-condition entity-name="SupplierProduct" list="supplierProducts"> <condition-list> <condition-expr field-name="productId" from-field="requirement.productId"/> - <condition-expr field-name="minimumOrderQuantity" from-field="requirement.quantity" operator="less-equals"/> + <condition-expr field-name="minimumOrderQuantity" operator="less-equals" from-field="requirement.quantity"/> </condition-list> <order-by field-name="lastPrice"/> <order-by field-name="supplierPrefOrderId"/> Modified: ofbiz/trunk/applications/party/minilang/party/PartyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/party/PartyServices.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/party/minilang/party/PartyServices.xml (original) +++ ofbiz/trunk/applications/party/minilang/party/PartyServices.xml Sat Nov 5 16:11:36 2016 @@ -259,7 +259,7 @@ under the License. <set from-field="dataResourceId" field="dataResource.dataResourceId"/> <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false"/> <set from-field="dataResource.dataResourceId" field="lookup.dataResourceId"/> - <find-by-primary-key use-cache="true" entity-name="DataResource" value-field="dataResourceMap" map="lookup"/> + <<find-by-primary-key entity-name="DataResource" map="lookup" value-field="dataResourceMap" use-cache="true"/> </if-not-empty> <set-service-fields service-name="createContent" map="parameters" to-map="createContentMap"/> @@ -322,13 +322,13 @@ under the License. <if-not-empty field="parameters._uploadedFile_fileName"> <set from-field="parameters.contentId" field="lookupParam.contentId"/> - <find-by-primary-key use-cache="true" entity-name="Content" value-field="content" map="lookupParam"/> + <<find-by-primary-key entity-name="Content" map="lookupParam" value-field="content" use-cache="true"/> <if-not-empty field="content.dataResourceId"> <set-service-fields service-name="updateDataResource" map="parameters" to-map="dataResource"/> <set from-field="content.dataResourceId" field="dataResource.dataResourceId"/> <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false"/> <set from-field="content.dataResourceId" field="lookup.dataResourceId"/> - <find-by-primary-key use-cache="true" entity-name="DataResource" value-field="dataResourceMap" map="lookup"/> + <<find-by-primary-key entity-name="DataResource" map="lookup" value-field="dataResourceMap" use-cache="true"/> <else> <set field="absolute" value="true" type="Boolean"/> <call-class-method method-name="getDataResourceContentUploadPath" class-name="org.apache.ofbiz.content.data.DataResourceWorker" ret-field="uploadPath"> @@ -357,7 +357,7 @@ under the License. <set from-field="dataResourceId" field="dataResource.dataResourceId"/> <call-service service-name="updateDataResource" in-map-name="dataResource" break-on-error="false"/> <set from-field="dataResource.dataResourceId" field="lookup.dataResourceId"/> - <find-by-primary-key use-cache="true" entity-name="DataResource" value-field="dataResourceMap" map="lookup"/> + <<find-by-primary-key entity-name="DataResource" map="lookup" value-field="dataResourceMap" use-cache="true"/> </else> </if-not-empty> </if-not-empty> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Sat Nov 5 16:11:36 2016 @@ -1405,7 +1405,7 @@ under the License. <condition-expr field-name="roleTypeId" value="EMPLOYEE" operator="equals"/> </condition-list> <condition-expr field-name="statusId" value="PARTY_DISABLED" operator="not-equals"/> - <condition-expr field-name="partyId" from-field="partyId" operator="equals" value="${parameters.partyId}" ignore-if-empty="true"/> + <condition-expr field-name="partyId" operator="equals" from-field="partyId" value="${parameters.partyId}" ignore-if-empty="true"/> </condition-list> <order-by field-name="partyId"/> </entity-condition> Modified: ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml Sat Nov 5 16:11:36 2016 @@ -922,7 +922,7 @@ under the License. <!-- In order to check if there is a link between the lot and the productId, we retrieve all the inventoryItems with this lotId ... --> <entity-condition entity-name="InventoryItem" list="inventoryItemList"> - <condition-expr field-name="lotId" from-field="parameters.lotId" operator="equals"/> + <condition-expr field-name="lotId" operator="equals" from-field="parameters.lotId"/> </entity-condition> <set value="ko" field="linkProductAndLot"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml Sat Nov 5 16:11:36 2016 @@ -381,7 +381,7 @@ under the License. <!-- club number --> <if-not-empty field="parameters.REQUIRE_CLUB"> <set from-field="tempMap.partyId" field="personLookup.partyId"/> - <find-by-primary-key map="personLookup" value-field="personVo" entity-name="Person"/> + <find-by-primary-key entity-name="Person" map="personLookup" value-field="personVo"/> <if-empty field="parameters.CLUB_NUMBER"> <script>groovy: clubId = org.apache.ofbiz.party.party.PartyWorker.createClubId(delegator, "999", 13); Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Nov 5 16:11:36 2016 @@ -498,7 +498,7 @@ under the License. <actions> <entity-condition entity-name="WorkEffortPartyAssignView" list="clientAssigns" distinct="true" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="workEffortId" from-field="projectId" operator="equals"/> + <condition-expr field-name="workEffortId" operator="equals" from-field="projectId"/> <condition-expr field-name="roleTypeId" value="CLIENT%" operator="like"/> <condition-expr field-name="roleTypeId" value="CLIENT_BILLING" operator="not-equals"/> </condition-list> @@ -516,7 +516,7 @@ under the License. </entity-condition> <entity-condition entity-name="WorkEffortPartyAssignView" list="companyAssigns" distinct="true" filter-by-date="true"> <condition-list combine="and"> - <condition-expr field-name="workEffortId" from-field="projectId" operator="equals"/> + <condition-expr field-name="workEffortId" operator="equals" from-field="projectId"/> <condition-list combine="or"> <condition-expr field-name="roleTypeId" value="INTERNAL_ORGANIZATIO" operator="equals"/> <condition-expr field-name="roleTypeId" value="CLIENT_BILLING" operator="equals"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Nov 5 16:11:36 2016 @@ -492,7 +492,7 @@ <actions> <entity-condition entity-name="WorkEffortPartyAssignView" list="assigns" distinct="true"> <condition-list combine="and"> - <condition-expr field-name="workEffortId" from-field="parameters.projectId" operator="equals"/> + <condition-expr field-name="workEffortId" operator="equals" from-field="parameters.projectId"/> <condition-expr field-name="roleTypeId" value="PROVIDER%" operator="like"/> </condition-list> <select-field field-name="partyId"/> Modified: ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml Sat Nov 5 16:11:36 2016 @@ -2547,7 +2547,7 @@ <entity-condition entity-name="WorkEffortAndContentDataResource" list="listIt"> <condition-list combine="and"> <condition-expr field-name="workEffortId" from-field="parameters.taskId"/> - <condition-expr field-name="contentId" from-field="contentIds" operator="in"/> + <condition-expr field-name="contentId" operator="in" from-field="contentIds"/> <condition-expr field-name="workEffortContentTypeId" value="TASK_SUB_INFO"/> </condition-list> <order-by field-name="fromDate"/> Modified: ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml?rev=1768235&r1=1768234&r2=1768235&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml Sat Nov 5 16:11:36 2016 @@ -124,7 +124,7 @@ </entity-condition> <entity-condition entity-name="ScrumPersonAndCompany" distinct="true" list="listPerson"> <condition-list combine="and"> - <condition-expr field-name="groupName" from-field="${nullField}" operator="not-equals"/> + <condition-expr field-name="groupName" operator="not-equals" from-field="${nullField}"/> <condition-expr field-name="statusId" value="PARTY_DISABLED" operator="not-equals"/> </condition-list> <select-field field-name="lastName"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |