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 23:29:24 UTC
svn commit: r616091 [1/2] - in /ofbiz/trunk/applications/accounting: config/
webapp/accounting/invoice/ webapp/accounting/payment/ widget/
Author: mrisaliti
Date: Mon Jan 28 14:29:23 2008
New Revision: 616091
URL: http://svn.apache.org/viewvc?rev=616091&view=rev
Log:
Payments/Invoices 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/invoice/InvoiceForms.xml
ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=616091&r1=616090&r2=616091&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Mon Jan 28 14:29:23 2008
@@ -182,6 +182,8 @@
AccountingFindInvoices=Find Invoices
AccountingFindPayment=Find Payment
AccountingFindPayments=Find Payments
+AccountingFindPurchaseInvoicesByDueDate=Find Purchase Invoices By Due Date
+AccountingFindSalesInvoicesByDueDate=Find Sales Invoices By Due Date
AccountingFirstNameCard=First Name on Card
AccountingFiscalMonth01=01-Jan
AccountingFiscalMonth02=02-Feb
@@ -900,6 +902,17 @@
FormFieldTitle_orderDate=Order Date
FormFieldTitle_maxAmount=Max Amount
FormFieldTitle_capture=Capture
+FormFieldTitle_postedDate=Posted Date
+FormFieldTitle_glJournalId=Gl Journal Id
+FormFieldTitle_transTypeDescription=Trans Type Description
+FormFieldTitle_daysOffset=Days Offset
+FormFieldTitle_termTypeId=Term Type Id
+FormFieldTitle_paidAmount=Paid Amount
+FormFieldTitle_outstandingAmount=Outstanding Amount
+FormFieldTitle_timeEntryId=Time Entry Id
+FormFieldTitle_rateTypeId=Rate Type Id
+FormFieldTitle_otherCurrency=Other Currency
+FormFieldTitle_removeButton=Remove
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=616091&r1=616090&r2=616091&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties Mon Jan 28 14:29:23 2008
@@ -124,6 +124,8 @@
AccountingCreateCostComponentCalc=Creare Nuovo Calcolo Costo Componente
AccountingCreateNewCreditCard=Creare Nuova Carta Credito
AccountingCreateNewEftAccount=Creare Nuovo Conto EFT
+AccountingCreateNewSalesInvoice=Nuova Fattura di Vendita
+AccountingCreateNewPurchaseInvoice=Nuova Fattura di Acquisto
AccountingCreateNewInvoice=Nuova fatture
AccountingCreatePayment=Creare Pagamento
AccountingCreatePaymentPermissionError=Errore Sicurezza : Per Creare un Pagamento tu devi inserire entrambi da/a Soggetto o avere il permesso PAY_INFO_CREATE o PAY_INFO_ADMIN.
@@ -148,6 +150,8 @@
AccountingFindInvoices=Ricerca Fatture
AccountingFindPayment=Ricerca Pagamento
AccountingFindPayments=Ricerca Pagamenti
+AccountingFindPurchaseInvoicesByDueDate=Ricerca Fatture Acquisto Per Data Scadenza
+AccountingFindSalesInvoicesByDueDate=Ricerca Fatture Vendita Per Data Scadenza
AccountingFirstNameCard=Nome sulla Carta
AccountingFiscalMonth01=01-Gen
AccountingFiscalMonth02=02-Feb
@@ -227,6 +231,7 @@
AccountingInvoicePayments=Pagamenti
AccountingInvoicePurchase=Fattura Acquisto
AccountingInvoicePDF=PDF
+AccountingInvoicePDFOtherCur=PDF Altra Valuta
AccountingInvoiceRoles=Ruoli
AccountingInvoiceSales=Fattura Vendita
AccountingInvoiceStatus=Stato
@@ -239,6 +244,7 @@
AccountingInvoiceStatusToReceived=Stato a 'Ricevuto'
AccountingInvoiceStatusToSent=Stato a 'Inviato'
AccountingInvoiceStatusToWriteoff=Stato a 'Perso'
+AccountingInvoiceTimeEntries=Righe Timbratura
AccountingInvoiceTotal=Totale Fattura
AccountingInvoices=Fatture
AccountingInvoicesFound=Fatture Trovate
@@ -276,6 +282,8 @@
AccountingNewFixedAssetMaint=Nuova Manutenzione
AccountingNewFixedAssetStdCost=Nuovo Costo Standard
AccountingNewPayment=Nuovo Pagamento
+AccountingNewPaymentIncoming=Nuovo Pagamento in Ingresso
+AccountingNewPaymentOutgoing=Nuovo Pagamento in Uscita
AccountingNewTaxAuthority=Nuova Autorit\u00e0 Tasse
AccountingNewTaxAuthorityPartyInfo=Nuova Autorit\u00e0 Tasse Informazioni Soggetto
AccountingNoAccount=Nessun Conto
@@ -815,6 +823,17 @@
FormFieldTitle_orderDate=Data Ordine
FormFieldTitle_maxAmount=Importo Massimo
FormFieldTitle_capture=Cattura
+FormFieldTitle_postedDate=Data Contabilizzazione
+FormFieldTitle_glJournalId=Giornale
+FormFieldTitle_transTypeDescription=Descrizione Tipo Transazione
+FormFieldTitle_daysOffset=Giorni di Intervallo
+FormFieldTitle_termTypeId=Tipo Termine di Pagamento
+FormFieldTitle_paidAmount=Importo Pagato
+FormFieldTitle_outstandingAmount=Importo Da Pagare
+FormFieldTitle_timeEntryId=Riga Timbratura
+FormFieldTitle_rateTypeId=Tipo Tasso
+FormFieldTitle_otherCurrency=Altra Valuta
+FormFieldTitle_removeButton=Rimuovi
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/invoice/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=616091&r1=616090&r2=616091&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Mon Jan 28 14:29:23 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">
<!-- Invoice forms -->
- <form name="FindInvoices" type="single" target="findInvoices" title="Find and list invoices">
+ <form name="FindInvoices" type="single" target="findInvoices" title="Find and list invoices"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="hideSearch"><hidden value="Y"/></field>
<field name="invoiceId"><text-find default-option="contains" ignore-case="true"/></field>
@@ -44,7 +45,8 @@
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListInvoices" type="list" separate-columns="true" title="Invoice List" list-name="listIt" target="" default-entity-name="Invoice" paginate-target="findInvoices">
+ <form name="ListInvoices" type="list" separate-columns="true" title="Invoice List" list-name="listIt" target="" default-entity-name="Invoice" paginate-target="findInvoices"
+ 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"/>
@@ -85,7 +87,8 @@
<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="${bsh:
import java.text.NumberFormat;
@@ -117,7 +120,8 @@
<field name="currencyUomId"><hidden/></field>
</form>
- <form name="invoiceItems" list-name="invoiceItems" target="" title="" type="list" separate-columns="true" paginate-target="invoiceOverview">
+ <form name="invoiceItems" list-name="invoiceItems" 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="total" value="${bsh:
import java.text.NumberFormat;
@@ -138,7 +142,8 @@
<field name="overrideGlAccountId" widget-area-style="align-text"><hyperlink target="GlAccountNavigate?glAccountId=${overrideGlAccountId}" description="${overrideGlAccountId}"/></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>
<field name="partyId" widget-style="buttontext">
@@ -154,8 +159,9 @@
<field name="datetimePerformed"><display/></field>
</form>
- <form name="ListInvoiceApplications" type="list" list-name="invoiceApplications" default-entity-name="invoiceItem" use-row-submit="true"
- target="updatePaymentApplication" title="Apply payments to invoices" separate-columns="false">
+ <form name="ListInvoiceApplications" type="list" list-name="invoiceApplications" default-entity-name="invoiceItem" use-row-submit="true"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
+ target="updatePaymentApplication" title="Apply payments to invoices" separate-columns="false">
<field name="invoiceItemSeqId"><display/></field>
<field name="productId"><display/></field>
<field name="description"><display/></field>
@@ -166,7 +172,8 @@
<field name="paymentApplicationId"><hidden/></field>
<field name="amountApplied" widget-area-style="align-text"><display type="currency" currency="${invoice.currencyUomId}"/></field>
</form>
- <form name="AcctgTransAndEntries" type="list" title="Accounting Transactions" list-name="AcctgTransAndEntries">
+ <form name="AcctgTransAndEntries" type="list" title="Accounting Transactions" list-name="AcctgTransAndEntries"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="AcctgTransAndEntries">
<condition-expr field-name="invoiceId" env-name="invoiceId"/>
@@ -177,7 +184,8 @@
<field name="paymentId"><hidden/></field>
</form>
- <form name="NewSalesInvoice" type="single" target="createInvoice" title="Edit Invoice Header" default-map-name="invoice">
+ <form name="NewSalesInvoice" type="single" target="createInvoice" title="Edit Invoice Header" default-map-name="invoice"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="statusId"><hidden value="INVOICE_IN_PROCESS"/></field>
<field position="2" name="invoiceTypeId">
<drop-down allow-empty="false" no-current-selected-key="SALES_INVOICE">
@@ -195,11 +203,12 @@
</drop-down>
</field>
<field position="2" name="partyIdTo" parameter-name="partyId" required-field="true"><lookup target-form-name="LookupPartyName"/></field>
- <field position="1" name="createButton" widget-style="smallSubmit">
+ <field position="1" name="createButton" widget-style="smallSubmit" title="${uiLabelMap.CommonCreate}">
<submit button-type="button"/>
</field>
</form>
- <form name="NewPurchaseInvoice" type="single" target="createInvoice" title="Edit Invoice Header" default-map-name="invoice">
+ <form name="NewPurchaseInvoice" type="single" target="createInvoice" title="Edit Invoice Header" default-map-name="invoice"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="statusId"><hidden value="INVOICE_IN_PROCESS"/></field>
<field position="2" name="invoiceTypeId">
<drop-down allow-empty="false" no-current-selected-key="PURCHASE_INVOICE">
@@ -217,12 +226,13 @@
</drop-down>
</field>
<field position="2" name="partyIdFrom" required-field="true"><lookup target-form-name="LookupPartyName"/></field>
- <field position="1" name="createButton" widget-style="smallSubmit">
+ <field position="1" name="createButton" widget-style="smallSubmit" title="${uiLabelMap.CommonCreate}">
<submit button-type="button"/>
</field>
</form>
- <form name="EditInvoice" type="single" target="updateInvoice" title="Edit Invoice Header" default-map-name="invoice">
+ <form name="EditInvoice" type="single" target="updateInvoice" title="Edit Invoice Header" default-map-name="invoice"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="invoice==null" target="createInvoice"/>
<field name="invoiceId"><hidden/></field>
<field position="1" name="invoiceDate"><date-time/></field>
@@ -280,7 +290,8 @@
</field>
</form>
- <form name="EditInvoiceItems" type="list" list-name="invoiceItems" default-entity-name="InvoiceItem" target="updateInvoiceItem" title="Edit Invoice Items" paginate-target="listInvoiceItems">
+ <form name="EditInvoiceItems" type="list" list-name="invoiceItems" default-entity-name="InvoiceItem" target="updateInvoiceItem" title="Edit Invoice Items" paginate-target="listInvoiceItems"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
<set field="total" value="${bsh:
import java.text.NumberFormat;
@@ -308,7 +319,8 @@
</field>
</form>
- <form name="EditInvoiceItem" type="single" target="updateInvoiceItem" title="" default-map-name="invoiceItem" default-entity-name="invoiceItem">
+ <form name="EditInvoiceItem" type="single" target="updateInvoiceItem" title="" default-map-name="invoiceItem" default-entity-name="invoiceItem"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="invoiceItem==null" target="createInvoiceItem"/>
<field name="invoiceId"><hidden/></field>
<field position="1" name="invoiceItemSeqId"><text size="5"/></field>
@@ -349,13 +361,15 @@
</field>
</form>
- <form name="ListInvoiceStatus" list-name="invoiceStatus" target="" title="" type="list" paginate-target="ListInvoiceStatus">
+ <form name="ListInvoiceStatus" list-name="invoiceStatus" target="" title="" type="list" paginate-target="ListInvoiceStatus"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="invoiceId"><hidden/></field>
<field name="statusDate"><display description="${bsh:statusDate.toString().substring(0,10)}"/></field>
<field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
</form>
- <form name="ListInvoiceTerms" list-name="invoiceTerms" target="" title="" type="list">
+ <form name="ListInvoiceTerms" list-name="invoiceTerms" target="" title="" type="list"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="InvoiceTerm" default-field-type="display"/>
<field name="invoiceId"><hidden/></field>
<field name="invoiceTermId"><hidden/></field>
@@ -364,7 +378,8 @@
</field>
</form>
- <form name="EditInvoiceApplications" type="list" list-name="invoiceApplications" default-entity-name="invoiceItem" use-row-submit="true" target="updateInvoiceApplication" title="Apply payments to invoices" separate-columns="false">
+ <form name="EditInvoiceApplications" type="list" list-name="invoiceApplications" default-entity-name="invoiceItem" use-row-submit="true" target="updateInvoiceApplication" title="Apply payments to invoices" separate-columns="false"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="statusId"><hidden/></field>
<field name="paymentApplicationId"><hidden/></field>
<field name="invoiceItemSeqId"><display/></field>
@@ -381,7 +396,8 @@
</field>
</form>
- <form name="AddPayment" type="single" target="updateInvoiceApplication" title="">
+ <form name="AddPayment" type="single" target="updateInvoiceApplication" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<field name="invoiceId"><hidden/></field>
<field name="paymentId"><lookup target-form-name="LookupPayment"/></field>
<field name="amountToApply" parameter-name="amountApplied"><text size="10"/></field>
@@ -391,7 +407,8 @@
</field>
</form>
- <form name="ListPaymentsNotApplied" type="list" list-name="payments" target="updateInvoiceApplication" title="">
+ <form name="ListPaymentsNotApplied" type="list" list-name="payments" target="updateInvoiceApplication" title=""
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="invoiceId"><hidden/></field>
<field name="paymentId" widget-style="buttontext"><hyperlink target="paymentOverview?paymentId=${paymentId}" description="[${paymentId}]"/></field>
<field name="amount"><display type="currency" currency="${currencyUomId}"/></field>
@@ -403,7 +420,8 @@
</field>
</form>
- <form name="ListInvoiceRoles" type="list" use-row-submit="true" title="" list-name="invoiceRoles" paginate-target="invoiceRoles">
+ <form name="ListInvoiceRoles" 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>
<field name="partyId" widget-style="buttontext">
@@ -421,7 +439,8 @@
<hyperlink description="${uiLabelMap.CommonRemove}" target="removeInvoiceRole?invoiceId=${invoiceId}&partyId=${partyId}&roleTypeId=${roleTypeId}"/>
</field>
</form>
- <form name="EditInvoiceRole" type="single" target="createInvoiceRole" title="">
+ <form name="EditInvoiceRole" type="single" target="createInvoiceRole" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="InvoiceRole" />
<field name="invoiceId"><hidden/></field>
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
@@ -434,7 +453,8 @@
</field>
<field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="SendPerEmail" type="single" target="executeSendPerEmail" title="">
+ <form name="SendPerEmail" type="single" target="executeSendPerEmail" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<actions>
<service service-name="getPartyEmail" result-map-name="mapFrom">
<field-map field-name="partyId" value="${invoice.partyIdFrom}"/>
@@ -454,7 +474,8 @@
<field name="bodyText"><textarea/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="EditTimeEntries" type="list" list-name="timeEntries">
+ <form name="EditTimeEntries" type="list" list-name="timeEntries"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateTimeEntry" default-field-type="display"/>
<field name="invoiceId"><hidden/></field>
@@ -464,13 +485,14 @@
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="ListTimeEntries" type="list" list-name="timeEntries">
+ <form name="ListTimeEntries" type="list" list-name="timeEntries"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-service service-name="updateTimeEntry" default-field-type="display"/>
<field name="invoiceId"><hidden/></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">
<drop-down allow-empty="true">
@@ -483,7 +505,8 @@
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
</form>
- <form name="ListInvoicePaymentInfo" type="list" list-name="invoicePaymentInfoList">
+ <form name="ListInvoicePaymentInfo" type="list" list-name="invoicePaymentInfoList"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<service service-name="getInvoicePaymentInfoList" result-map-list-name="invoicePaymentInfoList">
<field-map field-name="invoiceId" env-name="parameters.invoiceId"/>
@@ -498,4 +521,4 @@
<field name="paidAmount"><display/></field>
<field name="outstandingAmount"><display/></field>
</form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=616091&r1=616090&r2=616091&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Mon Jan 28 14:29:23 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="FindPayments" type="single" target="findPayments">
+ <form name="FindPayments" type="single" target="findPayments"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="paymentId"><text-find default-option="contains" ignore-case="true"/></field>
<field name="comments"><text-find default-option="contains" ignore-case="true"/></field>
@@ -46,7 +47,8 @@
<field name="paymentRefNum"><text-find default-option="contains" ignore-case="true"/></field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListPayments" type="list" separate-columns="true" default-entity-name="Payment" list-name="listIt" paginate-target="findPayments" paginate="true">
+ <form name="ListPayments" type="list" separate-columns="true" default-entity-name="Payment" list-name="listIt" paginate-target="findPayments" paginate="true"
+ 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"/>
@@ -73,7 +75,8 @@
<field name="amountToApply"><display also-hidden="false" type="currency" currency="${currencyUomId}"/></field>
</form>
- <form name="NewPaymentOut" type="single" target="createPayment" default-map-name="payment">
+ <form name="NewPaymentOut" type="single" target="createPayment" default-map-name="payment"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="statusId"><hidden value="PMNT_NOT_PAID"/></field>
<field position="1" name="organizationPartyId" parameter-name="partyIdFrom">
<drop-down allow-empty="false">
@@ -110,7 +113,8 @@
<submit button-type="button"/>
</field>
</form>
- <form name="NewPaymentIn" type="single" target="createPayment" default-map-name="payment">
+ <form name="NewPaymentIn" type="single" target="createPayment" default-map-name="payment"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="statusId"><hidden value="PMNT_NOT_PAID"/></field>
<field position="1" name="organizationPartyId" parameter-name="partyIdTo">
<drop-down allow-empty="false">
@@ -148,7 +152,8 @@
</field>
</form>
- <form name="EditPayment" type="single" target="updatePayment" default-map-name="payment">
+ <form name="EditPayment" type="single" target="updatePayment" default-map-name="payment"
+ header-row-style="header-row" default-table-style="basic-table">
<actions>
<entity-one entity-name="StatusItem" value-name="currentStatus">
<field-map field-name="statusId" env-name="payment.statusId"/>
@@ -225,7 +230,8 @@
<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="updatePaymentApplication" type="list" separate-columns="false">
+ <form name="editPaymentApplicationsInv" default-entity-name="PaymentApplication" list-name="paymentApplicationsInv" target="updatePaymentApplication" 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>
<field name="invoiceId"><lookup target-form-name="LookupInvoice"></lookup></field>
@@ -244,7 +250,8 @@
target="removePaymentApplication?paymentApplicationId=${paymentApplicationId}&paymentId=${paymentId}"/>
</field>
</form>
- <form name="editPaymentApplicationsPay" default-entity-name="PaymentApplication" list-name="paymentApplicationsPay" target="updatePaymentApplication" type="list" separate-columns="false">
+ <form name="editPaymentApplicationsPay" default-entity-name="PaymentApplication" list-name="paymentApplicationsPay" target="updatePaymentApplication" 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>
<field name="toPaymentId"><lookup target-form-name="LookupPayment"></lookup></field>
@@ -255,7 +262,8 @@
target="removePaymentApplication?paymentApplicationId=${paymentApplicationId}&paymentId=${paymentId}"/>
</field>
</form>
- <form name="editPaymentApplicationsBil" default-entity-name="PaymentApplication" list-name="paymentApplicationsBil" target="updatePaymentApplication" type="list" separate-columns="false">
+ <form name="editPaymentApplicationsBil" default-entity-name="PaymentApplication" list-name="paymentApplicationsBil" target="updatePaymentApplication" 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>
<field name="billingAccountId"><lookup target-form-name="LookupBillingAccount"/></field>
@@ -267,7 +275,8 @@
target="removePaymentApplication?paymentApplicationId=${paymentApplicationId}&paymentId=${paymentId}"/>
</field>
</form>
- <form name="editPaymentApplicationsTax" default-entity-name="PaymentApplication" list-name="paymentApplicationsTax" target="updatePaymentApplication" type="list" separate-columns="false">
+ <form name="editPaymentApplicationsTax" default-entity-name="PaymentApplication" list-name="paymentApplicationsTax" target="updatePaymentApplication" 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>
<field name="taxAuthGeoId">
@@ -286,7 +295,8 @@
</field>
</form>
- <form name="listInvoicesNotApplied" type="list" list-name="invoices" target="updatePaymentApplication" title="">
+ <form name="listInvoicesNotApplied" type="list" list-name="invoices" target="updatePaymentApplication" title=""
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentId"><hidden/></field>
<field name="invoiceId" widget-style="buttontext"><hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="${invoiceId}"/></field>
<field name="description"><display/></field>
@@ -301,7 +311,8 @@
</field>
</form>
- <form name="listPaymentsNotApplied" type="list" list-name="payments" target="updatePaymentApplication" title="">
+ <form name="listPaymentsNotApplied" type="list" list-name="payments" target="updatePaymentApplication" title=""
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentId"><hidden/></field>
<field name="toPaymentId" widget-style="buttontext"><hyperlink target="paymentOverview?paymentId=${toPaymentId}" description="[${toPaymentId}]"/></field>
<field name="effectiveDate"><display/></field>
@@ -313,7 +324,8 @@
</field>
</form>
- <form name="addPaymentApplication" type="single" target="updatePaymentApplication" title="">
+ <form name="addPaymentApplication" type="single" target="updatePaymentApplication" 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>
<field name="invoiceItemSeqId" use-when=""${uiConfigMap.invoiceProcessing}".equals("YY")"><text size="10"/></field>
@@ -335,7 +347,8 @@
</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-name="partyNameResultFrom">
<field-map field-name="partyId" env-name="payment.partyIdFrom"/>
@@ -367,7 +380,8 @@
<field name="overrideGlAccountId" position="2"><display/></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">
<condition-list combine="or">
@@ -389,7 +403,8 @@
<field name="amountApplied"><display type="currency" currency="${payment.currencyUomId}"/></field>
</form>
- <form name="AcctgTransAndEntries" type="list" list-name="AcctgTransAndEntries">
+ <form name="AcctgTransAndEntries" type="list" list-name="AcctgTransAndEntries"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="AcctgTransAndEntries">
<condition-expr field-name="paymentId" env-name="paymentId"/>
@@ -429,7 +444,8 @@
<field name="submitButton" title="${uiLabelMap.CommonSend}" widget-style="smallSubmit"><submit/></field>
</form>
- <form name="FindSalesInvoicesByDueDate" type="single" target="findSalesInvoicesByDueDate">
+ <form name="FindSalesInvoicesByDueDate" type="single" target="findSalesInvoicesByDueDate"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="invoiceTypeId"><hidden value="SALES_INVOICE"/></field>
<field name="organizationPartyId" parameter-name="partyIdFrom">
<drop-down allow-empty="false">
@@ -444,7 +460,8 @@
<submit button-type="button"/>
</field>
</form>
- <form name="FindPurchaseInvoicesByDueDate" type="single" target="findPurchaseInvoicesByDueDate">
+ <form name="FindPurchaseInvoicesByDueDate" type="single" target="findPurchaseInvoicesByDueDate"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="invoiceTypeId"><hidden value="PURCHASE_INVOICE"/></field>
<field name="organizationPartyId" parameter-name="partyId">
<drop-down allow-empty="false">
@@ -459,7 +476,8 @@
<submit button-type="button"/>
</field>
</form>
- <form name="ListInvoicesByDueDate" type="list" list-name="invoicePaymentInfoList">
+ <form name="ListInvoicesByDueDate" type="list" list-name="invoicePaymentInfoList"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="invoiceId" widget-style="buttontext"><hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="${invoiceId}"/></field>
<field name="termTypeId">
<display-entity entity-name="TermType" description="${description}"/>
@@ -469,4 +487,4 @@
<field name="paidAmount"><display/></field>
<field name="outstandingAmount"><display/></field>
</form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=616091&r1=616090&r2=616091&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Mon Jan 28 14:29:23 2008
@@ -59,7 +59,6 @@
<screen name="FindInvoices">
<section>
<actions>
- <set field="title" value="Find an Invoice"/>
<set field="headerItem" value="invoices"/>
<set field="titleProperty" value="PageTitleFindInvoice"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
@@ -68,10 +67,35 @@
<widgets>
<decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">
<decorator-section name="body">
- <container><label style="head1" text="${uiLabelMap.AccountingFindInvoices}"/></container>
<include-menu name="InvoiceSubTabBar" location="component://accounting/widget/Menus.xml"/>
- <include-form name="FindInvoices" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <include-form name="ListInvoices" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindInvoice}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="FindInvoices" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindInvoice}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListInvoices" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -81,7 +105,6 @@
<screen name="NewInvoice">
<section>
<actions>
- <set field="title" value="New Invoice"/>
<set field="titleProperty" value="PageTitleEditInvoice"/>
<entity-one entity-name="Invoice" value-name="invoice"/>
</actions>
@@ -90,10 +113,34 @@
<decorator-section name="body">
<section>
<widgets>
- <label style="head1" text="${uiLabelMap.AccountingCreateNewSalesInvoice}"></label>
- <include-form name="NewSalesInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <label style="head1" text="${uiLabelMap.AccountingCreateNewPurchaseInvoice}"/>
- <include-form name="NewPurchaseInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingCreateNewSalesInvoice}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="NewSalesInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingCreateNewPurchaseInvoice}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="NewPurchaseInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
</section>
</decorator-section>
@@ -105,7 +152,6 @@
<screen name="EditInvoice">
<section>
<actions>
- <set field="title" value="Edit Invoice"/>
<set field="titleProperty" value="PageTitleEditInvoice"/>
<set field="tabButtonItem" value="editInvoice"/>
<set field="invoiceId" from-field="parameters.invoiceId"/>
@@ -123,10 +169,36 @@
<if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
</condition>
<widgets>
- <include-form name="EditInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditInvoice}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
<fail-widgets>
- <include-form name="invoiceHeader" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditInvoice}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="invoiceHeader" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</fail-widgets>
</section>
</decorator-section>
@@ -138,7 +210,6 @@
<screen name="invoiceOverview">
<section>
<actions>
- <set field="title" value="Invoice Overview"/>
<set field="titleProperty" value="PageTitleInvoiceOverview"/>
<set field="tabButtonItem" value="invoiceOverview"/>
<set field="invoiceId" from-field="parameters.invoiceId"/>
@@ -168,51 +239,244 @@
<widgets>
<decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">
<decorator-section name="body">
- <container><label style="head1" text="${uiLabelMap.AccountingInvoiceHeader}"/></container>
<section>
<condition>
<if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
</condition>
<widgets>
- <container><link target="editInvoice?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
- <include-form name="invoiceHeader" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingInvoiceRoles}"/></container>
- <container><link target="invoiceRoles?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
- <include-form name="invoiceRoles" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingInvoiceStatus}"/></container>
- <include-form name="ListInvoiceStatus" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.PartyTerms}"/></container>
- <include-form name="ListInvoiceTerms" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <include-form name="ListInvoicePaymentInfo" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingAppliedPayments}: ${appliedAmount?currency(${invoice.currencyUomId})}, ${uiLabelMap.AccountingOpenPayments}: ${notAppliedAmount?currency(${invoice.currencyUomId})}"/></container>
- <container><link target="editInvoiceApplications?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
- <include-form name="ListInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingInvoiceItems}"/></container>
- <container><link target="listInvoiceItems?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
- <include-form name="invoiceItems" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingInvoiceTimeEntries}"/></container>
- <container><link target="editInvoiceTimeEntries?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
- <include-form name="ListTimeEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingTransactions}"/></container>
- <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceHeader}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container><link target="editInvoice?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
+ <include-form name="invoiceHeader" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceRoles}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container><link target="invoiceRoles?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
+ <include-form name="invoiceRoles" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceStatus}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListInvoiceStatus" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyTerms}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListInvoiceTerms" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <include-form name="ListInvoicePaymentInfo" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAppliedPayments} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container><link target="editInvoiceApplications?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
+ <include-form name="ListInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceItems}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container><link target="listInvoiceItems?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
+ <include-form name="invoiceItems" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceTimeEntries}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container><link target="editInvoiceTimeEntries?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
+ <include-form name="ListTimeEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingTransactions}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
<fail-widgets>
- <include-form name="invoiceHeader" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingInvoiceRoles}"/></container>
- <include-form name="invoiceRoles" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingInvoiceStatus}"/></container>
- <include-form name="ListInvoiceStatus" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.PartyTerms}"/></container>
- <include-form name="ListInvoiceTerms" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <include-form name="ListInvoicePaymentInfo" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingAppliedPayments}: ${appliedAmount?currency(${invoice.currencyUomId})}, ${uiLabelMap.AccountingOpenPayments}: ${notAppliedAmount?currency(${invoice.currencyUomId})}"/></container>
- <include-form name="ListInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingInvoiceItems}"/></container>
- <include-form name="invoiceItems" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingInvoiceTimeEntries}"/></container>
- <include-form name="ListTimeEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingTransactions}"/></container>
- <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceHeader}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="invoiceHeader" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceRoles}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="invoiceRoles" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceStatus}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListInvoiceStatus" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyTerms}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListInvoiceTerms" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <include-form name="ListInvoicePaymentInfo" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAppliedPayments} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceItems}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="invoiceItems" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceTimeEntries}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListTimeEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingTransactions}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</fail-widgets>
</section>
</decorator-section>
@@ -224,7 +488,6 @@
<screen name="InvoiceStatus">
<section>
<actions>
- <set field="title" value="List status records for an invoice"/>
<set field="titleProperty" value="PageTitleListInvoices"/>
<set field="tabButtonItem" value="invoiceStatus"/>
<set field="invoiceId" from-field="parameters.invoiceId"/>
@@ -237,8 +500,20 @@
<widgets>
<decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">
<decorator-section name="body">
- <label style="head1" text="${uiLabelMap.AccountingInvoiceStatusHistory}"/>
- <include-form name="ListInvoiceStatus" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceStatusHistory}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListInvoiceStatus" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -248,7 +523,6 @@
<screen name="EditInvoiceApplications">
<section>
<actions>
- <set field="title" value="List payments records for an invoice"/>
<set field="titleProperty" value="PageTitleListEditInvoiceApplications"/>
<set field="tabButtonItem" value="editInvoiceApplications"/>
@@ -267,8 +541,20 @@
<if-compare field-name="notAppliedAmount" operator="greater" value="0"/>
</condition>
<widgets>
- <container><label style="head1" text="${uiLabelMap.AccountingPaymentsApplied}: ${appliedAmount?currency(${invoice.currencyUomId})}, ${uiLabelMap.AccountingOpenPayments}: ${notAppliedAmount?currency(${invoice.currencyUomId})}"/></container>
- <include-form name="EditInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
<section>
<condition>
<if-empty field-name="invoiceApplications"/>
@@ -282,16 +568,52 @@
<not><if-empty field-name="payments"/></not>
</condition>
<widgets>
- <container><label style="head1" text="${uiLabelMap.AccountingListPaymentsNotYetApplied}: [${invoice.partyIdFrom}], ${uiLabelMap.AccountingPaymentSentForm}: [${invoice.partyId}]"/></container>
- <include-form name="ListPaymentsNotApplied" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingListPaymentsNotYetApplied} [${invoice.partyIdFrom}] ${uiLabelMap.AccountingPaymentSentForm} [${invoice.partyId}]"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListPaymentsNotApplied" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
</section>
- <container><label style="head1" text="${uiLabelMap.AccountingAssignPaymentToInvoice}"/></container>
- <include-form name="AddPayment" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAssignPaymentToInvoice}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddPayment" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
<fail-widgets>
- <label style="head1" text="${uiLabelMap.AccountingPaymentsApplied}: ${appliedAmount?currency(${invoice.currencyUomId})}, ${uiLabelMap.AccountingOpenPayments}: ${notAppliedAmount?currency(${invoice.currencyUomId})}"/>
- <include-form name="EditInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditInvoiceApplications" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
<section>
<condition>
<if-empty field-name="invoiceApplications"/>
@@ -311,7 +633,6 @@
<screen name="EditInvoiceItems">
<section>
<actions>
- <set field="title" value="List item lines for an invoice"/>
<set field="titleProperty" value="PageTitleListInvoices"/>
<set field="tabButtonItem" value="listInvoiceItems"/>
<set field="invoiceId" from-field="parameters.invoiceId"/>
@@ -328,10 +649,48 @@
<widgets>
<decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">
<decorator-section name="body">
- <label style="head1" text="${uiLabelMap.AccountingInvoiceItems}"/>
- <include-form name="EditInvoiceItems" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingInvoiceItemAdd}"/></container>
- <include-form name="EditInvoiceItem" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAssignPaymentToInvoice}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddPayment" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceItems}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditInvoiceItems" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceItemAdd}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditInvoiceItem" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -341,7 +700,6 @@
<screen name="EditInvoiceTimeEntries">
<section>
<actions>
- <set field="title" value="List time entries for an invoice"/>
<set field="titleProperty" value="PageTitleListInvoiceTimeEntries"/>
<set field="tabButtonItem" value="EditInvoiceTimeEntries"/>
<set field="invoiceId" from-field="parameters.invoiceId"/>
@@ -354,8 +712,20 @@
<widgets>
<decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">
<decorator-section name="body">
- <label style="head1" text="${uiLabelMap.AccountingInvoiceTimeEntries}"/>
- <include-form name="EditTimeEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingInvoiceTimeEntries}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditTimeEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -365,7 +735,6 @@
<screen name="InvoiceRoles">
<section>
<actions>
- <set field="title" value="List roles for an invoice"/>
<set field="titleProperty" value="PageTitleListInvoiceRoles"/>
<set field="tabButtonItem" value="invoiceRoles"/>
<set field="invoiceId" from-field="parameters.invoiceId"/>
@@ -378,10 +747,34 @@
<widgets>
<decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">
<decorator-section name="body">
- <label style="head1" text="${uiLabelMap.AccountingPartyRoleList}"/>
- <include-form name="ListInvoiceRoles" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <container><label style="head1" text="${uiLabelMap.AccountingPartyRoleAdd}"/></container>
- <include-form name="EditInvoiceRole" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingPartyRoleList}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListInvoiceRoles" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingPartyRoleAdd}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditInvoiceRole" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -399,8 +792,20 @@
<widgets>
<decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}">
<decorator-section name="body">
- <label style="head1" text="${uiLabelMap.CommonSendPerEmail}"/>
- <include-form name="SendPerEmail" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.CommonSendPerEmail}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="SendPerEmail" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -414,5 +819,4 @@
</widgets>
</section>
</screen>
-
-</screens>
+</screens>
\ No newline at end of file