OFBiz › OFBiz - Commits

svn commit: r617306 - in /ofbiz/trunk/applications/accounting: config/ webapp/accounting/payment/ widget/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

mrisaliti

svn commit: r617306 - in /ofbiz/trunk/applications/accounting: config/ webapp/accounting/payment/ widget/

Author: mrisaliti
Date: Thu Jan 31 15:52:40 2008
New Revision: 617306

URL: http://svn.apache.org/viewvc?rev=617306&view=rev
Log:
Gl/Report Financial Summary 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/payment/PaymentForms.xml
ofbiz/trunk/applications/accounting/widget/GlForms.xml
ofbiz/trunk/applications/accounting/widget/GlScreens.xml
ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=617306&r1=617305&r2=617306&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Thu Jan 31 15:52:40 2008
@@ -178,7 +178,7 @@
AccountingExpEndOfLifeIsEmpty=Field expectedEndOfLife is empty in FixedAsset data.
AccountingExpirationDate=Expiration Date
AccountingExternalAccountId=Accounting External Account Id
-AccountingAcctgTranss=Accounting Transactions
+AccountingAcctgTrans=Accounting Transactions
AccountingAcctgTransEntries=Accounting Transactions Entries
AccountingFindInvoices=Find Invoices
AccountingFindPayment=Find Payment
@@ -401,6 +401,7 @@
AccountingPayWithWorldPay=Pay With WorldPay
AccountingPermissionError=You do not have permission for this function.
AccountingPleaseSendPaymentTo=Please Send Payment To
+AccountingPost=Post
AccountingPostTransaction=Post Transaction
AccountingPreference=Accounting Preferences
AccountingPrefixCard=Prefix on Card
@@ -449,6 +450,7 @@
AccountingTotalCapital=TOTAL
AccountingTotalExclTax=Total excl. tax
AccountingTransactions=Transactions
+AccountingTransactionTotals=Transaction Totals
AccountingTransactionType=Transaction Type
AccountingTransactionTypeNotYetSupported=This transaction type is not yet supported
AccountingTrialBalance=Trial Balance
@@ -491,6 +493,7 @@
AccountingFixedAssetMaintMessage3=If Maintenance Template is specified with Product Maintenance, this will be set/reset automatically

PageTitleAddBillingAccountRoles=Add Billing Account Roles
+PageTitleAddTransactionEntry=Add Transaction Entry
PageTitleCopyAgreement=Copy Agreement
PageTitleEditAgreement=Edit Agreement
PageTitleEditAgreementGeographicalApplic=Edit Agreement Geographical Applic
@@ -517,6 +520,7 @@
PageTitleEditGlobalGlAccount=Edit Global GL Account
PageTitleEditInvoice=Edit Invoice
PageTitleEditPayment=Edit Payment
+PageTitleEditTransaction=Edit Accounting transaction
PageTitleFindAgreement=Find Agreements
PageTitleFindBillingAccount=Find Billing Account(s)
PageTitleFindGatewayResponses=Find Gateway Responses
@@ -552,6 +556,7 @@
PageTitleListInvoices=List Invoices
PageTitleListInvoiceRoles=List Invoice Roles
PageTitleListPaymentApplications=List Payment Applications
+PageTitleEditTransactionEntries=List Accounting Transaction Entries
PageTitleLogin=Login
PageTitleLookupBillingAccount=Lookup Billing Account by Name
PageTitleLookupFixedAsset=Lookup Fixed Asset
@@ -932,6 +937,7 @@
FormFieldTitle_periodName=Period Name
FormFieldTitle_customTimePeriodId=Custom Time Period Id
FormFieldTitle_isClosed=Is Closed
+FormFieldTitle_totalAmount=Total Amount

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=617306&r1=617305&r2=617306&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties Thu Jan 31 15:52:40 2008
@@ -51,7 +51,7 @@
AccountingAccountNumber=Numero Conto
AccountingAccountType=Tipo Conto
AccountingAccounts=Conti
-AccountingAcctgTranss=Transazioni Contabilit\u00e0
+AccountingAcctgTrans=Transazioni Contabilit\u00e0
AccountingAcctgTransEntries=Voci Transazioni Contabilit\u00e0
AccountingActualCurrencyAmount=Attuale Importo in Valuta
AccountingActualCurrencyUomId=Attuale Udm Valuta
@@ -114,6 +114,8 @@
AccountingBillToAddress1=Fattura-All'Indirizzo 1
AccountingBillToAddress2=Fattura-All'Indirizzo 2
AccountingBillUpTo=Fatturare A
+AccountingByAccount=Per Conto
+AccountingByDate=Per Data
AccountingCapture=Cattura
AccountingCardNumber=Numero Carta
AccountingCardType=Tipo Carta
@@ -127,8 +129,11 @@
AccountingCompanyNameAccount=Nome Azienda sul Conto
AccountingCompanyNameCard=Nome Azienda sulla Carta
AccountingCompanySubtitle=Part of the Open For Business Family of Open Source Software
+AccountingComparativeBalanceSheet=Bilancio Comparato
AccountingCopyAgreement=Copia Contratto
AccountingCouldNotFindGlAccount=Non trovato Conto Gl con Codice
+AccountingCreateAcctgTransAndEntries=Creazione Veloce Transazione Contabilit\u00e0
+AccountingCreateAnAccountingTransaction=Crea Transazione Contabilit\u00e0
AccountingCreateAssignment=Creare Assegnazione
AccountingCreateBillingAccount=Creare Conto Fatturazione
AccountingCreateBillingAccountPermissionError=Errore Sicurezza : per eseguire createBillingAccount tu devi avere il permesso ACCOUNTING_CREATE o ACCOUNTING_ADMIN<br>
@@ -155,6 +160,7 @@
AccountingDescription=Descrizione
AccountingDescr=Descr.
AccountingDueDate=Data Scadenza
+AccountingDuplicateAccountingTransaction=Duplica Transazione Contabilit\u00e0
AccountingEditPayment=Aggiorna Pagamento
AccountingEffective=Effettiva
AccountingEffectiveDate=Data Effettiva
@@ -378,6 +384,7 @@
AccountingPaymentTypeAssigmentList=Lista Assegnazioni Tipi Pagamento ai Tipo Conti Gl
AccountingPermissionError=Tu non hai il permesso per questa funzione.
AccountingPleaseSendPaymentTo=Perfavore Inviare Pagamento A:
+AccountingPost=Contabilizza
AccountingPostTransaction=Contabilizza Transazione
AccountingPreference=Preferenze Contabilit\u00e0 Organizzazione
AccountingPrefixCard=Prefisso sulla Carta
@@ -389,10 +396,10 @@
AccountingProductGlAccount=Conti Prodotto
AccountingProductId=Codice Prodotto
AccountingProductRates=Percentuali Prodotto
-AccountingAssignPurchaseInvoiceToRevenue=Purchase Invoice type to Expense GL Account Number assignment list
AccountingReceivePayment=Pagamento Ricevuto
AccountingReferenceNumber=Numero Riferimento
AccountingReports=Stampe
+AccountingRevertAccountingTransaction=Annulla Transazione Contabilit\u00e0
AccountingRoleType=Tipo Ruolo
AccountingRoleTypeIdFrom=Tipo Ruolo Da
AccountingRoleTypeIdTo=Tipo Ruolo A
@@ -422,6 +429,7 @@
AccountingTitleTransfer=Titolo Trasferimento
AccountingTotalCapital=TOTALE
AccountingTransactions=Transazioni
+AccountingTransactionTotals=Totali Transazioni
AccountingTransactionType=Tipo Transazione
AccountingTransactionTypeNotYetSupported=Questo tipo transazione non \u00e8 ancora supportata
AccountingTrialBalance=Bilancio di Prova
@@ -436,6 +444,7 @@
AccountingUpdatePaymentPermissionError=Errore Sicurezza : Per Aggiornare un Pagamento tu devi avere entrambi da o a Soggetto o il permesso PAY_INFO_UPDATE o PAY_INFO_ADMIN.
AccountingUnitPrice=Prezzo Unitario
AccountingValidationPattern=Usa espressioni regolari per la validazione dello stile
+AccountingVerifyTransaction=Verifica Transazione
AccountingVarianceReasonGlAccounts=Motivazione Varianza Conti Gl
AccountingViewPermissionError=Tu non sei autorizzato a vedere questa pagina. ("ACCOUNTING_VIEW" o "ACCOUNTING_ADMIN" necessitano)
AccountingFX=Tasso Cambio Valuta
@@ -458,6 +467,7 @@
AccountingFixedAssetMaintMessage2=Solamente usato se applicabile, pu\u00f2 essere usato Tipo Manutenzione invece

PageTitleAddBillingAccountRoles=Aggiungi Ruoli Conto Fatturazione
+PageTitleAddTransactionEntry=Aggiungi Voce Transazione
PageTitleCopyAgreement=Copia Contratto
PageTitleEditAgreement=Aggiorna Contratto
PageTitleEditAgreementGeographicalApplic=Aggiorna Contratto Applicazioni Geografiche
@@ -485,6 +495,7 @@
PageTitleEditInvoice=Aggiorna Fattura
PageTitleEditPartyGlAccounts=Aggiorna Conti Gl Soggetto
PageTitleEditPayment=Aggiorna Pagamento
+PageTitleEditTransaction=Aggiorna Transazione Contabilit\u00e0
PageTitleFindAgreement=Ricerca Contratti
PageTitleFindBillingAccount=Ricerca Conto(i) Fatturazione
PageTitleFindGatewayResponses=Ricerca Risposte Gateway
@@ -520,6 +531,7 @@
PageTitleListInvoices=Lista Fatture
PageTitleListInvoiceRoles=Lista Ruoli Fattura
PageTitleListPaymentApplications=Lista Applicazioni Pagamento
+PageTitleEditTransactionEntries=Lista Voci Transazione Contabilit\u00e0
PageTitleLogin=Login
PageTitleLookupBillingAccount=Ricerca Conto Fatturazione per Nome
PageTitleLookupFixedAsset=Ricerca Cespite
@@ -881,6 +893,7 @@
FormFieldTitle_periodName=Nome Periodo
FormFieldTitle_customTimePeriodId=Periodo Tempo Personalizzato
FormFieldTitle_isClosed=E\' Chiuso
+FormFieldTitle_totalAmount=Importo Totale

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/payment/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=617306&r1=617305&r2=617306&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Thu Jan 31 15:52:40 2008
@@ -415,7 +415,8 @@
<field name="paymentId"><hidden/></field>
</form>

- <form name="ListChecksToPrint" type="multi" list-name="payments" target="printChecks" separate-columns="true">
+ <form name="ListChecksToPrint" type="multi" list-name="payments" target="printChecks" separate-columns="true"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentId">
<hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/>
</field>
@@ -429,7 +430,8 @@
<submit/>
</field>
</form>
- <form name="ListChecksToSend" type="multi" use-row-submit="true" list-name="payments" target="quickSendPayment?organizationPartyId=${organizationPartyId}" separate-columns="true">
+ <form name="ListChecksToSend" type="multi" use-row-submit="true" list-name="payments" target="quickSendPayment?organizationPartyId=${organizationPartyId}" separate-columns="true"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentId"><hidden/></field>
<field name="paymentId">
<hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/>

Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=617306&r1=617305&r2=617306&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Thu Jan 31 15:52:40 2008
@@ -106,22 +106,22 @@
<hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice?invoiceId=${invoiceId}"/>
</field>
<field name="invoiceId" use-when="invoiceId==null"><display/></field>
- <field name="paymentId" use-when="paymentId!=null">
+ <field name="paymentId" use-when="paymentId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${paymentId}" target="editPayment?paymentId=${paymentId}"/>
</field>
<field name="paymentId" use-when="paymentId==null"><display/></field>
- <field name="workEffortId" use-when="workEffortId!=null">
+ <field name="workEffortId" use-when="workEffortId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" target-type="inter-app"/>
</field>
<field name="workEffortId" use-when="workEffortId==null"><display/></field>
- <field name="shipmentId" use-when="shipmentId!=null">
+ <field name="shipmentId" use-when="shipmentId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment?shipmentId=${shipmentId}" target-type="inter-app"/>
</field>
<field name="shipmentId" use-when="shipmentId==null"><display/></field>
<field name="isPosted"><display/></field>
<field name="postedDate"><display/></field>
<field name="postAcctgTrans" title="${uiLabelMap.CommonEmptyHeader}" use-when=""N".equals(isPosted)" widget-style="buttontext">
- <hyperlink target="postAcctgTrans?acctgTransId=${acctgTransId}" description="Post"/>
+ <hyperlink target="postAcctgTrans?acctgTransId=${acctgTransId}" description="${uiLabelMap.AccountingPost}"/>
</field>
<field name="postAcctgTrans" title="${uiLabelMap.CommonEmptyHeader}" use-when="!"N".equals(isPosted)"><display/></field>
</form>
@@ -138,7 +138,7 @@
<hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice?invoiceId=${invoiceId}"/>
</field>
<field name="invoiceId" use-when="invoiceId==null"><display/></field>
- <field name="paymentId" use-when="paymentId!=null">
+ <field name="paymentId" use-when="paymentId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${paymentId}" target="editPayment?paymentId=${paymentId}"/>
</field>
<field name="paymentId" use-when="paymentId==null"><display/></field>
@@ -241,11 +241,11 @@
<row-actions>
<set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("glAccountId");return new Boolean(!(prev!=null&&prev.equals(glAccountId)));}" type="Boolean"/>
</row-actions>
- <field name="glAccountId" position="1" use-when="showPosition1" widget-area-style="viewManyTR1"><display/></field>
- <field name="glAccountDescription" title="${uiLabelMap.CommonDescription}" position="1" use-when="showPosition1" widget-area-style="viewManyTR1">
+ <field name="glAccountId" position="1" use-when="showPosition1"><display/></field>
+ <field name="glAccountDescription" title="${uiLabelMap.CommonDescription}" position="1" use-when="showPosition1">
<display description="${accountCode} ${accountName}"/>
</field>
- <field name="glAccountClassId" position="1" use-when="showPosition1" widget-area-style="viewManyTR1">
+ <field name="glAccountClassId" position="1" use-when="showPosition1">
<display-entity entity-name="GlAccountClass" />
</field>

@@ -260,23 +260,23 @@
<hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice?invoiceId=${invoiceId}"/>
</field>
<field name="invoiceId" position="2" use-when="invoiceId==null"><display/></field>
- <field name="paymentId" position="2" use-when="paymentId!=null">
+ <field name="paymentId" position="2" use-when="paymentId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${paymentId}" target="editPayment?paymentId=${paymentId}"/>
</field>
<field name="paymentId" position="2" use-when="paymentId==null"><display/></field>
- <field name="workEffortId" position="2" use-when="workEffortId!=null">
+ <field name="workEffortId" position="2" use-when="workEffortId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" target-type="inter-app"/>
</field>
<field name="workEffortId" position="2" use-when="workEffortId==null"><display/></field>
- <field name="shipmentId" position="2" use-when="shipmentId!=null">
+ <field name="shipmentId" position="2" use-when="shipmentId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment?shipmentId=${shipmentId}" target-type="inter-app"/>
</field>
<field name="shipmentId" position="2" use-when="shipmentId==null"><display/></field>
- <field name="partyId" position="2" use-when="partyId!=null">
+ <field name="partyId" position="2" use-when="partyId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${partyId}" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app"/>
</field>
<field name="partyId" position="2" use-when="partyId==null"><display/></field>
- <field name="productId" position="2" use-when="productId!=null">
+ <field name="productId" position="2" use-when="productId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${productId}" target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app"/>
</field>
<field name="productId" position="2" use-when="productId==null"><display/></field>
@@ -321,30 +321,30 @@
<field name="glAccountDescription" title="${uiLabelMap.CommonDescription}">
<display description="${accountCode} ${accountName}"/>
</field>
- <field name="glAccountClassId" widget-area-style="viewManyTR1">
+ <field name="glAccountClassId">
<display-entity entity-name="GlAccountClass" />
</field>
<field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice?invoiceId=${invoiceId}"/>
</field>
<field name="invoiceId" use-when="invoiceId==null"><display/></field>
- <field name="paymentId" use-when="paymentId!=null">
+ <field name="paymentId" use-when="paymentId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${paymentId}" target="editPayment?paymentId=${paymentId}"/>
</field>
<field name="paymentId" use-when="paymentId==null"><display/></field>
- <field name="workEffortId" use-when="workEffortId!=null">
+ <field name="workEffortId" use-when="workEffortId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${workEffortId}" target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" target-type="inter-app"/>
</field>
<field name="workEffortId" use-when="workEffortId==null"><display/></field>
- <field name="shipmentId" use-when="shipmentId!=null">
+ <field name="shipmentId" use-when="shipmentId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${shipmentId}" target="/facility/control/EditShipment?shipmentId=${shipmentId}" target-type="inter-app"/>
</field>
<field name="shipmentId" use-when="shipmentId==null"><display/></field>
- <field name="partyId" use-when="partyId!=null">
+ <field name="partyId" use-when="partyId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${partyId}" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app"/>
</field>
<field name="partyId" use-when="partyId==null"><display/></field>
- <field name="productId" use-when="productId!=null">
+ <field name="productId" use-when="productId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${productId}" target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app"/>
</field>
<field name="productId" use-when="productId==null"><display/></field>

Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=617306&r1=617305&r2=617306&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Thu Jan 31 15:52:40 2008
@@ -37,26 +37,25 @@
<decorator-section name="body">
<section>
<widgets>
- <container style="lefthalf">
- <container>
- <link target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}&debitGlAccountClassId=CURRENT_ASSET&creditGlAccountClassId=REVENUE&acctgTransTypeId=SALES" text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext"/>
- </container>
- <container>
- <link target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}&debitGlAccountClassId=CASH_EQUIVALENT&creditGlAccountClassId=CURRENT_LIABILITY&acctgTransTypeId=PAYMENT_ACCTG_TRANS" text="${uiLabelMap.AccountingCreatePaymentAcctgTrans}" style="buttontext"/>
- </container>
- <container>
- <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
- </container>
- </container>
- <container style="righthalf">
- <container>
- <link target="TrialBalance?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingTrialBalance}" style="buttontext"/>
- </container>
- <container>
- <link target="IncomeStatement?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingIncomeStatement}" style="buttontext"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingPartyAccountsSummary}"/>
+ </container>
</container>
- <container>
- <link target="BalanceSheet?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingBalanceSheet}" style="buttontext"/>
+ <container style="screenlet-body">
+ <container>
+ <link target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}&debitGlAccountClassId=CURRENT_ASSET&creditGlAccountClassId=REVENUE&acctgTransTypeId=SALES" text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext"/>
+ <link target="TrialBalance?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingTrialBalance}" style="buttontext"/>
+ </container>
+ <container>
+ <link target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}&debitGlAccountClassId=CASH_EQUIVALENT&creditGlAccountClassId=CURRENT_LIABILITY&acctgTransTypeId=PAYMENT_ACCTG_TRANS" text="${uiLabelMap.AccountingCreatePaymentAcctgTrans}" style="buttontext"/>
+ <link target="IncomeStatement?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingIncomeStatement}" style="buttontext"/>
+ </container>
+ <container>
+ <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
+ <link target="BalanceSheet?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingBalanceSheet}" style="buttontext"/>
+ </container>
</container>
</container>
</widgets>
@@ -78,18 +77,36 @@
<widgets>
<decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <link text="${uiLabelMap.AccountingCreateAnAccountingTransaction}" style="buttontext" target="newAcctgTrans?organizationPartyId=${organizationPartyId}"/>
- <link text="${uiLabelMap.AccountingCreateAcctgTransAndEntries}" style="buttontext" target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}"/>
- <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAcctgTrans}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <container>
+ <link text="${uiLabelMap.AccountingCreateAnAccountingTransaction}" style="buttontext" target="newAcctgTrans?organizationPartyId=${organizationPartyId}"/>
+ <link text="${uiLabelMap.AccountingCreateAcctgTransAndEntries}" style="buttontext" target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}"/>
+ <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
+ </container>
+ <include-form name="FindAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
+ </container>
</container>
- <include-form name="FindAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
<section>
<condition>
<if-compare field-name="parameters.performSearch" operator="equals" value="Y"/>
</condition>
<widgets>
- <include-form name="ListAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAcctgTrans}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="ListAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
+ </container>
+ </container>
</widgets>
</section>
</decorator-section>
@@ -108,7 +125,16 @@
<widgets>
<decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="FindAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAcctgTransEntries}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="FindAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/>
+ </container>
+ </container>
<section>
<condition>
<and>
@@ -117,7 +143,16 @@
</and>
</condition>
<widgets>
- <include-form name="ListFindAcctgTransEntriesByAccount" location="component://accounting/widget/GlForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAcctgTransEntries} ${uiLabelMap.AccountingByAccount}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="ListFindAcctgTransEntriesByAccount" location="component://accounting/widget/GlForms.xml"/>
+ </container>
+ </container>
</widgets>
</section>
<section>
@@ -128,7 +163,16 @@
</and>
</condition>
<widgets>
- <include-form name="ListFindAcctgTransEntriesByDate" location="component://accounting/widget/GlForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAcctgTransEntries} ${uiLabelMap.AccountingByDate}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="ListFindAcctgTransEntriesByDate" location="component://accounting/widget/GlForms.xml"/>
+ </container>
+ </container>
</widgets>
</section>
</decorator-section>
@@ -148,7 +192,16 @@
<widgets>
<decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="CreateAcctgTransAndEntries" location="component://accounting/widget/GlForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingCreateAcctgTransAndEntries}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="CreateAcctgTransAndEntries" location="component://accounting/widget/GlForms.xml"/>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -159,7 +212,7 @@
<section>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="Edit Accounting transaction"/>
+ <set field="titleProperty" value="PageTitleEditTransaction"/>
<set field="tabButtonItem" value="FindAcctgTrans"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
<set field="acctgTransId" from-field="parameters.acctgTransId"/>
@@ -185,10 +238,30 @@
</condition>
<widgets>
<container>
- <link text="${uiLabelMap.AccountingDuplicateAccountingTransaction}" style="buttontext" target="copyAcctgTransAndEntries?revert=N&fromAcctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/>
- <link text="${uiLabelMap.AccountingRevertAccountingTransaction}" style="buttontext" target="copyAcctgTransAndEntries?revert=Y&fromAcctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/>
- <include-form name="EditAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
- <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditTransaction}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <link text="${uiLabelMap.AccountingDuplicateAccountingTransaction}" style="buttontext" target="copyAcctgTransAndEntries?revert=N&fromAcctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/>
+ <link text="${uiLabelMap.AccountingRevertAccountingTransaction}" style="buttontext" target="copyAcctgTransAndEntries?revert=Y&fromAcctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/>
+ <include-form name="EditAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
+ </container>
+ </container>
+ </container>
+ <container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditTransactionEntries}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/>
+ </container>
+ </container>
</container>
</widgets>
</section>
@@ -198,11 +271,22 @@
</condition>
<widgets>
<container>
- <link text="${uiLabelMap.AccountingVerifyTransaction}" style="buttontext" target="postAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}&verifyOnly=Y"/>
- <link text="${uiLabelMap.AccountingPostTransaction}" style="buttontext" target="postAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/>
- </container>
- <container>
- <include-form name="EditAcctgTransEntry" location="component://accounting/widget/GlForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleAddTransactionEntry}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <container>
+ <link text="${uiLabelMap.AccountingVerifyTransaction}" style="buttontext" target="postAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}&verifyOnly=Y"/>
+ <link text="${uiLabelMap.AccountingPostTransaction}" style="buttontext" target="postAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/>
+ </container>
+ <container>
+ <include-form name="EditAcctgTransEntry" location="component://accounting/widget/GlForms.xml"/>
+ </container>
+ </container>
+ </container>
</container>
</widgets>
</section>
@@ -216,6 +300,7 @@
<section>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="titleProperty" value="PageTitleUnpostedTransactions"/>
<set field="tabButtonItem" value="FindAcctgTrans"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
<set field="labelTitleProperty" value="${uiLabelMap.PageTitleUnpostedTransactions}"/>
@@ -228,7 +313,16 @@
<widgets>
<decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListUnpostedAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleUnpostedTransactions}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="ListUnpostedAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -265,7 +359,16 @@
<section>
<condition><if-has-permission permission="ACCOUNTING" action="_PRINT_CHECKS"/></condition>
<widgets>
- <include-form name="ListChecksToPrint" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingPrintChecks}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="ListChecksToPrint" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </container>
+ </container>
</widgets>
<fail-widgets>
<label style="head3">${uiLabelMap.AccountingPrintChecksPermissionError}</label>
@@ -305,7 +408,16 @@
<section>
<condition><if-has-permission permission="PAY_INFO" action="_UPDATE"/></condition>
<widgets>
- <include-form name="ListChecksToSend" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingSendChecks}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="ListChecksToSend" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </container>
+ </container>
</widgets>
<fail-widgets>
<label style="head3">${uiLabelMap.AccountingUpdatePaymentPermissionError}</label>
@@ -327,7 +439,16 @@
<widgets>
<decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="CreateAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingCreateAnAccountingTransaction}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="CreateAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -339,6 +460,7 @@
<actions>
<set field="titleProperty" value="AccountingAcctRecon"/>
<set field="tabButtonItem" value="AccountReconciliation"/>
+ <set field="labelTitleProperty" value="AccountingAcctRecon"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
<set field="glAccountId" from-field="parameters.glAccountId"/>
</actions>
@@ -443,6 +565,7 @@
<actions>
<set field="titleProperty" value="AccountingAcctRecons"/>
<set field="tabButtonItem" value="AccountReconciliations"/>
+ <set field="labelTitleProperty" value="AccountingAcctRecons"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
<set field="glAccountId" from-field="parameters.glAccountId"/>
</actions>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=617306&r1=617305&r2=617306&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Thu Jan 31 15:52:40 2008
@@ -24,8 +24,8 @@
<form name="ListCompanies" type="list" title="Internal Organizations" list-name="parties"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="partyId" title="${uiLabelMap.AccountingCompanies}"><display-entity entity-name="PartyGroup" description="${groupName}"/></field>
- <field name="setup" title="${uiLabelMap.CommonEmptyHeader}" use-when="hasPrefPermission"><hyperlink target="AdminMain?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingSetup}"/></field>
- <field name="accounting" title="${uiLabelMap.CommonEmptyHeader}" use-when="hasBasicPermission"><hyperlink target="PartyAccountsSummary?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAccounting}"/></field>
+ <field name="setup" title="${uiLabelMap.CommonEmptyHeader}" use-when="hasPrefPermission" widget-style="buttontext"><hyperlink target="AdminMain?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingSetup}"/></field>
+ <field name="accounting" title="${uiLabelMap.CommonEmptyHeader}" use-when="hasBasicPermission" widget-style="buttontext"><hyperlink target="PartyAccountsSummary?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAccounting}"/></field>
</form>

<form name="ListGlAccountOrganization" list-name="listIt" target="" title="" type="list"

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=617306&r1=617305&r2=617306&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Thu Jan 31 15:52:40 2008
@@ -434,7 +434,7 @@
<menu-item name="AccountReconciliations" title="${uiLabelMap.AccountingAcctRecons}">
<link target="findGlAccountReconciliations?organizationPartyId=${organizationPartyId}"/>
</menu-item>
- <menu-item name="FindAcctgTrans" title="${uiLabelMap.AccountingAcctgTranss}">
+ <menu-item name="FindAcctgTrans" title="${uiLabelMap.AccountingAcctgTrans}">
<link target="FindAcctgTrans?organizationPartyId=${organizationPartyId}"/>
</menu-item>
<menu-item name="FindAcctgTransEntries" title="${uiLabelMap.AccountingAcctgTransEntries}">

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=617306&r1=617305&r2=617306&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Thu Jan 31 15:52:40 2008
@@ -21,7 +21,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">

- <form name="BaseSummaryOptions" type="single">
+ <form name="BaseSummaryOptions" type="single" header-row-style="header-row" default-table-style="basic-table">
<field name="month" required-field="true">
<drop-down allow-empty="false">
<option key="01" description="1-January"/><option key="02" description="2-February"/>
@@ -51,24 +51,30 @@
</field>
</form>

- <form name="SalesInvoiceByProductCategorySummaryOptions" type="single" target="SalesInvoiceByProductCategorySummary" extends="BaseSummaryOptions">
+ <form name="SalesInvoiceByProductCategorySummaryOptions" type="single" target="SalesInvoiceByProductCategorySummary" extends="BaseSummaryOptions"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="rootProductCategoryId" required-field="true"><lookup target-form-name="LookupProductCategory"/></field>
<field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="SalesInvoiceByProductGlAccountSummaryOptions" type="single" target="SalesInvoiceByProductGlAccountSummary" extends="BaseSummaryOptions">
+ <form name="SalesInvoiceByProductGlAccountSummaryOptions" type="single" target="SalesInvoiceByProductGlAccountSummary" extends="BaseSummaryOptions"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="PaymentByMethodSummaryOptions" type="single" target="PaymentByMethodSummary" extends="BaseSummaryOptions">
+ <form name="PaymentByMethodSummaryOptions" type="single" target="PaymentByMethodSummary" extends="BaseSummaryOptions"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="InventoryIssueSummaryOptions" type="single" target="InventoryIssueSummary" extends="BaseSummaryOptions">
+ <form name="InventoryIssueSummaryOptions" type="single" target="InventoryIssueSummary" extends="BaseSummaryOptions"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="FinancialAccountSummaryOptions" type="single" target="FinancialAccountSummary" extends="BaseSummaryOptions">
+ <form name="FinancialAccountSummaryOptions" type="single" target="FinancialAccountSummary" extends="BaseSummaryOptions"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>

- <form name="TrialBalanceList" type="list" list-name="trialBalances">
+ <form name="TrialBalanceList" type="list" list-name="trialBalances"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
<entity-one entity-name="GlAccount" value-name="glAccount">
<field-map field-name="glAccountId"/>
@@ -94,7 +100,8 @@
<field name="credit" entry-name="creditTotal" use-when="showTotals" widget-area-style="viewManyTR1"><display type="currency" currency="${currencyUomId}"/></field>
</form>

- <form name="IncomeStatementParameters" type="single" target="prepareIncomeStatement">
+ <form name="IncomeStatementParameters" type="single" target="prepareIncomeStatement"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="organizationPartyId"><hidden/></field>
<field name="fromDate"><date-time/></field>
<field name="thruDate"><date-time/></field>
@@ -108,7 +115,8 @@
<field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>

- <form name="IncomeStatementList" type="list" list-name="glAccountTotalsList">
+ <form name="IncomeStatementList" type="list" list-name="glAccountTotalsList"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
<entity-one entity-name="GlAccount" value-name="glAccount">
<field-map field-name="glAccountId"/>
@@ -120,7 +128,8 @@
<field name="totalAmount"><display type="currency" currency="${currencyUomId}"/></field>
</form>

- <form name="BalanceSheetParameters" type="single" target="prepareBalanceSheet">
+ <form name="BalanceSheetParameters" type="single" target="prepareBalanceSheet"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="organizationPartyId"><hidden/></field>
<field name="thruDate"><date-time/></field>
<field name="glFiscalTypeId">
@@ -132,7 +141,8 @@
</field>
<field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ComparativeBalanceSheetParameters" type="single" target="prepareComparativeBalanceSheet">
+ <form name="ComparativeBalanceSheetParameters" type="single" target="prepareComparativeBalanceSheet"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="organizationPartyId"><hidden/></field>
<field name="period1ThruDate"><date-time/></field>
<field name="period1GlFiscalTypeId">
@@ -153,7 +163,8 @@
<field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>

- <form name="BalanceSheetAssetList" type="list" list-name="assetBalancesList">
+ <form name="BalanceSheetAssetList" type="list" list-name="assetBalancesList"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
<entity-one entity-name="GlAccount" value-name="glAccount">
<field-map field-name="glAccountId"/>
@@ -164,7 +175,8 @@
</field>
<field name="totalAmount"><display type="currency" currency="${currencyUomId}"/></field>
</form>
- <form name="BalanceSheetLiabilityList" type="list" list-name="liabilityBalancesList">
+ <form name="BalanceSheetLiabilityList" type="list" list-name="liabilityBalancesList"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
<entity-one entity-name="GlAccount" value-name="glAccount">
<field-map field-name="glAccountId"/>
@@ -175,7 +187,8 @@
</field>
<field name="totalAmount"><display type="currency" currency="${currencyUomId}"/></field>
</form>
- <form name="BalanceSheetEquityList" type="list" list-name="equityBalancesList">
+ <form name="BalanceSheetEquityList" type="list" list-name="equityBalancesList"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
<entity-one entity-name="GlAccount" value-name="glAccount">
<field-map field-name="glAccountId"/>
@@ -186,5 +199,4 @@
</field>
<field name="totalAmount"><display type="currency" currency="${currencyUomId}"/></field>
</form>
-
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=617306&r1=617305&r2=617306&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Thu Jan 31 15:52:40 2008
@@ -20,7 +20,7 @@

<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
-
+
<screen name="FinancialSummaryReportOptions">
<section>
<actions>
@@ -35,26 +35,66 @@
<decorator-section name="body">
<container><label style="head1" text="${uiLabelMap.PageTitleFinancialSummaryReportOptions}"/></container>

- <container><label style="head2" text="${uiLabelMap.PageTitleSalesInvoiceByProductCategorySummary}"/></container>
- <include-form name="SalesInvoiceByProductCategorySummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
-
- <container><label style="head2" text="${uiLabelMap.PageTitleSalesInvoiceByProductGlAccountSummary}"/></container>
- <include-form name="SalesInvoiceByProductGlAccountSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleSalesInvoiceByProductCategorySummary}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="SalesInvoiceByProductCategorySummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
+ </container>

- <container><label style="head2" text="${uiLabelMap.PageTitlePaymentByMethodSummary}"/></container>
- <include-form name="PaymentByMethodSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleSalesInvoiceByProductGlAccountSummary}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="SalesInvoiceByProductGlAccountSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
+ </container>

- <container><label style="head2" text="${uiLabelMap.PageTitleInventoryIssueSummary}"/></container>
- <include-form name="InventoryIssueSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitlePaymentByMethodSummary}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="PaymentByMethodSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
+ </container>
+
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleInventoryIssueSummary}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="InventoryIssueSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
+ </container>

- <container><label style="head2" text="${uiLabelMap.PageTitleFinancialAccountSummary}"/></container>
- <include-form name="FinancialAccountSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFinancialAccountSummary}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="FinancialAccountSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-
+
<screen name="FinancialSummaryDataPrep">
<section>
<actions>
@@ -94,8 +134,16 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <label style="head1" text="${uiLabelMap.PageTitleSalesInvoiceByProductCategorySummary}"/>
- <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl"/></html></platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleSalesInvoiceByProductCategorySummary}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl"/></html></platform-specific>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -116,8 +164,16 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <label style="head1" text="${uiLabelMap.PageTitleSalesInvoiceByProductGlAccountSummary}"/>
- <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/SalesInvoiceByProductGlAccountSummary.ftl"/></html></platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleSalesInvoiceByProductGlAccountSummary}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/SalesInvoiceByProductGlAccountSummary.ftl"/></html></platform-specific>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -139,8 +195,16 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <label style="head1" text="${uiLabelMap.PageTitlePaymentByMethodSummary}"/>
- <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/PaymentByMethodSummary.ftl"/></html></platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitlePaymentByMethodSummary}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/PaymentByMethodSummary.ftl"/></html></platform-specific>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -161,8 +225,16 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <label style="head1" text="${uiLabelMap.PageTitleInventoryIssueSummary}"/>
- <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/InventoryIssueSummary.ftl"/></html></platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleInventoryIssueSummary}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/InventoryIssueSummary.ftl"/></html></platform-specific>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -183,8 +255,16 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <label style="head1" text="${uiLabelMap.PageTitleFinancialAccountSummary}"/>
- <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/FinancialAccountSummary.ftl"/></html></platform-specific>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFinancialAccountSummary}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/FinancialAccountSummary.ftl"/></html></platform-specific>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -196,6 +276,7 @@
<screen name="TrialBalance">
<section>
<actions>
+ <set field="titleProperty" value="AccountingTrialBalance"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="TrialBalance"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
@@ -220,10 +301,16 @@
<widgets>
<decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="head2" text="${uiLabelMap.AccountingTrialBalance}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingTrialBalance}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="TrialBalanceList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
</container>
- <include-form name="TrialBalanceList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -233,6 +320,7 @@
<screen name="IncomeStatement">
<section>
<actions>
+ <set field="titleProperty" value="AccountingIncomeStatement"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="IncomeStatement"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
@@ -246,18 +334,33 @@
<widgets>
<decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="head2" text="${uiLabelMap.AccountingIncomeStatement}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingIncomeStatement}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="IncomeStatementParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
</container>
- <include-form name="IncomeStatementParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<section>
<condition>
<not><if-empty field-name="parameters.totalNetIncome"/></not>
</condition>
<widgets>
- <include-form name="IncomeStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- <container>
- <label style="head3" text="${uiLabelMap.AccountingNetIncome}: ${parameters.totalNetIncome}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingIncomeStatement}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="IncomeStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container>
+ <label style="head3" text="${uiLabelMap.AccountingNetIncome}: ${parameters.totalNetIncome}"/>
+ </container>
+ </container>
</container>
</widgets>
</section>
@@ -270,6 +373,7 @@
<screen name="BalanceSheet">
<section>
<actions>
+ <set field="titleProperty" value="AccountingBalanceSheet"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="BalanceSheet"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
@@ -285,10 +389,16 @@
<widgets>
<decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="head2" text="${uiLabelMap.AccountingBalanceSheet}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingBalanceSheet}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="BalanceSheetParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
</container>
- <include-form name="BalanceSheetParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<section>
<condition>
<or>
@@ -298,18 +408,36 @@
</or>
</condition>
<widgets>
- <container>
- <label style="head2" text="${uiLabelMap.AccountingAssets}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAssets}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="BalanceSheetAssetList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingLiabilities}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="BalanceSheetLiabilityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
</container>
- <include-form name="BalanceSheetAssetList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- <container>
- <label style="head2" text="${uiLabelMap.AccountingLiabilities}"/>
- </container>
- <include-form name="BalanceSheetLiabilityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- <container>
- <label style="head2" text="${uiLabelMap.AccountingEquities}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingEquities}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="BalanceSheetEquityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
</container>
- <include-form name="BalanceSheetEquityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</widgets>
</section>
</decorator-section>
@@ -321,6 +449,7 @@
<screen name="ComparativeBalanceSheet">
<section>
<actions>
+ <set field="titleProperty" value="AccountingComparativeBalanceSheet"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="ComparativeBalanceSheet"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
@@ -336,10 +465,16 @@
<widgets>
<decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="head2" text="${uiLabelMap.AccountingComparativeBalanceSheet}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingComparativeBalanceSheet}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="ComparativeBalanceSheetParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
</container>
- <include-form name="ComparativeBalanceSheetParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
<section>
<condition>
<or>
@@ -349,18 +484,36 @@
</or>
</condition>
<widgets>
- <container>
- <label style="head2" text="${uiLabelMap.AccountingAssets}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAssets}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="BalanceSheetAssetList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingLiabilities}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="BalanceSheetLiabilityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
</container>
- <include-form name="BalanceSheetAssetList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- <container>
- <label style="head2" text="${uiLabelMap.AccountingLiabilities}"/>
- </container>
- <include-form name="BalanceSheetLiabilityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- <container>
- <label style="head2" text="${uiLabelMap.AccountingEquities}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingEquities}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="BalanceSheetEquityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </container>
</container>
- <include-form name="BalanceSheetEquityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</widgets>
</section>
</decorator-section>
@@ -373,6 +526,7 @@
<screen name="TransactionTotals">
<section>
<actions>
+ <set field="titleProperty" value="AccountingTransactionTotals"/>
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="TransactionTotals"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
@@ -380,12 +534,16 @@
<widgets>
<decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container>
- <label style="head2" text="${uiLabelMap.AccountingTransactionTotals}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingTransactionTotals}"/>
+ </container>
+ </container>
</container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
+</screens>
\ No newline at end of file