svn commit: r599172 - in /ofbiz/trunk/applications/accounting: config/ script/org/ofbiz/accounting/finaccount/ servicedef/ webapp/accounting/WEB-INF/ widget/

[apatel-2]

Author: apatel
Date: Wed Nov 28 14:37:25 2007
New Revision: 599172

URL: http://svn.apache.org/viewvc?rev=599172&view=rev
Log:
Ashish, thanks for contribution.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.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.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=599172&r1=599171&r2=599172&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Wed Nov 28 14:37:25 2007
@@ -52,6 +52,7 @@
 AccountingAccounts=Accounts
 AccountingActualCurrencyAmount=Actual Currency Amount
 AccountingActualCurrencyUomId=Actual Currency Uom Id
+AccountingAddFinAccountTypeGlAccount=Add FinAccount Type Gl Account
 AccountingAdmin=Admin
 AccountingAssignPaymentToInvoice=Assign Payment to This Invoice
 AccountingAddNewCreditCard=Add New Credit Card
@@ -856,6 +857,7 @@
 AccountingFindFinAccount=Find Financial Account
 AccountingEditFinAccount=Create/Update Financial Account
 AccountingFinAccountTransations=Transactions
+AccountingFinAccountTypeGlAccount=FinAccount Type Gl Account
 AccountingFinAccountAuth=Authorizations
 PageTitleFinAccount=Financial Account
 PageTitleEditFinAccount=Edit Financial Account

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=599172&r1=599171&r2=599172&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Wed Nov 28 14:37:25 2007
@@ -324,4 +324,23 @@
         <set field="finAccount.availableBalance" from-field="availableBalanceSum" type="Double"/>
         <store-value value-name="finAccount"/>
     </simple-method>
+    
+    <!-- FinAccountTypeGlAccount methods -->
+    <simple-method method-name="createFinAccountTypeGlAccount" short-description="Create an FinAccountTypeGlAccount">
+        <make-value value-name="newEntity" entity-name="FinAccountTypeGlAccount"/>
+        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-pk-fields map-name="parameters" value-name="newEntity"/>
+        <create-value value-name="newEntity"/>
+    </simple-method>
+    
+    <simple-method method-name="updateFinAccountTypeGlAccount" short-description="Update an FinAccountTypeGlAccount">
+        <entity-one entity-name="FinAccountTypeGlAccount" value-name="lookedUpValue"/>
+        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <store-value value-name="lookedUpValue"/>
+    </simple-method>
+    
+    <simple-method method-name="deleteFinAccountTypeGlAccount" short-description="Delete an FinAccountTypeGlAccount">
+        <entity-one entity-name="FinAccountTypeGlAccount" value-name="lookedUpValue"/>
+        <remove-value value-name="lookedUpValue"/>
+    </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml?rev=599172&r1=599171&r2=599172&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml Wed Nov 28 14:37:25 2007
@@ -306,4 +306,23 @@
         <attribute name="acctgTransId" type="String" mode="OUT" optional="true"/>
     </service>
 
+    <!-- FinAccountTypeGlAccount Services -->
+    <service name="createFinAccountTypeGlAccount" default-entity-name="FinAccountTypeGlAccount" engine="simple"
+                location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="createFinAccountTypeGlAccount" auth="true">
+        <description>Create a FinAccountTypeGlAccount</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="false"/>
+    </service>
+    <service name="updateFinAccountTypeGlAccount" default-entity-name="FinAccountTypeGlAccount" engine="simple"
+                location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="updateFinAccountTypeGlAccount" auth="true">
+        <description>Update a FinAccountTypeGlAccount</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="false"/>
+    </service>
+    <service name="deleteFinAccountTypeGlAccount" default-entity-name="FinAccountTypeGlAccount" engine="simple"
+                location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="deleteFinAccountTypeGlAccount" auth="true">
+        <description>Delete a FinAccountTypeGlAccount</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </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=599172&r1=599171&r2=599172&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Wed Nov 28 14:37:25 2007
@@ -1402,6 +1402,34 @@
         <response name="error" type="view" value="EditFinAccountAuths"/>
     </request-map>
     
