svn commit: r1772880 [1/8] - in /ofbiz/trunk: applications/accounting/minila
Locked
svn commit: r1772880 [1/8] - in /ofbiz/trunk: applications/accounting/minila
 
|
Author: deepak
Date: Tue Dec 6 12:37:42 2016 New Revision: 1772880 URL: http://svn.apache.org/viewvc?rev=1772880&view=rev Log: Reverted: Minilang code readability and consistency improvements done at r#1768222, this commit reversed key and description of drop-down in the code. (OFBIZ-9114) Thanks Wei Zhang for reporting the issue. Modified: ofbiz/trunk/applications/accounting/minilang/UpgradeServices.xml ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml ofbiz/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml ofbiz/trunk/applications/accounting/servicedef/secas_invoice.xml ofbiz/trunk/applications/accounting/servicedef/secas_payment.xml ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/widget/AgreementForms.xml ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml ofbiz/trunk/applications/accounting/widget/GlForms.xml ofbiz/trunk/applications/accounting/widget/GlScreens.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml ofbiz/trunk/applications/content/minilang/compdoc/CompDocServices.xml ofbiz/trunk/applications/content/minilang/content/ContentEvents.xml ofbiz/trunk/applications/content/minilang/content/ContentServices.xml ofbiz/trunk/applications/content/minilang/layout/LayoutEvents.xml ofbiz/trunk/applications/content/minilang/survey/SurveyServices.xml ofbiz/trunk/applications/content/minilang/website/WebSiteServices.xml ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/trunk/applications/content/widget/cms/CMSForms.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml ofbiz/trunk/applications/content/widget/forum/BlogForms.xml ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleEvents.xml ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml ofbiz/trunk/applications/marketing/widget/ContactListForms.xml ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.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/minilang/shoppinglist/ShoppingListServices.xml ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml ofbiz/trunk/applications/party/minilang/contact/ContactMechServices.xml ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml ofbiz/trunk/applications/party/minilang/party/PartyServices.xml ofbiz/trunk/applications/party/minilang/party/PartySimpleEvents.xml ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml 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/ConfigServices.xml ofbiz/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml ofbiz/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.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/CustomerDigitalDownloadServices.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/storage/FacilityContactMechServices.xml ofbiz/trunk/applications/product/minilang/product/storage/StorageServices.xml ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.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/receipt/ShipmentReceiptServices.xml ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml ofbiz/trunk/applications/product/widget/catalog/PriceForms.xml ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml ofbiz/trunk/applications/product/widget/catalog/PromoForms.xml ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelForms.xml ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/framework/common/minilang/CommonServices.xml ofbiz/trunk/framework/common/minilang/PortalPageServices.xml ofbiz/trunk/framework/common/minilang/period/PeriodServices.xml ofbiz/trunk/framework/common/widget/SecurityForms.xml ofbiz/trunk/framework/webtools/widget/CacheForms.xml ofbiz/trunk/framework/webtools/widget/LogScreens.xml ofbiz/trunk/framework/webtools/widget/MiscForms.xml ofbiz/trunk/framework/webtools/widget/ServiceForms.xml ofbiz/trunk/specialpurpose/bi/minilang/DimensionServices.xml ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml ofbiz/trunk/specialpurpose/birt/widget/accounting/AccountingForms.xml ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml ofbiz/trunk/specialpurpose/ebaystore/servicedef/secas.xml ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml ofbiz/trunk/specialpurpose/scrum/minilang/ScrumServices.xml ofbiz/trunk/specialpurpose/scrum/servicedef/secas.xml ofbiz/trunk/specialpurpose/scrum/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml ofbiz/trunk/specialpurpose/scrum/widget/TaskForms.xml ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml ofbiz/trunk/specialpurpose/solr/entitydef/eecas.xml ofbiz/trunk/specialpurpose/webpos/minilang/ManagerEvents.xml Modified: ofbiz/trunk/applications/accounting/minilang/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/UpgradeServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/UpgradeServices.xml Tue Dec 6 12:37:42 2016 @@ -53,7 +53,7 @@ under the License. <simple-method method-name="migrateFixedAssetMaintMeter" short-description="Copy FixedAssetMaintMeter To FixedAssetMeter"> <entity-condition entity-name="FixedAssetMaintMeter" list="maintMeterList"/> <iterate list="maintMeterList" entry="maintMeter"> - <make-value entity-name="FixedAssetMeter" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="FixedAssetMeter"/> <set-pk-fields map="maintMeter" value-field="newEntity"/> <set-nonpk-fields map="maintMeter" value-field="newEntity"/> <set field="newEntity.readingDate" from-field="maintMeter.createdStamp"/> @@ -72,7 +72,7 @@ under the License. <simple-method method-name="migrateAgreementWorkEffortAppl" short-description="Copy AgreementWorkEffortAppl To AgreementWorkEffortApplic"> <entity-condition entity-name="OldAgreementWorkEffortAppl" list="agreementWorkEffortApplList"/> <iterate list="agreementWorkEffortApplList" entry="agreementWorkEffortAppl"> - <make-value entity-name="AgreementWorkEffortApplic" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="AgreementWorkEffortApplic"/> <set-pk-fields map="agreementWorkEffortAppl" value-field="newEntity"/> <create-value value-field="newEntity"/> <check-errors/> Modified: ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/admin/AcctgAdminServices.xml Tue Dec 6 12:37:42 2016 @@ -35,7 +35,7 @@ under the License. <!-- Does not check if the Party is actually a company because real people have to pay taxes too --> <!-- TODO: maybe check to make sure that all fields are not null --> - <make-value entity-name="PartyAcctgPreference" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="PartyAcctgPreference"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> Modified: ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/budget/BudgetServices.xml Tue Dec 6 12:37:42 2016 @@ -24,7 +24,7 @@ under the License. <!-- create a new Budget header record --> <simple-method method-name="createBudget" short-description="Create an Budget"> <!-- create new entity and create all the fields --> - <make-value entity-name="Budget" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="Budget"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <!-- create a non existing ID if not supplied --> Modified: ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/finaccount/FinAccountServices.xml Tue Dec 6 12:37:42 2016 @@ -35,7 +35,7 @@ under the License. <set field="parameters.statusId" value="FNACT_ACTIVE"/> </if-empty> - <make-value entity-name="FinAccount" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="FinAccount"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -211,7 +211,7 @@ under the License. </add-error> </if-compare> <check-errors/> - <make-value entity-name="FinAccountRole" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="FinAccountRole"/> <set-pk-fields value-field="newEntity" map="parameters"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -756,7 +756,7 @@ under the License. </if-compare> <iterate list="acctgTransEntries" entry="oldAcctgTransEntry"> <if-compare field="oldAcctgTransEntry.debitCreditFlag" operator="equals" value="D"> - <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/> + <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/> <set field="newAcctgTransEntry.glAccountId" from-field="oldAcctgTransEntry.glAccountId"/> <set field="organizationPartyId" from-field="oldAcctgTransEntry.organizationPartyId"/> <set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/> @@ -775,7 +775,7 @@ under the License. <clear-field field="createAcctgTransAndEntriesMap.acctgTransId"/> <set field="createAcctgTransAndEntriesMap.transactionDate" from-field="nowTimestamp"/> <set field="createAcctgTransAndEntriesMap.postedDate" from-field="nowTimestamp"/> - <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/> + <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/> <set field="newAcctgTransEntry.glAccountId" from-field="finAccount.postToGlAccountId"/> <set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/> <set field="newAcctgTransEntry.partyId" from-field="oldAcctgTransEntry.partyId"/> @@ -839,7 +839,7 @@ under the License. </if-compare> <iterate list="acctgTransEntries" entry="oldAcctgTransEntry"> <if-compare field="oldAcctgTransEntry.debitCreditFlag" operator="equals" value="C"> - <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/> + <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/> <set field="newAcctgTransEntry.glAccountId" from-field="oldAcctgTransEntry.glAccountId"/> <set field="organizationPartyId" from-field="oldAcctgTransEntry.organizationPartyId"/> <set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/> @@ -858,7 +858,7 @@ under the License. <clear-field field="createAcctgTransAndEntriesMap.acctgTransId"/> <set field="createAcctgTransAndEntriesMap.transactionDate" from-field="nowTimestamp"/> <set field="createAcctgTransAndEntriesMap.postedDate" from-field="nowTimestamp"/> - <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/> + <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/> <set field="newAcctgTransEntry.glAccountId" from-field="finAccount.postToGlAccountId"/> <set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/> <set field="newAcctgTransEntry.partyId" from-field="oldAcctgTransEntry.partyId"/> Modified: ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/invoice/InvoiceServices.xml Tue Dec 6 12:37:42 2016 @@ -145,7 +145,7 @@ under the License. <simple-method method-name="createInvoice" short-description="Create a new Invoice"> <now-timestamp field="nowTimestamp"/> - <make-value entity-name="Invoice" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="Invoice"/> <!-- call getNextInvoiceId service with the parameters.partyIdFrom when invoice Id is not suplied else use it from the input --> @@ -213,7 +213,7 @@ under the License. <simple-method method-name="getInvoice" short-description="Retrieve an invoice and the items"> <!-- find the invoice record --> - <make-value entity-name="Invoice" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="Invoice"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="Invoice" map="lookupPKMap" value-field="invoiceValue"/> <field-to-result field="invoiceValue" result-name="invoice"/> @@ -225,7 +225,7 @@ under the License. <simple-method method-name="updateInvoice" short-description="Update the header of an existing Invoice"> <call-simple-method method-name="InvoiceStatusInProgress"/> <!-- find the current record --> - <make-value entity-name="Invoice" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="Invoice"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="Invoice" map="lookupPKMap" value-field="lookedUpValue"/> @@ -272,7 +272,7 @@ under the License. <simple-method method-name="createInvoiceItem" short-description="Create a new Invoice Item"> <set field="invoiceId" from-field="parameters.invoiceId"/> <call-simple-method method-name="InvoiceStatusInProgress"/> - <make-value entity-name="InvoiceItem" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="InvoiceItem"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.invoiceItemSeqId"> @@ -306,7 +306,7 @@ under the License. <simple-method method-name="updateInvoiceItem" short-description="Update an existing Invoice Item"> <call-simple-method method-name="InvoiceStatusInProgress"/> - <make-value entity-name="InvoiceItem" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="InvoiceItem"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="InvoiceItem" map="lookupPKMap" value-field="lookedUpValue"/> @@ -450,7 +450,7 @@ under the License. <simple-method method-name="createInvoiceRole" short-description="Create a Invoice Role"> <call-simple-method method-name="InvoiceStatusInProgress"/> - <make-value entity-name="InvoiceRole" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="InvoiceRole"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.datetimePerformed"><now-timestamp field="newEntity.datetimePerformed"/></if-empty> @@ -556,7 +556,7 @@ under the License. <simple-method method-name="createInvoiceTerm" short-description="Create a Invoice Term"> <call-simple-method method-name="InvoiceStatusInProgress"/> - <make-value entity-name="InvoiceTerm" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="InvoiceTerm"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="InvoiceTerm" field="newEntity.invoiceTermId"/> @@ -942,7 +942,7 @@ under the License. <!-- InvoiceContent --> <simple-method method-name="createInvoiceContent" short-description="Create Content For Invoice"> - <make-value entity-name="InvoiceContent" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="InvoiceContent"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -961,7 +961,7 @@ under the License. <field-to-result field="newEntity.invoiceContentTypeId" result-name="invoiceContentTypeId"/> </simple-method> <simple-method method-name="updateInvoiceContent" short-description="Update Content For Invoice"> - <make-value entity-name="InvoiceContent" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="InvoiceContent"/> <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"/> Modified: ofbiz/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/payment/PaymentMethodServices.xml Tue Dec 6 12:37:42 2016 @@ -22,7 +22,7 @@ under the License. xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="setPaymentMethodAddress" short-description="Set the initial payment method address"> - <make-value entity-name="PaymentMethod" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="PaymentMethod"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="PaymentMethod" map="lookupPKMap" value-field="lookedUpValue"/> <if-compare field="lookedUpValue.paymentMethodTypeId" operator="equals" value="CREDIT_CARD"> @@ -82,7 +82,7 @@ under the License. </simple-method> <simple-method method-name="createPayPalPaymentMethod" short-description="Create a PayPal Payment Method"> - <make-value entity-name="PaymentMethod" value-field="newPaymentMethod"/> + <make-value value-field="newPaymentMethod" entity-name="PaymentMethod"/> <set-pk-fields value-field="newPaymentMethod" map="parameters"/> <if-empty field="newPaymentMethod.paymentMethodId"> <sequenced-id sequence-name="PaymentMethod" field="newPaymentMethod.paymentMethodId"/> @@ -91,7 +91,7 @@ under the License. <set field="newPaymentMethod.paymentMethodTypeId" value="EXT_PAYPAL"/> <create-value value-field="newPaymentMethod"/> - <make-value entity-name="PayPalPaymentMethod" value-field="newPayPalPaymentMethod"/> + <make-value value-field="newPayPalPaymentMethod" entity-name="PayPalPaymentMethod"/> <set field="newPayPalPaymentMethod.paymentMethodId" from-field="newPaymentMethod.paymentMethodId"/> <set-nonpk-fields map="parameters" value-field="newPayPalPaymentMethod"/> <create-value value-field="newPayPalPaymentMethod"/> Modified: ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/payment/PaymentServices.xml Tue Dec 6 12:37:42 2016 @@ -988,7 +988,7 @@ under the License. <set field="convertUomInMap.originalValue" from-field="orderHeader.grandTotal" /> <set field="convertUomInMap.uomId" from-field="orderHeader.currencyUom" /> <set field="convertUomInMap.uomIdTo" from-field="partyAcctgPreference.baseCurrencyUomId" /> - <log level="info" message="convertUomInMap = ${convertUomInMap}" /> + <log message="convertUomInMap = ${convertUomInMap}" level="info" /> <call-service service-name="convertUom" in-map-name="convertUomInMap"> <result-to-field result-name="convertedValue" field="parameters.amount" /> </call-service> @@ -1161,7 +1161,7 @@ under the License. <!-- PaymentContent --> <simple-method method-name="createPaymentContent" short-description="Create Content For Payment"> - <make-value entity-name="PaymentContent" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="PaymentContent"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -1180,7 +1180,7 @@ under the License. <field-to-result field="newEntity.paymentContentTypeId" result-name="paymentContentTypeId"/> </simple-method> <simple-method method-name="updatePaymentContent" short-description="Update Content For Payment"> - <make-value entity-name="PaymentContent" value-field="lookupPKMap"/> + <make-value value-field="lookupPKMap" entity-name="PaymentContent"/> <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"/> Modified: ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml (original) +++ ofbiz/trunk/applications/accounting/minilang/rate/RateServices.xml Tue Dec 6 12:37:42 2016 @@ -346,7 +346,7 @@ under the License. <store-value value-field="partyRate"/> </if-not-empty> - <make-value entity-name="PartyRate" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="PartyRate"/> <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"/> Modified: ofbiz/trunk/applications/accounting/servicedef/secas_invoice.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/secas_invoice.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/secas_invoice.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/secas_invoice.xml Tue Dec 6 12:37:42 2016 @@ -37,13 +37,13 @@ under the License. </eca> <eca service="setInvoiceStatus" event="commit"> - <condition field-name="statusId" operator="equals" value="INVOICE_APPROVED"/> - <condition field-name="oldStatusId" operator="not-equals" value="INVOICE_APPROVED"/> + <condition operator="equals" field-name="statusId" value="INVOICE_APPROVED"/> + <condition operator="not-equals" field-name="oldStatusId" value="INVOICE_APPROVED"/> <action service="createMatchingPaymentApplication" mode="sync"/> </eca> <eca service="setInvoiceStatus" event="return"> - <condition field-name="statusId" operator="equals" value="INVOICE_READY"/> - <condition field-name="oldStatusId" operator="equals" value="INVOICE_IN_PROCESS"/> + <condition operator="equals" field-name="statusId" value="INVOICE_READY"/> + <condition operator="equals" field-name="oldStatusId" value="INVOICE_IN_PROCESS"/> <action service="createMatchingPaymentApplication" mode="sync"/> </eca> Modified: ofbiz/trunk/applications/accounting/servicedef/secas_payment.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/secas_payment.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/secas_payment.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/secas_payment.xml Tue Dec 6 12:37:42 2016 @@ -69,14 +69,14 @@ under the License. </eca> <eca service="setPaymentStatus" event="commit"> - <condition field-name="statusId" operator="equals" value="PMNT_RECEIVED"/> - <condition field-name="oldStatusId" operator="not-equals" value="PMNT_RECEIVED"/> + <condition operator="equals" field-name="statusId" value="PMNT_RECEIVED"/> + <condition operator="not-equals" field-name="oldStatusId" value="PMNT_RECEIVED"/> <action service="createMatchingPaymentApplication" mode="sync"/> </eca> <eca service="setPaymentStatus" event="commit"> - <condition field-name="statusId" operator="equals" value="PMNT_SENT"/> - <condition field-name="oldStatusId" operator="not-equals" value="PMNT_SENT"/> + <condition operator="equals" field-name="statusId" value="PMNT_SENT"/> + <condition operator="not-equals" field-name="oldStatusId" value="PMNT_SENT"/> <action service="createMatchingPaymentApplication" mode="sync"/> </eca> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Dec 6 12:37:42 2016 @@ -771,7 +771,7 @@ under the License. </request-map> <request-map uri="ImportInvoice"> <security auth="true" https="true"/> - <event type="service" invoke="importInvoice" path=""/> + <event invoke="importInvoice" path="" type="service"/> <response name="success" type="request" value="ImportExport"/> <response name="error" type="view" value="ImportExport"/> </request-map> Modified: ofbiz/trunk/applications/accounting/widget/AgreementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AgreementForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AgreementForms.xml Tue Dec 6 12:37:42 2016 @@ -287,7 +287,7 @@ under the License. <field name="agreementId"><hidden value="${agreement.agreementId}"/></field> <field name="agreementItemSeqId"> <drop-down allow-empty="false"> - <option key=" " description="_NA_"/> + <option key="_NA_" description=" "/> <entity-options entity-name="AgreementItem" description="${agreementItemSeqId}"> <entity-constraint name="agreementId" env-name="agreement.agreementId"/> <entity-order-by field-name="agreementItemSeqId"/> @@ -661,7 +661,7 @@ under the License. <field name="agreementId"><hidden value="${agreementId}"/></field> <field name="agreementItemSeqId"> <drop-down allow-empty="false"> - <option key="${uiLabelMap.CommonNA}" description="_NA_"/> + <option key="_NA_" description="${uiLabelMap.CommonNA}"/> <entity-options entity-name="AgreementItem" description="${agreementItemSeqId}"> <entity-constraint name="agreementId" operator="equals" env-name="agreementId"/> <entity-order-by field-name="agreementItemSeqId"/> Modified: ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml Tue Dec 6 12:37:42 2016 @@ -359,8 +359,8 @@ under the License. <field name="thruDate"><date-time/></field> <field name="isClosed"> <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> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Tue Dec 6 12:37:42 2016 @@ -131,7 +131,7 @@ under the License. </drop-down> </field> <field name="isRefundable"> - <drop-down no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="fromDate"><date-time default-value="${nowTimestamp}"/></field> <field name="submitButton" use-when="finAccountId==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -335,7 +335,7 @@ under the License. </field> <field name="glReconciliationId" position="2"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonNotAssigned}" description="_NA_"/> + <option key="_NA_" description="${uiLabelMap.CommonNotAssigned}"/> <list-options list-name="glReconciliations" key-name="glReconciliationId" description="${glReconciliationName}[[${glReconciliationId}] [${reconciledDate}] [${reconciledBalance}]]"/> </drop-down> Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Tue Dec 6 12:37:42 2016 @@ -51,8 +51,8 @@ under the License. </field> <field name="isPosted" position="1"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonNo}" description="N"/> - <option key="${uiLabelMap.CommonYes}" description="Y"/> + <option description="${uiLabelMap.CommonNo}" key="N"/> + <option description="${uiLabelMap.CommonYes}" key="Y"/> </drop-down> </field> <field name="invoiceId" position="2"><lookup target-form-name="LookupInvoice" size="20" maxlength="20"/></field> @@ -228,8 +228,8 @@ under the License. </field> <field name="isPosted"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonNo}" description="N"/> - <option key="${uiLabelMap.CommonYes}" description="Y"/> + <option description="${uiLabelMap.CommonNo}" key="N"/> + <option description="${uiLabelMap.CommonYes}" key="Y"/> </drop-down> </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> @@ -245,8 +245,8 @@ under the License. <field name="performSearch"><hidden value="Y"/></field> <field name="reportType"> <drop-down allow-empty="false"> - <option key="${uiLabelMap.AccountingByAccount}" description="byAccount"/> - <option key="${uiLabelMap.AccountingByDate}" description="byDate"/> + <option description="${uiLabelMap.AccountingByAccount}" key="byAccount"/> + <option description="${uiLabelMap.AccountingByDate}" key="byDate"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> @@ -587,8 +587,8 @@ under the License. </field> <field name="debitCreditFlag" position="1" entry-name="resetFieldValue"> <drop-down current="selected"> - <option key="${uiLabelMap.FormFieldTitle_credit}" description="C"/> - <option key="${uiLabelMap.FormFieldTitle_debit}" description="D"/> + <option description="${uiLabelMap.FormFieldTitle_credit}" key="C"/> + <option description="${uiLabelMap.FormFieldTitle_debit}" key="D"/> </drop-down> </field> <field name="partyId" position="2"><text size="30"/></field> @@ -673,8 +673,8 @@ under the License. <field name="isSummary"><display/></field> <field name="debitCreditFlag"> <drop-down current="selected"> - <option key="${uiLabelMap.FormFieldTitle_credit}" description="C"/> - <option key="${uiLabelMap.FormFieldTitle_debit}" description="D"/> + <option description="${uiLabelMap.FormFieldTitle_credit}" key="C"/> + <option description="${uiLabelMap.FormFieldTitle_debit}" key="D"/> </drop-down> </field> <field name="origAmount"><display type="currency" currency="${origCurrencyUomId}"/></field> @@ -737,8 +737,8 @@ under the License. <field name="scheduledPostingDate" position="2"></field> <field name="isPosted" position="1"> <drop-down allow-empty="true"> - <option key="${uiLabelMap.CommonNo}" description="N"/> - <option key="${uiLabelMap.CommonYes}" description="Y"/> + <option description="${uiLabelMap.CommonNo}" key="N"/> + <option description="${uiLabelMap.CommonYes}" key="Y"/> </drop-down> </field> <field name="postedDate" position="2"><date-time/></field> Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Tue Dec 6 12:37:42 2016 @@ -57,7 +57,7 @@ under the License. <section> <widgets> <screenlet title="${uiLabelMap.AccountingPartyAccountsSummary}"> - <include-menu name="PartyGlShortCuts" location="component://accounting/widget/AccountingMenus.xml"/> + <include-menu location="component://accounting/widget/AccountingMenus.xml" name="PartyGlShortCuts"/> </screenlet> </widgets> </section> @@ -311,7 +311,7 @@ under the License. <not><if-empty field="acctgTransId"/></not> </condition> <widgets> - <include-menu name="EditGlAcctgTransSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/> + <include-menu location="component://accounting/widget/AccountingMenus.xml" name="EditGlAcctgTransSubTabBar"/> <section> <condition> <if-compare field="acctgTrans.isPosted" operator="equals" value="Y"/> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Tue Dec 6 12:37:42 2016 @@ -163,18 +163,18 @@ under the License. <field name="fiscalYearStartMonth" use-when="partyAcctgPreference==null" tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('fiscalYearStartMonth')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <drop-down> - <option key="${uiLabelMap.AccountingFiscalMonth01}" description="1"/> - <option key="${uiLabelMap.AccountingFiscalMonth02}" description="2"/> - <option key="${uiLabelMap.AccountingFiscalMonth03}" description="3"/> - <option key="${uiLabelMap.AccountingFiscalMonth04}" description="4"/> - <option key="${uiLabelMap.AccountingFiscalMonth05}" description="5"/> - <option key="${uiLabelMap.AccountingFiscalMonth06}" description="6"/> - <option key="${uiLabelMap.AccountingFiscalMonth07}" description="7"/> - <option key="${uiLabelMap.AccountingFiscalMonth08}" description="8"/> - <option key="${uiLabelMap.AccountingFiscalMonth09}" description="9"/> - <option key="${uiLabelMap.AccountingFiscalMonth10}" description="10"/> - <option key="${uiLabelMap.AccountingFiscalMonth11}" description="11"/> - <option key="${uiLabelMap.AccountingFiscalMonth12}" description="12"/> + <option key="1" description="${uiLabelMap.AccountingFiscalMonth01}"/> + <option key="2" description="${uiLabelMap.AccountingFiscalMonth02}"/> + <option key="3" description="${uiLabelMap.AccountingFiscalMonth03}"/> + <option key="4" description="${uiLabelMap.AccountingFiscalMonth04}"/> + <option key="5" description="${uiLabelMap.AccountingFiscalMonth05}"/> + <option key="6" description="${uiLabelMap.AccountingFiscalMonth06}"/> + <option key="7" description="${uiLabelMap.AccountingFiscalMonth07}"/> + <option key="8" description="${uiLabelMap.AccountingFiscalMonth08}"/> + <option key="9" description="${uiLabelMap.AccountingFiscalMonth09}"/> + <option key="10" description="${uiLabelMap.AccountingFiscalMonth10}"/> + <option key="11" description="${uiLabelMap.AccountingFiscalMonth11}"/> + <option key="12" description="${uiLabelMap.AccountingFiscalMonth12}"/> </drop-down> </field> <field name="fiscalYearStartDay" use-when="partyAcctgPreference==null" @@ -237,7 +237,7 @@ under the License. tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('useInvoiceIdForReturns')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <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> <field name="quoteIdPrefix" use-when="partyAcctgPreference==null" @@ -716,8 +716,8 @@ under the License. <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="isClosed"> <drop-down> - <option key="${uiLabelMap.CommonNo}" description="N"/> - <option key="${uiLabelMap.CommonYes}" description="Y"/> + <option description="${uiLabelMap.CommonNo}" key="N"/> + <option description="${uiLabelMap.CommonYes}" key="Y"/> </drop-down> </field> <field name="parentPeriodId"> @@ -1193,7 +1193,7 @@ under the License. <auto-fields-service service-name="createFixedAssetTypeGlAccount" default-field-type="edit"/> <field name="fixedAssetId"> <drop-down allow-empty="false"> - <option key="${uiLabelMap.CommonAll}" description="_NA_"/> + <option key="_NA_" description="${uiLabelMap.CommonAll}"/> <entity-options entity-name="FixedAsset" description="${fixedAssetId} - ${fixedAssetName}"> <entity-constraint name="partyId" operator="equals" env-name="organizationPartyId"/> <entity-order-by field-name="fixedAssetId"/> @@ -1202,7 +1202,7 @@ under the License. </field> <field name="fixedAssetTypeId"> <drop-down allow-empty="false"> - <option key="${uiLabelMap.CommonAll}" description="_NA_"/> + <option key="_NA_" description="${uiLabelMap.CommonAll}"/> <entity-options entity-name="FixedAssetType"> <entity-order-by field-name="description"/> </entity-options> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Tue Dec 6 12:37:42 2016 @@ -68,7 +68,7 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.AccountingAvailableInternalOrganizations}" navigation-menu-name="NewAccountOrganization"> - <include-menu name="NewAccountOrganization" location="component://accounting/widget/AccountingMenus.xml"/> + <include-menu location="component://accounting/widget/AccountingMenus.xml" name="NewAccountOrganization"/> <include-form name="ListCompanies" location="component://accounting/widget/GlSetupForms.xml"/> </screenlet> </decorator-section> Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Tue Dec 6 12:37:42 2016 @@ -131,7 +131,7 @@ under the License. <field name="currencyUomId"><hidden value="${defaultOrganizationPartyCurrencyUomId}"/></field> <field position="1" name="organizationPartyId" parameter-name="partyIdFrom" event="onchange" action="javascript:(document.NewPaymentOut.action = 'newPayment'),(document.NewPaymentOut.submit())"> <drop-down allow-empty="false" no-current-selected-key="${defaultOrganizationPartyId}"> - <option key="${partyGroupName}" description="${parameters.partyIdFrom}"/> + <option key="${parameters.partyIdFrom}" description="${partyGroupName}"/> <entity-options description="${groupName}" entity-name="PartyAcctgPrefAndGroup" key-field-name="partyId"> <entity-order-by field-name="groupName"/> </entity-options> Modified: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml Tue Dec 6 12:37:42 2016 @@ -82,8 +82,8 @@ under the License. </field> <field name="sagePayMode" title="${uiLabelMap.AccountingSagePayMode}"> <drop-down> - <option key="${uiLabelMap.AccountingSagePayTest}" description="TEST"/> - <option key="${uiLabelMap.AccountingSagePayProduction}" description="PRODUCTION"/> + <option key="TEST" description="${uiLabelMap.AccountingSagePayTest}"/> + <option key="PRODUCTION" description="${uiLabelMap.AccountingSagePayProduction}"/> </drop-down> </field> <field name="protocolVersion" title="${uiLabelMap.AccountingSagePayProtocolVersion}"> @@ -91,9 +91,9 @@ under the License. </field> <field name="authenticationTransType" title="${uiLabelMap.AccountingSagePayAuthenticationTransType}"> <drop-down> - <option key="${uiLabelMap.CommonPayment}" description="PAYMENT"/> - <option key="${uiLabelMap.CommonAuthenticate}" description="AUTHENTICATE"/> - <option key="${uiLabelMap.CommonDeferred}" description="DEFERRED"/> + <option key="PAYMENT" description="${uiLabelMap.CommonPayment}"/> + <option key="AUTHENTICATE" description="${uiLabelMap.CommonAuthenticate}"/> + <option key="DEFERRED" description="${uiLabelMap.CommonDeferred}"/> </drop-down> </field> <field name="authenticationUrl" title="${uiLabelMap.AccountingSagePayAuthenticationUrl}"> @@ -101,8 +101,8 @@ under the License. </field> <field name="authoriseTransType" title="${uiLabelMap.AccountingSagePayAuthorisationTransType}"> <drop-down> - <option key="${uiLabelMap.CommonAuthorise}" description="AUTHORISE"/> - <option key="${uiLabelMap.CommonRelease}" description="RELEASE"/> + <option key="AUTHORISE" description="${uiLabelMap.CommonAuthorise}"/> + <option key="RELEASE" description="${uiLabelMap.CommonRelease}"/> </drop-down> </field> <field name="authoriseUrl" title="${uiLabelMap.AccountingSagePayAuthorisationUrl}"> @@ -110,8 +110,8 @@ under the License. </field> <field name="releaseTransType" title="${uiLabelMap.AccountingSagePayReleaseTransType}"> <drop-down> - <option key="${uiLabelMap.CommonCancel}" description="CANCEL"/> - <option key="${uiLabelMap.CommonAbort}" description="ABORT"/> + <option key="CANCEL" description="${uiLabelMap.CommonCancel}"/> + <option key="ABORT" description="${uiLabelMap.CommonAbort}"/> </drop-down> </field> <field name="releaseUrl" title="${uiLabelMap.AccountingSagePayReleaseUrl}"> @@ -139,8 +139,8 @@ under the License. </field> <field name="delimitedData" title="${uiLabelMap.AccountingAuthorizeNetDelimitedData}"> <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="delimiterChar" title="${uiLabelMap.AccountingAuthorizeNetDelimiterChar}"> @@ -148,31 +148,31 @@ under the License. </field> <field name="method" title="${uiLabelMap.AccountingAuthorizeNetMethod}"> <drop-down> - <option key="${uiLabelMap.AccountingAuthorizeNetMethodCC}" description="CC"/> + <option key="CC" description="${uiLabelMap.AccountingAuthorizeNetMethodCC}"/> </drop-down> </field> <field name="emailCustomer" title="${uiLabelMap.AccountingAuthorizeNetEmailCustomer}"> <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="emailMerchant" title="${uiLabelMap.AccountingAuthorizeNetEmailMerchant}"> <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="testMode" title="${uiLabelMap.AccountingAuthorizeNetTestMode}"> <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="relayResponse" title="${uiLabelMap.AccountingAuthorizeNetRelayResponse}"> <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="cpVersion" title="${uiLabelMap.AccountingAuthorizeNetCpVersion}"> @@ -200,16 +200,16 @@ under the License. </field> <field name="production" title="${uiLabelMap.AccountingCyberSourceProduction}"> <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="keysDir" title="${uiLabelMap.AccountingCyberSourceKeysDir}"><text size="80" maxlength="80"/></field> <field name="keysFile" title="${uiLabelMap.AccountingCyberSourceKeysFile}"><text size="80" maxlength="80"/></field> <field name="logEnabled" title="${uiLabelMap.AccountingCyberSourceLogEnable}"> <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="logDir" title="${uiLabelMap.AccountingCyberSourceLogDir}"><text size="80" maxlength="80"/></field> @@ -219,32 +219,32 @@ under the License. <field name="merchantContact" title="${uiLabelMap.AccountingCyberSourceMerchantContact}"><text size="80" maxlength="80"/></field> <field name="autoBill" title="${uiLabelMap.AccountingCyberSourceAutoBill}"> <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="ignoreAvs" title="${uiLabelMap.AccountingCyberSourceIgnoreAvs}"> <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="enableDav" title="${uiLabelMap.AccountingCyberSourceEnableDav}"> <drop-down> - <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="fraudScore" title="${uiLabelMap.AccountingCyberSourceFraudScore}"> <drop-down> - <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="disableBillAvs" title="${uiLabelMap.AccountingCyberSourceDisableBillAvs}"> <drop-down> - <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="avsDeclineCodes" title="${uiLabelMap.AccountingCyberSourceAvsDeclineCodes}"><text size="20" maxlength="20"/></field> @@ -259,43 +259,43 @@ under the License. <field name="paymentGatewayConfigId"><hidden/></field> <field name="checkAvs"> <drop-down> - <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="checkCvv2"> <drop-down> - <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="preAuth"> <drop-down> - <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="enableTransmit"> <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="loggingLevel"> <drop-down> - <option key="${uiLabelMap.AccountingPayflowProLoggingOff}" description="6"/> - <option key="${uiLabelMap.AccountingPayflowProLoggingSeverityFatal}" description="5"/> - <option key="${uiLabelMap.AccountingPayflowProLoggingSeverityError}" description="4"/> - <option key="${uiLabelMap.AccountingPayflowProLoggingSeverityWarn}" description="3"/> - <option key="${uiLabelMap.AccountingPayflowProLoggingSeverityInfo}" description="2"/> - <option key="${uiLabelMap.AccountingPayflowProLoggingSeverityDebug}" description="1"/> + <option key="6" description="${uiLabelMap.AccountingPayflowProLoggingOff}"/> + <option key="5" description="${uiLabelMap.AccountingPayflowProLoggingSeverityFatal}"/> + <option key="4" description="${uiLabelMap.AccountingPayflowProLoggingSeverityError}"/> + <option key="3" description="${uiLabelMap.AccountingPayflowProLoggingSeverityWarn}"/> + <option key="2" description="${uiLabelMap.AccountingPayflowProLoggingSeverityInfo}"/> + <option key="1" description="${uiLabelMap.AccountingPayflowProLoggingSeverityDebug}"/> </drop-down> </field> <field name="maxLogFileSize"><text size="20" maxlength="20"/></field> <field name="stackTraceOn"> <drop-down> - <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.CommonUpdate}" widget-style="smallSubmit"> @@ -308,16 +308,16 @@ under the License. <field name="paymentGatewayConfigId"><hidden/></field> <field name="enableCVM"> <drop-down> - <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="processMode"> <drop-down> - <option key="${uiLabelMap.AccountingPaymentGatewayApprove}" description="Y"/> - <option key="${uiLabelMap.AccountingPaymentGatewayDecline}" description="N"/> - <option key="${uiLabelMap.AccountingPaymentGatewayRandom}" description="R"/> - <option key="${uiLabelMap.AccountingPaymentGatewayProduction}" description="P"/> + <option key="Y" description="${uiLabelMap.AccountingPaymentGatewayApprove}"/> + <option key="N" description="${uiLabelMap.AccountingPaymentGatewayDecline}"/> + <option key="R" description="${uiLabelMap.AccountingPaymentGatewayRandom}"/> + <option key="P" description="${uiLabelMap.AccountingPaymentGatewayProduction}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -330,20 +330,20 @@ under the License. <field name="paymentGatewayConfigId"><hidden/></field> <field name="testMode"> <drop-down> - <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="enableBeagle"> <drop-down> - <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="enableCvn"> <drop-down> - <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.CommonUpdate}" widget-style="smallSubmit"> @@ -358,26 +358,26 @@ under the License. <field name="instId" title="${uiLabelMap.AccountingWorldPayInstId}"><text size="10" maxlength="10"/></field> <field name="authMode" title="${uiLabelMap.AccountingWorldPayAuthMode}"> <drop-down> - <option key="${uiLabelMap.AccountingWorldPayFullAuth}" description="A"/> - <option key="${uiLabelMap.AccountingWorldPayPreAuth}" description="E"/> + <option key="A" description="${uiLabelMap.AccountingWorldPayFullAuth}"/> + <option key="E" description="${uiLabelMap.AccountingWorldPayPreAuth}"/> </drop-down> </field> <field name="fixContact" title="${uiLabelMap.AccountingWorldPayFixContact}"> <drop-down> - <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="hideContact" title="${uiLabelMap.AccountingWorldPayHideContact}"> <drop-down> - <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="hideCurrency" title="${uiLabelMap.AccountingWorldPayHideCurrency}"> <drop-down> - <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="langId" title="${uiLabelMap.AccountingWorldPayLangId}"> @@ -385,21 +385,21 @@ under the License. </field> <field name="noLanguageMenu" title="${uiLabelMap.AccountingWorldPayNoLanguageMenu}"> <drop-down> - <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="withDelivery" title="${uiLabelMap.AccountingWorldPayWithDelivery}"> <drop-down> - <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="testMode" title="${uiLabelMap.AccountingWorldPayTestMode}"> <drop-down> - <option key="${uiLabelMap.AccountingWorldPayApprove}" description="100"/> - <option key="${uiLabelMap.AccountingWorldPayCancelled}" description="101"/> - <option key="${uiLabelMap.AccountingWorldPayLive}" description="0"/> + <option key="100" description="${uiLabelMap.AccountingWorldPayApprove}"/> + <option key="101" description="${uiLabelMap.AccountingWorldPayCancelled}"/> + <option key="0" description="${uiLabelMap.AccountingWorldPayLive}"/> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"> @@ -447,8 +447,8 @@ under the License. </field> <field name="hasTable"> <drop-down> - <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.CommonUpdate}" widget-style="smallSubmit"> Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Tue Dec 6 12:37:42 2016 @@ -24,18 +24,18 @@ under the License. <form name="BaseSummaryOptions" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="month" title="${uiLabelMap.CommonMonth}" required-field="true"> <drop-down allow-empty="false"> - <option key="${uiLabelMap.CommonJanuary}" description="01"/> - <option key="${uiLabelMap.CommonFebruary}" description="02"/> - <option key="${uiLabelMap.CommonMarch}" description="03"/> - <option key="${uiLabelMap.CommonApril}" description="04"/> - <option key="${uiLabelMap.CommonMay}" description="05"/> - <option key="${uiLabelMap.CommonJune}" description="06"/> - <option key="${uiLabelMap.CommonJuly}" description="07"/> - <option key="${uiLabelMap.CommonAugust}" description="08"/> - <option key="${uiLabelMap.CommonSeptember}" description="09"/> - <option key="${uiLabelMap.CommonOctober}" description="10"/> - <option key="${uiLabelMap.CommonNovember}" description="11"/> - <option key="${uiLabelMap.CommonDecember}" description="12"/> + <option key="01" description="${uiLabelMap.CommonJanuary}"/> + <option key="02" description="${uiLabelMap.CommonFebruary}"/> + <option key="03" description="${uiLabelMap.CommonMarch}"/> + <option key="04" description="${uiLabelMap.CommonApril}"/> + <option key="05" description="${uiLabelMap.CommonMay}"/> + <option key="06" description="${uiLabelMap.CommonJune}"/> + <option key="07" description="${uiLabelMap.CommonJuly}"/> + <option key="08" description="${uiLabelMap.CommonAugust}"/> + <option key="09" description="${uiLabelMap.CommonSeptember}"/> + <option key="10" description="${uiLabelMap.CommonOctober}"/> + <option key="11" description="${uiLabelMap.CommonNovember}"/> + <option key="12" description="${uiLabelMap.CommonDecember}"/> </drop-down> </field> <field name="year" title="${uiLabelMap.CommonYear}" required-field="true"><text size="4"/></field> @@ -503,9 +503,9 @@ under the License. </field> <field name="isPosted"> <drop-down> - <option key="${uiLabelMap.CommonYes}" description="Y"/> - <option key="${uiLabelMap.CommonNo}" description="N"/> - <option key="${uiLabelMap.CommonAll}" description="ALL"/> + <option description="${uiLabelMap.CommonYes}" key="Y"/> + <option description="${uiLabelMap.CommonNo}" key="N"/> + <option description="${uiLabelMap.CommonAll}" key="ALL"/> </drop-down> </field> <field name="submitButton" widget-style="buttontext" action=""><submit button-type="text-link"/></field> Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Tue Dec 6 12:37:42 2016 @@ -61,10 +61,10 @@ under the License. <field use-when="taxAuthority==null&&taxAuthGeoId!=null" name="taxAuthGeoId" title="${uiLabelMap.CommonGeo}" tooltip="${uiLabelMap.CommonCannotBeFound}:[${taxAuthGeoId}]"><lookup target-form-name="LookupGeo"/></field> <field name="requireTaxIdForExemption" widget-style="smallSelect"> - <drop-down no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="includeTaxInPrice" widget-style="smallSelect"> - <drop-down no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="taxIdFormatPattern" tooltip="${uiLabelMap.AccountingValidationPattern}"></field> @@ -307,7 +307,7 @@ under the License. </drop-down> </field> <field name="taxShipping"> - <drop-down allow-empty="false" no-current-selected-key="Y"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -324,10 +324,10 @@ under the License. <field name="partyTaxId"><text-find/></field> <field name="isExempt" widget-style="smallSelect"> - <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="isNexus" widget-style="smallSelect"> - <drop-down allow-empty="true"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down> + <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> @@ -400,7 +400,7 @@ under the License. <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> <field name="partyTaxId"><text/></field> <field name="isExempt" widget-style="smallSelect"><drop-down no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> - <field name="isNexus" widget-style="smallSelect"><drop-down no-current-selected-key="N"><option key="${uiLabelMap.CommonY}" description="Y"/><option key="${uiLabelMap.CommonN}" description="N"/></drop-down></field> + <field name="isNexus" widget-style="smallSelect"><drop-down no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> <field use-when="partyTaxAuthInfo!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field use-when="partyTaxAuthInfo==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Tue Dec 6 12:37:42 2016 @@ -151,7 +151,7 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="pre-body"> - <include-menu name="ApInvoiceTabBar" location="component://accounting/widget/ap/ApMenus.xml"/> + <include-menu location="component://accounting/widget/ap/ApMenus.xml" name="ApInvoiceTabBar"/> </decorator-section> <decorator-section name="body"> <decorator-section-include name="body"/> Modified: ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml (original) +++ ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml Tue Dec 6 12:37:42 2016 @@ -257,12 +257,12 @@ <!-- Create partyId for UserLogin --> <session-to-field field="userLoginCtx" session-name="userLogin"/> <if-empty field="userLoginCtx.partyId"> - <make-value entity-name="Party" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="Party"/> <set field="newEntity.partyId" from-field="userLoginCtx.userLoginId"/> <set field="newEntity.partyTypeId" value="PERSON"/> <create-value value-field="newEntity"/> <clear-field field="newEntity"/> - <make-value entity-name="Person" value-field="newPerson"/> + <make-value value-field="newPerson" entity-name="Person"/> <set field="newPerson.partyId" from-field="userLoginCtx.userLoginId"/> <create-value value-field="newPerson"/> <clear-field field="newPerson"/> @@ -345,7 +345,7 @@ </if-empty> <check-errors/> - <make-value entity-name="Facility" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="Facility"/> <set field="defaultDaysToShip" from-field="parameters.defaultDaysToShip" type="Long"/> <clear-field field="parameters.defaultDaysToShip"/> @@ -426,7 +426,7 @@ <!-- create the ProductStoreFacility record --> <now-timestamp field="nowTimestamp"/> <if-not-empty field="newEntity.inventoryFacilityId"> - <make-value entity-name="ProductStoreFacility" value-field="storeFacility"/> + <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/> <set from-field="newEntity.inventoryFacilityId" field="storeFacility.facilityId"/> <set from-field="newEntity.productStoreId" field="storeFacility.productStoreId"/> <set from-field="nowTimestamp" field="storeFacility.fromDate"/> @@ -505,7 +505,7 @@ <result-to-request result-name="productCategoryId" request-name="productCategoryId"/> </call-service> - <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/> + <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/> <set field="newEntity.parentProductCategoryId" from-field="parameters.primaryParentCategoryId"/> <set field="newEntity.productCategoryId" from-field="productCategoryId"/> <set field="newEntity.sequenceNum" value="1" type="Long"/> Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml?rev=1772880&r1=1772879&r2=1772880&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml (original) +++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml Tue Dec 6 12:37:42 2016 @@ -77,7 +77,7 @@ </and> </condition> <widgets> - <include-menu name="SetupSubTabBar" location="component://commonext/widget/ofbizsetup/Menus.xml"/> + <include-menu location="component://commonext/widget/ofbizsetup/Menus.xml" name="SetupSubTabBar"/> </widgets> </section> <section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |