svn commit: r800412 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: apatel
Date: Mon Aug 3 14:57:51 2009 New Revision: 800412 URL: http://svn.apache.org/viewvc?rev=800412&view=rev Log: First version of Financial Account reconciliation tools. Patch from OFBIZ-2791. Thanks Rishi, Parimal, Sumit for implementation. We got help from Jacopo, Vince and Eva in defining process and design. Thanks for helping build tools. Added: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (with props) Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml ofbiz/trunk/applications/accounting/widget/FinAccountScreens.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=800412&r1=800411&r2=800412&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Aug 3 14:57:51 2009 @@ -2247,6 +2247,10 @@ <value xml:lang="th">à¸à¹à¸§à¸à¹à¸§à¸¥à¸²à¸à¸à¸à¸¥à¸¹à¸à¸à¹à¸²à¹à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸</value> <value xml:lang="zh">å½åå®å¶æ¶é´æ®µ</value> </property> + <property key="AccountingCurrentGlReconciliation"> + <value xml:lang="en">Current Gl Reconciliation</value> + <value xml:lang="hi_IN">वरà¥à¤¤à¤®à¤¾à¤¨ पà¥à¤°à¤§à¤¾à¤¨ à¤à¤¾à¤¤à¤¾-बहॠमिलाप</value> + </property> <property key="AccountingCustNr"> <value xml:lang="ar">رÙ٠اÙزبÙÙ</value> <value xml:lang="de">Kunden-Nr.</value> @@ -2549,6 +2553,10 @@ <property key="AccountingEditFinAccountAuthorityFor"> <value xml:lang="en">Edit Financial Account Authority For ${finAccount.finAccountName} [${finAccountId}]</value> </property> + <property key="AccountingEditFinAccountReconciliations"> + <value xml:lang="en">Edit Financial Account Reconciliations</value> + <value xml:lang="hi_IN">Edit वितà¥à¤¤à¥à¤¯ लà¥à¤à¤¾ मिलाप</value> + </property> <property key="AccountingEditFinAccountRoleFor"> <value xml:lang="en">Edit Financial Account Role For ${finAccount.finAccountName} [${finAccountId}]</value> </property> @@ -6931,6 +6939,10 @@ <value xml:lang="th">à¸à¸³à¸à¸³à¸«à¸à¹à¸²à¸à¸±à¸à¸£</value> <value xml:lang="zh">å¡ä¸åç¼</value> </property> + <property key="AccountingPreviousGlReconciliation"> + <value xml:lang="en">Previous Gl Reconciliation</value> + <value xml:lang="hi_IN">पिà¤à¤²à¤¾ पà¥à¤°à¤§à¤¾à¤¨ à¤à¤¾à¤¤à¤¾-बहॠमिलाप</value> + </property> <property key="AccountingPrintAsCheck"> <value xml:lang="ar">إطبع ٠صÙ</value> <value xml:lang="en">Print As Check</value> @@ -7149,6 +7161,10 @@ <property key="AccountingReconcile"> <value xml:lang="en">Reconcile</value> </property> + <property key="AccountingReconciliation"> + <value xml:lang="en">Reconciliation</value> + <value xml:lang="hi_IN">मिलाप</value> + </property> <property key="AccountingReferenceNumber"> <value xml:lang="ar">رÙ٠اÙ٠رجع</value> <value xml:lang="en">Reference Number</value> @@ -9116,6 +9132,9 @@ <value xml:lang="th">รหัสรายà¸à¸²à¸£à¸à¸±à¸à¸à¸µà¸à¸²à¸£à¹à¸à¸´à¸</value> <value xml:lang="zh">éèè´¦æ·äº¤ææ è¯</value> </property> + <property key="FormFieldTitle_finAccountTransType"> + <value xml:lang="en">Fin Account Trans Type</value> + </property> <property key="FormFieldTitle_finAccountTransTypeId"> <value xml:lang="en">Fin Account Trans Type Id</value> <value xml:lang="fr">Réf. type de tranfert de compte financier</value> Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=800412&r1=800411&r2=800412&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Mon Aug 3 14:57:51 2009 @@ -453,6 +453,7 @@ <field name="finAccountTransTypeId" type="id-ne"></field> <field name="finAccountId" type="id"></field> <field name="partyId" type="id"></field> + <field name="glReconciliationId" type="id"></field> <field name="transactionDate" type="date-time"></field> <field name="entryDate" type="date-time"></field> <field name="amount" type="currency-amount"></field> @@ -492,6 +493,9 @@ <relation type="one" fk-name="FIN_ACT_TX_STI" rel-entity-name="StatusItem"> <key-map field-name="statusId"/> </relation> + <relation type="one" fk-name="FIN_ACT_TX_GLREC" rel-entity-name="GlReconciliation"> + <key-map field-name="glReconciliationId"/> + </relation> </entity> <entity entity-name="FinAccountTransAttribute" package-name="org.ofbiz.accounting.finaccount" title="Financial Account Transaction Attribute Entity"> <field name="finAccountTransId" type="id-ne"></field> 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=800412&r1=800411&r2=800412&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 Mon Aug 3 14:57:51 2009 @@ -793,4 +793,26 @@ <field-to-list field="paymentId" list="paymentIds"/> <field-to-result field="paymentIds"/> </simple-method> + + <simple-method method-name="getTransactionTotalByGlReconcileId" short-description="Transaction Total By GlReconcile Id"> + <entity-one entity-name="GlReconciliation" value-field="glReconciliation"/> + <entity-and entity-name="FinAccountTrans" list="finAccountTransList"> + <field-map field-name="glReconciliationId" from-field="parameters.glReconciliationId"/> + </entity-and> + <set field="reconciledBalance" from-field="glReconciliation.reconciledBalance" type="BigDecimal"/> + <set field="grandTotal" value="0" type="BigDecimal"/> + <if-empty field="reconciledBalance"> + <set field="reconciledBalance" value="0" type="BigDecimal"/> + </if-empty> + <iterate list="finAccountTransList" entry="finAccountTrans"> + <if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="WITHDRAWAL"> + <set field="grandTotal" value="${grandTotal - finAccountTrans.amount}" type="BigDecimal"/> + <else> + <set field="grandTotal" value="${grandTotal + finAccountTrans.amount}" type="BigDecimal"/> + </else> + </if-compare> + </iterate> + <set field="grandTotal" value="${grandTotal + reconciledBalance}" type="BigDecimal"/> + <field-to-result field="grandTotal"/> + </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml?rev=800412&r1=800411&r2=800412&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml Mon Aug 3 14:57:51 2009 @@ -479,4 +479,11 @@ <attribute name="paymentGroupTypeId" type="String" mode="IN" optional="true"/> <attribute name="paymentIds" type="List" mode="OUT" optional="false"/> </service> + + <service name="getTransactionTotalByGlReconcileId" engine="simple" + location="component://accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="getTransactionTotalByGlReconcileId"> + <description>Transaction Total By GlReconcile Id</description> + <attribute name="glReconciliationId" type="String" mode="IN" optional="false"/> + <attribute name="grandTotal" type="BigDecimal" mode="OUT" 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=800412&r1=800411&r2=800412&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon Aug 3 14:57:51 2009 @@ -1947,6 +1947,32 @@ <response name="success" type="view" value="BankReconciliation"/> <response name="error" type="view" value="BankReconciliation"/> </request-map> + <request-map uri="EditFinAccountReconciliations"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditFinAccountReconciliations"/> + </request-map> + <request-map uri="createGlReconciliation"> + <security https="true" auth="true"/> + <event type="service" invoke="createGlReconciliation"/> + <response name="success" type="view" value="EditFinAccountReconciliations"/> + <response name="error" type="view" value="EditFinAccountReconciliations"/> + </request-map> + <request-map uri="updateFinAccountGlReconciliation"> + <security https="true" auth="true"/> + <event type="service" invoke="updateGlReconciliation"/> + <response name="success" type="view" value="EditFinAccountReconciliations"/> + <response name="error" type="view" value="EditFinAccountReconciliations"/> + </request-map> + <request-map uri="ViewGlReconciliationWithTransaction"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ViewGlReconciliationWithTransaction"/> + </request-map> + <request-map uri="callReconcileFinAccountTrans"> + <security https="true" auth="true"/> + <event type="service-multi" invoke="reconcileFinAccountTrans"/> + <response name="success" type="view" value="ViewGlReconciliationWithTransaction"/> + <response name="error" type="view" value="ViewGlReconciliationWithTransaction"/> + </request-map> <!-- Fin Account Authority--> <request-map uri="EditFinAccountAuths"> @@ -2450,6 +2476,8 @@ <view-map name="EditFinAccountTypeGlAccounts" type="screen" page="component://accounting/widget/GlSetupScreens.xml#EditFinAccountTypeGlAccounts"/> <view-map name="FindFinAccountTrans" type="screen" page="component://accounting/widget/FinAccountScreens.xml#FindFinAccountTrans"/> <view-map name="BankReconciliation" type="screen" page="component://accounting/widget/FinAccountScreens.xml#BankReconciliation"/> + <view-map name="EditFinAccountReconciliations" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccountReconciliations"/> + <view-map name="ViewGlReconciliationWithTransaction" type="screen" page="component://accounting/widget/FinAccountScreens.xml#ViewGlReconciliationWithTransaction"/> <!-- FixedAsset --> <view-map name="ListFixedAssets" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssets"/> Added: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=800412&view=auto ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (added) +++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl Mon Aug 3 14:57:51 2009 @@ -0,0 +1,141 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<form id="glReconciledFinAccountTrans" name="glReconciledFinAccountTransForm" method="post" action="<@ofbizUrl>callReconcileFinAccountTrans?clearAll=Y</@ofbizUrl>"> + <input name="_useRowSubmit" type="hidden" value="Y"/> + <input name="finAccountId" type="hidden" value="${finAccountId}"/> + <input name="glReconciliationId" type="hidden" value="${glReconciliationId}"/> + <#assign previousGlReconciliation = ""/> + <#if glReconciliationList?has_content> + <#assign previousGlReconciliation = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(glReconciliationList)/> + </#if> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <span class="label">${uiLabelMap.AccountingCurrentGlReconciliation}</span> + </div> + <div class="screenlet-body"> + <a href="<@ofbizUrl>EditFinAccountReconciliations?finAccountId=${finAccountId}&glReconciliationId=${glReconciliationId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> + <#if currentGlReconciliation?has_content> + <table> + <tr> + <td><span class="label">${uiLabelMap.FormFieldTitle_glReconciliationName}</span></td> + <td>${currentGlReconciliation.glReconciliationName?if_exists}</td> + </tr> + <tr> + <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledDate}</span></td> + <td>${currentGlReconciliation.reconciledDate?if_exists}</td> + </tr> + </table> + </#if> + </div> + </div> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <span class="label">${uiLabelMap.AccountingPreviousGlReconciliation}</span> + </div> + <div class="screenlet-body"> + <#if previousGlReconciliation?has_content> + <table> + <tr> + <td><span class="label">${uiLabelMap.FormFieldTitle_glReconciliationName}</span></td> + <td>${previousGlReconciliation.glReconciliationName?if_exists}</td> + </tr> + <tr> + <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledBalance}</span></td> + <td>${previousGlReconciliation.reconciledBalance?if_exists}</td> + </tr> + <tr> + <td><span class="label">${uiLabelMap.FormFieldTitle_reconciledDate}</span></td> + <td>${previousGlReconciliation.reconciledDate?if_exists}</td> + </tr> + </table> + </#if> + </div> + </div> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <span class="label">${uiLabelMap.AccountingAcctgTrans}</span> + </div> + <div class="screenlet-body"> + <#if finAccountTransList?has_content> + <table class="basic-table hover-bar" cellspacing="0"> + <tr class="header-row-2"> + <th>${uiLabelMap.FormFieldTitle_finAccountTransId}</th> + <th>${uiLabelMap.FormFieldTitle_finAccountTransType}</th> + <th>${uiLabelMap.PartyParty}</th> + <th>${uiLabelMap.FormFieldTitle_glReconciliationId}</th> + <th>${uiLabelMap.FormFieldTitle_transactionDate}</th> + <th>${uiLabelMap.FormFieldTitle_entryDate}</th> + <th>${uiLabelMap.CommonAmount}</th> + <th>${uiLabelMap.FormFieldTitle_paymentId}</th> + <th>${uiLabelMap.OrderPaymentType}</th> + <th>${uiLabelMap.FormFieldTitle_paymentMethodTypeId}</th> + <th>${uiLabelMap.CommonStatus}</th> + <th>${uiLabelMap.CommonComments}</th> + </tr> + <#assign alt_row = false/> + <#list finAccountTransList as finAccountTrans> + <input name="finAccountTransId_o_${finAccountTrans_index}" type="hidden" value="${finAccountTrans.finAccountTransId}"/> + <input name="organizationPartyId_o_${finAccountTrans_index}" type="hidden" value="${defaultOrganizationPartyId}"/> + <input id="finAccountTransId_${finAccountTrans_index}" name="_rowSubmit_o_${finAccountTrans_index}" type="hidden" value="Y"/> + <#assign payment = ""> + <#assign payments = ""> + <#if finAccountTrans.paymentId?has_content> + <#assign payment = delegator.findOne("Payment", {"paymentId" : finAccountTrans.paymentId}, true)> + </#if> + <#assign finAccountTransType = delegator.findOne("FinAccountTransType", {"finAccountTransTypeId" : finAccountTrans.finAccountTransTypeId}, true)> + <#if finAccountTrans.statusId?has_content> + <#assign status = delegator.findOne("StatusItem", {"statusId" : finAccountTrans.statusId}, true)> + </#if> + <#if payment?has_content && payment.paymentTypeId?has_content> + <#assign paymentType = delegator.findOne("PaymentType", {"paymentTypeId" : payment.paymentTypeId}, true)> + </#if> + <#if payment?has_content && payment.paymentMethodTypeId?has_content> + <#assign paymentMethodType = delegator.findOne("PaymentMethodType", {"paymentMethodTypeId" : payment.paymentMethodTypeId}, true)> + </#if> + <#if finAccountTrans.partyId?has_content> + <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : finAccountTrans.partyId}, true))> + </#if> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td>${finAccountTrans.finAccountTransId?if_exists}</td> + <td>${finAccountTransType.description?if_exists}</td> + <td>${(partyName.firstName)!} ${(partyName.lastName)!} ${(partyName.groupName)!}</td> + <td>${finAccountTrans.glReconciliationId?if_exists}</td> + <td>${finAccountTrans.transactionDate?if_exists}</td> + <td>${finAccountTrans.entryDateId?if_exists}</td> + <td>${finAccountTrans.amount?if_exists}</td> + <td><#if finAccountTrans.paymentId?has_content>${finAccountTrans.paymentId?if_exists}</#if></td> + <td><#if paymentType?has_content>${paymentType.description?if_exists}</#if></td> + <td><#if paymentMethodType?has_content>${paymentMethodType.description?if_exists}</#if></td> + <td><#if status?has_content>${status.description?if_exists}</#if></td> + <td>${finAccountTrans.comments?if_exists}</td> + </tr> + <#assign alt_row = !alt_row/> + </#list> + </table> + </#if> + </div> + <div class="right"> + <span class="label">${uiLabelMap.AccountingTotalCapital} </span>${transactionTotalAmount.grandTotal?if_exists} + <#if !currentGlReconciliation.reconciledBalance?has_content> + <input type="submit" value="${uiLabelMap.AccountingReconcile}"/> + </#if> + </div> + </div> +</form> Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=800412&r1=800411&r2=800412&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Mon Aug 3 14:57:51 2009 @@ -346,4 +346,32 @@ <field name="isDepositWithDrawPayment" title="${uiLabelMap.AccountingWithdrawalPaymentInFinAccount}" position="1"><check/></field> <field name="paymentGroupTypeId"><ignored/></field> </form> + <form name="EditFinAccountReconciliation" type="single" target="createGlReconciliation" default-map-name="glReconciliation" extends="EditGlReconciliation" + extends-resource="component://accounting/widget/GlForms.xml" header-row-style="header-row" default-table-style="basic-table"> + <actions> + <entity-one entity-name="GlReconciliation" value-field="glReconciliation"/> + </actions> + <alt-target use-when="glReconciliationId != null" target="updateFinAccountGlReconciliation"/> + <field name="finAccountId"><hidden/></field> + <field name="glReconciliationId" use-when="glReconciliationId == null"><ignored/></field> + <field name="glReconciliationId" use-when="glReconciliationId != null"><display/></field> + <field name="glAccountId"><lookup target-form-name="LookupGlAccount"/></field> + <field name="organizationPartyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="createButton" use-when="glReconciliationId == null" widget-style="smallSubmit"> + <submit button-type="button"/> + </field> + <field name="updateButton" use-when="glReconciliationId != null" widget-style="smallSubmit"> + <submit button-type="button"/> + </field> + </form> + <form name="ListFinAccountReconciliations" type="list" list-name="glReconciliations" separate-columns="true" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <auto-fields-service service-name="updateGlReconciliation" default-field-type="display"/> + <field name="glReconciliationId"> + <hyperlink description="${glReconciliationId}" target="ViewGlReconciliationWithTransaction"> + <parameter param-name="glReconciliationId"/> + <parameter param-name="finAccountId"/> + </hyperlink> + </field> + </form> </forms> Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=800412&r1=800411&r2=800412&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Mon Aug 3 14:57:51 2009 @@ -539,4 +539,61 @@ </widgets> </section> </screen> + <screen name="EditFinAccountReconciliations"> + <section> + <actions> + <set field="titleProperty" value="AccountingEditFinAccountReconciliations"/> + <set field="tabButtonItem" value="EditFinAccountReconciliations"/> + <set field="finAccountId" from-field="parameters.finAccountId"/> + <set field="glReconciliationId" from-field="parameters.glReconciliationId" default-value=""/> + <entity-one entity-name="FinAccount" value-field="finAccount"/> + <entity-and entity-name="GlReconciliation" list="glReconciliations"> + <field-map field-name="glAccountId" from-field="finAccount.postToGlAccountId"/> + <order-by field-name="reconciledDate DESC"/> + </entity-and> + </actions> + <widgets> + <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> + <decorator-section name="body"> + <screenlet id="FinAccountReconciliationPanel" title="${uiLabelMap.AccountingEditFinAccountReconciliations}" collapsible="true"> + <include-form name="EditFinAccountReconciliation" location="component://accounting/widget/FinAccountForms.xml"/> + </screenlet> + <include-form name="ListFinAccountReconciliations" location="component://accounting/widget/FinAccountForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="ViewGlReconciliationWithTransaction"> + <section> + <actions> + <set field="titleProperty" value="AccountingEditFinAccountReconciliations"/> + <set field="tabButtonItem" value="EditFinAccountReconciliations"/> + <set field="finAccountId" from-field="parameters.finAccountId"/> + <set field="glReconciliationId" from-field="parameters.glReconciliationId"/> + <entity-one entity-name="FinAccount" value-field="finAccount"/> + <entity-one entity-name="GlReconciliation" value-field="currentGlReconciliation"/> + <entity-and entity-name="FinAccountTrans" list="finAccountTransList"> + <field-map field-name="glReconciliationId"/> + </entity-and> + <entity-condition entity-name="GlReconciliation" list="glReconciliationList"> + <condition-list combine="and"> + <condition-expr field-name="reconciledDate" operator="less" from-field="currentGlReconciliation.reconciledDate" ignore-if-empty="true"/> + <condition-expr field-name="glAccountId" operator="equals" from-field="finAccount.postToGlAccountId"/> + </condition-list> + <order-by field-name="reconciledDate DESC"/> + </entity-condition> + <service service-name="getTransactionTotalByGlReconcileId" result-map="transactionTotalAmount"/> + </actions> + <widgets> + <decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}"> + <decorator-section name="body"> + <platform-specific> + <html><html-template location="component://accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl"/></html> + </platform-specific> + </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=800412&r1=800411&r2=800412&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/Menus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/Menus.xml Mon Aug 3 14:57:51 2009 @@ -667,6 +667,11 @@ <parameter param-name="organizationPartyId" from-field="finAccount.ownerPartyId"/> </link> </menu-item> + <menu-item name="EditFinAccountReconciliations" title="${uiLabelMap.AccountingReconciliation}"> + <link target="EditFinAccountReconciliations"> + <parameter param-name="finAccountId"/> + </link> + </menu-item> </menu> <menu name="PartyTopTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |