svn commit: r1772880 [7/8] - in /ofbiz/trunk: applications/accounting/minila
Locked
svn commit: r1772880 [7/8] - in /ofbiz/trunk: applications/accounting/minila
 
|
Modified: ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingForms.xml (original) +++ ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingForms.xml Tue Dec 6 12:37:42 2016 @@ -24,8 +24,8 @@ under the License. <form name="PaymentReport" type="single" target="paymentReportHtml" extends="FindPayments" extends-resource="component://accounting/widget/PaymentForms.xml" target-window="_BLANK"> <field name="contentType" action="document.PaymentReport.action=this.value" event="onchange"> <drop-down> - <option key="text/html" description="paymentReportHtml"></option> - <option key="application/pdf" description="paymentReportPdf"></option> + <option key="paymentReportHtml" description="text/html"></option> + <option key="paymentReportPdf" description="application/pdf"></option> <!--option key="application/vnd.ms-excel">application/vnd.ms-excel</option> <option key="application/vnd.ms-word">application/vnd.ms-word</option> <option key="application/vnd.ms-powerpoint">application/vnd.ms-powerpoint</option--> Modified: ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml (original) +++ ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml Tue Dec 6 12:37:42 2016 @@ -90,11 +90,11 @@ under the License. <field name="lastIntMonth" title="${uiLabelMap.BirtFacilityReportLastIntMonth}"><text size="15" default-value="0"></text></field> <field name="contentType" action="document.ViewFacilityInventoryHistoryReportForm.action=this.value" event="onchange"> <drop-down allow-empty="false" > - <option key="HTML" description="RenderInventoryReportHtml"/> - <option key="PDF" description="RenderInventoryReportPDF"/> + <option key="RenderInventoryReportHtml" description="HTML"/> + <option key="RenderInventoryReportPDF" description="PDF"/> <!--option key="RenderInventoryReportExcel" description="MS-Excel"/> - <option key="MS-Word" description="RenderInventoryReportMSWord"/> - <option key="MS-Powerpoint" description="RenderInventoryReportPPT"/--> + <option key="RenderInventoryReportMSWord" description="MS-Word"/> + <option key="RenderInventoryReportPPT" description="MS-Powerpoint"/--> </drop-down> </field> <field name="submitButton"><hidden/></field> Modified: ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml (original) +++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml Tue Dec 6 12:37:42 2016 @@ -28,16 +28,16 @@ under the License. <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="date"/></field> <field name="reportBy" title="${uiLabelMap.BirtOrderReportReportBy}"> <drop-down> - <option key="${uiLabelMap.CommonDays}" description="day"></option> - <option key="${uiLabelMap.CommonWeeks}" description="week"></option> - <option key="${uiLabelMap.CommonMonths}" description="month"></option> + <option key="day" description="${uiLabelMap.CommonDays}"></option> + <option key="week" description="${uiLabelMap.CommonWeeks}"></option> + <option key="month" description="${uiLabelMap.CommonMonths}"></option> </drop-down> </field> <field name="exportType" title="${uiLabelMap.BirtOrderReportFormatType}"> <drop-down> - <option key="PDF" description="pdf"></option> - <option key="Excel" description="excel"></option> - <option key="HTML" description="html"></option> + <option key="pdf" description="PDF"></option> + <option key="excel" description="Excel"></option> + <option key="html" description="HTML"></option> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml Tue Dec 6 12:37:42 2016 @@ -155,7 +155,7 @@ </entity-one> <if-empty field="ebayProductStoreInventory"> <!-- add new reserved product --> - <make-value entity-name="EbayProductStoreInventory" value-field="newEbayProductStoreInven"/> + <make-value value-field="newEbayProductStoreInven" entity-name="EbayProductStoreInventory"/> <set field="newEbayProductStoreInven.productStoreId" from-field="parameters.productStoreId"/> <set field="newEbayProductStoreInven.facilityId" from-field="parameters.facilityId"/> <set field="newEbayProductStoreInven.productId" from-field="parameters.productId"/> Modified: ofbiz/trunk/specialpurpose/ebaystore/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/servicedef/secas.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/servicedef/secas.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/servicedef/secas.xml Tue Dec 6 12:37:42 2016 @@ -21,22 +21,22 @@ under the License. <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd"> <eca service="createEbayProductStorePref" event="commit"> - <condition field-name="enabled" operator="equals" value="Y"/> - <condition field-name="serviceName" operator="is-not-empty"/> + <condition operator="equals" field-name="enabled" value="Y"/> + <condition operator="is-not-empty" field-name="serviceName"/> <action service="startEbayAutoPreference" mode="sync"/> </eca> <eca service="updateEbayProductStorePref" event="commit"> - <condition field-name="enabled" operator="equals" value="Y"/> - <condition field-name="serviceName" operator="is-not-empty"/> + <condition operator="equals" field-name="enabled" value="Y"/> + <condition operator="is-not-empty" field-name="serviceName"/> <action service="startEbayAutoPreference" mode="sync"/> </eca> <eca service="createEbayProductStorePref" event="commit"> - <condition field-name="enabled" operator="equals" value="N"/> - <condition field-name="serviceName" operator="is-not-empty"/> + <condition operator="equals" field-name="enabled" value="N"/> + <condition operator="is-not-empty" field-name="serviceName"/> <action service="stopEbayAutoPreference" mode="sync"/> </eca> <eca service="updateEbayProductStorePref" event="commit"> - <condition field-name="enabled" operator="equals" value="N"/> + <condition operator="equals" field-name="enabled" value="N"/> <action service="stopEbayAutoPreference" mode="sync"/> </eca> </service-eca> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml Tue Dec 6 12:37:42 2016 @@ -130,7 +130,7 @@ <decorator-section name="body"> <section> <widgets> - <include-menu name="EbaySellingManagerTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/> + <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbaySellingManagerTabBar"/> <decorator-section-include name="body"/> </widgets> </section> @@ -149,7 +149,7 @@ <decorator-section name="body"> <section> <widgets> - <include-menu name="EbayAccountTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/> + <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayAccountTabBar"/> <decorator-section-include name="body"/> </widgets> </section> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml Tue Dec 6 12:37:42 2016 @@ -25,8 +25,8 @@ under the License. <field name="statusId"><hidden value="PARTY_ENABLED"/></field> <field name="gender"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonMale}" description="M"/> - <option key="${uiLabelMap.CommonFemale}" description="F"/> + <option key="M" description="${uiLabelMap.CommonMale}"/> + <option key="F" description="${uiLabelMap.CommonFemale}"/> </drop-down> </field> <field name="currentPassword"><password/></field> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml Tue Dec 6 12:37:42 2016 @@ -56,7 +56,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.EbayFeedback}"> - <include-menu name="EbayFeedbackTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/> + <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackTabBar"/> <decorator-section-include name="body"/> </screenlet> </widgets> @@ -116,7 +116,7 @@ <decorator-section name="body"> <screenlet> <screenlet title="${uiLabelMap.EbayLeaveFeedback}"> - <include-menu name="EbayFeedbackSubTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/> + <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackSubTabBar"/> <platform-specific> <html><html-template location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html> </platform-specific> @@ -144,7 +144,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.EbayFeedback}"> - <include-menu name="EbayFeedbackTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/> + <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackTabBar"/> <decorator-section-include name="body"/> </screenlet> </widgets> @@ -204,7 +204,7 @@ <decorator-section name="body"> <screenlet> <screenlet title="${uiLabelMap.EbayLeaveFeedback}"> - <include-menu name="EbayFeedbackSubTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/> + <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackSubTabBar"/> <platform-specific> <html><html-template location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html> </platform-specific> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Tue Dec 6 12:37:42 2016 @@ -107,21 +107,21 @@ under the License. <field name="transaction"><text disabled="true" default-value="${parameters.transactionId}"/></field> <field name="disputeReasonCodeType"> <radio no-current-selected-key="TransactionMutuallyCanceled"> - <option key="The buyer has not paid for the item" description="BUYER_HAS_NOT_PAID"/> - <option key="We have both agreed not to complete the transaction" description="TRANSACTION_MUTUALLY_CANCELED"/> + <option key="BUYER_HAS_NOT_PAID" description="The buyer has not paid for the item"/> + <option key="TRANSACTION_MUTUALLY_CANCELED" description="We have both agreed not to complete the transaction"/> </radio> </field> <field name="disputeExplanationCodeType"> <drop-down> <option key="" description="- - Select One - -"/> - <option key="Buyer purchased item by mistake or changed mind" description="BUYER_PURCHASING_MISTAKE"/> - <option key="Buyer is returning item for a refund" description="BUYER_RETURNED_ITEM_FOR_REFUND"/> - <option key="Buyer and I disagreed over terms" description="UNABLE_TO_RESOLVE_TERMS"/> - <option key="Buyer is unresponsive" description="BUYER_HAS_NOT_RESPONDED"/> - <option key="Buyer's payment hasn't been received or hasn't cleared" description="PAYMENT_METHOD_NOT_SUPPORTED"/> - <option key="Buyer requested shipment to an unconfirmed address" description="SHIPPING_ADDRESS_NOT_CONFIRMED"/> - <option key="Seller doesn't ship to the country requested by buyer" description="SHIP_COUNTRY_NOT_SUPPORTED"/> - <option key="Other reason" description="OTHER_EXPLANATION"/> + <option key="BUYER_PURCHASING_MISTAKE" description="Buyer purchased item by mistake or changed mind"/> + <option key="BUYER_RETURNED_ITEM_FOR_REFUND" description="Buyer is returning item for a refund"/> + <option key="UNABLE_TO_RESOLVE_TERMS" description="Buyer and I disagreed over terms"/> + <option key="BUYER_HAS_NOT_RESPONDED" description="Buyer is unresponsive"/> + <option key="PAYMENT_METHOD_NOT_SUPPORTED" description="Buyer's payment hasn't been received or hasn't cleared"/> + <option key="SHIPPING_ADDRESS_NOT_CONFIRMED" description="Buyer requested shipment to an unconfirmed address"/> + <option key="SHIP_COUNTRY_NOT_SUPPORTED" description="Seller doesn't ship to the country requested by buyer"/> + <option key="OTHER_EXPLANATION" description="Other reason"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" position="1"><submit/></field> @@ -135,10 +135,10 @@ under the License. <auto-fields-service service-name="addEbaySecondChanceOffer"/> <field name="duration"> <drop-down> - <option key="a day" description="DAYS_1"/> - <option key="3 days" description="DAYS_3"/> - <option key="5 days" description="DAYS_5"/> - <option key="7 days" description="DAYS_7"/> + <option key="DAYS_1" description="a day"/> + <option key="DAYS_3" description="3 days"/> + <option key="DAYS_5" description="5 days"/> + <option key="DAYS_7" description="7 days"/> </drop-down> </field> <field name="recipientBidderUserId"> @@ -206,8 +206,8 @@ under the License. <field name="quantity" required-field="true"><text default-value="${ebayProductStoreInventory.quantityReserved}"></text></field> <field name="actionType"> <drop-down allow-empty="false"> - <option key="Add" description="ADD"/> - <option key="Remove" description="REMOVE"/> + <option key="ADD" description="Add"/> + <option key="REMOVE" description="Remove"/> </drop-down> </field> <field name="submitButton"><submit button-type="button"/></field> @@ -273,8 +273,8 @@ under the License. <field name="isAutoPositiveFeedback" position="1" title="${uiLabelMap.EbayIsAutoPositiveFeedback}"><check></check></field> <field name="feedbackEventCode" position="2" title="${uiLabelMap.EbaySituations}"> <radio> - <option key="${uiLabelMap.EbayTxtPaymentReceive}" description="PAYMENT_RECEIVED"/> - <option key="${uiLabelMap.EbayTxtPaymentReceiveAndPositive}" description="POSITIVE_FEEDBACK_RECEIVED"/> + <option key="PAYMENT_RECEIVED" description="${uiLabelMap.EbayTxtPaymentReceive}"/> + <option key="POSITIVE_FEEDBACK_RECEIVED" description="${uiLabelMap.EbayTxtPaymentReceiveAndPositive}"/> </radio> </field> <field name="headerLabel" title=" " encode-output="false"><display type="text" description="<br/><b>Your stored positive feedback comments.</b>"></display></field> @@ -396,55 +396,55 @@ under the License. <field name="emailDetail" title=" " widget-area-style="h2"><display description="${uiLabelMap.EbayEmailDetail}"/></field> <field name="autoText" action="doSelect(this.id)" event="onchange" > <drop-down allow-empty="true"> - <option key="Buyer User ID" description="$\{buyerUserId}"/> - <option key="Buyer name" description="$\{buyerName}"/> - <option key="Buyer First name" description="$\{buyerFirstName}"/> - <option key="Buyer Last name" description="$\{buyerLastName}"/> - <option key="Buyer street 1" description="$\{buyerStreet1}"/> - <option key="Buyer street 2" description="$\{buyerStreet2}"/> - <option key="Buyer City" description="$\{buyerCity}"/> - <option key="Buyer State" description="$\{buyerState}"/> - <option key="Buyer zip code" description="$\{buyerZipCode}"/> - <option key="Buyer Country" description="$\{buyerCountry}"/> - <option key="Item Number" description="$\{itemId}"/> - <option key="Item Title" description="$\{itemTitle}"/> - <option key="Link to listing" description="$\{linkToListing}"/> - <option key="Quantity" description="$\{Quantity}"/> - <option key="Favorites list" description="$\{favoriteslist}"/> - <option key="Feedback link" description="$\{feedbackLink}"/> - <option key="Closing Date/Time" description="$\{closingDateTime}"/> - <option key="Total price" description="$\{totalPrice}"/> - <option key="Closing price" description="$\{closingPrice}"/> - <option key="S&H fee" description="$\{SHFee}"/> - <option key="Insurance cost" description="$\{insuranceCost}"/> - <option key="Insurance option" description="$\{insuranceOption}"/> - <option key="Tax" description="$\{tax}"/> - <option key="Tax State" description="$\{taxState}"/> - <option key="Payment accepted" description="$\{paymentAcceped}"/> - <option key="Payment instructions" description="$\{paymentInstructions}"/> - <option key="Seller User ID" description="$\{sellerUserId}"/> - <option key="Seller name" description="$\{sellerName}"/> - <option key="Seller First name" description="$\{sellerFirstName}"/> - <option key="Seller Last name" description="$\{sellerLastName}"/> - <option key="Seller street 1" description="$\{sellerStreet1}"/> - <option key="Seller street 2" description="$\{sellerStreet2}"/> - <option key="Seller city" description="$\{sellerCity}"/> - <option key="Seller state" description="$\{sellerState}"/> - <option key="Seller zip code" description="$\{sellerZipCode}"/> - <option key="Seller country" description="$\{sellerCountry}"/> - <option key="Seller email" description="$\{sellerEmail}"/> - <option key="Seller phone" description="$\{sellerPhone}"/> - <option key="Sales record number" description="$\{salesRecordNumber}"/> - <option key="Shipped date" description="$\{shippedDate}"/> - <option key="Transaction table" description="$\{transactionTable}"/> - <option key="Checkout link" description="$\{checkoutLink}"/> - <option key="Shipping Calculator" description="$\{shippingCalculator}"/> - <option key="Track shipment link" description="$\{trackShipmentLink}"/> - <option key="Shipping Options" description="$\{shippingOptions}"/> - <option key="Notes to buyer" description="$\{notesToBuyer}"/> - <option key="Discounts or Charges" description="$\{DiscountsOrCharges}"/> - <option key="Refund Amount" description="$\{refundAmount}"/> - <option key="Variation details" description="$\{variationDetails}"/> + <option key="$\{buyerUserId}" description="Buyer User ID"/> + <option key="$\{buyerName}" description="Buyer name"/> + <option key="$\{buyerFirstName}" description="Buyer First name"/> + <option key="$\{buyerLastName}" description="Buyer Last name"/> + <option key="$\{buyerStreet1}" description="Buyer street 1"/> + <option key="$\{buyerStreet2}" description="Buyer street 2"/> + <option key="$\{buyerCity}" description="Buyer City"/> + <option key="$\{buyerState}" description="Buyer State"/> + <option key="$\{buyerZipCode}" description="Buyer zip code"/> + <option key="$\{buyerCountry}" description="Buyer Country"/> + <option key="$\{itemId}" description="Item Number"/> + <option key="$\{itemTitle}" description="Item Title"/> + <option key="$\{linkToListing}" description="Link to listing"/> + <option key="$\{Quantity}" description="Quantity"/> + <option key="$\{favoriteslist}" description="Favorites list"/> + <option key="$\{feedbackLink}" description="Feedback link"/> + <option key="$\{closingDateTime}" description="Closing Date/Time"/> + <option key="$\{totalPrice}" description="Total price"/> + <option key="$\{closingPrice}" description="Closing price"/> + <option key="$\{SHFee}" description="S&H fee"/> + <option key="$\{insuranceCost}" description="Insurance cost"/> + <option key="$\{insuranceOption}" description="Insurance option"/> + <option key="$\{tax}" description="Tax"/> + <option key="$\{taxState}" description="Tax State"/> + <option key="$\{paymentAcceped}" description="Payment accepted"/> + <option key="$\{paymentInstructions}" description="Payment instructions"/> + <option key="$\{sellerUserId}" description="Seller User ID"/> + <option key="$\{sellerName}" description="Seller name"/> + <option key="$\{sellerFirstName}" description="Seller First name"/> + <option key="$\{sellerLastName}" description="Seller Last name"/> + <option key="$\{sellerStreet1}" description="Seller street 1"/> + <option key="$\{sellerStreet2}" description="Seller street 2"/> + <option key="$\{sellerCity}" description="Seller city"/> + <option key="$\{sellerState}" description="Seller state"/> + <option key="$\{sellerZipCode}" description="Seller zip code"/> + <option key="$\{sellerCountry}" description="Seller country"/> + <option key="$\{sellerEmail}" description="Seller email"/> + <option key="$\{sellerPhone}" description="Seller phone"/> + <option key="$\{salesRecordNumber}" description="Sales record number"/> + <option key="$\{shippedDate}" description="Shipped date"/> + <option key="$\{transactionTable}" description="Transaction table"/> + <option key="$\{checkoutLink}" description="Checkout link"/> + <option key="$\{shippingCalculator}" description="Shipping Calculator"/> + <option key="$\{trackShipmentLink}" description="Track shipment link"/> + <option key="$\{shippingOptions}" description="Shipping Options"/> + <option key="$\{notesToBuyer}" description="Notes to buyer"/> + <option key="$\{DiscountsOrCharges}" description="Discounts or Charges"/> + <option key="$\{refundAmount}" description="Refund Amount"/> + <option key="$\{variationDetails}" description="Variation details"/> </drop-down> </field> <field name="subject"><text/></field> @@ -507,9 +507,9 @@ under the License. <field name="listingType" action="document.ItemOption.submit()" event="onchange"> <drop-down> <option key="" description="All"/> - <option key="Auction Only" description="AUCTION"/> - <option key="Fixed Price Item Only" description="FIXED_PRICE_ITEM"/> - <option key="Stores Inventory Only" description="STORES_FIXED_PRICE"/> + <option key="AUCTION" description="Auction Only"/> + <option key="FIXED_PRICE_ITEM" description="Fixed Price Item Only"/> + <option key="STORES_FIXED_PRICE" description="Stores Inventory Only"/> </drop-down> </field> <field name="submitButton"><submit/></field> @@ -545,8 +545,8 @@ under the License. <field name="orderTypeId" title="Order Type"> <drop-down> <option key="" description="Any Order Type"/> - <option key="Purchase Order" description="PURCHASE_ORDER"/> - <option key="Sales Order" description="SALES_ORDER"/> + <option key="PURCHASE_ORDER" description="Purchase Order"/> + <option key="SALES_ORDER" description="Sales Order"/> </drop-down> </field> <field name="statusId" title="Status"> @@ -690,11 +690,11 @@ under the License. <field name="contactStatus"><hidden value="${contactStatus}"/></field> <field name="contactSetting" title="Contact Status Setting"> <drop-down > - <option key="_Select_" description="_NA_"/> - <option key="Not Contact" description="NOT_CONTACT"/> - <option key="Contacting" description="CONTACTING"/> - <option key="Accept Offer" description="ACCEPT"/> - <option key="Decline Offer" description="DECLINE"/> + <option key="_NA_" description="_Select_"/> + <option key="NOT_CONTACT" description="Not Contact"/> + <option key="CONTACTING" description="Contacting"/> + <option key="ACCEPT" description="Accept Offer"/> + <option key="DECLINE" description="Decline Offer"/> </drop-down> </field> <field name="updateContactStatus"><submit button-type="button"/></field> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml Tue Dec 6 12:37:42 2016 @@ -111,8 +111,8 @@ under the License. <field name="statusId"><hidden value="PARTY_ENABLED"/></field> <field name="gender"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonMale}" description="M"/> - <option key="${uiLabelMap.CommonFemale}" description="F"/> + <option key="M" description="${uiLabelMap.CommonMale}"/> + <option key="F" description="${uiLabelMap.CommonFemale}"/> </drop-down> </field> <field name="currentPassword"><password/></field> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml Tue Dec 6 12:37:42 2016 @@ -45,9 +45,9 @@ under the License. </field> <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" > <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> - <option key="${uiLabelMap.EcommerceTextOnly}" description="TEMPLATE_TEXT_ONLY"/> - <option key="${uiLabelMap.EcommerceImageCenteredAbove}" description="TEMPLATE_IMAGE_CENTERED"/> - <option key="${uiLabelMap.EcommerceImageLeft}" description="TEMPLATE_IMAGE_LEFT"/> + <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/> + <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/> + <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}"/> </drop-down> </field> <field name="ftlContentId" position="1"> @@ -74,9 +74,9 @@ under the License. <field name="textData" title="${uiLabelMap.ProductText}" id-name="textData"><textarea rows="20" cols="60"/></field> <field name="privilegeEnumId" > <drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE"> - <option key="${uiLabelMap.EcommerceBronze}" description="SUBSCRIBE_BRONZE"/> - <option key="${uiLabelMap.EcommerceSilver}" description="SUBSCRIBE_SILVER"/> - <option key="${uiLabelMap.EcommerceGold}" description="SUBSCRIBE_GOLD"/> + <option key="SUBSCRIBE_BRONZE" description="${uiLabelMap.EcommerceBronze}"/> + <option key="SUBSCRIBE_SILVER" description="${uiLabelMap.EcommerceSilver}"/> + <option key="SUBSCRIBE_GOLD" description="${uiLabelMap.EcommerceGold}"/> </drop-down> </field> <field name="section" > @@ -227,9 +227,9 @@ under the License. </field> <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" > <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> - <option key="${uiLabelMap.EcommerceTextOnly}" description="TEMPLATE_TEXT_ONLY"/> - <option key="${uiLabelMap.EcommerceImageCenteredAbove}" description="TEMPLATE_IMAGE_CENTERED"/> - <option key="${uiLabelMap.EcommerceImageLeft}" description="TEMPLATE_IMAGE_LEFT"/> + <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/> + <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/> + <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}"/> </drop-down> </field> <field name="ftlContentId" position="1"> @@ -339,11 +339,11 @@ under the License. </field> <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"> <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> - <option key="${uiLabelMap.EcommerceTextOnly}" description="TEMPLATE_TEXT_ONLY"/> - <option key="${uiLabelMap.EcommerceImageCenteredAbove}" description="TEMPLATE_IMAGE_CENTERED"/> - <option key="${uiLabelMap.EcommerceImageCenteredAboveFile}" description="TEMPLATE_IMAGE_CENTERED_FILE"/> - <option key="${uiLabelMap.EcommerceImageLeft}" description="TEMPLATE_IMAGE_LEFT"/> - <option key="${uiLabelMap.EcommerceNestedContent}" description="TEMPLATE_COMPOSITE"/> + <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/> + <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/> + <option key="TEMPLATE_IMAGE_CENTERED_FILE" description="${uiLabelMap.EcommerceImageCenteredAboveFile}"/> + <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}"/> + <option key="TEMPLATE_COMPOSITE" description="${uiLabelMap.EcommerceNestedContent}"/> </drop-down> </field> <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> @@ -459,9 +459,9 @@ under the License. </field> <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" > <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> - <option key="${uiLabelMap.EcommerceTextOnly}" description="TEMPLATE_TEXT_ONLY"/> - <option key="${uiLabelMap.EcommerceImageCenteredAbove}" description="TEMPLATE_IMAGE_CENTERED"/> - <option key="${uiLabelMap.EcommerceImageLeft}" description="TEMPLATE_IMAGE_LEFT"/> + <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/> + <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/> + <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}"/> </drop-down> </field> <field name="contentId" position="1"> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml Tue Dec 6 12:37:42 2016 @@ -23,8 +23,8 @@ default-title-style="tableheadtext" default-widget-style="inputBox"> <field name="caContentIdTo" title="${uiLabelMap.ContentPublishToContent}"> <drop-down> - <option key="${uiLabelMap.ContentBlogs}" description="OFBIZBLOGROOT"/> - <option key="${uiLabelMap.ContentForums}" description="OFBIZFORUMROOT"/> + <option key="OFBIZBLOGROOT" description="${uiLabelMap.ContentBlogs}"/> + <option key="OFBIZFORUMROOT" description="${uiLabelMap.ContentForums}"/> </drop-down> </field> <field name="caMapKey"> @@ -100,8 +100,8 @@ </field> <field name="statusId"> <radio no-current-selected-key="CTNT_INITIAL_DRAFT"> - <option key="${uiLabelMap.ContentBlogPost}" description="CTNT_PUBLISHED"/> - <option key="${uiLabelMap.ContentBlogPreview}" description="CTNT_INITIAL_DRAFT"/> + <option key="CTNT_PUBLISHED" description="${uiLabelMap.ContentBlogPost}"/> + <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.ContentBlogPreview}"/> </radio> </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"> @@ -167,8 +167,8 @@ </field> <field name="statusId"> <radio no-current-selected-key="CTNT_INITIAL_DRAFT"> - <option key="${uiLabelMap.ContentBlogPost}" description="CTNT_PUBLISHED"/> - <option key="${uiLabelMap.ContentBlogPreview}" description="CTNT_INITIAL_DRAFT"/> + <option key="CTNT_PUBLISHED" description="${uiLabelMap.ContentBlogPost}"/> + <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.ContentBlogPreview}"/> </radio> </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"> Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml (original) +++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml Tue Dec 6 12:37:42 2016 @@ -206,7 +206,7 @@ under the License. <field name="longDescription" title="${uiLabelMap.ExampleLongDescription}"/> <field name="anotherText"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.ExampleExplicitOption}" description="Explicit Option"/> + <option key="Explicit Option" description="${uiLabelMap.ExampleExplicitOption}"/> <entity-options entity-name="ExampleType" key-field-name="exampleTypeId"> <entity-order-by field-name="description"/> </entity-options> @@ -333,56 +333,56 @@ under the License. <field name="userPassword" title="${uiLabelMap.PDFUserPassword}"><text size="15" maxlength="250"/></field> <field name="allowPrint" title="${uiLabelMap.PDFAllowPrint}"> <drop-down> - <option key="${uiLabelMap.CommonTrue}" description="true"/> - <option key="${uiLabelMap.CommonFalse}" description="false"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> + <option key="false" description="${uiLabelMap.CommonFalse}"/> </drop-down> </field> <field name="allowCopyContent" title="${uiLabelMap.PDFAllowCopyContent}"> <drop-down> - <option key="${uiLabelMap.CommonTrue}" description="true"/> - <option key="${uiLabelMap.CommonFalse}" description="false"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> + <option key="false" description="${uiLabelMap.CommonFalse}"/> </drop-down> </field> <field name="allowEditContent" title="${uiLabelMap.PDFAllowEditContent}"> <drop-down> - <option key="${uiLabelMap.CommonTrue}" description="true"/> - <option key="${uiLabelMap.CommonFalse}" description="false"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> + <option key="false" description="${uiLabelMap.CommonFalse}"/> </drop-down> </field> <field name="allowEditAnnotations" title="${uiLabelMap.PDFAllowEditAnnotations}"> <drop-down> - <option key="${uiLabelMap.CommonTrue}" description="true"/> - <option key="${uiLabelMap.CommonFalse}" description="false"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> + <option key="false" description="${uiLabelMap.CommonFalse}"/> </drop-down> </field> <field name="allowFillInForms" title="${uiLabelMap.PDFAllowFillInForms}"> <drop-down> - <option key="${uiLabelMap.CommonTrue}" description="true"/> - <option key="${uiLabelMap.CommonFalse}" description="false"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> + <option key="false" description="${uiLabelMap.CommonFalse}"/> </drop-down> </field> <field name="allowAccessContent" title="${uiLabelMap.PDFAllowAccessContent}"> <drop-down> - <option key="${uiLabelMap.CommonTrue}" description="true"/> - <option key="${uiLabelMap.CommonFalse}" description="false"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> + <option key="false" description="${uiLabelMap.CommonFalse}"/> </drop-down> </field> <field name="allowAssembleDocument" title="${uiLabelMap.PDFAllowAssembleDocument}"> <drop-down> - <option key="${uiLabelMap.CommonTrue}" description="true"/> - <option key="${uiLabelMap.CommonFalse}" description="false"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> + <option key="false" description="${uiLabelMap.CommonFalse}"/> </drop-down> </field> <field name="allowPrintHq" title="${uiLabelMap.PDFAllowPrintHq}"> <drop-down> - <option key="${uiLabelMap.CommonTrue}" description="true"/> - <option key="${uiLabelMap.CommonFalse}" description="false"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> + <option key="false" description="${uiLabelMap.CommonFalse}"/> </drop-down> </field> <field name="encrypt-metadata" title="${uiLabelMap.PDFEncryptMetadata}"> <drop-down> - <option key="${uiLabelMap.CommonTrue}" description="true"/> - <option key="${uiLabelMap.CommonFalse}" description="false"/> + <option key="true" description="${uiLabelMap.CommonTrue}"/> + <option key="false" description="${uiLabelMap.CommonFalse}"/> </drop-down> </field> <field name="encryption-length" title="${uiLabelMap.PDFEncryptionLength}"><text size="15"/></field> Modified: ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml (original) +++ ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml Tue Dec 6 12:37:42 2016 @@ -137,8 +137,8 @@ under the License. title="${uiLabelMap.ExampleDropDownField1Title}" tooltip="${uiLabelMap.ExampleDropDownField1Tooltip}" tooltip-style="button-text"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonY}" description="Y"/> - <option key="${uiLabelMap.CommonN}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonY}"/> + <option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> <!-- ***************** --> @@ -148,8 +148,8 @@ under the License. title="${uiLabelMap.ExampleDropDownField2Title}" tooltip="${uiLabelMap.ExampleDropDownField2Tooltip}" tooltip-style="button-text"> <drop-down allow-empty="false"> <!-- allow-empty="false" is also the default value, so you can also not specify this attribute here --> - <option key="${uiLabelMap.CommonY}" description="Y"/> - <option key="${uiLabelMap.CommonN}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonY}"/> + <option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> <!-- ***************** --> @@ -159,8 +159,8 @@ under the License. title="${uiLabelMap.ExampleDropDownField5Title}" tooltip="${uiLabelMap.ExampleDropDownField5Tooltip}" tooltip-style="button-text"> <drop-down no-current-selected-key="N"> - <option key="${uiLabelMap.CommonY}" description="Y"/> - <option key="${uiLabelMap.CommonN}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonY}"/> + <option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> <!-- ***************** --> @@ -172,8 +172,8 @@ under the License. action="return showErrorAlert('${uiLabelMap.CommonErrorMessage2}','${uiLabelMap.YouChangedTheSelectBoxValue}');" tooltip="${uiLabelMap.ExampleDropDownField8Tooltip}" tooltip-style="button-text"> <drop-down> - <option key="${uiLabelMap.CommonY}" description="Y"/> - <option key="${uiLabelMap.CommonN}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonY}"/> + <option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> @@ -253,10 +253,10 @@ under the License. <field name="otherValue" title="${uiLabelMap.ExampleSpecifyOtherDropdown}" tooltip="${uiLabelMap.ExampleSpecifyOtherTooltip}" tooltip-style="button-text" > <drop-down other-field-size="15"> - <option key="Option A" description="A" /> - <option key="Option B" description="B" /> - <option key="Option C" description="C" /> - <option key="specify other" description="_OTHER_" /> + <option key="A" description="Option A" /> + <option key="B" description="Option B" /> + <option key="C" description="Option C" /> + <option key="_OTHER_" description="specify other" /> </drop-down> </field> <!-- ****************************** --> Modified: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml Tue Dec 6 12:37:42 2016 @@ -33,7 +33,7 @@ under the License. <request-map uri="AdminIndex"><security https="true" auth="true"/><response name="success" type="view" value="AdminIndex"/></request-map> <request-map uri="indexContentTree"> <security https="true" auth="true"/> - <event type="java" invoke="indexContentTree" path="org.apache.ofbiz.content.search.SearchEvents"/> + <event invoke="indexContentTree" path="org.apache.ofbiz.content.search.SearchEvents" type="java"/> <response name="success" type="view" value="AdminIndex"/> <response name="error" type="view" value="AdminIndex"/> </request-map> Modified: ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml Tue Dec 6 12:37:42 2016 @@ -148,7 +148,7 @@ </or> </condition> <then> - <make-value entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/> + <make-value value-field="workEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/> <set field="workEffortPartyAssignment.workEffortId" from-field="parameters.workEffortId"/> <set field="workEffortPartyAssignment.partyId" from-field="updProjectRole.newPartyId"/> <set field="workEffortPartyAssignment.roleTypeId" from-field="updProjectRole.roleTypeId"/> @@ -236,7 +236,7 @@ <now-timestamp field="workEffortPartyAssignment.thruDate"/> <store-value value-field="workEffortPartyAssignment"/> <!-- create a new one --> - <make-value entity-name="WorkEffortPartyAssignment" value-field="newAssign"/> + <make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment"/> <set field="newAssign.workEffortId" from-field="parameters.workEffortId"/> <set field="newAssign.partyId" from-field="parameters.newPartyId"/> <set field="newAssign.roleTypeId" from-field="parameters.newRoleTypeId"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Tue Dec 6 12:37:42 2016 @@ -352,7 +352,7 @@ under the License. <section> <condition><not><if-empty field="partyId"/></not></condition> <widgets> - <include-menu name="ResourceTabBar" location="component://projectmgr/widget/ProjectMenus.xml"/> + <include-menu location="component://projectmgr/widget/ProjectMenus.xml" name="ResourceTabBar"/> <container> <section> <widgets> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Tue Dec 6 12:37:42 2016 @@ -65,15 +65,15 @@ </field> <field name="priority" title="${uiLabelMap.CommonPriority}"> <drop-down allow-empty="true" no-current-selected-key="${priority}"> - <option key="${uiLabelMap.WorkEffortPriorityOne}" description="1"/> - <option key="${uiLabelMap.WorkEffortPriorityTwo}" description="2"/> - <option key="${uiLabelMap.WorkEffortPriorityThree}" description="3"/> - <option key="${uiLabelMap.WorkEffortPriorityFour}" description="4"/> - <option key="${uiLabelMap.WorkEffortPriorityFive}" description="5"/> - <option key="${uiLabelMap.WorkEffortPrioritySix}" description="6"/> - <option key="${uiLabelMap.WorkEffortPrioritySeventh}" description="7"/> - <option key="${uiLabelMap.WorkEffortPriorityEight}" description="8"/> - <option key="${uiLabelMap.WorkEffortPriorityNine}" description="9"/> + <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/> + <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/> + <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/> + <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/> + <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/> + <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/> + <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/> + <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/> + <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/> </drop-down> </field> <field name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}"> @@ -285,15 +285,15 @@ <field name="description" title="${uiLabelMap.CommonDescription}"><text size="15"/></field> <field name="priority" title="${uiLabelMap.CommonPriority}" position="1"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.WorkEffortPriorityOne}" description="1"/> - <option key="${uiLabelMap.WorkEffortPriorityTwo}" description="2"/> - <option key="${uiLabelMap.WorkEffortPriorityThree}" description="3"/> - <option key="${uiLabelMap.WorkEffortPriorityFour}" description="4"/> - <option key="${uiLabelMap.WorkEffortPriorityFive}" description="5"/> - <option key="${uiLabelMap.WorkEffortPrioritySix}" description="6"/> - <option key="${uiLabelMap.WorkEffortPrioritySeventh}" description="7"/> - <option key="${uiLabelMap.WorkEffortPriorityEight}" description="8"/> - <option key="${uiLabelMap.WorkEffortPriorityNine}" description="9"/> + <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/> + <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/> + <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/> + <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/> + <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/> + <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/> + <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/> + <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/> + <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/> </drop-down> </field> <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><date-time/></field> @@ -338,15 +338,15 @@ <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field> <field name="priority" title="${uiLabelMap.CommonPriority}"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.WorkEffortPriorityOne}" description="1"/> - <option key="${uiLabelMap.WorkEffortPriorityTwo}" description="2"/> - <option key="${uiLabelMap.WorkEffortPriorityThree}" description="3"/> - <option key="${uiLabelMap.WorkEffortPriorityFour}" description="4"/> - <option key="${uiLabelMap.WorkEffortPriorityFive}" description="5"/> - <option key="${uiLabelMap.WorkEffortPrioritySix}" description="6"/> - <option key="${uiLabelMap.WorkEffortPrioritySeventh}" description="7"/> - <option key="${uiLabelMap.WorkEffortPriorityEight}" description="8"/> - <option key="${uiLabelMap.WorkEffortPriorityNine}" description="9"/> + <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/> + <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/> + <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/> + <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/> + <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/> + <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/> + <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/> + <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/> + <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/> </drop-down> </field> <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><date-time type="date"/></field> @@ -381,15 +381,15 @@ <field name="description" title="${uiLabelMap.CommonDescription}"><text size="15"/></field> <field name="priority" title="${uiLabelMap.CommonPriority}" position="1"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.WorkEffortPriorityOne}" description="1"/> - <option key="${uiLabelMap.WorkEffortPriorityTwo}" description="2"/> - <option key="${uiLabelMap.WorkEffortPriorityThree}" description="3"/> - <option key="${uiLabelMap.WorkEffortPriorityFour}" description="4"/> - <option key="${uiLabelMap.WorkEffortPriorityFive}" description="5"/> - <option key="${uiLabelMap.WorkEffortPrioritySix}" description="6"/> - <option key="${uiLabelMap.WorkEffortPrioritySeventh}" description="7"/> - <option key="${uiLabelMap.WorkEffortPriorityEight}" description="8"/> - <option key="${uiLabelMap.WorkEffortPriorityNine}" description="9"/> + <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/> + <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/> + <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/> + <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/> + <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/> + <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/> + <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/> + <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/> + <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> @@ -842,8 +842,8 @@ <field name="invoiceId"><hidden/></field> <field name="reCreate" position="1" title="${uiLabelMap.ProjectMgrRecreateInvoice}: ${invoiceId}" use-when="context.get("invoiceId")!=null"> <drop-down no-current-selected-key="N"> - <option key="${uiLabelMap.CommonYes}" description="Y"/> - <option key="${uiLabelMap.CommonNo}" description="N"/> + <option key="Y" description="${uiLabelMap.CommonYes}"/> + <option key="N" description="${uiLabelMap.CommonNo}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.PageTitleAddProjectTimeToNewInvoice}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Tue Dec 6 12:37:42 2016 @@ -85,21 +85,21 @@ <field name="currentStatusId" use-when="task==null||task==void"><hidden value="PTS_CREATED"/></field> <field name="priority" title="${uiLabelMap.CommonPriority}"> <drop-down allow-empty="true" current="selected"> - <option key="${uiLabelMap.WorkEffortPriorityOne}" description="1"/> - <option key="${uiLabelMap.WorkEffortPriorityTwo}" description="2"/> - <option key="${uiLabelMap.WorkEffortPriorityThree}" description="3"/> - <option key="${uiLabelMap.WorkEffortPriorityFour}" description="4"/> - <option key="${uiLabelMap.WorkEffortPriorityFive}" description="5"/> - <option key="${uiLabelMap.WorkEffortPrioritySix}" description="6"/> - <option key="${uiLabelMap.WorkEffortPrioritySeventh}" description="7"/> - <option key="${uiLabelMap.WorkEffortPriorityEight}" description="8"/> - <option key="${uiLabelMap.WorkEffortPriorityNine}" description="9"/> + <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/> + <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/> + <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/> + <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/> + <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/> + <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/> + <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/> + <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/> + <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/> </drop-down> </field> <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"> <drop-down allow-empty="false" current="selected"> - <option key="${uiLabelMap.FormFieldTitle_task}" description="TASK"/> - <option key="${uiLabelMap.FormFieldTitle_milestone}" description="MILESTONE"/> + <option key="TASK" description="${uiLabelMap.FormFieldTitle_task}"/> + <option key="MILESTONE" description="${uiLabelMap.FormFieldTitle_milestone}"/> </drop-down> </field> <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonMax250Chars}"><textarea/></field> @@ -717,15 +717,15 @@ </field> <field name="taskPriority" parameter-name="priority" title="${uiLabelMap.CommonPriority}"> <drop-down allow-empty="true" current="selected"> - <option key="${uiLabelMap.WorkEffortPriorityOne}" description="1"/> - <option key="${uiLabelMap.WorkEffortPriorityTwo}" description="2"/> - <option key="${uiLabelMap.WorkEffortPriorityThree}" description="3"/> - <option key="${uiLabelMap.WorkEffortPriorityFour}" description="4"/> - <option key="${uiLabelMap.WorkEffortPriorityFive}" description="5"/> - <option key="${uiLabelMap.WorkEffortPrioritySix}" description="6"/> - <option key="${uiLabelMap.WorkEffortPrioritySeventh}" description="7"/> - <option key="${uiLabelMap.WorkEffortPriorityEight}" description="8"/> - <option key="${uiLabelMap.WorkEffortPriorityNine}" description="9"/> + <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/> + <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/> + <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/> + <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/> + <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/> + <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/> + <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/> + <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/> + <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/> </drop-down> </field> <field name="taskScopeEnumId" parameter-name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}"> Modified: ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml Tue Dec 6 12:37:42 2016 @@ -460,7 +460,7 @@ <field-to-request field="workEffortId" request-name="projectId"/> <log level="info" message="Creating new project, projectId=${workEffortId}"/> <!-- Create workeffort associate with product --> - <make-value entity-name="WorkEffortGoodStandard" value-field="goodStandardMap"/> + <make-value value-field="goodStandardMap" entity-name="WorkEffortGoodStandard"/> <set field="goodStandardMap.workEffortId" from-field="workEffortId"/> <set field="goodStandardMap.productId" from-field="parameters.productId"/> <set field="goodStandardMap.workEffortGoodStdTypeId" value="SCRUM_PRO_WORKEFF"/> @@ -469,7 +469,7 @@ <create-value value-field="goodStandardMap"/> <!-- Create project billed options --> <if-not-empty field="parameters.billed"> - <make-value entity-name="WorkEffortAttribute" value-field="workEffortAttMap"/> + <make-value value-field="workEffortAttMap" entity-name="WorkEffortAttribute"/> <set field="workEffortAttMap.workEffortId" from-field="workEffortId"/> <set field="workEffortAttMap.attrName" value="PROJECT_BILLED"/> <set field="workEffortAttMap.attrValue" from-field="parameters.billed"/> @@ -530,7 +530,7 @@ <remove-list list="workEffGSDList"/> </if-not-empty> <!-- create old workeffort associate with product --> - <make-value entity-name="WorkEffortGoodStandard" value-field="goodStandardMap"/> + <make-value value-field="goodStandardMap" entity-name="WorkEffortGoodStandard"/> <set field="goodStandardMap.workEffortId" from-field="parameters.workEffortId"/> <set field="goodStandardMap.productId" from-field="parameters.productId"/> <set field="goodStandardMap.workEffortGoodStdTypeId" value="SCRUM_PRO_WORKEFF"/> @@ -546,7 +546,7 @@ <set field="workEffortAttMap.attrValue" from-field="parameters.billed"/> <store-value value-field="workEffortAttMap"/> <else> - <make-value entity-name="WorkEffortAttribute" value-field="workEffortAttMap"/> + <make-value value-field="workEffortAttMap" entity-name="WorkEffortAttribute"/> <set field="workEffortAttMap.workEffortId" from-field="parameters.workEffortId"/> <set field="workEffortAttMap.attrName" value="PROJECT_BILLED"/> <set field="workEffortAttMap.attrValue" from-field="parameters.billed"/> @@ -596,7 +596,7 @@ <remove-by-and entity-name="CustRequestItemNote" map="custRequestItemCtx"/> <remove-by-and entity-name="CustRequestItemWorkEffort" map="custRequestItemCtx"/> - <make-value entity-name="CustRequestItem" value-field="deleteCustRequestItem"/> + <make-value value-field="deleteCustRequestItem" entity-name="CustRequestItem"/> <set-pk-fields value-field="deleteCustRequestItem" map="parameters"/> <set-nonpk-fields map="parameters" value-field="deleteCustRequestItem"/> <remove-value value-field="deleteCustRequestItem"/> @@ -1015,7 +1015,7 @@ <call-service service-name="createNote" in-map-name="newNoteMap"> <result-to-field result-name="noteId" field="noteId"/> </call-service> - <make-value entity-name="CustRequestNote" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="CustRequestNote"/> <set from-field="custRequestId" field="newEntity.custRequestId"/> <set from-field="noteId" field="newEntity.noteId"/> <create-value value-field="newEntity"/> @@ -1671,7 +1671,7 @@ <if-empty field="custRequestNoteViews"> <!-- create CustRequestNote --> <if-not-empty field="parameters.noteInfo"> - <make-value entity-name="CustRequestNote" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="CustRequestNote"/> <set from-field="parameters.custRequestId" field="newEntity.custRequestId"/> <set field="newNoteMap.note" from-field="parameters.noteInfo"/> <set field="newNoteMap.noteName" value="How to test"/> @@ -1749,12 +1749,12 @@ <field-map field-name="roleTypeId" value="PRODUCT_OWNER"/> </entity-one> <if-empty field="partyRoles"> - <make-value entity-name="PartyRole" value-field="partyRole"/> + <make-value value-field="partyRole" entity-name="PartyRole"/> <set field="partyRole.partyId" value="${parameters.partyId}"/> <set field="partyRole.roleTypeId" value="PRODUCT_OWNER"/> <create-value value-field="partyRole"/> </if-empty> - <make-value entity-name="ProductRole" value-field="productRole" /> + <make-value value-field="productRole" entity-name="ProductRole" /> <set field="productRole.productId" from-field="parameters.productId" /> <set field="productRole.partyId" value="${parameters.partyId}"/> <set field="productRole.roleTypeId" value="PRODUCT_OWNER"/> @@ -1766,12 +1766,12 @@ <field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/> </entity-one> <if-empty field="partyRoles"> - <make-value entity-name="PartyRole" value-field="partyRole"/> + <make-value value-field="partyRole" entity-name="PartyRole"/> <set field="partyRole.partyId" value="${companyId}"/> <set field="partyRole.roleTypeId" value="PRODUCT_OWNER_COMP"/> <create-value value-field="partyRole"/> </if-empty> - <make-value entity-name="ProductRole" value-field="productRole" /> + <make-value value-field="productRole" entity-name="ProductRole" /> <set field="productRole.productId" from-field="parameters.productId" /> <set field="productRole.partyId" value="${companyId}"/> <set field="productRole.roleTypeId" value="PRODUCT_OWNER_COMP"/> @@ -1828,7 +1828,7 @@ <field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/> </entity-and> <if-empty field="partyRoleList"> - <make-value entity-name="PartyRole" value-field="partyRole"/> + <make-value value-field="partyRole" entity-name="PartyRole"/> <set field="partyRole.partyId" value="${companyId}"/> <set field="partyRole.roleTypeId" value="PRODUCT_OWNER_COMP"/> <create-value value-field="partyRole"/> @@ -1836,7 +1836,7 @@ <call-class-method class-name="org.apache.ofbiz.base.util.UtilDateTime" method-name="getDayStart" ret-field="formDate"> <field field="nowTimestamp" type="java.sql.Timestamp"/> </call-class-method> - <make-value entity-name="ProductRole" value-field="productRole" /> + <make-value value-field="productRole" entity-name="ProductRole" /> <set field="productRole.productId" from-field="parameters.productId" /> <set field="productRole.partyId" value="${companyId}"/> <set field="productRole.roleTypeId" value="PRODUCT_OWNER_COMP"/> @@ -1879,7 +1879,7 @@ <field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/> </entity-and> <if-empty field="productCompList"> - <make-value entity-name="ProductRole" value-field="productComp" /> + <make-value value-field="productComp" entity-name="ProductRole" /> <set field="productComp.productId" from-field="parameters.productId" /> <set field="productComp.partyId" value="${companyId}"/> <set field="productComp.roleTypeId" value="PRODUCT_OWNER_COMP"/> @@ -1954,7 +1954,7 @@ </call-class-method> <if-not-empty field="parameters.noteInfo1"> - <make-value entity-name="NoteData" value-field="noteData"/> + <make-value value-field="noteData" entity-name="NoteData"/> <sequenced-id sequence-name="NoteData" field="noteId"/> <set field="noteData.noteId" from-field="noteId"/> <set field="noteData.noteName" from-field="parameters.noteName1"/> @@ -1963,16 +1963,16 @@ <set field="noteData.noteDateTime" from-field="noteDateTime" type="Timestamp"/> <create-value value-field="noteData"/> - <make-value entity-name="WorkEffortNote" value-field="newWorkEffortNote"/> + <make-value value-field="newWorkEffortNote" entity-name="WorkEffortNote"/> <set from-field="noteId" field="newWorkEffortNote.noteId"/> <set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/> <create-value value-field="newWorkEffortNote"/> - <make-value entity-name="NoteData" value-field="noteData"/> + <make-value value-field="noteData" entity-name="NoteData"/> </if-not-empty> <if-not-empty field="parameters.noteInfo2"> - <make-value entity-name="NoteData" value-field="noteData"/> + <make-value value-field="noteData" entity-name="NoteData"/> <sequenced-id sequence-name="NoteData" field="noteId"/> <set field="noteData.noteId" from-field="noteId"/> <set field="noteData.noteName" from-field="parameters.noteName2"/> @@ -1981,16 +1981,16 @@ <set field="noteData.noteDateTime" from-field="noteDateTime" type="Timestamp"/> <create-value value-field="noteData"/> - <make-value entity-name="WorkEffortNote" value-field="newWorkEffortNote"/> + <make-value value-field="newWorkEffortNote" entity-name="WorkEffortNote"/> <set from-field="noteId" field="newWorkEffortNote.noteId"/> <set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/> <create-value value-field="newWorkEffortNote"/> - <make-value entity-name="NoteData" value-field="noteData"/> + <make-value value-field="noteData" entity-name="NoteData"/> </if-not-empty> <if-not-empty field="parameters.noteInfo3"> - <make-value entity-name="NoteData" value-field="noteData"/> + <make-value value-field="noteData" entity-name="NoteData"/> <sequenced-id sequence-name="NoteData" field="noteId"/> <set field="noteData.noteId" from-field="noteId"/> <set field="noteData.noteName" from-field="parameters.noteName3"/> @@ -1999,12 +1999,12 @@ <set field="noteData.noteDateTime" from-field="noteDateTime" type="Timestamp"/> <create-value value-field="noteData"/> - <make-value entity-name="WorkEffortNote" value-field="newWorkEffortNote"/> + <make-value value-field="newWorkEffortNote" entity-name="WorkEffortNote"/> <set from-field="noteId" field="newWorkEffortNote.noteId"/> <set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/> <create-value value-field="newWorkEffortNote"/> - <make-value entity-name="NoteData" value-field="noteData"/> + <make-value value-field="noteData" entity-name="NoteData"/> </if-not-empty> <field-to-request field="parameters.workEffortId" request-name="projectId"/> </then> @@ -2176,7 +2176,7 @@ <call-service service-name="createNote" in-map-name="newNoteMap"> <result-to-field result-name="noteId" field="noteId"/> </call-service> - <make-value entity-name="WorkEffortNote" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="WorkEffortNote"/> <set field="newEntity.workEffortId" from-field="parameters.workEffortId" /> <set field="newEntity.noteId" from-field="noteId" /> <set field="newEntity.internalNote" value="Y"/> @@ -2392,7 +2392,7 @@ </if-compare> </iterate> </if-not-empty> - <make-value entity-name="CustRequest" value-field="custRequestMap"/> + <make-value value-field="custRequestMap" entity-name="CustRequest"/> <set field="custRequestMap.custRequestId" from-field="formInput.formInput.custRequestId"/> <set field="custRequestMap.custRequestTypeId" value="RF_UNPLAN_BACKLOG"/> <store-value value-field="custRequestMap"/> @@ -2653,7 +2653,7 @@ <result-to-field result-name="workEffortId"/> </call-service> <if-compare field="parameters.workEffortPurposeTypeId" operator="not-equals" value="SYSTEM_DEFAULT_TASK" > - <make-value entity-name="WorkEffortGoodStandard" value-field="goodStandardMap"/> + <make-value value-field="goodStandardMap" entity-name="WorkEffortGoodStandard"/> <set field="goodStandardMap.workEffortId" from-field="workEffortId"/> <set field="goodStandardMap.productId" from-field="parameters.productId"/> <set field="goodStandardMap.workEffortGoodStdTypeId" value="SCRUM_PRO_WORKEFF"/> @@ -2971,7 +2971,7 @@ <call-service service-name="createNote" in-map-name="newNoteMap"> <result-to-field result-name="noteId" field="noteId"/> </call-service> - <make-value entity-name="CustRequestNote" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="CustRequestNote"/> <set field="newEntity.custRequestId" from-field="parameters.custRequestId" /> <set field="newEntity.noteId" from-field="noteId" /> <create-value value-field="newEntity"/> @@ -3603,7 +3603,7 @@ <call-service service-name="createNote" in-map-name="newNoteMap"> <result-to-field result-name="noteId" field="noteId"/> </call-service> - <make-value entity-name="CustRequestNote" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="CustRequestNote"/> <set from-field="custRequestId" field="newEntity.custRequestId"/> <set from-field="noteId" field="newEntity.noteId"/> <log level="always" message=">>>>>>>>>>>>>>>>>> newEntity : ${newEntity}"></log> @@ -4321,13 +4321,13 @@ <field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/> </entity-and> <if-empty field="partyRoleList"> - <make-value entity-name="PartyRole" value-field="partyRole"/> + <make-value value-field="partyRole" entity-name="PartyRole"/> <set field="partyRole.partyId" from-field="parameters.partyId"/> <set field="partyRole.roleTypeId" from-field="parameters.roleTypeId"/> <create-value value-field="partyRole"/> </if-empty> <now-timestamp field="nowTimestamp"/> - <make-value entity-name="ProductRole" value-field="productRoleMap" /> + <make-value value-field="productRoleMap" entity-name="ProductRole" /> <set field="productRoleMap.productId" from-field="parameters.productId" /> <set field="productRoleMap.partyId" from-field="parameters.partyId"/> <set field="productRoleMap.roleTypeId" from-field="parameters.roleTypeId"/> Modified: ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml Tue Dec 6 12:37:42 2016 @@ -1141,7 +1141,7 @@ <now-timestamp field="workEffortPartyAssignment.thruDate" /> <store-value value-field="workEffortPartyAssignment" /> <!-- create a new one --> - <make-value entity-name="WorkEffortPartyAssignment" value-field="newAssign" /> + <make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment" /> <set field="newAssign.workEffortId" from-field="parameters.workEffortId" /> <set field="newAssign.partyId" from-field="parameters.newPartyId" /> <set field="newAssign.roleTypeId" from-field="parameters.newRoleTypeId" /> Modified: ofbiz/trunk/specialpurpose/scrum/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/servicedef/secas.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/servicedef/secas.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/servicedef/secas.xml Tue Dec 6 12:37:42 2016 @@ -21,51 +21,51 @@ under the License. <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd"> <eca service="updateWorkEffort" event="commit"> - <condition field-name="currentStatusId" operator="equals" value="STS_COMPLETED"/> + <condition operator="equals" field-name="currentStatusId" value="STS_COMPLETED"/> <set field-name="webSiteId" env-name="webSiteId"/> <action service="autoCompleteBacklog" mode="sync"/> </eca> <eca service="createWorkEffort" event="commit"> - <condition field-name="currentStatusId" operator="equals" value="SPRINT_ACTIVE"/> + <condition operator="equals" field-name="currentStatusId" value="SPRINT_ACTIVE"/> <set field-name="sprintId" env-name="workEffortId"/> <set field-name="sprintStatusId" env-name="currentStatusId"/> <set field-name="webSiteId" env-name="webSiteId"/> <action service="autoScrumNotification" mode="sync"/> </eca> <eca service="updateWorkEffort" event="commit"> - <condition field-name="currentStatusId" operator="equals" value="SPRINT_CLOSED"/> + <condition operator="equals" field-name="currentStatusId" value="SPRINT_CLOSED"/> <set field-name="sprintId" env-name="workEffortId"/> <set field-name="sprintStatusId" env-name="currentStatusId"/> <set field-name="webSiteId" env-name="webSiteId"/> <action service="autoScrumNotification" mode="sync"/> </eca> <eca service="createCustRequest" event="commit"> - <condition field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/> + <condition operator="equals" field-name="statusId" value="CRQ_ACCEPTED"/> <set field-name="custRequestStatusId" value="CRQ_ACCEPTED"/> <set field-name="webSiteId" env-name="webSiteId"/> <action service="autoScrumNotification" mode="sync"/> </eca> <eca service="setCustRequestStatus" event="commit"> <condition field-name="oldStatusId" operator="equals" value="CRQ_REVIEWED"/> - <condition field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/> + <condition operator="equals" field-name="statusId" value="CRQ_ACCEPTED"/> <set field-name="custRequestStatusId" value="CRQ_ACCEPTED"/> <set field-name="webSiteId" env-name="webSiteId"/> <action service="autoScrumNotification" mode="sync"/> </eca> <eca service="setCustRequestStatus" event="commit"> - <condition field-name="statusId" operator="equals" value="CRQ_REVIEWED"/> + <condition operator="equals" field-name="statusId" value="CRQ_REVIEWED"/> <set field-name="custRequestStatusId" value="CRQ_REVIEWED"/> <set field-name="webSiteId" env-name="webSiteId"/> <action service="autoScrumNotification" mode="sync"/> </eca> <eca service="setCustRequestStatus" event="commit"> - <condition field-name="statusId" operator="equals" value="CRQ_COMPLETED"/> + <condition operator="equals" field-name="statusId" value="CRQ_COMPLETED"/> <set field-name="custRequestStatusId" value="CRQ_COMPLETED"/> <set field-name="webSiteId" env-name="webSiteId"/> <action service="autoScrumNotification" mode="sync"/> </eca> <eca service="setCustRequestStatus" event="commit"> - <condition field-name="statusId" operator="equals" value="CRQ_CANCELLED"/> + <condition operator="equals" field-name="statusId" value="CRQ_CANCELLED"/> <set field-name="custRequestStatusId" value="CRQ_CANCELLED"/> <set field-name="webSiteId" env-name="webSiteId"/> <action service="autoScrumNotification" mode="sync"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |