You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/11/21 17:10:33 UTC
svn commit: r597128 - in /ofbiz/trunk/applications/accounting/widget:
AccountingScreens.xml CommonScreens.xml Menus.xml
ReportFinancialSummaryForms.xml
Author: jacopoc
Date: Wed Nov 21 08:10:32 2007
New Revision: 597128
URL: http://svn.apache.org/viewvc?rev=597128&view=rev
Log:
Misc improvements to the menu of the accounting screens.
Modified:
ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?rev=597128&r1=597127&r2=597128&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Wed Nov 21 08:10:32 2007
@@ -106,7 +106,7 @@
</entity-condition -->
</actions>
<widgets>
- <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<label style="head1">${uiLabelMap.PartyAccountsSummary}</label>
<section>
@@ -133,7 +133,7 @@
<set field="labelTitleProperty" value="AcctgFindGlJournalEntry"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
<link text="${uiLabelMap.AcctgNewGlJournalEntry}" style="buttontext" target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
@@ -162,7 +162,7 @@
<set field="labelTitleProperty" value="AcctgNewGlJournalEntry"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="NewGlJournalEntry" location="component://accounting/widget/JournalEntryForms.xml"/>
</decorator-section>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=597128&r1=597127&r2=597128&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Wed Nov 21 08:10:32 2007
@@ -216,7 +216,7 @@
</section>
</screen>
- <screen name="CommonAdminDecorator">
+ <screen name="CommonPartyDecorator">
<section>
<actions>
<set field="headerItem" value="companies"/>
@@ -226,10 +226,11 @@
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
+ <condition>
+ <not><if-empty field-name="organizationPartyId"/></not>
+ </condition>
<widgets>
- <platform-specific>
- <html><html-template location="component://accounting/webapp/accounting/admin/AdminTabBar.ftl"/></html>
- </platform-specific>
+ <include-menu name="PartyTopTabBar" location="component://accounting/widget/Menus.xml"/>
<decorator-section-include name="body"/>
</widgets>
</section>
@@ -238,23 +239,53 @@
</widgets>
</section>
</screen>
-
- <screen name="CommonPartyAccountsDecorator">
+
+ <screen name="CommonAdminDecorator">
<section>
<actions>
- <set field="headerItem" value="companies"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
+ <set field="tabButtonItemTop" value="Admin"/>
+ <entity-one entity-name="PartyNameView" value-name="currentOrganization" auto-field-map="false">
+ <field-map field-name="partyId" env-name="organizationPartyId"/>
+ </entity-one>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <section><condition><not><if-empty field-name="organizationPartyId"/></not></condition>
+ <include-menu name="PartyAdminTabBar" location="component://accounting/widget/Menus.xml"/>
+ <section>
+ <condition>
+ <if-compare field-name="tabButtonItem" operator="equals" value="GlAccountAssignment"/>
+ </condition>
<widgets>
- <include-menu name="PartyAccountsTabBar" location="component://accounting/widget/Menus.xml"/>
- <decorator-section-include name="body"/>
+ <include-menu name="PartyAdminAssignTabBar" location="component://accounting/widget/Menus.xml"/>
</widgets>
</section>
- <!-- Todo: Add fail widget to show partyId missing error -->
+ <container>
+ <label style="head1">${labelTitleProperty} ${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
+ </container>
+ <decorator-section-include name="body"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="CommonPartyAccountsDecorator">
+ <section>
+ <actions>
+ <set field="tabButtonItemTop" value="PartyAccountsSummary"/>
+ <entity-one entity-name="PartyNameView" value-name="currentOrganization" auto-field-map="false">
+ <field-map field-name="partyId" env-name="organizationPartyId"/>
+ </entity-one>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-menu name="PartyAccountsTabBar" location="component://accounting/widget/Menus.xml"/>
+ <container>
+ <label style="head1">${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
+ </container>
+ <decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=597128&r1=597127&r2=597128&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Wed Nov 21 08:10:32 2007
@@ -404,8 +404,17 @@
</menu-item>
</menu>
+ <menu name="PartyTopTabBar" selected-menuitem-context-field-name="tabButtonItemTop" default-menu-item-name="PartyAccountsSummary" default-selected-style="selected"
+ menu-container-style="button-bar tab-bar" type="simple">
+ <menu-item name="Admin" title="${uiLabelMap.AccountingAccounts}">
+ <link target="AdminMain?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ <menu-item name="PartyAccountsSummary" title="${uiLabelMap.AcctgPartyGlJournalSummary}">
+ <link target="PartyAccountsSummary?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ </menu>
<menu name="PartyAccountsTabBar" default-menu-item-name="PartyAccountsSummary" default-selected-style="selected"
- menu-container-style="button-bar tab-bar" type="simple">
+ menu-container-style="button-bar tab-bar" type="simple">
<menu-item name="PartyAccountsSummary" title="${uiLabelMap.AcctgPartyGlJournalSummary}">
<link target="PartyAccountsSummary?organizationPartyId=${organizationPartyId}"/>
</menu-item>
@@ -416,7 +425,43 @@
<link target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
</menu-item>
</menu>
-
+ <menu name="PartyAdminTabBar" default-menu-item-name="ListGlAccountOrganization" default-selected-style="selected"
+ menu-container-style="button-bar tab-bar" type="simple">
+ <menu-item name="ListGlAccountOrganization" title="${uiLabelMap.AcctgListGlAcctOrg}">
+ <link target="ListGlAccountOrganization?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ <menu-item name="TimePeriods" title="${uiLabelMap.TimePeriod}">
+ <link target="TimePeriods?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ <menu-item name="PartyAcctgPreference" title="${uiLabelMap.AccountingPreference}">
+ <link target="PartyAcctgPreference?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ <menu-item name="ChecksTabButton" title="${uiLabelMap.AccountingChecks}">
+ <link target="listChecksToPrint?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ <menu-item name="ViewFXConversions" title="${uiLabelMap.AccountingFX}">
+ <link target="viewFXConversions?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ <menu-item name="GlAccountAssignment" title="${uiLabelMap.AccountingGlAccountDefault}">
+ <link target="GlAccountAssignment?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ </menu>
+ <menu name="PartyAdminAssignTabBar" selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="GlAccountSalInvoice" default-selected-style="selected"
+ menu-container-style="button-bar tab-bar" type="simple">
+ <menu-item name="GlAccountSalInvoice" title="${uiLabelMap.AccountingInvoiceSales}">
+ <link target="GlAccountSalInvoice?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ <menu-item name="GlAccountPurInvoice" title="${uiLabelMap.AccountingInvoicePurchase}">
+ <link target="GlAccountPurInvoice?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ <menu-item name="GlAccountTypePaymentType" title="${uiLabelMap.AccountingPaymentType}/${uiLabelMap.FormFieldTitle_glAccountTypeId}">
+ <link target="GlAccountTypePaymentType?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ <menu-item name="GlAccountNrPaymentMethod" title="${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}">
+ <link target="GlAccountNrPaymentMethod?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ </menu>
+
<menu name="JournalEntryShortcuts" menu-container-style="${shortCutsMenuStyle}" type="simple">
<menu-item name="CreateSalesJournalEntry" title="${uiLabelMap.AccountingCreateSalesJournalEntry}">
<link target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}&debitGlAccountClassId=CURRENT_ASSET&creditGlAccountClassId=REVENUE&acctgTransTypeId=SALES_ACCTG_TRANS"/>
Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=597128&r1=597127&r2=597128&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Wed Nov 21 08:10:32 2007
@@ -82,7 +82,9 @@
<set field="parameters.debitTotal" value="${bsh:(showDebit? (debitTotal + absolutePostedBalance): (debitTotal))}" type="Double"/>
<set field="parameters.creditTotal" value="${bsh:(showCredit? (creditTotal + absolutePostedBalance): (creditTotal))}" type="Double"/>
</row-actions>
- <field name="glAccountId" use-when="!showTotals"><display description="[${glAccount.accountCode}] ${glAccount.accountName}"/></field>
+ <field name="glAccountId" use-when="!showTotals">
+ <hyperlink target="ListGlAccountEntries?glAccountId=${glAccountId}" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"/>
+ </field>
<field name="debit" entry-name="absolutePostedBalance" use-when="showDebit"><display type="currency" currency="${currencyUomId}"/></field>
<field name="debit" use-when="showCredit"><display/></field>
<field name="credit" entry-name="absolutePostedBalance" use-when="showCredit"><display type="currency" currency="${currencyUomId}"/></field>