+    <!--request-uri FinAccountTypeGlAccount -->
+    
+    <request-map uri="editFinAccountTypeGlAccounts">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditFinAccountTypeGlAccounts"/>
+    </request-map>
+    
+    <request-map uri="createFinAccountTypeGlAccount">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createFinAccountTypeGlAccount"/>
+        <response name="success" type="view" value="EditFinAccountTypeGlAccounts"/>
+        <response name="error" type="view" value="EditFinAccountTypeGlAccounts"/>
+    </request-map>
+    
+    <request-map uri="updateFinAccountTypeGlAccount">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateFinAccountTypeGlAccount"/>
+        <response name="success" type="view" value="EditFinAccountTypeGlAccounts"/>
+        <response name="error" type="view" value="EditFinAccountTypeGlAccounts"/>
+    </request-map>
+    
+    <request-map uri="deleteFinAccountTypeGlAccount">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteFinAccountTypeGlAccount"/>
+        <response name="success" type="view" value="EditFinAccountTypeGlAccounts"/>
+        <response name="error" type="view" value="EditFinAccountTypeGlAccounts"/>
+    </request-map>
+    
     <!-- =================== Assignment ====================== -->
     <request-map uri="EditPartyFixedAssetAssignments">
         <security https="true" auth="true"/>
@@ -1537,6 +1565,7 @@
     <view-map name="EditFinAccountRoles" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccountRoles"/>
     <view-map name="EditFinAccountTrans" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccountTrans"/>
     <view-map name="EditFinAccountAuths" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccountAuths"/>
+    <view-map name="EditFinAccountTypeGlAccounts" type="screen" page="component://accounting/widget/GlSetupScreens.xml#EditFinAccountTypeGlAccounts"/>
     
     <!-- FixedAsset -->
     <view-map name="ListFixedAssets" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssets"/>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=599172&r1=599171&r2=599172&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Wed Nov 28 14:37:25 2007
@@ -519,4 +519,34 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
     
+    <form name="ListFinAccountTypeGlAccounts" type="list" target="updateFinAccountTypeGlAccount" list-name="finAccountTypeGlAccounts">
+        <auto-fields-service service-name="updateFinAccountTypeGlAccount"/>
+        <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+        <field name="finAccountTypeId"><display-entity entity-name="FinAccountType"/></field>
+        <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
+            <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="deleteFinAccountTypeGlAccount?organizationPartyId=${organizationPartyId}&amp;finAccountTypeId=${finAccountTypeId}" description="${uiLabelMap.CommonRemove}"/>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+
+    <form name="AddFinAccountTypeGlAccount" type="single" target="createFinAccountTypeGlAccount">
+        <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+        <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountTypeId}">
+            <drop-down allow-empty="false">
+                <list-options key-name="finAccountTypeId" list-name="finAccountTypes" description="${description}"/>
+            </drop-down>
+        </field>
+        <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
+            <drop-down allow-empty="false">
+                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+            </drop-down>
+        </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=599172&r1=599171&r2=599172&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Wed Nov 28 14:37:25 2007
@@ -327,4 +327,43 @@
             </widgets>
         </section>
     </screen>
+    
+    <screen name="EditFinAccountTypeGlAccounts">
+        <section>
+            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>                
+                <set field="titleProperty" value="AccountingFinAccountTypeGlAccount"/>
+                <set field="labelTitleProperty" value="${uiLabelMap.AccountingFinAccountTypeGlAccount}"/>
+                <set field="tabButtonItem" value="GlAccountAssignment"/>
+                <set field="tabButtonItem2" value="FinAccountTypeGlAccounts"/>
+                <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
+                
+                 <entity-condition entity-name="FinAccountTypeGlAccount" list-name="finAccountTypeGlAccounts">
+                    <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <order-by field-name="finAccountTypeId"/>
+                </entity-condition>
+                <entity-condition entity-name="GlAccountOrganizationAndClass" list-name="glAccounts" use-cache="true">
+                    <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+                    <order-by field-name="accountCode"/>
+                </entity-condition>
+                <entity-condition entity-name="FinAccountType" list-name="finAccountTypes" use-cache="true">
+                    <order-by field-name="finAccountTypeId"/>
+                </entity-condition>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container>
+                            <include-form name="ListFinAccountTypeGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/>
+                            <container>
+                                <label style="head2">${uiLabelMap.AccountingAddFinAccountTypeGlAccount}</label>
+                            </container>
+                            <include-form name="AddFinAccountTypeGlAccount" 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=599172&r1=599171&r2=599172&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Wed Nov 28 14:37:25 2007
@@ -457,6 +457,9 @@
         <menu-item name="ProductGlAccounts" title="${uiLabelMap.AccountingProductGlAccount}">
             <link target="editProductGlAccounts?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
+        <menu-item name="FinAccountTypeGlAccounts" title="${uiLabelMap.AccountingFinAccountTypeGlAccount}">
+            <link target="editFinAccountTypeGlAccounts?organizationPartyId=${organizationPartyId}"/>
+        </menu-item>
         <menu-item name="GlAccountSalInvoice" title="${uiLabelMap.AccountingInvoiceSales}">
             <link target="GlAccountSalInvoice?organizationPartyId=${organizationPartyId}"/>
         </menu-item>