svn commit: r1768239 [1/2] - in /ofbiz/trunk: applications/accounting/minila
Locked
svn commit: r1768239 [1/2] - in /ofbiz/trunk: applications/accounting/minila
 
|
Author: deepak
Date: Sat Nov 5 16:28:57 2016 New Revision: 1768239 URL: http://svn.apache.org/viewvc?rev=1768239&view=rev Log: Fixed: Update Services that sets non-pk fields to null if not passed, if non-pks not passed than it should remain unupaded. (OFBIZ-8722) Thanks Pawan Verma for your contribution. Modified: ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml ofbiz/trunk/applications/accounting/minilang/ledger/AcctgTransServices.xml ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml ofbiz/trunk/applications/content/minilang/content/ContentServices.xml ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml ofbiz/trunk/applications/marketing/servicedef/services.xml ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml ofbiz/trunk/applications/order/minilang/order/OrderServices.xml ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml ofbiz/trunk/applications/order/servicedef/services.xml ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml ofbiz/trunk/applications/party/minilang/party/PartyInvitationServices.xml ofbiz/trunk/applications/party/minilang/party/PartyServices.xml ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml ofbiz/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml ofbiz/trunk/applications/product/minilang/product/price/PriceServices.xml ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml ofbiz/trunk/applications/product/minilang/product/promo/PromoServices.xml ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml ofbiz/trunk/applications/product/minilang/product/subscription/SubscriptionServices.xml ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml ofbiz/trunk/applications/product/servicedef/services.xml ofbiz/trunk/applications/product/servicedef/services_picklist.xml ofbiz/trunk/applications/product/servicedef/services_shipment.xml ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml ofbiz/trunk/applications/workeffort/servicedef/services.xml ofbiz/trunk/framework/common/minilang/CommonServices.xml ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml ofbiz/trunk/framework/entityext/minilang/EntitySyncServices.xml ofbiz/trunk/framework/entityext/servicedef/services.xml Modified: ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml Sat Nov 5 16:28:57 2016 @@ -135,7 +135,7 @@ under the License. </else> </if> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <!-- make sure the replenishLevel is a sane number --> <calculate field="lookedUpValue.replenishLevel" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}"> Modified: ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/fixedasset/FixedAssetServices.xml Sat Nov 5 16:28:57 2016 @@ -91,7 +91,7 @@ under the License. <entity-one entity-name="FixedAssetMaint" value-field="lookedUpValue"/> <set field="oldStatusId" from-field="lookedUpValue.statusId"/> <field-to-result field="oldStatusId"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <if-not-empty field="parameters.productMaintSeqId"> <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> <entity-one entity-name="ProductMaint" value-field="productMaint"> @@ -156,7 +156,7 @@ under the License. </simple-method> <simple-method method-name="updateFixedAssetMeter" short-description="Update a Fixed Asset Meter Reading"> <entity-one entity-name="FixedAssetMeter" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <check-errors/> <set field="meterValue" from-field="lookedUpValue"/> Modified: ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml Sat Nov 5 16:28:57 2016 @@ -232,7 +232,7 @@ under the License. <!-- only try to update content if the status is in process.... --> <if-compare field="lookedUpValue.statusId" operator="equals" value="INVOICE_IN_PROCESS"> <clone-value value-field="lookedUpValue" new-value-field="savedValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <!-- only save if something has changed, do not update status here --> <set from-field="savedValue.statusId" field="lookedUpValue.statusId"/> <!-- get old status back --> @@ -313,7 +313,7 @@ under the License. <clone-value value-field="lookedUpValue" new-value-field="savedValue"/> <!-- set all parameters --> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <!-- check if the productNumber is updated, when yes retrieve product description and price --> <if-not-empty field="productId"> @@ -964,7 +964,7 @@ under the License. <make-value entity-name="InvoiceContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/> Modified: ofbiz/trunk/applications/accounting/minilang/ledger/AcctgTransServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/ledger/AcctgTransServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/ledger/AcctgTransServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/ledger/AcctgTransServices.xml Sat Nov 5 16:28:57 2016 @@ -41,7 +41,7 @@ under the License. <add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error> <check-errors/> </if-compare> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/> @@ -124,7 +124,7 @@ under the License. <!-- Only status change will be allowed in case of posted entry --> <make-value entity-name="AcctgTransEntry" value-field="acctgTransEntry"/> <set field="acctgTransEntry" from-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="acctgTransEntry"/> + <set-nonpk-fields map="parameters" value-field="acctgTransEntry" set-if-null="false"/> <set field="lookedUpValue.reconcileStatusId" from-field="acctgTransEntry.reconcileStatusId"/> <if-compare-field field="acctgTransEntry" operator="not-equals" to-field="lookedUpValue"> <entity-one entity-name="AcctgTrans" value-field="acctgTrans"/> Modified: ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/ledger/GeneralLedgerServices.xml Sat Nov 5 16:28:57 2016 @@ -141,7 +141,7 @@ under the License. <call-service service-name="setGlReconciliationStatus" in-map-name="setGlReconciliationStatusMap"/> <check-errors/> <entity-one entity-name="GlReconciliation" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/> <store-value value-field="lookedUpValue"/> @@ -187,7 +187,7 @@ under the License. </simple-method> <simple-method method-name="updateGlReconciliationEntry" short-description="Update Entry To GlReconciliation"> <entity-one entity-name="GlReconciliationEntry" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <!-- when changing entries, also update the last modified info for the GlReconciliation --> Modified: ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml Sat Nov 5 16:28:57 2016 @@ -126,7 +126,7 @@ under the License. <check-errors/> <set field="statusIdSave" from-field="payment.statusId"/><!-- do not allow status change here --> - <set-nonpk-fields map="parameters" value-field="payment"/> + <set-nonpk-fields map="parameters" value-field="payment" set-if-null="false"/> <set field="payment.statusId" from-field="statusIdSave"/><!-- do not allow status change here --> <if-empty field="payment.effectiveDate"> @@ -1183,7 +1183,7 @@ under the License. <make-value entity-name="PaymentContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/> Modified: ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml Sat Nov 5 16:28:57 2016 @@ -60,7 +60,7 @@ under the License. <make-value entity-name="RateAmount" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity" set-if-null="false"/> <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> <clear-field field="newEntity.thruDate"/> <create-value value-field="newEntity"/> @@ -349,7 +349,7 @@ under the License. <make-value entity-name="PartyRate" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> - <set-nonpk-fields map="parameters" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity" set-if-null="false"/> <call-simple-method method-name="checkOtherDefaultRate"/> <create-value value-field="newEntity"/> Modified: ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/tax/TaxAuthorityServices.xml Sat Nov 5 16:28:57 2016 @@ -67,7 +67,7 @@ under the License. <check-errors/> <entity-one entity-name="PartyTaxAuthInfo" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="validatePartyTaxIdInline" short-description="validatePartyTaxIdInline"> Modified: ofbiz/trunk/applications/content/minilang/content/ContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/content/ContentServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/content/minilang/content/ContentServices.xml (original) +++ ofbiz/trunk/applications/content/minilang/content/ContentServices.xml Sat Nov 5 16:28:57 2016 @@ -53,7 +53,7 @@ </simple-method> <simple-method method-name="updateContent" short-description="Update a Content Record"> <entity-one entity-name="Content" value-field="content" auto-field-map="true"/> - <set-nonpk-fields map="parameters" value-field="content"/> + <set-nonpk-fields map="parameters" value-field="content" set-if-null="false"/> <now-timestamp field="nowTimestamp"/> <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/> @@ -116,7 +116,7 @@ <simple-method method-name="updateContentAssoc" short-description="Update a ContentAssoc Record"> <set field="contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}"/> <entity-one entity-name="ContentAssoc" value-field="assoc" auto-field-map="true"/> - <set-nonpk-fields map="parameters" value-field="assoc"/> + <set-nonpk-fields map="parameters" value-field="assoc" set-if-null="false"/> <now-timestamp field="nowTimestamp"/> <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/> @@ -578,7 +578,7 @@ <fail-property resource="ContentUiLabels" property="ContenCommEventContentAssocNotFoundForUpdate"/> </add-error> </if-empty> - <set-nonpk-fields map="parameters" value-field="commEventContentAssoc"/> + <set-nonpk-fields map="parameters" value-field="commEventContentAssoc" set-if-null="false"/> <store-value value-field="commEventContentAssoc"/> </simple-method> Modified: ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml (original) +++ ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml Sat Nov 5 16:28:57 2016 @@ -126,7 +126,7 @@ <simple-method method-name="createEmplLeave" short-description="Create Employee Leave"> <make-value entity-name="EmplLeave" value-field="newEntity"/> <set-pk-fields value-field="newEntity" map="parameters"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity" set-if-null="false"/> <create-value value-field="newEntity"/> <check-errors/> <property-to-field resource="HumanResUiLabels" property="HumanResLeaveCreationSuccess" field="successMessage"/> Modified: ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml (original) +++ ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml Sat Nov 5 16:28:57 2016 @@ -108,7 +108,7 @@ under the License. <make-value entity-name="ProductManufacturingRule" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductManufacturingRule" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> Modified: ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml (original) +++ ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml Sat Nov 5 16:28:57 2016 @@ -57,7 +57,7 @@ under the License. <make-value entity-name="TechDataCalendar" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendar" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> @@ -114,7 +114,7 @@ under the License. <make-value entity-name="TechDataCalendarWeek" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarWeek" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> @@ -171,7 +171,7 @@ under the License. <make-value entity-name="TechDataCalendarExcDay" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarExcDay" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> @@ -212,7 +212,7 @@ under the License. <make-value entity-name="TechDataCalendarExcWeek" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarExcWeek" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> Modified: ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml (original) +++ ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml Sat Nov 5 16:28:57 2016 @@ -154,7 +154,7 @@ under the License. <call-service service-name="createContactListPartyStatus" in-map-name="createContactListPartyStatusMap"/> </if-compare-field> </if-not-empty> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <field-to-result field="parameters.productStoreId" result-name="productStoreId" /> <field-to-result field="parameters.contactListId" result-name="contactListId" /> @@ -418,7 +418,7 @@ under the License. </entity-and> <first-from-list list="webSiteContactList" entry="entryWebSiteContactList"/> <set-pk-fields value-field="entryWebSiteContactList" map="parameters"/> - <set-nonpk-fields map="parameters" value-field="entryWebSiteContactList"/> + <set-nonpk-fields map="parameters" value-field="entryWebSiteContactList" set-if-null="false"/> <store-value value-field="entryWebSiteContactList"/> </simple-method> <simple-method method-name="deleteWebSiteContactList" short-description="Delete WebSite ContactList"> @@ -468,7 +468,7 @@ under the License. <set field="lookedUpValue.changeByUserLoginId" from-field="userLogin.userLoginId"/> <create-value value-field="lookedUpValue"/> <else> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <set field="lookedUpValue.changeByUserLoginId" from-field="userLogin.userLoginId"/> <store-value value-field="lookedUpValue"/> </else> Modified: ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml (original) +++ ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml Sat Nov 5 16:28:57 2016 @@ -33,16 +33,6 @@ under the License. <create-value value-field="newEntity"/> </simple-method> - <simple-method method-name="updateTrackingCodeType" short-description="Update an TrackingCodeType"> - <now-timestamp field="nowStamp"/> - - <make-value entity-name="TrackingCodeType" value-field="lookupPKMap"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="TrackingCodeType" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - - <store-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="deleteTrackingCodeType" short-description="Delete an TrackingCodeType"> <make-value entity-name="TrackingCodeType" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> @@ -67,7 +57,7 @@ under the License. <make-value entity-name="TrackingCodeOrder" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TrackingCodeOrder" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <!-- set the history/audit info --> <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/> @@ -121,7 +111,7 @@ under the License. <make-value entity-name="TrackingCodeOrderReturn" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="TrackingCodeOrderReturn" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <!-- set the history/audit info --> <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/> Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/servicedef/services.xml (original) +++ ofbiz/trunk/applications/marketing/servicedef/services.xml Sat Nov 5 16:28:57 2016 @@ -278,8 +278,7 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateTrackingCodeType" default-entity-name="TrackingCodeType" engine="simple" - location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="updateTrackingCodeType" auth="true"> + <service name="updateTrackingCodeType" default-entity-name="TrackingCodeType" engine="entity-auto" invoke="update" auth="true"> <description>Update a TrackingCodeType record</description> <permission-service service-name="marketingPermissionService" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> Modified: ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml Sat Nov 5 16:28:57 2016 @@ -53,7 +53,7 @@ This file contains basic services for Sa <entity-one entity-name="SalesForecast" auto-field-map="true" value-field="salesForecast"/> <!-- set the fields from the parameters --> - <set-nonpk-fields map="parameters" value-field="salesForecast"/> + <set-nonpk-fields map="parameters" value-field="salesForecast" set-if-null="false"/> <!-- store the value --> <store-value value-field="salesForecast"/> Modified: ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml Sat Nov 5 16:28:57 2016 @@ -58,7 +58,7 @@ under the License. <!-- only set statusId if hasScheduleAdminRelatedPermission --> <set from-field="schedule.statusId" field="saveStatusId"/> - <set-nonpk-fields map="parameters" value-field="schedule"/> + <set-nonpk-fields map="parameters" value-field="schedule" set-if-null="false"/> <if-has-permission permission="ORDERMGR" action="_${checkAction}"> <else> <!-- no permission, restore saved status --> Modified: ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml Sat Nov 5 16:28:57 2016 @@ -247,7 +247,7 @@ under the License. </if-compare> <field-to-result field="returnHeader.statusId" result-name="oldStatusId"/> - <set-nonpk-fields map="parameters" value-field="returnHeader"/> + <set-nonpk-fields map="parameters" value-field="returnHeader" set-if-null="false"/> <store-value value-field="returnHeader"/> </simple-method> @@ -419,7 +419,7 @@ under the License. <set field="originalReturnQuantity" from-field="returnItem.returnQuantity"/> <field-to-result field="returnItem.statusId" result-name="oldStatusId"/> - <set-nonpk-fields map="parameters" value-field="returnItem"/> + <set-nonpk-fields map="parameters" value-field="returnItem" set-if-null="false"/> <store-value value-field="returnItem"/> <refresh-value value-field="returnItem"/> Modified: ofbiz/trunk/applications/order/minilang/order/OrderServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/order/OrderServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/order/OrderServices.xml Sat Nov 5 16:28:57 2016 @@ -737,7 +737,7 @@ under the License. parameters.put("carrierRoleTypeId", arr[2]); } </script> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <set from-field="parameters.orderId" field="inputMap.orderId"/> <set from-field="parameters.contactMechPurposeTypeId" field="inputMap.contactMechPurposeTypeId"/> @@ -782,7 +782,7 @@ under the License. </check-permission> <check-errors/> <entity-one entity-name="OrderHeaderNote" value-field="orderHeaderNote"/> - <set-nonpk-fields map="parameters" value-field="orderHeaderNote"/> + <set-nonpk-fields map="parameters" value-field="orderHeaderNote" set-if-null="false"/> <store-value value-field="orderHeaderNote"/> </simple-method> Modified: ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml Sat Nov 5 16:28:57 2016 @@ -184,7 +184,7 @@ under the License. <check-errors/> </if-empty> </if-compare-field> - <set-nonpk-fields map="parameters" value-field="quote"/> + <set-nonpk-fields map="parameters" value-field="quote" set-if-null="false"/> <store-value value-field="quote"/> <check-errors/> </simple-method> @@ -417,7 +417,7 @@ under the License. <check-errors/> <entity-one entity-name="QuoteItem" value-field="quoteItem" auto-field-map="true"/> <check-errors/> - <set-nonpk-fields map="parameters" value-field="quoteItem"/> + <set-nonpk-fields map="parameters" value-field="quoteItem" set-if-null="false"/> <store-value value-field="quoteItem"/> <check-errors/> </simple-method> @@ -502,7 +502,7 @@ under the License. <check-errors/> <entity-one entity-name="QuoteAttribute" value-field="quoteAttribute" auto-field-map="true"/> <check-errors/> - <set-nonpk-fields map="parameters" value-field="quoteAttribute"/> + <set-nonpk-fields map="parameters" value-field="quoteAttribute" set-if-null="false"/> <store-value value-field="quoteAttribute"/> <check-errors/> </simple-method> @@ -759,7 +759,7 @@ under the License. <check-errors/> <entity-one entity-name="QuoteAdjustment" value-field="quoteAdjustment" auto-field-map="true"/> <check-errors/> - <set-nonpk-fields map="parameters" value-field="quoteAdjustment"/> + <set-nonpk-fields map="parameters" value-field="quoteAdjustment" set-if-null="false"/> <store-value value-field="quoteAdjustment"/> <check-errors/> </simple-method> @@ -991,12 +991,6 @@ under the License. <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> </simple-method> - <simple-method method-name="updateQuoteTerm" short-description="Update a QuoteTerm"> - <make-value entity-name="QuoteTerm" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <store-value value-field="newEntity"/> - </simple-method> <simple-method method-name="deleteQuoteTerm" short-description="Delete a QuoteTerm"> <make-value entity-name="QuoteTerm" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> Modified: ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml Sat Nov 5 16:28:57 2016 @@ -125,7 +125,7 @@ under the License. <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="custRequest.lastModifiedDate"/> <set from-field="userLogin.userLoginId" field="custRequest.lastModifiedByUserLogin"/> - <set-nonpk-fields map="parameters" value-field="custRequest"/> + <set-nonpk-fields map="parameters" value-field="custRequest" set-if-null="false"/> <set field="custRequest.statusId" from-field="oldStatusId"/><!-- not update status yet --> <store-value value-field="custRequest"/> <if-not-empty field="parameters.statusId"> @@ -250,7 +250,7 @@ under the License. <set from-field="parameters.custRequestId" field="lookupPKMap.custRequestId"/> <set from-field="parameters.custRequestItemSeqId" field="lookupPKMap.custRequestItemSeqId"/> <find-by-primary-key entity-name="CustRequestItem" map="lookupPKMap" value-field="custRequestItem"/> - <set-nonpk-fields map="parameters" value-field="custRequestItem"/> + <set-nonpk-fields map="parameters" value-field="custRequestItem" set-if-null="false"/> <store-value value-field="custRequestItem"/> <call-simple-method method-name="updateCustRequestLastModifiedDate"/> </simple-method> @@ -277,7 +277,7 @@ under the License. <simple-method method-name="updateCustRequestParty" short-description="Update an existing CustRequestParty"> <call-simple-method method-name="checkStatusCustRequest"/> <entity-one entity-name="CustRequestParty" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <call-simple-method method-name="updateCustRequestLastModifiedDate"/> </simple-method> Modified: ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml Sat Nov 5 16:28:57 2016 @@ -138,7 +138,7 @@ under the License. <check-errors/> <entity-one entity-name="RequirementRole" value-field="requirementRole" auto-field-map="true"/> <check-errors/> - <set-nonpk-fields map="parameters" value-field="requirementRole"/> + <set-nonpk-fields map="parameters" value-field="requirementRole" set-if-null="false"/> <store-value value-field="requirementRole"/> <check-errors/> </simple-method> Modified: ofbiz/trunk/applications/order/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/order/servicedef/services.xml (original) +++ ofbiz/trunk/applications/order/servicedef/services.xml Sat Nov 5 16:28:57 2016 @@ -1112,8 +1112,7 @@ under the License. <auto-attributes mode="IN" include="nonpk" optional="true"/> <override name="quoteItemSeqId" type="String" mode="IN" optional="true"/> </service> - <service name="updateQuoteTerm" engine="simple" default-entity-name="QuoteTerm" - location="component://order/minilang/quote/QuoteServices.xml" invoke="updateQuoteTerm"> + <service name="updateQuoteTerm" engine="entity-auto" default-entity-name="QuoteTerm" invoke="update"> <description> Edit the Quate term. </description> Modified: ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml (original) +++ ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml Sat Nov 5 16:28:57 2016 @@ -328,7 +328,7 @@ under the License. <set field="parameters.contactMechIdTo" from-field="newRoleTo.contactMechId"/> </then> </if> - <set-nonpk-fields map="parameters" value-field="event"/> + <set-nonpk-fields map="parameters" value-field="event" set-if-null="false"/> <store-value value-field="event"/> <!-- set status at the end if required with the com event completed --> <if-not-empty field="newStatusId"> @@ -453,7 +453,7 @@ under the License. <simple-method method-name="updateCommunicationEventRole" short-description="Create a CommunicationEventRole"> <entity-one entity-name="CommunicationEventRole" value-field="eventRole"/> <if-not-empty field="eventRole"> - <set-nonpk-fields map="parameters" value-field="eventRole"/> + <set-nonpk-fields map="parameters" value-field="eventRole" set-if-null="false"/> <store-value value-field="eventRole"/> </if-not-empty> </simple-method> Modified: ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml Sat Nov 5 16:28:57 2016 @@ -173,7 +173,7 @@ under the License. <make-value entity-name="TelecomNumber" value-field="newValue"/> <set-pk-fields value-field="newValue" map="parameters"/> <find-by-primary-key entity-name="TelecomNumber" map="newValue" value-field="oldValue"/> - <set-nonpk-fields map="parameters" value-field="newValue"/> + <set-nonpk-fields map="parameters" value-field="newValue" set-if-null="false"/> <set field="context.contactMechTypeId" value="TELECOM_NUMBER"/> <if-compare-field field="oldValue" to-field="newValue" operator="not-equals" type="Object"> Modified: ofbiz/trunk/applications/party/minilang/party/PartyInvitationServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/party/PartyInvitationServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/party/minilang/party/PartyInvitationServices.xml (original) +++ ofbiz/trunk/applications/party/minilang/party/PartyInvitationServices.xml Sat Nov 5 16:28:57 2016 @@ -49,7 +49,7 @@ under the License. <set field="parameters.toName" value="${person.firstName} ${person.middleName} ${person.lastName}"/> </if-not-empty> </if-empty> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deletePartyInvitation" short-description="Remove a PartyInvitation"> Modified: ofbiz/trunk/applications/party/minilang/party/PartyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/party/PartyServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/party/minilang/party/PartyServices.xml (original) +++ ofbiz/trunk/applications/party/minilang/party/PartyServices.xml Sat Nov 5 16:28:57 2016 @@ -822,7 +822,7 @@ under the License. <if-empty field="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty> <entity-one entity-name="PartyRelationship" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deletePartyRelationship" short-description="deletePartyRelationship"> Modified: ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java (original) +++ ofbiz/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java Sat Nov 5 16:28:57 2016 @@ -638,7 +638,7 @@ public class PartyServices { "partyservices.could_not_update_affiliate_information_not_found", locale)); } - affiliate.setNonPKFields(context); + affiliate.setNonPKFields(context, false); try { affiliate.store(); Modified: ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml Sat Nov 5 16:28:57 2016 @@ -44,7 +44,7 @@ under the License. <make-value entity-name="ProductCategoryContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryContent" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/> Modified: ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml Sat Nov 5 16:28:57 2016 @@ -84,7 +84,7 @@ under the License. <entity-one entity-name="ProductCategory" value-field="lookedUpValue"/> <!-- save this value before overwriting it so we can compare it later --> <!-- <field-to-field field-name="primaryParentCategoryId" map-name="lookedUpValue" to-map-name="saveIdMap"/> --> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <!-- if setting the primaryParentCategoryId, create a rollup entity too --> @@ -591,7 +591,7 @@ under the License. <check-errors/> <make-value entity-name="ProductCategoryAttribute" value-field="lookupPKMap"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap" set-if-null="false"/> <find-by-primary-key entity-name="ProductCategoryAttribute" map="lookupPKMap" value-field="ProductCategoryAttributeInstance"/> <set-nonpk-fields map="parameters" value-field="ProductCategoryAttributeInstance"/> <store-value value-field="ProductCategoryAttributeInstance"/> @@ -631,12 +631,6 @@ under the License. <create-value value-field="newEntity"/> </simple-method> - <simple-method method-name="updateProductCategoryLink" short-description="update a ProductCategoryLink"> - <entity-one entity-name="ProductCategoryLink" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deleteProductCategoryLink" short-description="delete a ProductCategoryLink"> <entity-one entity-name="ProductCategoryLink" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> Modified: ofbiz/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml Sat Nov 5 16:28:57 2016 @@ -44,7 +44,7 @@ under the License. <make-value entity-name="ProdConfItemContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/> Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml Sat Nov 5 16:28:57 2016 @@ -313,7 +313,7 @@ under the License. <create-value value-field="lot"/> </if-empty> </if-not-empty> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <!-- if the unit cost is changed create an InventoryItemDetail to keep track of unit cost history --> <if-not-empty field="parameters.unitCost"> @@ -925,7 +925,7 @@ under the License. </if-compare-field> </if-not-empty> - <set-nonpk-fields map="parameters" value-field="inventoryTransfer"/> + <set-nonpk-fields map="parameters" value-field="inventoryTransfer" set-if-null="false"/> <store-value value-field="inventoryTransfer"/> </simple-method> Modified: ofbiz/trunk/applications/product/minilang/product/price/PriceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/price/PriceServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/price/PriceServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/price/PriceServices.xml Sat Nov 5 16:28:57 2016 @@ -66,7 +66,7 @@ under the License. <!-- grab the old price value before setting nonpk parameter fields --> <field-to-result field="lookedUpValue.price" result-name="oldPrice"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <now-timestamp field="nowTimestamp"/> <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp"/> Modified: ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml Sat Nov 5 16:28:57 2016 @@ -44,7 +44,7 @@ under the License. <make-value entity-name="ProductContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/> Modified: ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml Sat Nov 5 16:28:57 2016 @@ -100,7 +100,7 @@ under the License. <entity-one entity-name="Product" value-field="lookedUpValue"/> <!-- save this value before overwriting it so we can compare it later --> <set from-field="lookedUpValue.primaryProductCategoryId" field="saveIdMap.primaryProductCategoryId"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <now-timestamp field="lookedUpValue.lastModifiedDate"/> <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/> @@ -489,7 +489,7 @@ under the License. <make-value entity-name="ProductReview" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <set from-field="lookedUpValue.productId" field="productId"/> @@ -799,7 +799,7 @@ under the License. <check-errors/> <entity-one entity-name="ProductCategoryGlAccount" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> @@ -824,7 +824,7 @@ under the License. <simple-method method-name="updateProductGroupOrder" short-description="Update ProductGroupOrder"> <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/> - <set-nonpk-fields map="parameters" value-field="productGroupOrder"/> + <set-nonpk-fields map="parameters" value-field="productGroupOrder" set-if-null="false"/> <store-value value-field="productGroupOrder"/> <if-compare field="productGroupOrder.statusId" operator="equals" value="GO_CREATED"> Modified: ofbiz/trunk/applications/product/minilang/product/promo/PromoServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/promo/PromoServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/promo/PromoServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/promo/PromoServices.xml Sat Nov 5 16:28:57 2016 @@ -38,7 +38,7 @@ under the License. <make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPromoCond" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <if-not-empty field="parameters.carrierShipmentMethod"> <set field="lookedUpValue.otherValue" from-field="parameters.carrierShipmentMethod"/> </if-not-empty> Modified: ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml Sat Nov 5 16:28:57 2016 @@ -87,7 +87,7 @@ under the License. <set from-field="parameters.productStoreId" field="lookupPKMap.productStoreId"/> <find-by-primary-key entity-name="ProductStore" map="lookupPKMap" value-field="store"/> <set from-field="store.inventoryFacilityId" field="oldFacilityId"/> - <set-nonpk-fields map="parameters" value-field="store"/> + <set-nonpk-fields map="parameters" value-field="store" set-if-null="false"/> <if-compare field="store.showPricesWithVatTax" operator="equals" value="Y"> <if-empty field="store.vatTaxAuthGeoId"> Modified: ofbiz/trunk/applications/product/minilang/product/subscription/SubscriptionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/subscription/SubscriptionServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/subscription/SubscriptionServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/subscription/SubscriptionServices.xml Sat Nov 5 16:28:57 2016 @@ -84,7 +84,7 @@ under the License. <if-empty field="lookedUpValue"> <make-value entity-name="SubscriptionAttribute" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity" set-if-null="false"/> <create-value value-field="newEntity"/> <else> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> Modified: ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml Sat Nov 5 16:28:57 2016 @@ -70,7 +70,7 @@ under the License. <check-errors/> <entity-one entity-name="ItemIssuance" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteItemIssuance" short-description="Delete ItemIssuance"> 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=1768239&r1=1768238&r2=1768239&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:28:57 2016 @@ -816,7 +816,7 @@ under the License. <field-to-result field="lookedUpValue.statusId" result-name="oldStatusId"/> <!-- now that all changes have been checked, set the nonpks --> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/> <store-value value-field="lookedUpValue"/> @@ -838,14 +838,6 @@ under the License. <create-value value-field="newEntity"/> </simple-method> - <simple-method method-name="updatePicklistBin" short-description="Update PicklistBin"> - <make-value value-field="lookupPKMap" entity-name="PicklistBin"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - - <store-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="deletePicklistBin" short-description="Delete PicklistBin"> <make-value value-field="lookupPKMap" entity-name="PicklistBin"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> @@ -890,7 +882,7 @@ under the License. <field-to-result field="lookedUpValue.itemStatusId" result-name="oldItemStatusId"/> <!-- now that all changes have been checked, set the nonpks --> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <!-- store the changes --> <store-value value-field="lookedUpValue"/> @@ -1120,14 +1112,6 @@ under the License. <create-value value-field="newEntity"/> </simple-method> - <simple-method method-name="updatePicklistRole" short-description="Update PicklistRole"> - <make-value value-field="lookupPKMap" entity-name="PicklistRole"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - - <store-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="deletePicklistRole" short-description="Delete PicklistRole"> <make-value value-field="lookupPKMap" entity-name="PicklistRole"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> Modified: ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml Sat Nov 5 16:28:57 2016 @@ -275,7 +275,7 @@ under the License. <field-to-result field="lookedUpValue.destinationFacilityId" result-name="oldDestinationFacilityId"/> <!-- now that all changes have been checked, set the nonpks --> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <now-timestamp field="lookedUpValue.lastModifiedDate"/> <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/> <field-to-result field="lookedUpValue.shipmentId" result-name="shipmentId"/> @@ -837,7 +837,7 @@ under the License. <make-value entity-name="ShipmentItem" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ShipmentItem" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteShipmentItem" short-description="Delete ShipmentItem"> @@ -977,7 +977,7 @@ under the License. <make-value entity-name="ShipmentPackage" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ShipmentPackage" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> <set from-field="lookedUpValue.shipmentId" field="shipmentId"/> @@ -1048,7 +1048,7 @@ under the License. <make-value entity-name="ShipmentPackageContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ShipmentPackageContent" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteShipmentPackageContent" short-description="Delete ShipmentPackageContent"> @@ -1096,13 +1096,6 @@ under the License. <create-value value-field="newEntity"/> </simple-method> - <simple-method method-name="updateShipmentPackageRouteSeg" short-description="Update ShipmentPackageRouteSeg"> - <make-value entity-name="ShipmentPackageRouteSeg" value-field="lookupPKMap"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="deleteShipmentPackageRouteSeg" short-description="Delete ShipmentPackageRouteSeg"> <set value="Delete ShipmentPackageRouteSeg" field="operationName"/> <call-simple-method method-name="checkCanChangeShipmentStatusPacked"/> @@ -1144,7 +1137,7 @@ under the License. <check-errors/> <entity-one entity-name="ShipmentRouteSegment" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <if-empty field="newEntity.carrierServiceStatusId"> <set value="SHRSCS_NOT_STARTED" field="newEntity.carrierServiceStatusId"/> @@ -1243,11 +1236,6 @@ under the License. <set-nonpk-fields map="parameters" value-field="carrierShipmentMethod"/> <create-value value-field="carrierShipmentMethod"/> </simple-method> - <simple-method method-name="updateCarrierShipmentMethod" short-description="Updates a CarrierShipmentMethod"> - <entity-one entity-name="CarrierShipmentMethod" value-field="carrierShipmentMethod"/> - <set-nonpk-fields map="parameters" value-field="carrierShipmentMethod"/> - <store-value value-field="carrierShipmentMethod"/> - </simple-method> <simple-method method-name="deleteCarrierShipmentMethod" short-description="Removes a CarrierShipmentMethod"> <entity-one entity-name="CarrierShipmentMethod" value-field="carrierShipmentMethod"/> <remove-value value-field="carrierShipmentMethod"/> @@ -2034,15 +2022,6 @@ under the License. <check-errors/> </simple-method> - <!-- update an existing QuantityBreak --> - <simple-method method-name="updateQuantityBreak" short-description="Update an existing QuantityBreak"> - <entity-one entity-name="QuantityBreak" value-field="quantityBreak" auto-field-map="true"/> - <check-errors/> - <set-nonpk-fields map="parameters" value-field="quantityBreak"/> - <store-value value-field="quantityBreak"/> - <check-errors/> - </simple-method> - <!-- remove an existing QuantityBreak --> <simple-method method-name="deleteQuantityBreak" short-description="Remove an existing QuantityBreak"> <entity-one entity-name="QuantityBreak" value-field="quantityBreak" auto-field-map="true"/> Modified: ofbiz/trunk/applications/product/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services.xml Sat Nov 5 16:28:57 2016 @@ -890,9 +890,8 @@ under the License. <override name="fromDate" optional="true"/> <override name="linkSeqId" optional="true"/> </service> - <service name="updateProductCategoryLink" default-entity-name="ProductCategoryLink" engine="simple" - location="component://product/minilang/product/category/CategoryServices.xml" - invoke="updateProductCategoryLink" auth="true"> + <service name="updateProductCategoryLink" default-entity-name="ProductCategoryLink" engine="entity-auto" + invoke="update" auth="true"> <description>Update a ProductCategoryLink</description> <permission-service service-name="productCategoryGenericPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> Modified: ofbiz/trunk/applications/product/servicedef/services_picklist.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_picklist.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services_picklist.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services_picklist.xml Sat Nov 5 16:28:57 2016 @@ -139,8 +139,7 @@ under the License. <auto-attributes include="pk" mode="OUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="false"/> </service> - <service name="updatePicklistBin" default-entity-name="PicklistBin" engine="simple" - location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="updatePicklistBin" auth="true"> + <service name="updatePicklistBin" default-entity-name="PicklistBin" engine="entity-auto" invoke="update" auth="true"> <description>Update PicklistBin</description> <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -217,8 +216,7 @@ under the License. </auto-attributes> <override name="fromDate" optional="true"/> </service> - <service name="updatePicklistRole" default-entity-name="PicklistRole" engine="simple" - location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="updatePicklistRole" auth="true"> + <service name="updatePicklistRole" default-entity-name="PicklistRole" engine="entity-auto" invoke="update" auth="true"> <description>Update PicklistRole</description> <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> Modified: ofbiz/trunk/applications/product/servicedef/services_shipment.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_shipment.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services_shipment.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services_shipment.xml Sat Nov 5 16:28:57 2016 @@ -31,8 +31,7 @@ under the License. <auto-attributes entity-name="CarrierShipmentMethod" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="CarrierShipmentMethod" include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateCarrierShipmentMethod" engine="simple" - location="component://product/minilang/shipment/shipment/ShipmentServices.xml" invoke="updateCarrierShipmentMethod" auth="true"> + <service name="updateCarrierShipmentMethod" engine="entity-auto" default-entity-name="CarrierShipmentMethod" invoke="update" auth="true"> <description>Updates A CarrierShipmentMethod</description> <auto-attributes entity-name="CarrierShipmentMethod" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="CarrierShipmentMethod" include="nonpk" mode="IN" optional="true"/> @@ -321,8 +320,7 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateShipmentPackageRouteSeg" default-entity-name="ShipmentPackageRouteSeg" engine="simple" - location="component://product/minilang/shipment/shipment/ShipmentServices.xml" invoke="updateShipmentPackageRouteSeg" auth="true"> + <service name="updateShipmentPackageRouteSeg" default-entity-name="ShipmentPackageRouteSeg" engine="entity-auto" invoke="update" auth="true"> <description>Update ShipmentPackageRouteSeg</description> <permission-service service-name="facilityGenericPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -899,8 +897,7 @@ under the License. <permission-service service-name="facilityGenericPermission" main-action="CREATE"/> <auto-attributes entity-name="QuantityBreak" include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateQuantityBreak" engine="simple" - location="component://product/minilang/shipment/shipment/ShipmentServices.xml" invoke="updateQuantityBreak" auth="true"> + <service name="updateQuantityBreak" engine="entity-auto" invoke="update" default-entity-name="QuantityBreak" auth="true"> <description>Update a QuantityBreak</description> <permission-service service-name="facilityGenericPermission" main-action="UPDATE"/> <auto-attributes entity-name="QuantityBreak" include="pk" mode="IN" optional="false"/> Modified: ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml Sat Nov 5 16:28:57 2016 @@ -35,7 +35,7 @@ under the License. </simple-method> <simple-method method-name="updateTimesheet" short-description="Update Timesheet"> <call-simple-method method-name="checkTimesheetStatus"/> - <set-nonpk-fields map="parameters" value-field="timesheet"/> + <set-nonpk-fields map="parameters" value-field="timesheet" set-if-null="false"/> <store-value value-field="timesheet"/> </simple-method> <simple-method method-name="updateTimesheetToInProcess" short-description="Updates the Timesheet status back to in process to be able to correct errors"> @@ -352,7 +352,7 @@ under the License. </then> </if> - <set-nonpk-fields map="fieldsToCopy" value-field="lookedUpValue"/> + <set-nonpk-fields map="fieldsToCopy" value-field="lookedUpValue" set-if-null="false"/> <if-not-empty field="parameters.invoiceId"> <if-empty field="lookedUpValue.invoiceId"> Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Sat Nov 5 16:28:57 2016 @@ -167,7 +167,7 @@ under the License. </then> </if> <!-- after checking status change, set all parameters --> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <!-- only save if something has changed --> <if-compare-field field="lookedUpValue" to-field="savedValue" operator="not-equals" type="Object"> @@ -311,7 +311,7 @@ under the License. </add-error> </if-empty> <check-errors/> - <set-nonpk-fields map="parameters" value-field="communicationEventWorkEff"/> + <set-nonpk-fields map="parameters" value-field="communicationEventWorkEff" set-if-null="false"/> <store-value value-field="communicationEventWorkEff"/> </simple-method> @@ -376,7 +376,7 @@ under the License. </if-compare-field> --> <set from-field="workEffortPartyAssignment.statusId" field="oldStatusId"/> - <set-nonpk-fields map="parameters" value-field="workEffortPartyAssignment"/> + <set-nonpk-fields map="parameters" value-field="workEffortPartyAssignment" set-if-null="false"/> <if-compare-field field="parameters.statusId" to-field="oldStatusId" operator="not-equals"> <now-timestamp field="workEffortPartyAssignment.statusDateTime"/> @@ -813,12 +813,6 @@ under the License. </else> </if-not-empty> </simple-method> - <simple-method method-name="updateWorkEffortFixedAssetStd" - short-description="Update an existing WorkEffort FixedAsset Standard"> - <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="removeWorkEffortFixedAssetStd" short-description="Delete a WorkEffort FixedAsset Standard"> <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue"/> @@ -851,12 +845,6 @@ under the License. </else> </if-not-empty> </simple-method> - <simple-method method-name="updateWorkEffortFixedAssetAssign" - short-description="Update an existing WorkEffort FixedAsset Assign"> - <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="removeWorkEffortFixedAssetAssign" short-description="Remove a WorkEffort FixedAsset Assign"> <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue"/> @@ -884,11 +872,6 @@ under the License. </else> </if-not-empty> </simple-method> - <simple-method method-name="updateWorkEffortReview" short-description="Update Work Effort Review"> - <entity-one entity-name="WorkEffortReview" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="deleteWorkEffortReview" short-description="Remove a WorkEffort Review"> <entity-one entity-name="WorkEffortReview" value-field="lookedUpValue"/> Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original) +++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Sat Nov 5 16:28:57 2016 @@ -517,10 +517,8 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateWorkEffortFixedAssetStd" engine="simple" auth="true" - default-entity-name="WorkEffortFixedAssetStd" - location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" - invoke="updateWorkEffortFixedAssetStd"> + <service name="updateWorkEffortFixedAssetStd" engine="entiy-auto" auth="true" + default-entity-name="WorkEffortFixedAssetStd" invoke="update"> <description>Updates an existing WorkEffortFixedAssetStd entry</description> <permission-service service-name="workEffortManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -546,10 +544,8 @@ under the License. <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="fromDate" optional="true" mode="IN"/> </service> - <service name="updateWorkEffortFixedAssetAssign" engine="simple" auth="true" - default-entity-name="WorkEffortFixedAssetAssign" - location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" - invoke="updateWorkEffortFixedAssetAssign"> + <service name="updateWorkEffortFixedAssetAssign" engine="entity-auto" auth="true" + default-entity-name="WorkEffortFixedAssetAssign" invoke="update"> <description>Update an existing WorkEffortFixedAssetAssign entry</description> <permission-service service-name="workEffortManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -618,8 +614,7 @@ under the License. <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateWorkEffortReview" default-entity-name="WorkEffortReview" engine="simple" - location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="updateWorkEffortReview" auth="true"> + <service name="updateWorkEffortReview" default-entity-name="WorkEffortReview" engine="entity-auto" invoke="update" auth="true"> <description>Update a Work Effort Review</description> <permission-service service-name="workEffortManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> Modified: ofbiz/trunk/framework/common/minilang/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/CommonServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/CommonServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/CommonServices.xml Sat Nov 5 16:28:57 2016 @@ -44,7 +44,7 @@ under the License. <check-errors/> <make-value entity-name="KeywordThesaurus" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity" set-if-null="false"/> <store-value value-field="newEntity"/> </simple-method> <simple-method method-name="deleteKeywordThesaurus" short-description="Delete a KeywordThesaurus"> Modified: ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml?rev=1768239&r1=1768238&r2=1768239&view=diff ============================================================================== --- ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml (original) +++ ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml Sat Nov 5 16:28:57 2016 @@ -45,7 +45,7 @@ under the License. <make-value entity-name="CustomTimePeriod" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue" set-if-null="false"/> <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteCustomTimePeriod" short-description="Delete a CustomTimePeriod"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |