svn commit: r1761077 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: mbrohl
Date: Fri Sep 16 20:27:26 2016 New Revision: 1761077 URL: http://svn.apache.org/viewvc?rev=1761077&view=rev Log: Improved: Accounting: Consistent form name. (OFBIZ-8045) Change all form names to upper camel case for consistency. Thanks: Tanmay Muley for reporting and providing the patch. Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml ofbiz/trunk/applications/accounting/widget/BudgetForms.xml ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml ofbiz/trunk/applications/accounting/widget/LookupScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml ofbiz/trunk/applications/accounting/widget/ap/LookupScreens.xml ofbiz/trunk/applications/accounting/widget/ar/LookupScreens.xml Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Fri Sep 16 20:27:26 2016 @@ -221,7 +221,7 @@ under the License. <decorator-screen name="CommonBillingAccountDecorator" location="${parameters.billingAccountDecoratorLocation}"> <decorator-section name="body"> <screenlet id="BillingAccountInvoicePanel" title="${uiLabelMap.AccountingFindInvoices}" collapsible="true"> - <include-form name="lookupInvoicesStatus" location="component://accounting/widget/InvoiceForms.xml"/> + <include-form name="LookupInvoicesStatus" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <include-form name="ListBillingAccountInvoices" location="component://accounting/widget/BillingAccountForms.xml"/> </decorator-section> Modified: ofbiz/trunk/applications/accounting/widget/BudgetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BudgetForms.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BudgetForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BudgetForms.xml Fri Sep 16 20:27:26 2016 @@ -47,7 +47,7 @@ under the License. <on-event-update-area event-type="paginate" area-id="search-results" area-target="BudgetSearchResults"/> </form> - <form name="FindBudgetOptions" extends="lookupBudget" extends-resource="component://accounting/widget/FieldLookupForms.xml" + <form name="FindBudgetOptions" extends="LookupBudget" extends-resource="component://accounting/widget/FieldLookupForms.xml" target="ListBudgets"> <field name="searchOptions_collapsed"><hidden value="true"/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml Fri Sep 16 20:27:26 2016 @@ -21,7 +21,7 @@ under the License. <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="lookupFixedAsset" target="LookupFixedAsset" title="" type="single" + <form name="LookupFixedAsset" target="LookupFixedAsset" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="FixedAsset" default-field-type="hidden"/> <field name="fixedAssetId"><text-find/></field> @@ -36,7 +36,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupFixedAsset" list-name="listIt" title="" type="list" paginate-target="LookupFixedAsset" + <form name="ListLookupFixedAsset" list-name="listIt" title="" type="list" paginate-target="LookupFixedAsset" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -52,7 +52,7 @@ under the License. <field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field> <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity entity-name="FixedAssetType"/></field> </form> - <form name="lookupBudget" target="LookupBudget" title="" type="single" + <form name="LookupBudget" target="LookupBudget" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Budget" default-field-type="hidden"/> <field name="budgetId"><text-find/></field> @@ -68,7 +68,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupBudget" list-name="listIt" title="" type="list" paginate-target="LookupBudget" + <form name="ListLookupBudget" list-name="listIt" title="" type="list" paginate-target="LookupBudget" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -94,7 +94,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listBillingAccount" list-name="listIt" title="" type="list" paginate-target="LookupBillingAccount" + <form name="ListBillingAccount" list-name="listIt" title="" type="list" paginate-target="LookupBillingAccount" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -112,7 +112,7 @@ under the License. <field name="externalAccountId" title="${uiLabelMap.AccountingExternalAccountId}"><display/></field> </form> - <form name="lookupGlAccount" target="LookupGlAccount" title="" type="single" + <form name="LookupGlAccount" target="LookupGlAccount" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="GlAccount" default-field-type="hidden"/> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}"><text-find/></field> @@ -134,7 +134,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupGlAccount" list-name="listIt" title="" type="list" paginate-target="LookupGlAccount" + <form name="ListLookupGlAccount" list-name="listIt" title="" type="list" paginate-target="LookupGlAccount" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -151,7 +151,7 @@ under the License. <field name="glAccountTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="GlAccountType"/></field> <field name="glAccountClassId" title="${uiLabelMap.AccountingGlAccountClass}"><display-entity entity-name="GlAccountClass"/></field> </form> - <form name="lookupPayment" target="LookupPayment" title="" type="single" + <form name="LookupPayment" target="LookupPayment" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Payment" default-field-type="hidden"/> <field name="paymentId" title="${uiLabelMap.AccountingPaymentID}"><text-find/></field> @@ -162,7 +162,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listPayment" list-name="listIt" title="" type="list" paginate-target="LookupPayment" + <form name="ListPayment" list-name="listIt" title="" type="list" paginate-target="LookupPayment" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -182,7 +182,7 @@ under the License. <field name="currencyUomId"><display/></field> </form> - <form name="lookupInvoice" target="LookupInvoice" title="" type="single" + <form name="LookupInvoice" target="LookupInvoice" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <!--auto-fields-entity entity-name="Invoice" default-field-type="hidden" /--> <field position="1" name="invoiceId" ><text-find/></field> @@ -206,7 +206,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listInvoice" list-name="listIt" title="" type="list" paginate-target="LookupInvoice" + <form name="ListInvoice" list-name="listIt" title="" type="list" paginate-target="LookupInvoice" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -228,7 +228,7 @@ under the License. <field name="currencyUomId"><display/></field> </form> - <form name="lookupAgreement" target="LookupAgreement" title="" type="single" + <form name="LookupAgreement" target="LookupAgreement" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="agreementId" ><text-find/></field> <field name="productId" ><text-find/></field> @@ -238,7 +238,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listAgreements" list-name="listIt" title="" type="list" target="LookupAgreement" + <form name="ListAgreements" list-name="listIt" title="" type="list" target="LookupAgreement" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -257,7 +257,7 @@ under the License. <field name="description"><display/></field> </form> - <form name="lookupAgreementItem" target="LookupAgreementItem" title="" type="single" + <form name="LookupAgreementItem" target="LookupAgreementItem" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="agreementId"><text-find/></field> <field name="agreementItemSeqId"><text-find/></field> @@ -269,7 +269,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listAgreementItems" list-name="listIt" title="" type="list" target="LookupAgreementItem" + <form name="ListAgreementItems" list-name="listIt" title="" type="list" target="LookupAgreementItem" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -287,7 +287,7 @@ under the License. <field name="currencyUomId"><display/></field> </form> - <form name="lookupPaymentGroupMember" target="LookupPaymentGroupMember" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> + <form name="LookupPaymentGroupMember" target="LookupPaymentGroupMember" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="paymentGroupId"><text-find/></field> <field name="paymentId"><text-find/></field> <field name="fromDate" position="1"><date-time/></field> @@ -296,7 +296,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listPaymentGroupMember" list-name="listIt" title="" type="list" target="LookupPaymentGroupMember" + <form name="ListPaymentGroupMember" list-name="listIt" title="" type="list" target="LookupPaymentGroupMember" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -341,7 +341,7 @@ under the License. <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> </form> - <form name="lookupCustomTimePeriod" target="LookupCustomTimePeriod" title="" type="single" + <form name="LookupCustomTimePeriod" target="LookupCustomTimePeriod" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="CustomTimePeriod" default-field-type="hidden"/> <field name="customTimePeriodId"><text-find/></field> @@ -366,7 +366,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupCustomTimePeriod" list-name="listIt" title="" type="list" paginate-target="LookupCustomTimePeriod" + <form name="ListLookupCustomTimePeriod" list-name="listIt" title="" type="list" paginate-target="LookupCustomTimePeriod" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml Fri Sep 16 20:27:26 2016 @@ -21,7 +21,7 @@ under the License. <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd"> <!-- list all assets in a tabular format --> - <form name="FindFixedAssetOptions" extends="lookupFixedAsset" extends-resource="component://accounting/widget/FieldLookupForms.xml" + <form name="FindFixedAssetOptions" extends="LookupFixedAsset" extends-resource="component://accounting/widget/FieldLookupForms.xml" target="ListFixedAssets"> <field name="searchOptions_collapsed"><hidden value="true"/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Fri Sep 16 20:27:26 2016 @@ -391,7 +391,7 @@ under the License. <field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field> </form> - <form name="updateFXConversion" type="single" target="updateFXConversion" default-service-name="updateFXConversion" + <form name="UpdateFXConversion" type="single" target="updateFXConversion" default-service-name="updateFXConversion" header-row-style="header-row" default-table-style="basic-table"> <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="uomId" title="${uiLabelMap.CommonFrom} ${uiLabelMap.CommonCurrency}"> Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Fri Sep 16 20:27:26 2016 @@ -254,7 +254,7 @@ under the License. <field name="delete" title="${uiLabelMap.CommonDelete}"><submit/></field> </form> - <form name="updateRateAmount" type="single" target="updateRateAmount" default-service-name="updateRateAmount" + <form name="UpdateRateAmount" type="single" target="updateRateAmount" default-service-name="updateRateAmount" header-row-style="header-row" default-table-style="basic-table"> <actions> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Fri Sep 16 20:27:26 2016 @@ -305,7 +305,7 @@ under the License. <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.AccountingUpdateRateAmount}" navigation-form-name="ListRateAmounts"> - <include-form name="updateRateAmount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + <include-form name="UpdateRateAmount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> </screenlet> <include-form name="ListRateAmounts" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> </decorator-section> @@ -334,7 +334,7 @@ under the License. <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="FxConversionPanel" title="${uiLabelMap.AccountingUpdateFX}" collapsible="true"> - <include-form name="updateFXConversion" location="component://accounting/widget/GlSetupForms.xml"/> + <include-form name="UpdateFXConversion" location="component://accounting/widget/GlSetupForms.xml"/> </screenlet> <include-form name="ListConversions" location="component://accounting/widget/GlSetupForms.xml"/> </decorator-section> Modified: ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceForms.xml Fri Sep 16 20:27:26 2016 @@ -98,7 +98,7 @@ under the License. <field name="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> </form> - <form name="invoiceHeader" type="single" title="Invoice header information" default-map-name="invoice" + <form name="InvoiceHeader" type="single" title="Invoice header information" default-map-name="invoice" header-row-style="header-row" default-table-style="basic-table"> <actions> <set field="total" value="${groovy:return(org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice));}"/> @@ -138,7 +138,7 @@ under the License. <field name="currencyUomId"><hidden/></field> </form> -<form name="invoiceItems" list-name="invItemAndOrdItems" target="" title="" type="list" separate-columns="true" paginate-target="invoiceOverview" +<form name="InvoiceItems" list-name="invItemAndOrdItems" target="" title="" type="list" separate-columns="true" paginate-target="invoiceOverview" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> <set field="quantity" value="${groovy: quantity ?: 1}" type="BigDecimal"/> @@ -170,7 +170,7 @@ under the License. </field> </form> - <form name="invoiceRoles" type="list" use-row-submit="true" title="" list-name="invoiceRoles" paginate-target="invoiceRoles" + <form name="InvoiceRoles" type="list" use-row-submit="true" title="" list-name="invoiceRoles" paginate-target="invoiceRoles" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <!--auto-fields-entity entity-name="InvoiceRole" default-field-type="display"/--> <field name="invoiceId"><hidden/></field> @@ -663,7 +663,7 @@ under the License. <field name="thruDate"><display type="date"/></field> <field name="comments"><display/></field> </form> - <form name="lookupInvoicesStatus" type="single" target="BillingAccountInvoices" title="" + <form name="LookupInvoicesStatus" type="single" target="BillingAccountInvoices" title="" header-row-style="header-row" default-table-style="basic-table"> <field name="billingAccountId"><hidden/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Fri Sep 16 20:27:26 2016 @@ -152,7 +152,7 @@ under the License. </widgets> <fail-widgets> <screenlet title="${uiLabelMap.PageTitleEditInvoice}"> - <include-form name="invoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/> + <include-form name="InvoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> </fail-widgets> </section> @@ -218,7 +218,7 @@ under the License. <link target="editInvoice" text="${uiLabelMap.CommonUpdate}" style="buttontext"> <parameter param-name="invoiceId"/> </link> - <include-form name="invoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/> + <include-form name="InvoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <container style="lefthalf"> <screenlet title="${uiLabelMap.CommonStatus}" navigation-form-name="ListInvoiceStatus"> @@ -233,13 +233,13 @@ under the License. </screenlet> </container> <container style="righthalf"> - <screenlet title="${uiLabelMap.AccountingInvoiceRoles}" navigation-form-name="invoiceRoles"> + <screenlet title="${uiLabelMap.AccountingInvoiceRoles}" navigation-form-name="InvoiceRoles"> <container> <link target="invoiceRoles" text="${uiLabelMap.CommonUpdate}" style="buttontext"> <parameter param-name="invoiceId"/> </link> </container> - <include-form name="invoiceRoles" location="component://accounting/widget/InvoiceForms.xml"/> + <include-form name="InvoiceRoles" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PartyTerms}"> <container> @@ -252,11 +252,11 @@ under the License. </screenlet> </container> <container style="clear"/> - <screenlet title="${uiLabelMap.AccountingInvoiceItems}" navigation-form-name="invoiceItems"> + <screenlet title="${uiLabelMap.AccountingInvoiceItems}" navigation-form-name="InvoiceItems"> <link target="listInvoiceItems" text="${uiLabelMap.CommonUpdate}" style="buttontext"> <parameter param-name="invoiceId"/> </link> - <include-form name="invoiceItems" location="component://accounting/widget/InvoiceForms.xml"/> + <include-form name="InvoiceItems" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <section> <condition> @@ -277,7 +277,7 @@ under the License. </widgets> <fail-widgets> <screenlet title="${uiLabelMap.AccountingInvoiceHeader}"> - <include-form name="invoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/> + <include-form name="InvoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <container style="lefthalf"> <screenlet title="${uiLabelMap.CommonStatus}" navigation-form-name="ListInvoiceStatus"> @@ -289,8 +289,8 @@ under the License. </screenlet> </container> <container style="righthalf"> - <screenlet title="${uiLabelMap.AccountingInvoiceRoles}" navigation-form-name="invoiceRoles"> - <include-form name="invoiceRoles" location="component://accounting/widget/InvoiceForms.xml"/> + <screenlet title="${uiLabelMap.AccountingInvoiceRoles}" navigation-form-name="InvoiceRoles"> + <include-form name="InvoiceRoles" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PartyTerms}"> <include-form name="ListInvoiceTerms" location="component://accounting/widget/InvoiceForms.xml"/> @@ -298,8 +298,8 @@ under the License. </screenlet> </container> <container style="clear"/> - <screenlet title="${uiLabelMap.AccountingInvoiceItems}" navigation-form-name="invoiceItems"> - <include-form name="invoiceItems" location="component://accounting/widget/InvoiceForms.xml"/> + <screenlet title="${uiLabelMap.AccountingInvoiceItems}" navigation-form-name="InvoiceItems"> + <include-form name="InvoiceItems" location="component://accounting/widget/InvoiceForms.xml"/> </screenlet> <section> <condition> Modified: ofbiz/trunk/applications/accounting/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/LookupScreens.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Fri Sep 16 20:27:26 2016 @@ -38,10 +38,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPayment" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="LookupPayment" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listPayment" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListPayment" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -65,10 +65,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="LookupInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -92,10 +92,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupFixedAsset" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="LookupFixedAsset" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupFixedAsset" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListLookupFixedAsset" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -123,7 +123,7 @@ under the License. <include-form name="lookupBillingAccount" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listBillingAccount" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListBillingAccount" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -148,10 +148,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupGlAccount" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="LookupGlAccount" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupGlAccount" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListLookupGlAccount" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -176,10 +176,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupAgreement" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="LookupAgreement" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listAgreements" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListAgreements" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -204,10 +204,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupAgreementItem" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="LookupAgreementItem" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listAgreementItems" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListAgreementItems" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -232,10 +232,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupPaymentGroupMember" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="LookupPaymentGroupMember" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listPaymentGroupMember" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListPaymentGroupMember" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -284,10 +284,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupCustomTimePeriod" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="LookupCustomTimePeriod" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupCustomTimePeriod" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListLookupCustomTimePeriod" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Fri Sep 16 20:27:26 2016 @@ -263,7 +263,7 @@ under the License. <field position="1" name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="editPaymentApplicationsInv" default-entity-name="PaymentApplication" list-name="paymentApplicationsInv" target="removePaymentApplication" type="list" separate-columns="false" + <form name="EditPaymentApplicationsInv" default-entity-name="PaymentApplication" list-name="paymentApplicationsInv" target="removePaymentApplication" type="list" separate-columns="false" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentApplicationId"><hidden/></field> <field name="paymentId"><hidden/></field> @@ -278,7 +278,7 @@ under the License. <field name="amountApplied"><display/></field> <field name="removeButton"><submit/></field> </form> - <form name="editPaymentApplicationsPay" default-entity-name="PaymentApplication" list-name="paymentApplicationsPay" target="removePaymentApplication" type="list" separate-columns="false" + <form name="EditPaymentApplicationsPay" default-entity-name="PaymentApplication" list-name="paymentApplicationsPay" target="removePaymentApplication" type="list" separate-columns="false" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentApplicationId"><hidden/></field> <field name="paymentId"><hidden/></field> @@ -286,7 +286,7 @@ under the License. <field name="amountApplied"><display/></field> <field name="removeButton"><submit/></field> </form> - <form name="editPaymentApplicationsBil" default-entity-name="PaymentApplication" list-name="paymentApplicationsBil" target="removePaymentApplication" type="list" separate-columns="false" + <form name="EditPaymentApplicationsBil" default-entity-name="PaymentApplication" list-name="paymentApplicationsBil" target="removePaymentApplication" type="list" separate-columns="false" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentApplicationId"><hidden/></field> <field name="paymentId"><hidden/></field> @@ -295,7 +295,7 @@ under the License. <field name="amountApplied"><display/></field> <field name="removeButton" title="${uiLabelMap.CommonRemove}"><submit/></field> </form> - <form name="editPaymentApplicationsTax" default-entity-name="PaymentApplication" list-name="paymentApplicationsTax" target="removePaymentApplication" type="list" separate-columns="false" + <form name="EditPaymentApplicationsTax" default-entity-name="PaymentApplication" list-name="paymentApplicationsTax" target="removePaymentApplication" type="list" separate-columns="false" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentApplicationId"><hidden/></field> <field name="paymentId"><hidden/></field> @@ -304,7 +304,7 @@ under the License. <field name="removeButton" title="${uiLabelMap.CommonRemove}"><submit/></field> </form> - <form name="listInvoicesNotApplied" type="list" list-name="invoices" target="createPaymentApplication" title="" + <form name="ListInvoicesNotApplied" type="list" list-name="invoices" target="createPaymentApplication" title="" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentId"><hidden/></field> <field name="invoiceId" widget-style="buttontext"> @@ -324,9 +324,9 @@ under the License. </field> </form> - <form name="listInvoicesNotAppliedOtherCurrency" extends="listInvoicesNotApplied" list-name="invoicesOtherCurrency"/> + <form name="ListInvoicesNotAppliedOtherCurrency" extends="ListInvoicesNotApplied" list-name="invoicesOtherCurrency"/> - <form name="listPaymentsNotApplied" type="list" list-name="payments" target="createPaymentApplication" title="" + <form name="ListPaymentsNotApplied" type="list" list-name="payments" target="createPaymentApplication" title="" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentId"><hidden/></field> <field name="toPaymentId" widget-style="buttontext"> @@ -343,7 +343,7 @@ under the License. </field> </form> - <form name="addPaymentApplication" type="single" target="createPaymentApplication" title="" + <form name="AddPaymentApplication" type="single" target="createPaymentApplication" title="" header-row-style="header-row" default-table-style="basic-table"> <field name="paymentId"><hidden/></field> <field name="invoiceId"><lookup target-form-name="LookupInvoice"/></field> @@ -359,7 +359,7 @@ under the License. </field> </form> - <form name="paymentHeader" type="single" default-map-name="payment" + <form name="PaymentHeader" type="single" default-map-name="payment" header-row-style="header-row" default-table-style="basic-table"> <actions> <service service-name="getPartyNameForDate" result-map="partyNameResultFrom"> @@ -402,7 +402,7 @@ under the License. </field> </form> - <form name="paymentApplications" type="list" list-name="paymentApplications" + <form name="PaymentApplications" type="list" list-name="paymentApplications" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PaymentApplication"> Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Fri Sep 16 20:27:26 2016 @@ -235,7 +235,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.AccountingPayment} ${uiLabelMap.AccountingApplications}"> - <include-form name="editPaymentApplicationsInv" location="component://accounting/widget/PaymentForms.xml"/> + <include-form name="EditPaymentApplicationsInv" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> @@ -254,7 +254,7 @@ under the License. <not><if-empty field="paymentApplicationsPay"/></not> </condition> <widgets> - <include-form name="editPaymentApplicationsPay" location="component://accounting/widget/PaymentForms.xml"/> + <include-form name="EditPaymentApplicationsPay" location="component://accounting/widget/PaymentForms.xml"/> </widgets> </section> <section> @@ -262,7 +262,7 @@ under the License. <not><if-empty field="paymentApplicationsBil"/></not> </condition> <widgets> - <include-form name="editPaymentApplicationsBil" location="component://accounting/widget/PaymentForms.xml"/> + <include-form name="EditPaymentApplicationsBil" location="component://accounting/widget/PaymentForms.xml"/> </widgets> </section> <section> @@ -270,7 +270,7 @@ under the License. <not><if-empty field="paymentApplicationsTax"/></not> </condition> <widgets> - <include-form name="editPaymentApplicationsTax" location="component://accounting/widget/PaymentForms.xml"/> + <include-form name="EditPaymentApplicationsTax" location="component://accounting/widget/PaymentForms.xml"/> </widgets> </section> </screenlet> @@ -301,7 +301,7 @@ under the License. <not><if-empty field="invoices"/></not> </condition> <widgets> - <include-form name="listInvoicesNotApplied" location="component://accounting/widget/PaymentForms.xml"/> + <include-form name="ListInvoicesNotApplied" location="component://accounting/widget/PaymentForms.xml"/> </widgets> </section> <section> @@ -310,7 +310,7 @@ under the License. </condition> <widgets> <label style="h2" text="${uiLabelMap.FormFieldTitle_otherCurrency}"/> - <include-form name="listInvoicesNotAppliedOtherCurrency" location="component://accounting/widget/PaymentForms.xml"/> + <include-form name="ListInvoicesNotAppliedOtherCurrency" location="component://accounting/widget/PaymentForms.xml"/> </widgets> </section> </screenlet> @@ -326,12 +326,12 @@ under the License. <label style="h2" text="${uiLabelMap.CommonFrom}: ${partyNameViewTo.groupName}${partyNameViewTo.lastName},${partyNameViewTo.firstName} ${partyNameViewTo.middleName}[${payment.partyIdTo}]"/> <label style="h2" text="${uiLabelMap.CommonTo}: ${partyNameViewFrom.groupName}${partyNameViewFrom.lastName},${partyNameViewFrom.firstName} ${partyNameViewFrom.middleName} [${payment.partyIdFrom}]"/> </container> - <include-form name="listPaymentsNotApplied" location="component://accounting/widget/PaymentForms.xml"/> + <include-form name="ListPaymentsNotApplied" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> <screenlet title="${uiLabelMap.AccountingApplyPaymentoTo}"> - <include-form name="addPaymentApplication" location="component://accounting/widget/PaymentForms.xml"/> + <include-form name="AddPaymentApplication" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </widgets> </section> @@ -372,7 +372,7 @@ under the License. <link target="editPayment" text="${uiLabelMap.CommonUpdate}" style="buttontext"> <parameter param-name="paymentId"/> </link> - <include-form name="paymentHeader" location="component://accounting/widget/PaymentForms.xml"/> + <include-form name="PaymentHeader" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </container> <container style="righthalf"> @@ -380,7 +380,7 @@ under the License. <link target="editPaymentApplications" text="${uiLabelMap.CommonUpdate}" style="buttontext"> <parameter param-name="paymentId"/> </link> - <include-form name="paymentApplications" location="component://accounting/widget/PaymentForms.xml"/> + <include-form name="PaymentApplications" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> <section> <condition> @@ -401,12 +401,12 @@ under the License. <fail-widgets> <container style="lefthalf"> <screenlet title="${uiLabelMap.AccountingPaymentHeader}"> - <include-form name="paymentHeader" location="component://accounting/widget/PaymentForms.xml"/> + <include-form name="PaymentHeader" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> </container> <container style="righthalf"> <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${payment.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${payment.currencyUomId})}"> - <include-form name="paymentApplications" location="component://accounting/widget/PaymentForms.xml"/> + <include-form name="PaymentApplications" location="component://accounting/widget/PaymentForms.xml"/> </screenlet> <section> <condition> Modified: ofbiz/trunk/applications/accounting/widget/ap/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/LookupScreens.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/LookupScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/LookupScreens.xml Fri Sep 16 20:27:26 2016 @@ -42,7 +42,7 @@ under the License. <include-form name="LookupInvoice" location="component://accounting/widget/ap/forms/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -70,7 +70,7 @@ under the License. <include-form name="LookupPayment" location="component://accounting/widget/ap/forms/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listPayment" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListPayment" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/ar/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/LookupScreens.xml?rev=1761077&r1=1761076&r2=1761077&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ar/LookupScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ar/LookupScreens.xml Fri Sep 16 20:27:26 2016 @@ -42,7 +42,7 @@ under the License. <include-form name="LookupInvoice" location="component://accounting/widget/ar/forms/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListInvoice" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -70,7 +70,7 @@ under the License. <include-form name="LookupPayment" location="component://accounting/widget/ar/forms/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listPayment" location="component://accounting/widget/FieldLookupForms.xml"/> + <include-form name="ListPayment" location="component://accounting/widget/FieldLookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |