You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2009/11/30 14:03:38 UTC
svn commit: r885409 - in /ofbiz/trunk/applications/accounting: ./ config/
data/ script/org/ofbiz/accounting/finaccount/ servicedef/ widget/
Author: ashish
Date: Mon Nov 30 13:03:37 2009
New Revision: 885409
URL: http://svn.apache.org/viewvc?rev=885409&view=rev
Log:
Applied patch from jira issue OFBIZ-3269 - Reconciliation Screen Enhancements.
In Financial Account At Reconciliation Screen (https://demo.ofbiz.org/accounting/control/EditFinAccountReconciliations?finAccountId=ABN_CHECKING), rename field name "Reconciled Date" by "Reconciliation Date".
A write a scheduled service(autoFinAccountReconciliation) which will call once in a day and get all of the reconciliation records whose reconciliation date is set in between current date.
Thanks Sumit & Awdesh for the contribution.
Added:
ofbiz/trunk/applications/accounting/data/AccountingScheduledServiceData.xml (with props)
Removed:
ofbiz/trunk/applications/accounting/data/InvoiceScheduledServiceData.xml
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/ofbiz-component.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml
ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=885409&r1=885408&r2=885409&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Nov 30 13:03:37 2009
@@ -8180,6 +8180,10 @@
<value xml:lang="en">Reconciliation</value>
<value xml:lang="hi_IN">मिलाप</value>
</property>
+ <property key="AccountingReconciliationDate">
+ <value xml:lang="en">Reconciliation Date</value>
+ <value xml:lang="hi_IN">मिलाप दिनाà¤à¤</value>
+ </property>
<property key="AccountingReconciliationError">
<value xml:lang="en">Can not Reconcile finAccountTrans [${finAccountTrans.finAccountTransId}], glReconciliationId not exist</value>
<value xml:lang="hi_IN">finAccountTrans [${finAccountTrans.finAccountTransId}] à¤à¤¾ पà¥à¤¨à¤°à¥à¤®à¤¿à¤²à¤¾à¤¨ नहà¥à¤ à¤à¤° सà¤à¤¤à¥, glReconciliationId मà¥à¤à¥à¤¦ नहà¥à¤ हà¥</value>
Added: ofbiz/trunk/applications/accounting/data/AccountingScheduledServiceData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingScheduledServiceData.xml?rev=885409&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingScheduledServiceData.xml (added)
+++ ofbiz/trunk/applications/accounting/data/AccountingScheduledServiceData.xml Mon Nov 30 13:03:37 2009
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<entity-engine-xml>
+ <RecurrenceRule recurrenceRuleId="400" untilDateTime="" frequency="MONTHLY" intervalNumber="1" countNumber="-1"/>
+ <RecurrenceInfo recurrenceInfoId="400" startDateTime="2008-05-14 22:00:00.000" recurrenceRuleId="400" recurrenceCount="0"/>
+ <RuntimeData runtimeDataId="8501">
+ <runtimeInfo><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ <ofbiz-ser>
+ <map-HashMap>
+ <map-Entry>
+ <map-Key>
+ <std-String value="recurrenceInfoId"/>
+ </map-Key>
+ <map-Value>
+ <std-String value="400"/>
+ </map-Value>
+ </map-Entry>
+ </map-HashMap>
+ </ofbiz-ser>
+ ]]></runtimeInfo>
+ </RuntimeData>
+ <JobSandbox jobId="8500" jobName="Generate Invoice template" runTime="2008-05-14 00:00:00.000" serviceName="autoGenerateInvoiceFromExistingInvoice" runtimeDataId="8501" poolId="pool" runAsUser="system" recurrenceInfoId="400"/>
+
+ <RecurrenceRule recurrenceRuleId="9000" untilDateTime="" frequency="DAILY" intervalNumber="5" countNumber="-1"/>
+ <RecurrenceInfo recurrenceInfoId="9000" startDateTime="2000-01-01 00:00:00.000" recurrenceRuleId="9000" recurrenceCount="0"/>
+ <JobSandbox jobId="9000" jobName="Auto Reconcile Financial Account" runTime="2000-01-01 00:00:00.000" serviceName="autoFinAccountReconciliation" poolId="pool" runAsUser="system" recurrenceInfoId="9000"/>
+</entity-engine-xml>
Propchange: ofbiz/trunk/applications/accounting/data/AccountingScheduledServiceData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/data/AccountingScheduledServiceData.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/accounting/data/AccountingScheduledServiceData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/ofbiz-component.xml?rev=885409&r1=885408&r2=885409&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Mon Nov 30 13:03:37 2009
@@ -40,7 +40,7 @@
<entity-resource type="data" reader-name="seed" loader="main" location="data/UsTaxAccountGroups.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingPortletData.xml"/>
- <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/InvoiceScheduledServiceData.xml"/>
+ <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/AccountingScheduledServiceData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGeneralChartOfAccounts.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoOrganizationData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGlSetupData.xml"/>
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=885409&r1=885408&r2=885409&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 Nov 30 13:03:37 2009
@@ -1051,4 +1051,26 @@
<set field="closingBalance" value="${reconciledBalance + openingBalance}" type="BigDecimal"/>
<field-to-result field="closingBalance"/>
</simple-method>
+
+ <simple-method method-name="autoFinAccountReconciliation" short-description="Auto Reconcile Financial(bank) Account Transactions">
+ <now-timestamp field="nowTimestamp"/>
+ <set field="reconciliationDayStart" value="${groovy: org.ofbiz.base.util.UtilDateTime.getDayStart(nowTimestamp)}" type="Timestamp"/>
+ <set field="reconciliationDayEnd" value="${groovy: org.ofbiz.base.util.UtilDateTime.getDayEnd(nowTimestamp)}" type="Timestamp"/>
+ <entity-condition entity-name="GlReconciliation" list="glReconciliation">
+ <condition-list combine="and">
+ <condition-expr field-name="reconciledDate" operator="greater-equals" from-field="reconciliationDayStart"/>
+ <condition-expr field-name="reconciledDate" operator="less-equals" from-field="reconciliationDayEnd"/>
+ <condition-expr field-name="statusId" operator="equals" value="GLREC_CREATED"/>
+ </condition-list>
+ </entity-condition>
+ <set field="glReconciliationIds" value="${groovy:org.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(glReconciliation, 'glReconciliationId', true);}" type="List"/>
+ <entity-condition entity-name="FinAccountTrans" list="finAccountTransList">
+ <condition-expr field-name="glReconciliationId" operator="in" from-field="glReconciliationIds"/>
+ </entity-condition>
+ <iterate list="finAccountTransList" entry="finAccountTrans">
+ <set field="reconcileFinAccountTransMap.finAccountTransId" from-field="finAccountTrans.finAccountTransId"/>
+ <set field="reconcileFinAccountTransMap.organizationPartyId" from-field="finAccountTrans.partyId"/>
+ <call-service service-name="reconcileFinAccountTrans" in-map-name="reconcileFinAccountTransMap"/>
+ </iterate>
+ </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=885409&r1=885408&r2=885409&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml Mon Nov 30 13:03:37 2009
@@ -521,4 +521,9 @@
<attribute name="finAccountTransId" type="String" mode="IN" optional="false"/>
<attribute name="acctgTransAndEntries" type="List" mode="OUT" optional="true"/>
</service>
+
+ <service name="autoFinAccountReconciliation" engine="simple"
+ location="component://accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="autoFinAccountReconciliation" auth="true">
+ <description>Auto Reconciled FinAccountTrans entries</description>
+ </service>
</services>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=885409&r1=885408&r2=885409&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Mon Nov 30 13:03:37 2009
@@ -405,6 +405,7 @@
<field name="organizationPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="reconciledBalance" use-when="${reconciledBalance == null}"><hidden/></field>
<field name="reconciledBalance" use-when=""GLREC_RECONCILED".equals("${glReconciliation.statusId}")"><display type="currency" currency="${defaultOrganizationPartyCurrencyUomId}"/></field>
+ <field name="reconciledDate" title="${uiLabelMap.AccountingReconciliationDate}"><date-time/></field>
<field name="createButton" use-when="glReconciliationId == null" widget-style="smallSubmit">
<submit button-type="button"/>
</field>