You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/01/28 20:50:06 UTC
svn commit: r616013 [1/2] - in /ofbiz/trunk/applications/accounting: config/
webapp/accounting/agreement/ webapp/accounting/billingaccount/
webapp/accounting/lookup/ widget/
Author: mrisaliti
Date: Mon Jan 28 11:50:02 2008
New Revision: 616013
URL: http://svn.apache.org/viewvc?rev=616013&view=rev
Log:
Agreement/Billing Account/Lookup forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1603)
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties
ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountTabBar.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/LookupScreens.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=616013&r1=616012&r2=616013&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Mon Jan 28 11:50:02 2008
@@ -285,6 +285,7 @@
AccountingLastNameCard=Last Name on Card
AccountingLiabilities=Liabilities
AccountingListPaymentMethodType=Payment Method Type List
+AccountingListInvoices=List Invoices
AccountingListInvoicesNotYetApplied=Possible invoices to apply
AccountingListInvoiceItemType=Invoice Item Type List
AccountingListPaymentsNotYetApplied=Possible payments to apply
@@ -478,6 +479,8 @@
AccountingFixedAssetMaintMessage2=Only use if applicable, can use Maintenance Type instead
AccountingFixedAssetMaintMessage3=If Maintenance Template is specified with Product Maintenance, this will be set/reset automatically
+PageTitleAddBillingAccountRoles=Add Billing Account Roles
+PageTitleCopyAgreement=Copy Agreement
PageTitleEditAgreement=Edit Agreement
PageTitleEditAgreementGeographicalApplic=Edit Agreement Geographical Applic
PageTitleEditAgreementItem=Edit Agreement Item
@@ -488,6 +491,7 @@
PageTitleEditAgreementTerm=Edit Agreement Term
PageTitleEditBillingAccount=Edit Billing Account
PageTitleEditBillingAccountInvoices=Edit Billing Account Invoices
+PageTitleEditBillingAccountOrders=Edit Billing Account Orders
PageTitleEditBillingAccountPayments=Edit Billing Account Payments
PageTitleEditBillingAccountRoles=Edit Billing Account Roles
PageTitleEditBillingAccountTerms=Edit Billing Account Terms
@@ -510,6 +514,7 @@
PageTitleInvoiceItemType=List Invoice Item Type
PageTitleInvoiceOverview=Invoice Overview
PageTitleListAccounts=List Accounts
+PageTitleListAgreement=List Agreement
PageTitleListAgreementGeographicalApplic=List Agreement Geographical Applic
PageTitleListAgreementItems=List Agreement Items
PageTitleListAgreementItemParties=List Agreement Item Parties
@@ -884,6 +889,9 @@
FormFieldTitle_performedByPartyId=Performed By Party Id
FormFieldTitle_finAccountAuthId=Fin Account Auth Id
FormFieldTitle_authorizationDate=Authorization Date
+FormFieldTitle_orderDate=Order Date
+FormFieldTitle_maxAmount=Max Amount
+FormFieldTitle_capture=Capture
AccountingFinAccount=Financial Account
AccountingFinAccounts=Financial Accounts
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties?rev=616013&r1=616012&r2=616013&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties Mon Jan 28 11:50:02 2008
@@ -190,6 +190,7 @@
AccountingFX=Tasso Cambi Valuta
AccountingGatewayResponse=Risposta Gateway
AccountingGatewayResponses=Risposte Gateway
+AccountingGeneralLedger=Contabilit\u00e0 Generale
AccountingGlAcc=Conto Contabilit\u00e0 Generale
AccountingGlAccs=Conti Contabilit\u00e0 Generale
AccountingGlAccount=Conto Contabilit\u00e0 Generale
@@ -198,6 +199,9 @@
AccountingGlAccountClass=Classe Conto Contabilit\u00e0 Generale
AccountingGlAccountDefault=Defaults Conto Contabilit\u00e0 Generale
AccountingGlAccountId=Codice Conto Contabilit\u00e0 Generale
+AccountingGlAccountTypeDefaults=Default Tipo Conto Contabilit\u00e0 Generale
+AccountingGlobalGLSettings=Configurazione Contabilit\u00e0 Generale
+AccountingGlJournals=Giornali
AccountingInvoiceHeaderDetailedInformation=Informazioni Dettagliate Testata
AccountingHideFields=Campi Nascosti
AccountingIgnoreInvoiceItems=Ignora Righe Fattura
@@ -238,6 +242,7 @@
AccountingItemNr=Nr.Riga
AccountingLastNameCard=Cognome sulla Carta
AccountingLiabilities=Debiti
+AccountingListInvoices=Lista Fatture
AccountingListInvoicesNotYetApplied=Possibili fatture da applicare
AccountingListPaymentsNotYetApplied=Possibili pagamenti da applicare
AccountingLineTotal=Totale Riga
@@ -404,6 +409,8 @@
AccountingFixedAssetMaintMessage1=Se la Manutenzione Prodotto \u00e8 specificata, questa sar\u00e0 impostata/azzerata automaticamente
AccountingFixedAssetMaintMessage2=Solamente usato se applicabile, pu\u00f2 essere usato Tipo Manutenzione invece
+PageTitleAddBillingAccountRoles=Aggiungi Ruoli Conto Fatturazione
+PageTitleCopyAgreement=Copia Contratto
PageTitleEditAgreement=Aggiorna Contratto
PageTitleEditAgreementGeographicalApplic=Aggiorna Contratto Applicazioni Geografiche
PageTitleEditAgreementItem=Aggiorna Riga Contratto
@@ -414,6 +421,7 @@
PageTitleEditAgreementTerm=Aggiorna Termine Contratto
PageTitleEditBillingAccount=Aggiorna Conto Fatturazione
PageTitleEditBillingAccountInvoices=Aggiorna Conto Fatturazione Fatture
+PageTitleEditBillingAccountOrders=Aggiorna Ordini Conto Fatturazione
PageTitleEditBillingAccountPayments=Aggiorna Conto Fatturazione Pagamenti
PageTitleEditBillingAccountRoles=Aggiorna Ruoli Conto Fatturazione
PageTitleEditBillingAccountTerms=Aggiorna Termini Conto Fatturazione
@@ -434,6 +442,7 @@
PageTitleFindPayment=Ricerca Pagamento
PageTitleInvoiceOverview=Visione Fattura
PageTitleListAccounts=Lista Conti
+PageTitleListAgreement=Lista Contratti
PageTitleListAgreementGeographicalApplic=Lista Applicazioni Geografiche Contratto
PageTitleListAgreementItems=Lista Righe Contratto
PageTitleListAgreementItemParties=Lista Soggetti Riga Contratto
@@ -787,6 +796,9 @@
FormFieldTitle_performedByPartyId=Eseguito Dal Soggetto
FormFieldTitle_finAccountAuthId=Autorizzazione Conto Finanziario
FormFieldTitle_authorizationDate=Data Autorizzazione
+FormFieldTitle_orderDate=Data Ordine
+FormFieldTitle_maxAmount=Importo Massimo
+FormFieldTitle_capture=Cattura
payPalEvents.problemsGettingOrderHeader=Problemi nel ricavare la testata ordine.
payPalEvents.problemsGettingMerchantConfiguration=Problemi leggendo la configurazione del venditore, perfavore contattare il servizio clienti.
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?rev=616013&r1=616012&r2=616013&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Mon Jan 28 11:50:02 2008
@@ -20,7 +20,8 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="FindAgreements" target="FindAgreement" title="" type="single">
+ <form name="FindAgreements" target="FindAgreement" title="" type="single"
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="Agreement" default-field-type="find"/>
<field name="productId" title="${uiLabelMap.AccountingProductId}">
<lookup target-form-name="LookupProduct"/>
@@ -48,7 +49,8 @@
</field>
</form>
- <form name="ListAgreements" list-name="listIt" target="" title="" type="list" paginate-target="FindAgreement">
+ <form name="ListAgreements" list-name="listIt" target="" title="" type="list" paginate-target="FindAgreement"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<set field="entityName" value="Agreement"/>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
@@ -74,7 +76,8 @@
</field>
</form>
- <form name="EditAgreement" type="single" target="updateAgreement" title="" default-map-name="agreement">
+ <form name="EditAgreement" type="single" target="updateAgreement" title="" default-map-name="agreement"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="agreement==null" target="createAgreement"/>
<auto-fields-entity entity-name="Agreement" default-field-type="edit"/>
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><display/></field>
@@ -108,7 +111,8 @@
</field>
</form>
- <form name="ListAgreementItems" list-name="agreementItems" target="" title="" type="list" paginate-target="ListAgreementItems">
+ <form name="ListAgreementItems" list-name="agreementItems" target="" title="" type="list" paginate-target="ListAgreementItems"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="AgreementItem" default-field-type="display"/>
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
@@ -118,11 +122,12 @@
<display-entity entity-name="AgreementItemType"/>
</field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="removeAgreementItem?agreementItemSeqId=${agreementItemSeqId}&agreementId=${agreementId}" description="[${uiLabelMap.CommonRemove}]" also-hidden="false"/>
+ <hyperlink target="removeAgreementItem?agreementItemSeqId=${agreementItemSeqId}&agreementId=${agreementId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
</field>
</form>
- <form name="EditAgreementItem" type="single" target="updateAgreementItem" title="" default-map-name="agreementItem">
+ <form name="EditAgreementItem" type="single" target="updateAgreementItem" title="" default-map-name="agreementItem"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="agreementItem==null" target="createAgreementItem"/>
<auto-fields-entity entity-name="AgreementItem" default-field-type="edit"/>
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
@@ -145,7 +150,8 @@
</field>
</form>
- <form name="ListAgreementItemTerms" target="" title="" type="list" list-name="agreementTerms" paginate-target="ListAgreementItemTerms">
+ <form name="ListAgreementItemTerms" target="" title="" type="list" list-name="agreementTerms" paginate-target="ListAgreementItemTerms"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="AgreementTerm" default-field-type="display"/>
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
@@ -162,7 +168,8 @@
<hyperlink target="removeAgreementItemTerm?agreementTermId=${agreementTermId}&agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
</field>
</form>
- <form name="ListAgreementTerms" target="updateAgreementTerm" list-name="agreementTerms" paginate-target="ListAgreementTerms" title="" type="list">
+ <form name="ListAgreementTerms" target="updateAgreementTerm" list-name="agreementTerms" paginate-target="ListAgreementTerms" title="" type="list"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="AgreementTerm">
<condition-list>
@@ -190,7 +197,8 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="AddAgreementTerm" type="single" target="createAgreementTerm" title="" default-map-name="agreementTerm">
+ <form name="AddAgreementTerm" type="single" target="createAgreementTerm" title="" default-map-name="agreementTerm"
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="AgreementTerm" default-field-type="edit"/>
<field name="agreementTermId" title="${uiLabelMap.AccountingAgreementTermId}"><hidden/></field>
<field name="termTypeId" title="${uiLabelMap.AccountingTermTypeId}">
@@ -211,7 +219,8 @@
<submit button-type="button"/>
</field>
</form>
- <form name="EditAgreementItemTerm" type="single" target="updateAgreementItemTerm" title="" default-map-name="agreementTerm">
+ <form name="EditAgreementItemTerm" type="single" target="updateAgreementItemTerm" title="" default-map-name="agreementTerm"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="agreementTerm==null" target="createAgreementItemTerm"/>
<auto-fields-entity entity-name="AgreementTerm" default-field-type="edit"/>
<field name="agreementTermId" title="${uiLabelMap.AccountingAgreementTermId}"><display/></field>
@@ -233,7 +242,8 @@
<submit button-type="button"/>
</field>
</form>
- <form name="ListAgreementItemProducts" list-name="agreementProducts" target="" title="" type="list" paginate-target="ListAgreementItemProducts">
+ <form name="ListAgreementItemProducts" list-name="agreementProducts" target="" title="" type="list" paginate-target="ListAgreementItemProducts"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="AgreementProductAppl" default-field-type="display"/>
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
@@ -248,7 +258,8 @@
<hyperlink target="removeAgreementItemProduct?productId=${productId}&agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
</field>
</form>
- <form name="ListAgreementItemSupplierProducts" list-name="agreementProducts" target="" title="" type="list" paginate-target="ListAgreementItemSupplierProducts">
+ <form name="ListAgreementItemSupplierProducts" list-name="agreementProducts" target="" title="" type="list" paginate-target="ListAgreementItemSupplierProducts"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="SupplierProduct" default-field-type="display"/>
<field name="agreementId"><hidden/></field>
<field name="agreementItemSeqId"><hidden/></field>
@@ -266,7 +277,8 @@
</field>
</form>
- <form name="ViewAgreementInfoForReport" type="single" title="" default-map-name="agreement">
+ <form name="ViewAgreementInfoForReport" type="single" title="" default-map-name="agreement"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="agreementId"><text/></field>
<field name="partyIdFrom"><text/></field>
<field name="partyIdTo">
@@ -276,18 +288,21 @@
<field name="thruDate"><display/></field>
<field name="description"><display/></field>
</form>
- <form name="ViewAgreementItemInfoForReport" type="single" title="" default-map-name="agreementItem">
+ <form name="ViewAgreementItemInfoForReport" type="single" title="" default-map-name="agreementItem"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="agreementItemSeqId"><display/></field>
<field name="currencyUomId"><display/></field>
</form>
- <form name="ListAgreementItemProductsForReport" list-name="agreementProducts" target="" title="" type="list">
+ <form name="ListAgreementItemProductsForReport" list-name="agreementProducts" target="" title="" type="list"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="productId" title-area-style="tableheadmedium"><display/></field>
<field name="internalName" entry-name="productId">
<display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/>
</field>
<field name="price" title-area-style="tableheadmedium" widget-area-style="align-text"><display/></field>
</form>
- <form name="ListAgreementItemSupplierProductsForReport" list-name="agreementProducts" target="" title="" type="list">
+ <form name="ListAgreementItemSupplierProductsForReport" list-name="agreementProducts" target="" title="" type="list"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="productId" title-area-style="tableheadmedium"><display/></field>
<field name="supplierProductId" title-area-style="tableheadmedium"><display/></field>
<field name="internalName" entry-name="productId">
@@ -295,7 +310,8 @@
</field>
<field name="lastPrice" title-area-style="tableheadmedium" widget-area-style="align-text"><display/></field>
</form>
- <form name="EditAgreementItemProduct" type="single" target="updateAgreementItemProduct" title="" default-map-name="agreementProductAppl">
+ <form name="EditAgreementItemProduct" type="single" target="updateAgreementItemProduct" title="" default-map-name="agreementProductAppl"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="agreementProductAppl==null" target="createAgreementItemProduct"/>
<auto-fields-entity entity-name="AgreementProductAppl" default-field-type="edit"/>
<field name="agreementId"><hidden/></field>
@@ -308,7 +324,8 @@
<submit button-type="button"/>
</field>
</form>
- <form name="EditAgreementItemSupplierProduct" type="single" target="updateAgreementItemSupplierProduct" title="" default-map-name="agreementProductAppl">
+ <form name="EditAgreementItemSupplierProduct" type="single" target="updateAgreementItemSupplierProduct" title="" default-map-name="agreementProductAppl"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="agreementProductAppl==null" target="createAgreementItemSupplierProduct"/>
<auto-fields-entity entity-name="SupplierProduct" default-field-type="edit"/>
<field name="agreementId"><hidden/></field>
@@ -360,7 +377,8 @@
</field>
</form>
- <form name="ListAgreementPromoAppls" list-name="agreementPromoAppls" target="" title="" type="list" paginate-target="ListAgreementPromoAppls">
+ <form name="ListAgreementPromoAppls" list-name="agreementPromoAppls" target="" title="" type="list" paginate-target="ListAgreementPromoAppls"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="AgreementPromoAppl" default-field-type="display"/>
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
@@ -374,7 +392,8 @@
<hyperlink target="removeAgreementPromoAppl?productPromoId=${productPromoId}&agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}&fromDate=${fromDate}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
</field>
</form>
- <form name="EditAgreementPromoAppl" type="single" target="updateAgreementPromoAppl" title="" default-map-name="agreementPromoAppl">
+ <form name="EditAgreementPromoAppl" type="single" target="updateAgreementPromoAppl" title="" default-map-name="agreementPromoAppl"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="agreementPromoAppl==null" target="createAgreementPromoAppl"/>
<auto-fields-entity entity-name="AgreementPromoAppl" default-field-type="edit"/>
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
@@ -394,7 +413,8 @@
<submit button-type="button"/>
</field>
</form>
- <form name="ListAgreementItemParties" list-name="agreementParties" target="" title="" type="list" paginate-target="ListAgreementItemParties">
+ <form name="ListAgreementItemParties" list-name="agreementParties" target="" title="" type="list" paginate-target="ListAgreementItemParties"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="AgreementPartyApplic" default-field-type="display"/>
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
@@ -408,7 +428,8 @@
<hyperlink target="removeAgreementItemParty?partyId=${partyId}&agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="EditAgreementItemParty" type="single" target="updateAgreementItemParty" title="" default-map-name="agreementPartyApplic">
+ <form name="EditAgreementItemParty" type="single" target="updateAgreementItemParty" title="" default-map-name="agreementPartyApplic"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="agreementPartyApplic==null" target="createAgreementItemParty"/>
<auto-fields-entity entity-name="AgreementPartyApplic" default-field-type="edit"/>
<field name="agreementId"><hidden/></field>
@@ -421,7 +442,8 @@
<submit button-type="button"/>
</field>
</form>
- <form name="ListAgreementGeographicalApplic" target="" title="" type="list" list-name="agreementGeographicalApplics" paginate-target="ListAgreementGeographicalApplic">
+ <form name="ListAgreementGeographicalApplic" target="" title="" type="list" list-name="agreementGeographicalApplics" paginate-target="ListAgreementGeographicalApplic"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="AgreementGeographicalApplic" default-field-type="display"/>
<field name="agreementId"><hidden/></field>
<field name="agreementItemSeqId"><hidden/></field>
@@ -432,7 +454,8 @@
<hyperlink target="removeAgreementGeographicalApplic?geoId=${geoId}&agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="EditAgreementGeographicalApplic" type="single" target="updateAgreementGeographicalApplic" title="" default-map-name="agreementGeographicalApplic">
+ <form name="EditAgreementGeographicalApplic" type="single" target="updateAgreementGeographicalApplic" title="" default-map-name="agreementGeographicalApplic"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="agreementGeographicalApplic==null" target="createAgreementGeographicalApplic"/>
<auto-fields-entity entity-name="AgreementGeographicalApplic" default-field-type="edit"/>
<field name="agreementId"><hidden/></field>
@@ -449,4 +472,4 @@
<submit button-type="button"/>
</field>
</form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl?rev=616013&r1=616012&r2=616013&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementTabBar.ftl Mon Jan 28 11:50:02 2008
@@ -44,5 +44,4 @@
</ul>
<br class="clear"/>
</div>
-</#if>
-
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl?rev=616013&r1=616012&r2=616013&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/CopyAgreement.ftl Mon Jan 28 11:50:02 2008
@@ -17,16 +17,26 @@
under the License.
-->
<#if agreement?exists>
-<form action="<@o...@ofbizUrl>" method="post">
- <input type="hidden" name="agreementId" value="${agreementId}"/>
- <div>
- <b>${uiLabelMap.AccountingCopyAgreement}:</b>
- ${uiLabelMap.AccountingAgreementTerms} <input type="checkbox" name="copyAgreementTerms" value="Y" checked/>
- ${uiLabelMap.ProductProducts} <input type="checkbox" name="copyAgreementProducts" value="Y" checked/>
- ${uiLabelMap.Party} <input type="checkbox" name="copyAgreementParties" value="Y" checked/>
- </div>
- <div class="button-bar">
- <input type="submit" value="${uiLabelMap.CommonCopy}"/>
- </div>
-</form>
-</#if>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3">${uiLabelMap.PageTitleCopyAgreement}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
+ <div class="screenlet-body">
+ <form action="<@o...@ofbizUrl>" method="post">
+ <input type="hidden" name="agreementId" value="${agreementId}"/>
+ <div>
+ <span class="label">${uiLabelMap.AccountingCopyAgreement}</span>
+ ${uiLabelMap.AccountingAgreementTerms} <input type="checkbox" name="copyAgreementTerms" value="Y" checked/>
+ ${uiLabelMap.ProductProducts} <input type="checkbox" name="copyAgreementProducts" value="Y" checked/>
+ ${uiLabelMap.Party} <input type="checkbox" name="copyAgreementParties" value="Y" checked/>
+ </div>
+ <div class="button-bar">
+ <input type="submit" value="${uiLabelMap.CommonCopy}"/>
+ </div>
+ </form>
+ </div>
+</div>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountTabBar.ftl?rev=616013&r1=616012&r2=616013&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountTabBar.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountTabBar.ftl Mon Jan 28 11:50:02 2008
@@ -18,8 +18,8 @@
-->
<#if billingAccount?has_content>
- <#assign selected = page.tabButtonItem?default("void")>
- <div class="button-bar button-style-1">
+ <#assign selected = tabButtonItem?default("void")>
+ <div class="button-bar tab-bar">
<ul>
<li<#if selected == "EditBillingAccount"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingAccount}</a></li>
<li<#if selected == "EditBillingAccountRoles"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.PartyRoles}</a></li>
@@ -30,4 +30,4 @@
</ul>
<br class="clear"/>
</div>
-</#if>
+</#if>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml?rev=616013&r1=616012&r2=616013&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml Mon Jan 28 11:50:02 2008
@@ -21,7 +21,8 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="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" title="${uiLabelMap.AccountingFixedAssetId}"><text-find/></field>
<field name="fixedAssetName" title="${uiLabelMap.AccountingFixedAssetName}"><text-find/></field>
@@ -35,7 +36,8 @@
<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.CommonLookup}" 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-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -48,7 +50,8 @@
<field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field>
<field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity entity-name="FixedAssetType"/></field>
</form>
- <form name="lookupBillingAccount" target="LookupBillingAccount" title="" type="single">
+ <form name="lookupBillingAccount" target="LookupBillingAccount" title="" type="single"
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="BillingAccount" default-field-type="hidden" />
<field name="billingAccountId" title="${uiLabelMap.AccountingBillingAccountId}"><text-find/></field>
<field name="description" title="${uiLabelMap.AccountingDescription}"><text-find/></field>
@@ -57,7 +60,8 @@
<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.CommonLookup}" 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-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -72,7 +76,8 @@
<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>
<field name="accountName" title="${uiLabelMap.CommonName}"><text-find/></field>
@@ -93,7 +98,8 @@
<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.CommonLookup}" 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-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -107,7 +113,8 @@
<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>
<field name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field>
@@ -117,7 +124,8 @@
<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.CommonLookup}" 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-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -134,7 +142,8 @@
<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>
<field position="1" name="invoiceTypeId">
@@ -157,7 +166,8 @@
<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.CommonLookup}" 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-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -175,4 +185,4 @@
<field name="amount"><display/></field>
<field name="currencyUomId"><display/></field>
</form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=616013&r1=616012&r2=616013&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Mon Jan 28 11:50:02 2008
@@ -75,17 +75,37 @@
<if-service-permission service-name="acctgAgreementPermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <container>
- <label style="head1">${uiLabelMap.PageTitleFindAgreement}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindAgreement}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <link target="EditAgreement" text="${uiLabelMap.AccountingNewAgreement}" style="buttontext"/>
+ </container>
+ <include-form name="FindAgreements" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <container style="button-bar">
- <link target="EditAgreement" text="${uiLabelMap.AccountingNewAgreement}" style="buttontext"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListAgreement}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListAgreements" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="FindAgreements" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
- <container style="button-bar">
- <label text=""/>
- </container>
- <include-form name="ListAgreements" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
</widgets>
<fail-widgets>
<label style="head3">${uiLabelMap.AcccountingViewPermissionError}</label>
@@ -100,7 +120,6 @@
<screen name="EditAgreement">
<section>
<actions>
- <set field="title" value="Edit Agreement"/>
<set field="titleProperty" value="PageTitleEditAgreement"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementMain"/>
@@ -120,7 +139,20 @@
</container>
</widgets>
</section>
- <include-form name="EditAgreement" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditAgreement}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditAgreement" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
<platform-specific>
<html><html-template location="component://accounting/webapp/accounting/agreement/CopyAgreement.ftl"/></html>
</platform-specific>
@@ -133,7 +165,6 @@
<screen name="ListAgreementItems">
<section>
<actions>
- <set field="title" value="List Agreement Items"/>
<set field="titleProperty" value="PageTitleListAgreementItems"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -148,7 +179,20 @@
<container style="button-bar">
<link target="EditAgreementItem?agreementId=${agreement.agreementId}" text="${uiLabelMap.AccountingNewAgreementItem}" style="buttontext"/>
</container>
- <include-form name="ListAgreementItems" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListAgreementItems}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListAgreementItems" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -158,7 +202,6 @@
<screen name="EditAgreementItem">
<section>
<actions>
- <set field="title" value="Edit Agreement Item"/>
<set field="titleProperty" value="PageTitleEditAgreementItem"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -175,7 +218,20 @@
<container style="button-bar">
<link target="EditAgreementItem?agreementId=${agreement.agreementId}" text="${uiLabelMap.AccountingNewAgreementItem}" style="buttontext"/>
</container>
- <include-form name="EditAgreementItem" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditAgreementItem}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditAgreementItem" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -185,7 +241,6 @@
<screen name="EditAgreementTerms">
<section>
<actions>
- <set field="title" value="Edit Agreement Terms"/>
<set field="titleProperty" value="PageTitleEditAgreementTerm"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementTerms"/>
@@ -196,8 +251,34 @@
<widgets>
<decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListAgreementTerms" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
- <include-form name="AddAgreementTerm" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListAgreementTerms}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListAgreementTerms" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditAgreementTerm}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddAgreementTerm" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -207,7 +288,6 @@
<screen name="ListAgreementPromoAppls">
<section>
<actions>
- <set field="title" value="List Agreement Promo Appls"/>
<set field="titleProperty" value="PageTitleListAgreementPromoAppls"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -226,7 +306,20 @@
<container>
<link target="EditAgreementPromoAppl?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.AccountingNewAgreementPromoAppl}" style="buttontext"/>
</container>
- <include-form name="ListAgreementPromoAppls" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListAgreementPromoAppls}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListAgreementPromoAppls" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -236,7 +329,6 @@
<screen name="EditAgreementPromoAppl">
<section>
<actions>
- <set field="title" value="Edit Agreement Promo Appl"/>
<set field="titleProperty" value="PageTitleEditAgreementPromoAppl"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -253,7 +345,20 @@
<container>
<link target="EditAgreementPromoAppl?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.AccountingNewAgreementPromoAppl}" style="buttontext"/>
</container>
- <include-form name="EditAgreementPromoAppl" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditAgreementPromoAppl}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditAgreementPromoAppl" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -263,7 +368,6 @@
<screen name="ListAgreementItemTerms">
<section>
<actions>
- <set field="title" value="List Agreement Item Terms"/>
<set field="titleProperty" value="PageTitleListAgreementItemTerms"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -281,7 +385,20 @@
<container>
<link target="EditAgreementItemTerm?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.AccountingNewAgreementItemTerm}" style="buttontext"/>
</container>
- <include-form name="ListAgreementItemTerms" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListAgreementItemTerms}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListAgreementItemTerms" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -291,7 +408,6 @@
<screen name="EditAgreementItemTerm">
<section>
<actions>
- <set field="title" value="Edit Agreement Item Term"/>
<set field="titleProperty" value="PageTitleEditAgreementItemTerm"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -309,7 +425,20 @@
<container>
<link target="EditAgreementItemTerm?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.AccountingNewAgreementItemTerm}" style="buttontext"/>
</container>
- <include-form name="EditAgreementItemTerm" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditAgreementItemTerm}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditAgreementItemTerm" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -319,7 +448,6 @@
<screen name="ListAgreementItemProducts">
<section>
<actions>
- <set field="title" value="List Agreement Item Products"/>
<set field="titleProperty" value="PageTitleListAgreementItemProducts"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -338,7 +466,20 @@
<link target="EditAgreementItemProduct?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
<link target="ListAgreementItemProductsReport?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
</container>
- <include-form name="ListAgreementItemProducts" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListAgreementItemProducts}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListAgreementItemProducts" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -362,15 +503,48 @@
<widgets>
<decorator-screen name="FoDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <container>
- <label style="head1">${uiLabelMap.AccountingAgreement}</label>
- </container>
- <include-form name="ViewAgreementInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
- <container>
- <label style="head2">${uiLabelMap.AccountingAgreementItem}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAgreement}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ViewAgreementInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAgreementItem}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ViewAgreementItemInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAgreementItemProductsForReport}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListAgreementItemProductsForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="ViewAgreementItemInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
- <include-form name="ListAgreementItemProductsForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -380,7 +554,6 @@
<screen name="EditAgreementItemProduct">
<section>
<actions>
- <set field="title" value="Edit Agreement Item Product"/>
<set field="titleProperty" value="PageTitleEditAgreementItemProduct"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -399,7 +572,20 @@
<container>
<link target="EditAgreementItemProduct?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
</container>
- <include-form name="EditAgreementItemProduct" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditAgreementItemProduct}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditAgreementItemProduct" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -409,7 +595,6 @@
<screen name="ListAgreementItemSupplierProducts">
<section>
<actions>
- <set field="title" value="List Agreement Item Products"/>
<set field="titleProperty" value="PageTitleListAgreementItemProducts"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -428,7 +613,20 @@
<link target="EditAgreementItemSupplierProduct?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
<link target="ListAgreementItemSupplierProductsReport?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
</container>
- <include-form name="ListAgreementItemSupplierProducts" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListAgreementItemProducts}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListAgreementItemSupplierProducts" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -452,15 +650,48 @@
<widgets>
<decorator-screen name="FoDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <container>
- <label style="head1">${uiLabelMap.AccountingAgreement}</label>
- </container>
- <include-form name="ViewAgreementInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
- <container>
- <label style="head2">${uiLabelMap.AccountingAgreementItem}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAgreement}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ViewAgreementInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAgreementItem}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ViewAgreementItemInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAgreementItemSupplierProductsForReport}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListAgreementItemSupplierProductsForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="ViewAgreementItemInfoForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
- <include-form name="ListAgreementItemSupplierProductsForReport" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -470,7 +701,6 @@
<screen name="EditAgreementItemSupplierProduct">
<section>
<actions>
- <set field="title" value="Edit Agreement Item Product"/>
<set field="titleProperty" value="PageTitleEditAgreementItemProduct"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -496,7 +726,20 @@
<container>
<link target="EditAgreementItemSupplierProduct?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
</container>
- <include-form name="EditAgreementItemSupplierProduct" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditAgreementItemProduct}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditAgreementItemSupplierProduct" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -517,7 +760,6 @@
<screen name="ListAgreementItemParties">
<section>
<actions>
- <set field="title" value="List Agreement Item Parties"/>
<set field="titleProperty" value="PageTitleListAgreementItemParties"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -535,7 +777,20 @@
<container>
<link target="EditAgreementItemParty?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonNew}" style="buttontext"/>
</container>
- <include-form name="ListAgreementItemParties" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListAgreementItemParties}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListAgreementItemParties" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -545,7 +800,6 @@
<screen name="EditAgreementItemParty">
<section>
<actions>
- <set field="title" value="Edit Agreement Item Party"/>
<set field="titleProperty" value="PageTitleEditAgreementItemParty"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -563,7 +817,20 @@
<container>
<link target="EditAgreementItemParty?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonNew}" style="buttontext"/>
</container>
- <include-form name="EditAgreementItemParty" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditAgreementItemParty}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditAgreementItemParty" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -573,7 +840,6 @@
<screen name="ListAgreementGeographicalApplic">
<section>
<actions>
- <set field="title" value="List Agreement Geos"/>
<set field="titleProperty" value="PageTitleListAgreementGeographicalApplic"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -591,7 +857,20 @@
<container>
<link target="EditAgreementGeographicalApplic?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonNew}" style="buttontext"/>
</container>
- <include-form name="ListAgreementGeographicalApplic" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListAgreementGeographicalApplic}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListAgreementGeographicalApplic" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -601,7 +880,6 @@
<screen name="EditAgreementGeographicalApplic">
<section>
<actions>
- <set field="title" value="Edit Agreement Geo"/>
<set field="titleProperty" value="PageTitleEditAgreementGeographicalApplic"/>
<set field="headerItem" value="agreement"/>
<set field="tabButtonItem" value="AgreementItems"/>
@@ -619,10 +897,23 @@
<container>
<link target="EditAgreementGeographicalApplic?agreementId=${agreement.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonNew}" style="buttontext"/>
</container>
- <include-form name="EditAgreementGeographicalApplic" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditAgreementGeographicalApplic}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditAgreementGeographicalApplic" location="component://accounting/webapp/accounting/agreement/AgreementForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
+</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=616013&r1=616012&r2=616013&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Mon Jan 28 11:50:02 2008
@@ -21,7 +21,8 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="ListBillingAccounts" type="list" list-name="billingAccounts" paginate-target="FindBillingAccount" default-entity-name="BillingAccount">
+ <form name="ListBillingAccounts" type="list" list-name="billingAccounts" paginate-target="FindBillingAccount" default-entity-name="BillingAccount"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="billingAccountId" widget-style="buttontext">
<hyperlink description="${billingAccountId}" target="EditBillingAccount?billingAccountId=${billingAccountId}"/>
</field>
@@ -33,7 +34,8 @@
<field name="thruDate"><display/></field>
</form>
- <form name="ListBillingAccountsByParty" type="list" list-name="billingAccounts" paginate-target="FindBillingAccount" default-entity-name="BillingAccountAndRole">
+ <form name="ListBillingAccountsByParty" type="list" list-name="billingAccounts" paginate-target="FindBillingAccount" default-entity-name="BillingAccountAndRole"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="billingAccountId" widget-style="buttontext">
<hyperlink description="${billingAccountId}" target="EditBillingAccount?billingAccountId=${billingAccountId}"/>
</field>
@@ -47,7 +49,8 @@
<field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
</form>
- <form name="ListBillingAccountInvoices" type="list" list-name="billingAccountInvoices" paginate-target="BillingAccountInvoices" default-entity-name="Invoice">
+ <form name="ListBillingAccountInvoices" type="list" list-name="billingAccountInvoices" paginate-target="BillingAccountInvoices" default-entity-name="Invoice"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="Invoice" list-name="billingAccountInvoices">
<condition-list>
@@ -94,7 +97,8 @@
<field name="capture" use-when="${bsh:paidInvoice}"><display/></field>
</form>
- <form name="EditBillingAccount" type="single" target="updateBillingAccount" title="">
+ <form name="EditBillingAccount" type="single" target="updateBillingAccount" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<actions>
<set field="availableBalance" value="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount)}" type="BigDecimal"/>
</actions>
@@ -139,7 +143,8 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListBillingAccountRoles" type="list" list-name="billingAccountRoleList" target="updateBillingAccountRole">
+ <form name="ListBillingAccountRoles" type="list" list-name="billingAccountRoleList" target="updateBillingAccountRole"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="BillingAccountRole" list-name="billingAccountRoleList">
<condition-expr field-name="billingAccountId" env-name="billingAccountId"/>
@@ -166,8 +171,8 @@
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="AddBillingAccountRole" type="single" target="createBillingAccountRole" title="" default-map-name="billingAccountRole">
-
+ <form name="AddBillingAccountRole" type="single" target="createBillingAccountRole" title="" default-map-name="billingAccountRole"
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createBillingAccountRole"/>
<field name="billingAccountId"><hidden/></field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
@@ -181,7 +186,8 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListBillingAccountTerms" type="list" list-name="billingAccountTermsList" default-entity-name="BillingAccountTerm" paginate-target="EditBillingAccountTerms">
+ <form name="ListBillingAccountTerms" type="list" list-name="billingAccountTermsList" default-entity-name="BillingAccountTerm" paginate-target="EditBillingAccountTerms"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="BillingAccountTerm" list-name="billingAccountTermsList">
<condition-expr field-name="billingAccountId" env-name="billingAccountId"/>
@@ -202,7 +208,8 @@
<hyperlink description="${uiLabelMap.CommonDelete}" target="removeBillingAccountTerm?billingAccountId=${billingAccountId}&billingAccountTermId=${billingAccountTermId}"/>
</field>
</form>
- <form name="EditBillingAccountTerms" type="single" target="updateBillingAccountTerm" title="" default-map-name="billingAccountTerm">
+ <form name="EditBillingAccountTerms" type="single" target="updateBillingAccountTerm" title="" default-map-name="billingAccountTerm"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="billingAccountTermId==null" target="createBillingAccountTerm"/>
<field name="billingAccountId"><hidden/></field>
<field use-when="billingAccountTermId!=null" name="billingAccountTermId"><hidden/></field>
@@ -224,7 +231,8 @@
<field name="termValue" title="${uiLabelMap.PartyTermValue}"><text size="10"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListBillingAccountPayments" type="list" list-name="payments" paginate-target="BillingAccountPayments">
+ <form name="ListBillingAccountPayments" type="list" list-name="payments" paginate-target="BillingAccountPayments"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="PaymentAndApplication" list-name="payments">
<condition-expr field-name="billingAccountId" env-name="billingAccountId"/>
@@ -246,7 +254,8 @@
<display type="currency" currency="${currencyUomId}"/>
</field>
</form>
- <form name="CreateIncomingBillingAccountPayment" type="single" target="createPaymentAndAssociateToBillingAccount" title="">
+ <form name="CreateIncomingBillingAccountPayment" type="single" target="createPaymentAndAssociateToBillingAccount" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<actions>
<set field="partyIdFrom" from-field="billToCustomer.partyId"/>
</actions>
@@ -280,12 +289,13 @@
<submit button-type="button"/>
</field>
</form>
- <form name="ListBillingAccountOrders" type="list" list-name="orderPaymentPreferencesList" paginate-target="BillingAccountOrders">
+ <form name="ListBillingAccountOrders" type="list" list-name="orderPaymentPreferencesList" paginate-target="BillingAccountOrders"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="billingAccountId"><hidden/></field>
<field name="orderId" widget-style="buttontext">
<hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}" also-hidden="false"/>
</field>
- <field name="orderDate" title="${uiLabelMap.OrderDate}"><display/></field>
+ <field name="orderDate"><display/></field>
<field name="paymentMethodTypeId" title="${uiLabelMap.CommonType}">
<display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/>
</field>
@@ -296,5 +306,4 @@
<display type="currency" currency="${currencyUomId}"/>
</field>
</form>
-
-</forms>
+</forms>
\ No newline at end of file