OFBiz › OFBiz - Commits

svn commit: r798447 - in /ofbiz/trunk/applications/accounting: config/ data/ entitydef/ servicedef/ webapp/accounting/WEB-INF/ widget/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

apatel-2

svn commit: r798447 - in /ofbiz/trunk/applications/accounting: config/ data/ entitydef/ servicedef/ webapp/accounting/WEB-INF/ widget/

Author: apatel
Date: Tue Jul 28 08:48:48 2009
New Revision: 798447

URL: http://svn.apache.org/viewvc?rev=798447&view=rev
Log:
Adding Product Category and Member entity and related service and forms. Will be used for adding Cost Center reporting.

Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=798447&r1=798446&r2=798447&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jul 28 08:48:48 2009
@@ -8609,6 +8609,12 @@
<value xml:lang="th">à¸à¸¶à¸à¸à¸³à¸«à¸à¸à¸§à¸±à¸à¸à¸µà¹</value>
<value xml:lang="zh">æ¯ä»æ¥</value>
</property>
+ <property key="FormFieldTitle_editGlAccountCategory">
+ <value xml:lang="en">Edit GL Account Category</value>
+ </property>
+ <property key="FormFieldTitle_editGlAccountCategoryMember">
+ <value xml:lang="en">Edit GL Account Category Member</value>
+ </property>
<property key="FormFieldTitle_effectiveAlias">
<value xml:lang="en">effective Alias</value>
<value xml:lang="it">Alias effettivo</value>
@@ -8750,6 +8756,9 @@
<value xml:lang="ru">ÐÐ¾Ð´ ÑÐ¸Ð¿Ð° ÑÐ¸Ð½Ð°Ð½ÑÐ¾Ð²Ð¾Ð³Ð¾ ÑÑÐµÑÐ°</value>
<value xml:lang="th">à¸£à¸«à¸±à¸ªà¸à¸£à¸°à¹à¸ à¸à¸à¸±à¸à¸à¸µà¸à¸²à¸£à¹à¸à¸´à¸</value>
</property>
+ <property key="FormFieldTitle_findGlAccountCategory">
+ <value xml:lang="en">Find Gl Account Category</value>
+ </property>
<property key="FormFieldTitle_fiscalYearStartDay">
<value xml:lang="ar">ÙÙÙ Ø¨Ø¯Ø§ÙØ© Ø§ÙØ¹Ø§Ù Ø§ÙØ¶Ø±ÙØ¨Ù</value>
<value xml:lang="en">Fiscal Year Start Day</value>
@@ -8881,6 +8890,9 @@
<value xml:lang="th">Gateway Score Result</value>
<value xml:lang="zh">ç½å³(é£é©)è¯åç»æ</value>
</property>
+ <property key="FormFieldTitle_glAccountCategory">
+ <value xml:lang="en">GL Account Category</value>
+ </property>
<property key="FormFieldTitle_glAccountClassId">
<value xml:lang="ar">Ø¯ÙÙÙ ØµÙÙ Ø§ÙØØ³Ø§Ø¨ Ø§ÙÙØØ§Ø³Ø¨Ù</value>
<value xml:lang="en">Gl Account Class Id</value>
@@ -9348,6 +9360,18 @@
<value xml:lang="th">à¸à¸·à¹à¸</value>
<value xml:lang="zh">åç§°</value>
</property>
+ <property key="FormFieldTitle_glAccountCategoryId">
+ <value xml:lang="en">GL Account Category Id</value>
+ </property>
+ <property key="FormFieldTitle_glAccountCategoryMember">
+ <value xml:lang="en">GL Account Category Member</value>
+ </property>
+ <property key="FormFieldTitle_glAccountCategoryTypeId">
+ <value xml:lang="en">GL Account Category Type Id</value>
+ </property>
+ <property key="FormFieldTitle_newGlAccountCategory">
+ <value xml:lang="en">New GL Account Category</value>
+ </property>
<property key="FormFieldTitle_notApplied">
<value xml:lang="en">Not Applied</value>
<value xml:lang="fr">Non allouÃ©</value>

Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=798447&r1=798446&r2=798447&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Tue Jul 28 08:48:48 2009
@@ -371,7 +371,7 @@
<GlFiscalType description="Plan" glFiscalTypeId="PLAN"/>
<GlFiscalType description="Scenario" glFiscalTypeId="SCENARIO"/>

- <GlAccountGroupType glAccountGroupTypeId="COST_CENTER" description="Cost Center Group"/>
+ <GlAccountCategoryType glAccountCategoryTypeId="COST_CENTER" description="Cost Center Category"/>


<InvoiceItemType description="Invoice Adjustment" hasTable="N" invoiceItemTypeId="INVOICE_ADJ" parentTypeId=""/>

Modified: ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml?rev=798447&r1=798446&r2=798447&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml Tue Jul 28 08:48:48 2009
@@ -297,9 +297,9 @@
<GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="TAX_ACCOUNT" glAccountId="900000"/>


- <GlAccountGroup glAccountGroupId="9301" glAccountGroupTypeId="COST_CENTER" description="Cost Center 1"/>
- <GlAccountGroup glAccountGroupId="9302" glAccountGroupTypeId="COST_CENTER" description="Cost Center 2"/>
- <GlAccountGroup glAccountGroupId="9303" glAccountGroupTypeId="COST_CENTER" description="Cost Center 3"/>
+ <GlAccountCategory glAccountCategoryId="9301" glAccountCategoryTypeId="COST_CENTER" description="Cost Center 1"/>
+ <GlAccountCategory glAccountCategoryId="9302" glAccountCategoryTypeId="COST_CENTER" description="Cost Center 2"/>
+ <GlAccountCategory glAccountCategoryId="9303" glAccountCategoryTypeId="COST_CENTER" description="Cost Center 3"/>


<PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="CUSTOMER_REFUND" glAccountTypeId="CUSTOMER_CREDIT"/>

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=798447&r1=798446&r2=798447&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Tue Jul 28 08:48:48 2009
@@ -1941,7 +1941,6 @@
<field name="glAccountId" type="id-ne"></field>
<field name="glAccountGroupTypeId" type="id-ne"></field>
<field name="glAccountGroupId" type="id-ne"></field>
- <field name="amountPercentage" type="fixed-point"></field>
<prim-key field="glAccountId"/>
<prim-key field="glAccountGroupTypeId"/>
<relation type="one" fk-name="GLACT_GPMBR_AC" rel-entity-name="GlAccount">
@@ -3733,4 +3732,42 @@
</relation>
</entity>

+ <entity entity-name="GlAccountCategory"
+ package-name="org.ofbiz.accounting.ledger"
+ title="General Ledger Account Category Entity">
+ <field name="glAccountCategoryId" type="id-ne"></field>
+ <field name="glAccountCategoryTypeId" type="id-ne"></field>
+ <field name="description" type="description"></field>
+ <prim-key field="glAccountCategoryId"/>
+ <relation type="one" fk-name="GLACT_CAT_TP" rel-entity-name="GlAccountCategoryType">
+ <key-map field-name="glAccountCategoryTypeId"/>
+ </relation>
+ </entity>
+
+ <entity entity-name="GlAccountCategoryMember"
+ package-name="org.ofbiz.accounting.ledger"
+ title="General Ledger Account Category Member Entity">
+ <field name="glAccountId" type="id-ne"></field>
+ <field name="glAccountCategoryId" type="id-ne"></field>
+ <field name="fromDate" type="date-time"></field>
+ <field name="thruDate" type="date-time"></field>
+ <field name="amountPercentage" type="fixed-point"></field>
+ <prim-key field="glAccountId"/>
+ <prim-key field="glAccountCategoryId"/>
+ <prim-key field="fromDate"/>
+ <relation type="one" fk-name="GLACT_CATMBR_AC" rel-entity-name="GlAccount">
+ <key-map field-name="glAccountId"/>
+ </relation>
+ <relation type="one" fk-name="GLACT_CATMBR_CAT" rel-entity-name="GlAccountCategory">
+ <key-map field-name="glAccountCategoryId"/>
+ </relation>
+ </entity>
+
+ <entity entity-name="GlAccountCategoryType"
+ package-name="org.ofbiz.accounting.ledger"
+ title="General Ledger Account Category Type Entity">
+ <field name="glAccountCategoryTypeId" type="id-ne"></field>
+ <field name="description" type="description"></field>
+ <prim-key field="glAccountCategoryTypeId"/>
+ </entity>
</entitymodel>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml?rev=798447&r1=798446&r2=798447&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml Tue Jul 28 08:48:48 2009
@@ -609,5 +609,31 @@
<description>Create Reverse Accounting Transaction and Entries on removing PaymentApplication records.</description>
<attribute name="paymentApplicationId" mode="IN" type="String" optional="false"/>
</service>
-
+
+ <service name="createGlAccountCategory" engine="entity-auto" default-entity-name="GlAccountCategory" invoke="create" auth="true">
+ <description>Create GL Account Category</description>
+ <auto-attributes mode="OUT" include="pk" optional="false"/>
+ <auto-attributes mode="IN" include="nonpk" optional="true"/>
+ </service>
+ <service name="updateGlAccountCategory" engine="entity-auto" default-entity-name="GlAccountCategory" invoke="update" auth="true">
+ <description>Update GL Account Category</description>
+ <auto-attributes mode="IN" include="pk" optional="false" />
+ <auto-attributes mode="IN" include="nonpk" optional="true"/>
+ </service>
+ <service name="createGlAccountCategoryMember" engine="entity-auto" default-entity-name="GlAccountCategoryMember" invoke="create" auth="true">
+ <description>Create GL Account Category Member</description>
+ <auto-attributes mode="IN" include="pk" optional="false"/>
+ <auto-attributes mode="IN" include="nonpk" optional="true"/>
+ <override name="fromDate" optional="true"/>
+ </service>
+ <service name="deleteGlAccountCategoryMember" engine="entity-auto" default-entity-name="GlAccountCategoryMember" invoke="delete" auth="true">
+ <description>Delete GL Account Category Member</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+ <service name="updateGlAccountCategoryMember" engine="entity-auto" default-entity-name="GlAccountCategoryMember" invoke="update" auth="true">
+ <description>Update GL Account Category Member</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+
</services>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=798447&r1=798446&r2=798447&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Jul 28 08:48:48 2009
@@ -2249,6 +2249,48 @@
<security auth="true" https="true"/>
<response name="success" type="view" value="MonthlyTrialBalancePdf"/>
</request-map>
+
+ <request-map uri="FindGlAccountCategory">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindGlAccountCategory"/>
+ </request-map>
+ <request-map uri="EditGlAccountCategory">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditGlAccountCategory"/>
+ </request-map>
+ <request-map uri="createGlAccountCategory">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createGlAccountCategory"/>
+ <response name="success" type="view" value="EditGlAccountCategory"/>
+ </request-map>
+ <request-map uri="updateGlAccountCategory">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateGlAccountCategory"/>
+ <response name="success" type="view" value="EditGlAccountCategory"/>
+ </request-map>
+ <request-map uri="EditGlAccountCategoryMember">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditGlAccountCategoryMember"/>
+ </request-map>
+ <request-map uri="updateGlAccountCategoryMember">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateGlAccountCategoryMember"/>
+ <response name="success" type="request-redirect" value="EditGlAccountCategoryMember">
+ <redirect-parameter name="glAccountCategoryId"/>
+ </response>
+ </request-map>
+ <request-map uri="createGlAccountCategoryMember">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createGlAccountCategoryMember"/>
+ <response name="success" type="request-redirect" value="EditGlAccountCategoryMember">
+ <redirect-parameter name="glAccountCategoryId"/>
+ </response>
+ </request-map>
+ <request-map uri="deleteGlAccountCategoryMember">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteGlAccountCategoryMember"/>
+ <response name="success" type="view" value="EditGlAccountCategoryMember"/>
+ </request-map>



@@ -2527,6 +2569,8 @@
<view-map name="CommissionRun" type="screen" page="component://accounting/widget/ap/InvoiceScreens.xml#CommissionRun"/>
<view-map name="MonthlyTrialBalance" type="screen" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#MonthlyTrialBalance"/>
<view-map name="MonthlyTrialBalancePdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#MonthlyTrialBalancePdf" content-type="application/pdf"/>
-
+ <view-map name="EditGlAccountCategory" type="screen" page="component://accounting/widget/GlSetupScreens.xml#EditGlAccountCategory"/>
+ <view-map name="FindGlAccountCategory" type="screen" page="component://accounting/widget/GlSetupScreens.xml#FindGlAccountCategory"/>
+ <view-map name="EditGlAccountCategoryMember" type="screen" page="component://accounting/widget/GlSetupScreens.xml#EditGlAccountCategoryMember"/>

</site-conf>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=798447&r1=798446&r2=798447&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Tue Jul 28 08:48:48 2009
@@ -1029,4 +1029,79 @@
<field name="postedBalance"><display description="${postedBalance}"/></field>
<field name="quot13" title="""><display description="""/></field>
</form>
+
+ <form name="FindGlAccountCategory" type="single" target="FindGlAccountCategory" default-entity-name="GlAccountCategory">
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="glAccountCategoryId"><text-find/></field>
+ <field name="glAccountCategoryTypeId">
+ <drop-down>
+ <entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId" description="${description}"/>
+ </drop-down>
+ </field>
+ <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <form name="ListGlAccountCategory" type="list" list-name="listIt" paginate-target="FindGlAccountCategory" default-entity-name="GlAccountCategory" separate-columns="true"
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+ <actions>
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="entityName" value="GlAccountCategory"/>
+ </service>
+ </actions>
+ <field name="glAccountCategoryId" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${glAccountCategoryId}" target="EditGlAccountCategory">
+ <parameter param-name="glAccountCategoryId"/>
+ <parameter param-name="glAccountCategoryTypeId"/>
+ </hyperlink>
+ </field>
+ <field name="glAccountCategoryTypeId"><display-entity entity-name="GlAccountCategoryType"/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}" sort-field="true"><display/></field>
+ </form>
+
+ <form name="EditGlAccountCategory" type="single" target="updateGlAccountCategory" default-map-name="glAccountCategory">
+ <alt-target use-when="glAccountCategory==null" target="createGlAccountCategory"/>
+ <auto-fields-entity entity-name="GlAccountCategory" default-field-type="edit"/>
+ <field name="glAccountCategoryId" use-when="glAccountCategoryId!=null"><display/></field>
+ <field name="glAccountCategoryId" use-when="glAccountCategoryId==null"><hidden/></field>
+ <field name="glAccountCategoryTypeId">
+ <drop-down>
+ <entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId" description="${description}"/>
+ </drop-down>
+ </field>
+ <field name="submit" use-when="glAccountCategory==null" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
+ <field name="submit" use-when="glAccountCategory!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+ </form>
+
+ <form name="ListGlAccountCategoryMember" type="list" list-name="glAccountCategoryMemberList" target="updateGlAccountCategoryMember">
+ <actions>
+ <entity-condition entity-name="GlAccountCategoryMember" list="glAccountCategoryMemberList">
+ <condition-expr field-name="glAccountCategoryId" from-field="glAccountCategoryId"/>
+ </entity-condition>
+ </actions>
+ <auto-fields-entity entity-name="GlAccountCategoryMember" default-field-type="edit"/>
+ <field name="glAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${glAccountId}-${accountName}"/></field>
+ <field name="glAccountCategoryId"><display/></field>
+ <field name="deleteLink" title="" widget-style="buttontext">
+ <hyperlink target="deleteGlAccountCategoryMember" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="glAccountId" from-field="glAccountId"/>
+ <parameter param-name="glAccountCategoryId" from-field="glAccountCategoryId"/>
+ </hyperlink>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+ </form>
+
+ <form name="AddGlAccountCategoryMember" type="single" target="createGlAccountCategoryMember">
+ <field name="glAccountCategoryId"><display/></field>
+ <field name="glAccountId">
+ <drop-down allow-empty="false">
+ <entity-options description="${glAccountId}" entity-name="GlAccount"/>
+ </drop-down>
+ </field>
+ <field name="fromDate"><date-time/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="amountPercentage"><text/></field>
+ <field name="submit" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
+ </form>
+
</forms>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=798447&r1=798446&r2=798447&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Tue Jul 28 08:48:48 2009
@@ -590,4 +590,98 @@
</widgets>
</section>
</screen>
+
+ <screen name="FindGlAccountCategory">
+ <section>
+ <actions>
+ <set field="titleProperty" value="FormFieldTitle_findGlAccountCategory"/>
+ <set field="tabButtonItem" value="FindGlAccountCategory"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container style="button-bar">
+ <link target="EditGlAccountCategory" text="${uiLabelMap.FormFieldTitle_newGlAccountCategory}" style="buttontext"/>
+ </container>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindGlAccountCategory" location="component://accounting/widget/GlSetupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListGlAccountCategory" location="component://accounting/widget/GlSetupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.AccountingViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditGlAccountCategory">
+ <section>
+ <actions>
+ <set field="titleProperty" value="FormFieldTitle_glAccountCategory"/>
+ <set field="tabButtonItem" value="FindGlAccountCategory"/>
+ <set field="tabButtonItem2" value="EditGlAccountCategory"/>
+ <set field="glAccountCategoryId" from-field="parameters.glAccountCategoryId"/>
+ <set field="glAccountCategoryTypeId" from-field="parameters.glAccountCategoryTypeId"/>
+ <entity-one entity-name="GlAccountCategory" value-field="glAccountCategory" auto-field-map="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <not><if-empty field="glAccountCategory"/></not>
+ </condition>
+ <widgets>
+ <container style="h1"><label>${uiLabelMap.FormFieldTitle_editGlAccountCategory}</label></container>
+ <include-menu name="GlAccountCategoryTabBar" location="component://accounting/widget/Menus.xml"/>
+ </widgets>
+ <fail-widgets>
+ <container style="h1"><label>${uiLabelMap.FormFieldTitle_newGlAccountCategory}</label></container>
+ </fail-widgets>
+ </section>
+ <include-form name="EditGlAccountCategory" location="component://accounting/widget/GlSetupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditGlAccountCategoryMember">
+ <section>
+ <actions>
+ <set field="titleProperty" value="FormFieldTitle_editGlAccountCategoryMember"/>
+ <set field="tabButtonItem" value="FindGlAccountCategory"/>
+ <set field="tabButtonItem2" value="EditGlAccountCategoryMember"/>
+ <set field="glAccountCategoryId" from-field="parameters.glAccountCategoryId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet>
+ <container style="h1"><label>${uiLabelMap.FormFieldTitle_editGlAccountCategoryMember}</label></container>
+ <include-menu name="GlAccountCategoryTabBar" location="component://accounting/widget/Menus.xml"/>
+ <include-form name="ListGlAccountCategoryMember" location="component://accounting/widget/GlSetupForms.xml"/>
+ <include-form name="AddGlAccountCategoryMember" location="component://accounting/widget/GlSetupForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=798447&r1=798446&r2=798447&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Tue Jul 28 08:48:48 2009
@@ -901,8 +901,11 @@
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
+ <menu-item name="FindGlAccountCategory" title="${uiLabelMap.FormFieldTitle_glAccountCategory}">
+ <link target="FindGlAccountCategory"/>
+ </menu-item>
</menu>
-
+
<menu name="AgreementTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="AgreementMain" title="${uiLabelMap.AccountingAgreement}">
<link target="EditAgreement">
@@ -1077,4 +1080,19 @@
<link target="FindFinAccount"/>
</menu-item>
</menu>
+
+ <menu name="GlAccountCategoryTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ selected-menuitem-context-field-name="tabButtonItem2">
+ <menu-item name="EditGlAccountCategory" title="${uiLabelMap.FormFieldTitle_glAccountCategory}">
+ <link target="EditGlAccountCategory">
+ <parameter param-name="glAccountCategoryId"/>
+ <parameter param-name="glAccountCategoryTypeId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditGlAccountCategoryMember" title="${uiLabelMap.FormFieldTitle_glAccountCategoryMember}">
+ <link target="EditGlAccountCategoryMember">
+ <parameter param-name="glAccountCategoryId"/>
+ </link>
+ </menu-item>
+ </menu>
</menus>