svn commit: r826270 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: buscob
Date: Sat Oct 17 15:14:14 2009 New Revision: 826270 URL: http://svn.apache.org/viewvc?rev=826270&view=rev Log: Changed <container style="screenlet"> pattern to <screenlet...>. Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml ofbiz/trunk/applications/accounting/widget/GlScreens.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=826270&r1=826269&r2=826270&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Sat Oct 17 15:14:14 2009 @@ -160,20 +160,9 @@ <widgets> <decorator-screen name="CommonBillingAccountDecorator" location="${parameters.billingAccountDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditBillingAccountTerms} - ${uiLabelMap.AccountingAccountId} ${billingAccount.billingAccountId}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListBillingAccountTerms" location="component://accounting/widget/BillingAccountForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditBillingAccountTerms} - ${uiLabelMap.AccountingAccountId} ${billingAccount.billingAccountId}"> + <include-form name="ListBillingAccountTerms" location="component://accounting/widget/BillingAccountForms.xml"/> + </screenlet> <section> <condition> <not><if-empty field="parameters.billingAccountTermId"/></not> @@ -182,36 +171,14 @@ <entity-one entity-name="BillingAccountTerm" value-field="billingAccountTerm"/> </actions> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditBillingAccountTerms}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditBillingAccountTerms" location="component://accounting/widget/BillingAccountForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditBillingAccountTerms}"> + <include-form name="EditBillingAccountTerms" location="component://accounting/widget/BillingAccountForms.xml"/> + </screenlet> </widgets> <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingCreateBillingAccountTerm}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditBillingAccountTerms" location="component://accounting/widget/BillingAccountForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingCreateBillingAccountTerm}"> + <include-form name="EditBillingAccountTerms" location="component://accounting/widget/BillingAccountForms.xml"/> + </screenlet> </fail-widgets> </section> </decorator-section> @@ -256,20 +223,9 @@ <widgets> <decorator-screen name="CommonBillingAccountDecorator" location="${parameters.billingAccountDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditBillingAccountOrders}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListBillingAccountOrders" location="component://accounting/widget/BillingAccountForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditBillingAccountOrders}"> + <include-form name="ListBillingAccountOrders" location="component://accounting/widget/BillingAccountForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=826270&r1=826269&r2=826270&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Sat Oct 17 15:14:14 2009 @@ -521,22 +521,11 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFixedAssetDepreciationReport}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/fixedasset/DepreciationReport.ftl"/></html> - </platform-specific> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleFixedAssetDepreciationReport}"> + <platform-specific> + <html><html-template location="component://accounting/webapp/accounting/fixedasset/DepreciationReport.ftl"/></html> + </platform-specific> + </screenlet> </widgets> </section> </decorator-section> Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=826270&r1=826269&r2=826270&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Sat Oct 17 15:14:14 2009 @@ -37,45 +37,38 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingPartyAccountsSummary}"/> - </container> + <screenlet title="${uiLabelMap.AccountingPartyAccountsSummary}"> + <container> + <link target="CreateAcctgTransAndEntries" text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="debitGlAccountClassId" value="CURRENT_ASSET"/> + <parameter param-name="creditGlAccountClassId" value="REVENUE"/> + <parameter param-name="acctgTransTypeId" value="SALES"/> + </link> + <link target="TrialBalance" text="${uiLabelMap.AccountingTrialBalance}" style="buttontext"> + <parameter param-name="organizationPartyId"/> + </link> </container> - <container style="screenlet-body"> - <container> - <link target="CreateAcctgTransAndEntries" text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext"> - <parameter param-name="organizationPartyId"/> - <parameter param-name="debitGlAccountClassId" value="CURRENT_ASSET"/> - <parameter param-name="creditGlAccountClassId" value="REVENUE"/> - <parameter param-name="acctgTransTypeId" value="SALES"/> - </link> - <link target="TrialBalance" text="${uiLabelMap.AccountingTrialBalance}" style="buttontext"> - <parameter param-name="organizationPartyId"/> - </link> - </container> - <container> - <link target="CreateAcctgTransAndEntries" text="${uiLabelMap.AccountingCreatePaymentAcctgTrans}" style="buttontext"> - <parameter param-name="organizationPartyId"/> - <parameter param-name="debitGlAccountClassId" value="CASH_EQUIVALENT"/> - <parameter param-name="creditGlAccountClassId" value="CURRENT_LIABILITY"/> - <parameter param-name="acctgTransTypeId" value="PAYMENT_ACCTG_TRANS"/> - </link> - <link target="IncomeStatement" text="${uiLabelMap.AccountingIncomeStatement}" style="buttontext"> - <parameter param-name="organizationPartyId"/> - </link> - </container> - <container> - <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans"> - <parameter param-name="organizationPartyId"/> - </link> - <link target="BalanceSheet" text="${uiLabelMap.AccountingBalanceSheet}" style="buttontext"> - <parameter param-name="organizationPartyId"/> - </link> - </container> + <container> + <link target="CreateAcctgTransAndEntries" text="${uiLabelMap.AccountingCreatePaymentAcctgTrans}" style="buttontext"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="debitGlAccountClassId" value="CASH_EQUIVALENT"/> + <parameter param-name="creditGlAccountClassId" value="CURRENT_LIABILITY"/> + <parameter param-name="acctgTransTypeId" value="PAYMENT_ACCTG_TRANS"/> + </link> + <link target="IncomeStatement" text="${uiLabelMap.AccountingIncomeStatement}" style="buttontext"> + <parameter param-name="organizationPartyId"/> + </link> </container> - </container> + <container> + <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans"> + <parameter param-name="organizationPartyId"/> + </link> + <link target="BalanceSheet" text="${uiLabelMap.AccountingBalanceSheet}" style="buttontext"> + <parameter param-name="organizationPartyId"/> + </link> + </container> + </screenlet> </widgets> </section> </decorator-section> @@ -95,72 +88,91 @@ <widgets> <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingAcctgTrans}"/> - </container> + <screenlet title="${uiLabelMap.AccountingAcctgTrans}"> + <container> + <link text="${uiLabelMap.AccountingCreateAnAccountingTransaction}" style="buttontext" target="newAcctgTrans"> + <parameter param-name="organizationPartyId"/> + </link> + <link text="${uiLabelMap.AccountingCreateAcctgTransAndEntries}" style="buttontext" target="CreateAcctgTransAndEntries"> + <parameter param-name="organizationPartyId"/> + </link> + <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans"> + <parameter param-name="organizationPartyId"/> + </link> </container> - <container style="screenlet-body"> - <container> - <link text="${uiLabelMap.AccountingCreateAnAccountingTransaction}" style="buttontext" target="newAcctgTrans"> + <include-form name="FindAcctgTrans" location="component://accounting/widget/GlForms.xml"/> + </screenlet> + <section> + <condition> + <if-compare field="parameters.performSearch" operator="equals" value="Y"/> + </condition> + <widgets> + <screenlet title="${uiLabelMap.AccountingAcctgTrans}"> + <link text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext" target="AcctgTransSearchResultsCsv.csv"> <parameter param-name="organizationPartyId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> </link> - <link text="${uiLabelMap.AccountingCreateAcctgTransAndEntries}" style="buttontext" target="CreateAcctgTransAndEntries"> + <link text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext" target="AcctgTransSearchResultPdf.pdf"> <parameter param-name="organizationPartyId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> </link> - <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans"> + <include-form name="ListAcctgTrans" location="component://accounting/widget/GlForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.AccountingAcctgTrans}"> + <link text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext" target="AcctgTransSearchResultsCsv.csv"> <parameter param-name="organizationPartyId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> </link> - </container> - <include-form name="FindAcctgTrans" location="component://accounting/widget/GlForms.xml"/> - </container> - </container> - <section> - <condition> - <if-compare field="parameters.performSearch" operator="equals" value="Y"/> - </condition> - <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingAcctgTrans}"/> - </container> - </container> - <container style="screenlet-body"> - <link text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext" target="AcctgTransSearchResultsCsv.csv"> - <parameter param-name="organizationPartyId"/> - <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> - <parameter param-name="produtId" from-field="parameters.produtId"/> - <parameter param-name="isPosted" from-field="parameters.isPosted"/> - <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> - <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> - <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> - <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> - <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> - <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> - <parameter param-name="paymentId" from-field="parameters.paymentId"/> - <parameter param-name="fromDate" from-field="parameters.fromDate"/> - <parameter param-name="thruDate" from-field="parameters.thruDate"/> - </link> - <link text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext" target="AcctgTransSearchResultPdf.pdf"> - <parameter param-name="organizationPartyId"/> - <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> - <parameter param-name="produtId" from-field="parameters.produtId"/> - <parameter param-name="isPosted" from-field="parameters.isPosted"/> - <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> - <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> - <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> - <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> - <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> - <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> - <parameter param-name="paymentId" from-field="parameters.paymentId"/> - <parameter param-name="fromDate" from-field="parameters.fromDate"/> - <parameter param-name="thruDate" from-field="parameters.thruDate"/> - </link> - <include-form name="ListAcctgTrans" location="component://accounting/widget/GlForms.xml"/> - </container> - </container> + <link text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext" target="AcctgTransSearchResultPdf.pdf"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> + </link> + <include-form name="ListAcctgTrans" location="component://accounting/widget/GlForms.xml"/> + </screenlet> </widgets> </section> </decorator-section> @@ -179,16 +191,9 @@ <widgets> <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingAcctgTransEntries}"/> - </container> - </container> - <container style="screenlet-body"> - <include-form name="FindAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingAcctgTransEntries}"> + <include-form name="FindAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/> + </screenlet> <section> <condition> <and> @@ -197,50 +202,43 @@ </and> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingAcctgTransEntries} ${uiLabelMap.AccountingByAccount}"/> - </container> - </container> - <container style="screenlet-body"> - <link text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext" target="AcctgTransEntriesSearchResultsCsv.csv"> - <parameter param-name="organizationPartyId"/> - <parameter param-name="produtId" from-field="parameters.produtId"/> - <parameter param-name="isPosted" from-field="parameters.isPosted"/> - <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> - <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> - <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> - <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> - <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> - <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> - <parameter param-name="fromDate" from-field="parameters.fromDate"/> - <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> - <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> - <parameter param-name="partyId" from-field="parameters.partyId"/> - <parameter param-name="thruDate" from-field="parameters.thruDate"/> - <parameter param-name="paymentId" from-field="parameters.paymentId"/> - </link> - <link text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext" target="AcctgTransEntriesSearchResultsPdf.pdf"> - <parameter param-name="organizationPartyId"/> - <parameter param-name="produtId" from-field="parameters.produtId"/> - <parameter param-name="isPosted" from-field="parameters.isPosted"/> - <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> - <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> - <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> - <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> - <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> - <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> - <parameter param-name="fromDate" from-field="parameters.fromDate"/> - <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> - <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> - <parameter param-name="partyId" from-field="parameters.partyId"/> - <parameter param-name="thruDate" from-field="parameters.thruDate"/> - <parameter param-name="paymentId" from-field="parameters.paymentId"/> - </link> - <include-form name="ListFindAcctgTransEntriesByAccount" location="component://accounting/widget/GlForms.xml"/> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingAcctgTransEntries} ${uiLabelMap.AccountingByAccount}"> + <link text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext" target="AcctgTransEntriesSearchResultsCsv.csv"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + </link> + <link text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext" target="AcctgTransEntriesSearchResultsPdf.pdf"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + </link> + <include-form name="ListFindAcctgTransEntriesByAccount" location="component://accounting/widget/GlForms.xml"/> + </screenlet> </widgets> </section> <section> @@ -251,50 +249,43 @@ </and> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingAcctgTransEntries} ${uiLabelMap.AccountingByDate}"/> - </container> - </container> - <container style="screenlet-body"> - <link text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext" target="AcctgTransEntriesSearchResultsCsv.csv"> - <parameter param-name="organizationPartyId"/> - <parameter param-name="produtId" from-field="parameters.produtId"/> - <parameter param-name="isPosted" from-field="parameters.isPosted"/> - <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> - <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> - <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> - <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> - <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> - <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> - <parameter param-name="fromDate" from-field="parameters.fromDate"/> - <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> - <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> - <parameter param-name="partyId" from-field="parameters.partyId"/> - <parameter param-name="thruDate" from-field="parameters.thruDate"/> - <parameter param-name="paymentId" from-field="parameters.paymentId"/> - </link> - <link text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext" target="AcctgTransEntriesSearchResultsPDF.pdf"> - <parameter param-name="organizationPartyId"/> - <parameter param-name="produtId" from-field="parameters.produtId"/> - <parameter param-name="isPosted" from-field="parameters.isPosted"/> - <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> - <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> - <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> - <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> - <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> - <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> - <parameter param-name="fromDate" from-field="parameters.fromDate"/> - <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> - <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> - <parameter param-name="partyId" from-field="parameters.partyId"/> - <parameter param-name="thruDate" from-field="parameters.thruDate"/> - <parameter param-name="paymentId" from-field="parameters.paymentId"/> - </link> - <include-form name="ListFindAcctgTransEntriesByDate" location="component://accounting/widget/GlForms.xml"/> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingAcctgTransEntries} ${uiLabelMap.AccountingByDate}"> + <link text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext" target="AcctgTransEntriesSearchResultsCsv.csv"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + </link> + <link text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext" target="AcctgTransEntriesSearchResultsPDF.pdf"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + </link> + <include-form name="ListFindAcctgTransEntriesByDate" location="component://accounting/widget/GlForms.xml"/> + </screenlet> </widgets> </section> </decorator-section> @@ -314,16 +305,9 @@ <widgets> <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingCreateAcctgTransAndEntries}"/> - </container> - </container> - <container style="screenlet-body"> - <include-form name="CreateAcctgTransAndEntries" location="component://accounting/widget/GlForms.xml"/> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingCreateAcctgTransAndEntries}"> + <include-form name="CreateAcctgTransAndEntries" location="component://accounting/widget/GlForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=826270&r1=826269&r2=826270&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Sat Oct 17 15:14:14 2009 @@ -109,20 +109,9 @@ <include-menu name="GlSettingTabBar" location="component://accounting/widget/Menus.xml"/> </widgets> </section> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AcctgAssignGlAccount}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AssignGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AcctgAssignGlAccount}"> + <include-form name="AssignGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -155,34 +144,12 @@ </widgets> </section> <include-menu name="GlSettingTabBar" location="component://accounting/widget/Menus.xml"/> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AcctgNavigateAccts}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditGlAccount}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AcctgNavigateAccts}"> + <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleEditGlAccount}"> + <include-form name="EditGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -203,34 +170,12 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleViewGlAccountEntries}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleViewGlAccountEntries}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleViewGlAccountEntries}"> + <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleViewGlAccountEntries}"> + <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -251,34 +196,12 @@ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <include-menu name="GlAccountTabBar" location="component://accounting/widget/Menus.xml"/> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleViewAccountingTransaction}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleViewAccountingTransaction}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleViewAccountingTransaction}"> + <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleViewAccountingTransaction}"> + <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -297,20 +220,9 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddGlAccount}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleAddGlAccount}"> + <include-form name="EditGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </screenlet> <!-- include-screen screen-name="ListGlAccounts" name="ListGlAccounts" / --> @@ -336,25 +248,14 @@ <widgets> <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-menu name="GlSettingTabBar" location="component://accounting/widget/Menus.xml"/> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap[labelTitleProperty]}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container style="button-bar"> - <link target="ListGlAccountsReport" text="${uiLabelMap.CommonPrint}" style="buttontext"/> - <link target="ListGlAccountsExport" text="${uiLabelMap.CommonExport}" style="buttontext"/> - </container> - <include-form name="ListGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> - </widgets> - </section> + <include-menu name="GlSettingTabBar" location="component://accounting/widget/Menus.xml"/> + <screenlet title="${uiLabelMap[labelTitleProperty]}"> + <container style="button-bar"> + <link target="ListGlAccountsReport" text="${uiLabelMap.CommonPrint}" style="buttontext"/> + <link target="ListGlAccountsExport" text="${uiLabelMap.CommonExport}" style="buttontext"/> </container> - </container> + <include-form name="ListGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |