You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2007/11/28 04:33:19 UTC
svn commit: r598860 - in /ofbiz/trunk/applications/accounting:
config/AccountingUiLabels.properties
webapp/accounting/WEB-INF/controller.xml widget/GlSetupForms.xml
widget/GlSetupScreens.xml widget/Menus.xml
Author: apatel
Date: Tue Nov 27 19:33:18 2007
New Revision: 598860
URL: http://svn.apache.org/viewvc?rev=598860&view=rev
Log:
Ashish, thanks for patch.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
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.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=598860&r1=598859&r2=598860&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Tue Nov 27 19:33:18 2007
@@ -373,6 +373,7 @@
AccountingPrintChecks=Checks to Print
AccountingPrintChecksPermissionError=Security Error: to print checks, you must have the ACCOUNTING_PRINT_CHECKS permission
AccountingProduct=Product
+AccountingProductGlAccount=Product GL Accounts
AccountingProductId=Product Id
AccountingProductRates=Product Rates
AccountingReceivePayment=Receive Payment
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=598860&r1=598859&r2=598860&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Nov 27 19:33:18 2007
@@ -1257,7 +1257,33 @@
<response name="success" type="view" value="ViewFXConversions"/>
<response name="error" type="view" value="ViewFXConversions"/>
</request-map>
-
+
+ <request-map uri="editProductGlAccounts">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditProductGlAccounts"/>
+ </request-map>
+
+ <request-map uri="createProductGlAccount">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createProductGlAccount"/>
+ <response name="success" type="view" value="EditProductGlAccounts"/>
+ <response name="error" type="view" value="EditProductGlAccounts"/>
+ </request-map>
+
+ <request-map uri="updateProductGlAccount">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateProductGlAccount"/>
+ <response name="success" type="view" value="EditProductGlAccounts"/>
+ <response name="error" type="view" value="EditProductGlAccounts"/>
+ </request-map>
+
+ <request-map uri="deleteProductGlAccount">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteProductGlAccount"/>
+ <response name="success" type="view" value="EditProductGlAccounts"/>
+ <response name="error" type="view" value="EditProductGlAccounts"/>
+ </request-map>
+
<!-- Actually reconcile account -->
<request-map uri="reconcileGlAccount">
<security https="true" auth="true"/>
@@ -1576,6 +1602,7 @@
<view-map name="GlAccountSalInvoice" type="screen" page="component://accounting/widget/GlSetupScreens.xml#GlAccountSalInvoice"/>
<view-map name="GlAccountTypePaymentType" type="screen" page="component://accounting/widget/GlSetupScreens.xml#GlAccountTypePaymentType"/>
<view-map name="GlAccountNrPaymentMethod" type="screen" page="component://accounting/widget/GlSetupScreens.xml#GlAccountNrPaymentMethod"/>
+ <view-map name="EditProductGlAccounts" type="screen" page="component://accounting/widget/GlSetupScreens.xml#EditProductGlAccounts"/>
<!-- Manual Credit Card Transaction -->
<view-map name="FindGatewayResponses" page="component://accounting/widget/TransactionScreens.xml#FindGatewayResponses" type="screen"/>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=598860&r1=598859&r2=598860&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Tue Nov 27 19:33:18 2007
@@ -485,4 +485,38 @@
<hyperlink target="deleteGlJournal?organizationPartyId=${organizationPartyId}&glJournalId=${glJournalId}" description="${uiLabelMap.CommonRemove}"/>
</field>
</form>
+
+ <form name="ListProductGlAccounts" type="list" target="updateProductGlAccount" list-name="productGlAccounts">
+ <auto-fields-service service-name="updateProductGlAccount" default-field-type="display"/>
+ <field name="organizationPartyId"><hidden/></field>
+ <field name="glAccountTypeId"><display-entity entity-name="GlAccountType"/></field>
+ <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
+ <drop-down allow-empty="false">
+ <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+ </drop-down>
+ </field>
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <hyperlink target="deleteProductGlAccount?organizationPartyId=${organizationPartyId}&productId=${productId}&glAccountTypeId=${glAccountTypeId}" description="${uiLabelMap.CommonRemove}"/>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <form name="AddProductGlAccount" type="single" target="createProductGlAccount">
+ <field name="organizationPartyId"><hidden/></field>
+ <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}">
+ <drop-down allow-empty="false">
+ <list-options key-name="glAccountTypeId" list-name="productGlAccountTypes" description="${description}"/>
+ </drop-down>
+ </field>
+ <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}">
+ <drop-down allow-empty="false">
+ <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+ </drop-down>
+ </field>
+ <field name="productId" title="${uiLabelMap.AccountingProductId}">
+ <lookup target-form-name="LookupProduct"/>
+ </field>
+ <field name="submitButton" 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=598860&r1=598859&r2=598860&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Tue Nov 27 19:33:18 2007
@@ -290,4 +290,39 @@
</widgets>
</section>
</screen>
+ <screen name="EditProductGlAccounts">
+ <section>
+ <actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="titleProperty" value="AccountingProductGlAccount"/>
+ <set field="labelTitleProperty" value="${uiLabelMap.AccountingProductGlAccount}"/>
+ <set field="tabButtonItem" value="ProductGlAccounts"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
+
+ <entity-condition entity-name="ProductGlAccount" list-name="productGlAccounts">
+ <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+ <order-by field-name="glAccountTypeId"/>
+ </entity-condition>
+ <entity-condition entity-name="GlAccountType" list-name="productGlAccountTypes" use-cache="true">
+ <order-by field-name="description"/>
+ </entity-condition>
+ <entity-condition entity-name="GlAccount" list-name="glAccounts" use-cache="true">
+ <order-by field-name="accountCode"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container>
+ <include-form name="ListProductGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/>
+ <container>
+ <label style="head2">${uiLabelMap.ProductAddGlAccount}</label>
+ </container>
+ <include-form name="AddProductGlAccount" location="component://accounting/widget/GlSetupForms.xml"/>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=598860&r1=598859&r2=598860&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Tue Nov 27 19:33:18 2007
@@ -448,6 +448,9 @@
<menu-item name="ViewFXConversions" title="${uiLabelMap.AccountingFX}">
<link target="viewFXConversions?organizationPartyId=${organizationPartyId}"/>
</menu-item>
+ <menu-item name="ProductGlAccounts" title="${uiLabelMap.AccountingProductGlAccount}">
+ <link target="editProductGlAccounts?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">