svn commit: r789335 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: mor
Date: Mon Jun 29 14:12:47 2009 New Revision: 789335 URL: http://svn.apache.org/viewvc?rev=789335&view=rev Log: Accounting Transaction and Accounting Transaction Entries search results now can be exported to CSV and PDF format. Patch from Brajesh Patel, OFBIZ-2667 Added: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl (with props) ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl (with props) Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/widget/GlForms.xml ofbiz/trunk/applications/accounting/widget/GlScreens.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=789335&r1=789334&r2=789335&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Jun 29 14:12:47 2009 @@ -168,6 +168,12 @@ <value xml:lang="nl">Ingaves Boekhoudtransacties</value> <value xml:lang="th">รายà¸à¸²à¸£à¸à¸±à¸à¸à¸µà¸£à¸²à¸¢à¸£à¸±à¸</value> </property> + <property key="AccountingAcctgTransEntriesFor"> + <value xml:lang="en">Accounting Transaction Entries For</value> + </property> + <property key="AccountingAcctgTransFor"> + <value xml:lang="en">Accounting Transactions For</value> + </property> <property key="AccountingActualCurrencyAmount"> <value xml:lang="de">Ist-Währungsbetrag</value> <value xml:lang="en">Actual Currency Amount</value> @@ -1777,6 +1783,9 @@ <value xml:lang="th">à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸«à¸²à¸à¸±à¸à¸à¸µà¹à¸¢à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¹à¸§à¹à¸à¸à¹à¸§à¸¢à¸£à¸«à¸±à¸ª</value> <value xml:lang="zh">没æå¨æ»è´¦ä¸æ¾å°ç¸åºçç¼å·</value> </property> + <property key="AccountingCreditDebitFlag"> + <value xml:lang="en">C/D</value> + </property> <property key="AccountingCreateAcctRecons"> <value xml:lang="de">Kontenabstimmung erstellen</value> <value xml:lang="en">Create Account Reconciliation</value> @@ -2655,6 +2664,12 @@ <value xml:lang="th">วัà¸à¸«à¸¡à¸à¸à¸²à¸¢à¸¸</value> <value xml:lang="zh">æææ</value> </property> + <property key="AccountingExportAsCsv"> + <value xml:lang="en">Export as CSV</value> + </property> + <property key="AccountingExportAsPdf"> + <value xml:lang="en">Export as PDF</value> + </property> <property key="AccountingExternalAccountId"> <value xml:lang="ar">دÙÙÙ Øساب Ù Øاسب٠خارجÙ</value> <value xml:lang="en">Accounting External Account Id</value> @@ -5263,6 +5278,9 @@ <value xml:lang="th">No current invoice line items</value> <value xml:lang="zh">没æå½åå票çè¡æç»</value> </property> + <property key="AccountingNoAcctgTransFound"> + <value xml:lang="en">No Accounting Transactions Found.</value> + </property> <property key="AccountingNotModificationRecrationGlAccount"> <value xml:lang="ar">Ùا ÙÙ Ù٠تعÙÙر Ùذا دÙ٠إعادة إستØداث Øساب اÙÙ ØاسبÙ</value> <value xml:lang="en">This cannot be changed without re-creating the GL Account.</value> 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=789335&r1=789334&r2=789335&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon Jun 29 14:12:47 2009 @@ -2051,6 +2051,25 @@ <response name="error" type="view" value="EditFacility"/> </request-map> + <request-map uri="AcctgTransEntriesSearchResultsCsv.csv"> + <security https="true" auth="true"/> + <response name="success" type="view" value="AcctgTransEntriesSearchResultsCsv"/> + </request-map> + + <request-map uri="AcctgTransEntriesSearchResultsPdf.pdf"> + <security auth="true" https="true"/> + <response name="success" type="view" value="AcctgTransEntriesSearchResultsPdf"/> + </request-map> + + <request-map uri="AcctgTransSearchResultsCsv.csv"> + <security https="true" auth="true"/> + <response name="success" type="view" value="AcctgTransSearchResultsCsv"/> + </request-map> + + <request-map uri="AcctgTransSearchResultPdf.pdf"> + <security https="true" auth="true"/> + <response name="success" type="view" value="AcctgTransSearchResultPdf"/> + </request-map> <!-- end of request mappings --> @@ -2301,6 +2320,10 @@ --> <view-map name="FixedAssetGeoLocation" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#FixedAssetGeoLocation"/> - + <view-map name="AcctgTransEntriesSearchResultsCsv" type="screentext" page="component://accounting/widget/GlScreens.xml#AcctgTransEntriesSearchResultsCsv" content-type="text/csv" encoding="none"/> + <view-map name="AcctgTransEntriesSearchResultsPdf" type="screenfop" page="component://accounting/widget/GlScreens.xml#AcctgTransEntriesSearchResultsPdf" content-type="application/pdf" encoding="none"/> + <view-map name="AcctgTransSearchResultsCsv" type="screentext" page="component://accounting/widget/GlScreens.xml#AcctgTransSearchResultsCsv" content-type="text/csv" encoding="none"/> + <view-map name="AcctgTransSearchResultPdf" type="screenfop" page="component://accounting/widget/GlScreens.xml#AcctgTransSearchResultPdf" content-type="application/pdf" encoding="none"/> + <!-- end of view mappings --> </site-conf> Added: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl?rev=789335&view=auto ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl (added) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl Mon Jun 29 14:12:47 2009 @@ -0,0 +1,205 @@ +<#-- +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. +--> + +<#escape x as x?xml> + <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> + <fo:layout-master-set> + <fo:simple-page-master master-name="11x17-landscape" page-width="17in" page-height="11in" + margin-top="0.1in" margin-bottom="0.5in" margin-left="0.5in" margin-right="0.5in"> + <fo:region-body margin-top="1in" margin-bottom="0.5in"/> + </fo:simple-page-master> + </fo:layout-master-set> + <fo:page-sequence master-reference="11x17-landscape"> + <fo:flow flow-name="xsl-region-body" font-family="Helvetica"> + <fo:block align="center">${screens.render("component://order/widget/ordermgr/OrderPrintScreens.xml#CompanyLogo")}</fo:block> + <#if acctgTransEntryList?has_content> + <fo:block>${uiLabelMap.AccountingAcctgTransEntriesFor} + <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : organizationPartyId}, false))!> + <#if partyName.partyTypeId == "PERSON"> + ${(partyName.firstName)!} ${(partyName.lastName)!} + <#elseif (partyName.partyTypeId)! == "PARTY_GROUP"> + ${(partyName.groupName)!} + </#if> + </fo:block> + <fo:block></fo:block> + <fo:block> + <fo:table> + <fo:table-column column-width="20mm"/> + <fo:table-column column-width="20mm"/> + <fo:table-column column-width="15mm"/> + <fo:table-column column-width="35mm"/> + <fo:table-column column-width="25mm"/> + <fo:table-column column-width="25mm"/> + <fo:table-column column-width="15mm"/> + <fo:table-column column-width="20mm"/> + <fo:table-column column-width="35mm"/> + <fo:table-column column-width="15mm"/> + <fo:table-column column-width="15mm"/> + <fo:table-column column-width="15mm"/> + <fo:table-column column-width="15mm"/> + <fo:table-column column-width="15mm"/> + <fo:table-column column-width="25mm"/> + <fo:table-column column-width="20mm"/> + <fo:table-header> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.AccountingAcctgTrans}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_transactionDate}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_glAccountId}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_glAccountClassId}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_invoiceId}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_paymentId} - (${uiLabelMap.AccountingPaymentType})</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_workEffortId}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_shipmentId}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.CommonPartyID}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.AccountingProductId}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_isPosted}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_postedDate}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.AccountingCreditDebitFlag}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.AccountingAmount}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_acctgTransTypeId}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_glFiscalTypeId}</fo:block> + </fo:table-cell> + </fo:table-header> + <fo:table-body> + <#list acctgTransEntryList as acctgTransEntry> + <fo:table-row> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt">${(acctgTransEntry.acctgTransId)!} - ${(acctgTransEntry.acctgTransEntrySeqId)!}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + <#assign dateFormat = Static["java.text.DateFormat"].LONG/> + <#assign transactionDate = Static["java.text.DateFormat"].getDateInstance(dateFormat, locale).format((acctgTransEntry.transactionDate)!)/> + ${(transactionDate)!} + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt">${(acctgTransEntry.glAccountId)!}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + <#if (acctgTransEntry.glAccountClassId)??> + <#assign glAccountClass = (delegator.findOne("GlAccountClass", {"glAccountClassId" : (acctgTransEntry.glAccountClassId)!}, false))!/> + <#if (glAccountClass?has_content)>${(glAccountClass.description)!}</#if> + </#if> + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + ${(acctgTransEntry.invoiceId)!} + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + <#if (acctgTransEntry.paymentId)??> + <#assign paymentType = (delegator.findOne("Payment", {"paymentId" : (acctgTransEntry.paymentId)!}, false)).getRelatedOne("PaymentType")/> + ${(acctgTransEntry.paymentId)!}<#if (paymentType?has_content)> -(${(paymentType.description)!})</#if> + </#if> + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt">${(acctgTransEntry.workEffortId)!}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + ${(acctgTransEntry.shipmentId)!} + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt">${(acctgTransEntry.partyId)!}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt">${(acctgTransEntry.productId)!}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt">${(acctgTransEntry.isPosted)!}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + <#if acctgTransEntry.postedDate?has_content> + <#assign dateFormat = Static["java.text.DateFormat"].LONG> + <#assign postedDate = Static["java.text.DateFormat"].getDateInstance(dateFormat,locale).format((acctgTransEntry.postedDate)!)> + ${postedDate} + </#if> + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt">${(acctgTransEntry.debitCreditFlag)!}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"><#if acctgTransEntry.amount?exists><@ofbizCurrency amount=(acctgTransEntry.amount)! isoCode=(acctgTransEntry.currencyUomId)!/></#if></fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + <#if (acctgTransEntry.acctgTransTypeId)??> + <#assign acctgTransType = (delegator.findOne("AcctgTransType", {"acctgTransTypeId" : (acctgTransEntry.acctgTransTypeId)!}, false))!/> + <#if acctgTransType?has_content>${acctgTransType.description}</#if> + </#if> + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="left" font-size="5pt"> + <#if (acctgTransEntry.glFiscalTypeId)??> + <#assign glFiscalType = (delegator.findOne("GlFiscalType", {"glFiscalTypeId" : (acctgTransEntry.glFiscalTypeId)!}, false))!/> + ${(glFiscalType.description)!} + </#if> + </fo:block> + </fo:table-cell> + </fo:table-row> + </#list> + </fo:table-body> + </fo:table> + </fo:block> + <#else> + <fo:block text-align="center">${uiLabelMap.AccountingNoAcctgTransFound}</fo:block> + </#if> + </fo:flow> + </fo:page-sequence> + </fo:root> +</#escape> Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl?rev=789335&view=auto ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl (added) +++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl Mon Jun 29 14:12:47 2009 @@ -0,0 +1,162 @@ +<#-- +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. +--> +<#escape x as x?xml> + <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> + <fo:layout-master-set> + <fo:simple-page-master master-name="main" page-height="8in" page-width="8.5in" + margin-top="0.1in" margin-bottom="1in" margin-left="0.2in" margin-right="0.5in"> + <fo:region-body margin-top="1in"/> + </fo:simple-page-master> + </fo:layout-master-set> + <fo:page-sequence master-reference="main"> + <fo:flow flow-name="xsl-region-body" font-family="Helvetica"> + <fo:block align="center">${screens.render("component://order/widget/ordermgr/OrderPrintScreens.xml#CompanyLogo")}</fo:block> + <#if acctgTransList?has_content> + <fo:block>${uiLabelMap.AccountingAcctgTransFor} + <#if (organizationPartyId)??> + <#assign partyName = (delegator.findOne("PartyNameView", {"partyId" : organizationPartyId}, false))!> + <#if partyName.partyTypeId == "PERSON"> + ${(partyName.firstName)!} ${(partyName.lastName)!} + <#elseif (partyName.partyTypeId)! == "PARTY_GROUP"> + ${(partyName.groupName)!} + </#if> + </#if> + </fo:block> + <fo:block> + <fo:table> + <fo:table-column column-width="15mm"/> + <fo:table-column column-width="20mm"/> + <fo:table-column column-width="30mm"/> + <fo:table-column column-width="20mm"/> + <fo:table-column column-width="15mm"/> + <fo:table-column column-width="25mm"/> + <fo:table-column column-width="20mm"/> + <fo:table-column column-width="20mm"/> + <fo:table-column column-width="10mm"/> + <fo:table-column column-width="25mm"/> + <fo:table-header> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_theirAcctgTransId}</fo:block> + </fo:table-cell> + <fo:table-cell border="2pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_transactionDate}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_acctgTransTypeId}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_glFiscalTypeId}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_invoiceId}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_paymentId} - (${uiLabelMap.AccountingPaymentType})</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_workEffortId}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_shipmentId}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_isPosted}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="6pt">${uiLabelMap.FormFieldTitle_postedDate}</fo:block> + </fo:table-cell> + </fo:table-header> + <fo:table-body> + <#list acctgTransList as acctgTrans> + <fo:table-row> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt">${(acctgTrans.acctgTransId)!}</fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + <#assign dateFormat = Static["java.text.DateFormat"].LONG/> + <#assign transactionDate = Static["java.text.DateFormat"].getDateInstance(dateFormat, locale).format((acctgTrans.transactionDate)!)/> + ${(transactionDate)!} + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + <#if (acctgTrans.acctgTransTypeId)??> + <#assign acctgTransType = (delegator.findOne("AcctgTransType", {"acctgTransTypeId" : (acctgTrans.acctgTransTypeId)!}, false))!/> + <#if acctgTransType?has_content>${acctgTransType.description}</#if> + </#if> + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + <#if (acctgTrans.glFiscalTypeId)??> + <#assign glFiscalType = (delegator.findOne("GlFiscalType", {"glFiscalTypeId" : (acctgTrans.glFiscalTypeId)!}, false))!/> + ${(glFiscalType.description)!} + </#if> + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + ${(acctgTrans.invoiceId)!} + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + <#if (acctgTrans.paymentId)??> + <#assign paymentType = (delegator.findOne("Payment", {"paymentId" : (acctgTrans.paymentId)!}, false)).getRelatedOne("PaymentType")/> + ${(acctgTrans.paymentId)!}<#if (paymentType?has_content)> -(${(paymentType.description)!})</#if> + </#if> + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + ${(acctgTrans.workEffortId)!} + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + ${(acctgTrans.shipmentId)!} + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + ${(acctgTrans.isPosted)!} + </fo:block> + </fo:table-cell> + <fo:table-cell border="1pt solid" border-width=".1mm"> + <fo:block text-align="center" font-size="5pt"> + <#if acctgTrans.postedDate?has_content> + <#assign dateFormat = Static["java.text.DateFormat"].LONG/> + <#assign postedDate = Static["java.text.DateFormat"].getDateInstance(dateFormat, locale).format((acctgTrans.postedDate)!)/> + ${(postedDate)!} + </#if> + </fo:block> + </fo:table-cell> + </fo:table-row> + </#list> + </fo:table-body> + </fo:table> + </fo:block> + <#else> + <fo:block text-align="center">${uiLabelMap.AccountingNoAcctgTransFound}</fo:block> + </#if> + </fo:flow> + </fo:page-sequence> + </fo:root> +</#escape> Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=789335&r1=789334&r2=789335&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Mon Jun 29 14:12:47 2009 @@ -869,4 +869,179 @@ <field name="origAmount"><display type="currency" currency="${origCurrencyUomId}"/></field> <field name="amount"><display type="currency" currency="${currencyUomId}"/></field> </form> + + <form name="AcctgTransEntriesSearchResultsCsv" type="list" title="List Accounting Transaction Entries" list-name="acctgTransEntryList" view-size="1000"> + <actions> + <entity-condition entity-name="AcctgTransAndEntries" list="acctgTransEntryList"> + <condition-list> + <condition-expr field-name="organizationPartyId" operator="equals" from-field="parameters.organizationPartyId"/> + <condition-expr field-name="glAccountId" operator="equals" from-field="parameters.glAccountId" ignore-if-empty="true"/> + <condition-expr field-name="acctgTransTypeId" operator="equals" from-field="parameters.acctgTransTypeId" ignore-if-empty="true"/> + <condition-expr field-name="glFiscalTypeId" operator="equals" from-field="parameters.glFiscalTypeId" ignore-if-empty="true"/> + <condition-expr field-name="glJournalId" operator="equals" from-field="parameters.glJournalId" ignore-if-empty="true"/> + <condition-expr field-name="isPosted" operator="equals" from-field="parameters.isPosted" ignore-if-empty="true"/> + <condition-expr field-name="partyId" operator="equals" from-field="parameters.partyId" ignore-if-empty="true"/> + <condition-expr field-name="invoiceId" operator="equals" from-field="parameters.invoiceId" ignore-if-empty="true"/> + <condition-expr field-name="paymentId" operator="equals" from-field="parameters.paymentId" ignore-if-empty="true"/> + <condition-expr field-name="productId" operator="equals" from-field="parameters.productId" ignore-if-empty="true"/> + <condition-expr field-name="workEffortId" operator="equals" from-field="parameters.workEffortId" ignore-if-empty="true"/> + <condition-expr field-name="shipmentId" operator="equals" from-field="parameters.shipmentId" ignore-if-empty="true"/> + <condition-expr field-name="acctgTransId" operator="equals" from-field="parameters.acctgTransId" ignore-if-empty="true"/> + <condition-expr field-name="transactionDate" operator="greater-equals" from-field="parameters.fromDate" ignore-if-empty="true"/> + <condition-expr field-name="transactionDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/> + </condition-list> + <order-by field-name="-transactionDate"/> + </entity-condition> + </actions> + <field name="quot0" title="""><display/></field> + <field name="acctgTransId"><display/></field> + <field name="quot1" title="""><display/></field> + <field name="separator0" title=","><display description=", "/></field> + + <field name="quot2" title="""><display/></field> + <field name="acctgTransEntrySeqId"><display description="${acctgTransEntrySeqId}"/></field> + <field name="quot3" title="""><display/></field> + <field name="separator1" title=","><display description=", "/></field> + + <field name="quot4" title="""><display/></field> + <field name="transactionDate"><display/></field> + <field name="quot5" title="""><display/></field> + <field name="separator2" title=","><display description=", "/></field> + + <field name="acctgTransTypeId"><display-entity entity-name="AcctgTransType" description="${description}"/></field> + <field name="separator3" title=","><display description=", "/></field> + + <field name="glFiscalTypeId"><display-entity entity-name="GlFiscalType" description="${description}"/></field> + <field name="separator4" title=","><display description=", "/></field> + + <field name="quot6" title="""><display/></field> + <field name="glAccountId"><display/></field> + <field name="quot7" title="""><display/></field> + <field name="separator5" title=","><display description=","/></field> + + <field name="glAccountDescription"><display description="${accountName}"/></field> + <field name="separator6" title=","><display description=","/></field> + + <field name="glAccountClassId"><display-entity entity-name="GlAccountClass" description="${description}"/></field> + <field name="separator7" title=","><display description=","/></field> + + <field name="quot8" title="""><display/></field> + <field name="invoiceId"><display/></field> + <field name="quot9" title="""><display/></field> + <field name="separator8" title=","><display description=","/></field> + + <field name="quot10" title="""><display/></field> + <field name="paymentId"><display/></field> + <field name="quot11" title="""><display/></field> + <field name="separator9" title=","><display description=","/></field> + + <field name="quot12" title="""><display/></field> + <field name="workEffortId"><display/></field> + <field name="quot13" title="""><display/></field> + <field name="separator10" title=","><display description=","/></field> + + <field name="quot14" title="""><display/></field> + <field name="shipmentId"><display/></field> + <field name="quot15" title="""><display/></field> + <field name="separator12" title=","><display description=","/></field> + + <field name="quot16" title="""><display/></field> + <field name="partyId"><display/></field> + <field name="quot17" title="""><display/></field> + <field name="separator13" title=","><display description=","/></field> + + <field name="quot18" title="""><display/></field> + <field name="productId"><display/></field> + <field name="quot19" title="""><display/></field> + <field name="separator14" title=","><display description=","/></field> + + <field name="quot20" title="""><display/></field> + <field name="isPosted"><display/></field> + <field name="quot21" title="""><display/></field> + <field name="separator15" title=","><display description=","/></field> + + <field name="quot22" title="""><display/></field> + <field name="postedDate"><display/></field> + <field name="quot23" title="""><display/></field> + <field name="separator16" title=","><display description=","/></field> + + <field name="quot24" title="""><display/></field> + <field name="debitCreditFlag"><display/></field> + <field name="quot25" title="""><display/></field> + <field name="separator17" title=","><display description=","/></field> + + <field name="quot26" title="""><display/></field> + <field name="amount"><display currency="${currencyUomId}"/></field> + <field name="quot27" title="""><display/></field> + </form> + + <form name="AcctgTransSearchResultsCsv" type="list" title="List Accounting Transactions" list-name="acctgTransList" view-size="1000"> + <actions> + <entity-condition entity-name="AcctgTransAndEntries" list="acctgTransList" result-set-type="forward" distinct="true"> + <condition-list> + <condition-expr field-name="organizationPartyId" operator="equals" from-field="organizationPartyId"/> + <condition-expr field-name="acctgTransTypeId" operator="equals" from-field="parameters.acctgTransTypeId" ignore-if-empty="true"/> + <condition-expr field-name="glFiscalTypeId" operator="equals" from-field="parameters.glFiscalTypeId" ignore-if-empty="true"/> + <condition-expr field-name="glJournalId" operator="equals" from-field="parameters.glJournalId" ignore-if-empty="true"/> + <condition-expr field-name="isPosted" operator="equals" from-field="parameters.isPosted" ignore-if-empty="true"/> + <condition-expr field-name="invoiceId" operator="equals" from-field="parameters.invoiceId" ignore-if-empty="true"/> + <condition-expr field-name="paymentId" operator="equals" from-field="parameters.paymentId" ignore-if-empty="true"/> + <condition-expr field-name="productId" operator="equals" from-field="parameters.productId" ignore-if-empty="true"/> + <condition-expr field-name="workEffortId" operator="equals" from-field="parameters.workEffortId" ignore-if-empty="true"/> + <condition-expr field-name="shipmentId" operator="equals" from-field="parameters.shipmentId" ignore-if-empty="true"/> + <condition-expr field-name="acctgTransId" operator="equals" from-field="parameters.acctgTransId" ignore-if-empty="true"/> + <condition-expr field-name="transactionDate" operator="greater-equals" from-field="parameters.fromDate" ignore-if-empty="true"/> + <condition-expr field-name="transactionDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/> + </condition-list> + <select-field field-name="acctgTransId"/> + <select-field field-name="transactionDate"/> + <select-field field-name="acctgTransTypeId"/> + <select-field field-name="glFiscalTypeId"/> + <select-field field-name="invoiceId"/> + <select-field field-name="paymentId"/> + <select-field field-name="workEffortId"/> + <select-field field-name="shipmentId"/> + <select-field field-name="isPosted"/> + <select-field field-name="postedDate"/> + <order-by field-name="-transactionDate"/> + </entity-condition> + </actions> + <field name="quot0" title="""><display/></field> + <field name="acctgTransId"><display/></field> + <field name="quot1" title="""><display/></field> + <field name="separator1" title=","><display description=","/></field> + + <field name="quot2" title="""><display/></field> + <field name="transactionDate"><display/></field> + <field name="quot3" title="""><display/></field> + <field name="separator2" title=","><display description=","/></field> + <field name="acctgTransTypeId"><display-entity entity-name="AcctgTransType" description="${description}"/></field> + <field name="separator3" title=","><display description=","/></field> + <field name="glFiscalTypeId"><display-entity entity-name="GlFiscalType" description="${description}"/></field> + <field name="separator4" title=","><display description=","/></field> + <field name="quot4" title="""><display/></field> + <field name="invoiceId"><display/></field> + <field name="quot5" title="""><display/></field> + <field name="separator5" title=","><display description=","/></field> + <field name="quot6" title="""><display/></field> + <field name="paymentId"><display/></field> + <field name="quot7" title="""><display/></field> + <field name="separator6" title=","><display description=","/></field> + <field name="quot8" title="""><display/></field> + <field name="workEffortId"><display/></field> + <field name="quot9" title="""><display/></field> + <field name="separator7" title=","><display description=","/></field> + <field name="quot10" title="""><display/></field> + <field name="shipmentId"><display/></field> + <field name="quot11" title="""><display/></field> + <field name="separator8" title=","><display description=","/></field> + <field name="quot12" title="""><display/></field> + <field name="isPosted"><display/></field> + <field name="quot13" title="""><display/></field> + <field name="separator9" title=","><display description=","/></field> + <field name="quot14" title="""><display/></field> + <field name="postedDate"><display/></field> + <field name="quot15" title="""><display/></field> + <field name="separator10" title=","><display description=","/></field> + </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=789335&r1=789334&r2=789335&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Mon Jun 29 14:12:47 2009 @@ -128,6 +128,36 @@ </container> </container> <container style="screenlet-body"> + <link text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext" target="AcctgTransSearchResultsCsv.csv"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> + </link> + <link text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext" target="AcctgTransSearchResultPdf.pdf"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> + </link> <include-form name="ListAcctgTrans" location="component://accounting/widget/GlForms.xml"/> </container> </container> @@ -174,6 +204,40 @@ </container> </container> <container style="screenlet-body"> + <link text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext" target="AcctgTransEntriesSearchResultsCsv.csv"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + </link> + <link text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext" target="AcctgTransEntriesSearchResultsPdf.pdf"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + </link> <include-form name="ListFindAcctgTransEntriesByAccount" location="component://accounting/widget/GlForms.xml"/> </container> </container> @@ -194,6 +258,40 @@ </container> </container> <container style="screenlet-body"> + <link text="${uiLabelMap.AccountingExportAsCsv}" style="buttontext" target="AcctgTransEntriesSearchResultsCsv.csv"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + </link> + <link text="${uiLabelMap.AccountingExportAsPdf}" style="buttontext" target="AcctgTransEntriesSearchResultsPDF.pdf"> + <parameter param-name="organizationPartyId"/> + <parameter param-name="produtId" from-field="parameters.produtId"/> + <parameter param-name="isPosted" from-field="parameters.isPosted"/> + <parameter param-name="invoiceId" from-field="parameters.invoiceId"/> + <parameter param-name="acctgTransId" from-field="parameters.acctgTransId"/> + <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/> + <parameter param-name="glAccountId" from-field="parameters.glAccountId"/> + <parameter param-name="shipmentId" from-field="parameters.shipmentId"/> + <parameter param-name="acctgTransTypeId" from-field="parameters.acctgTransTypeId"/> + <parameter param-name="fromDate" from-field="parameters.fromDate"/> + <parameter param-name="workEffortId" from-field="parameters.workEffortId"/> + <parameter param-name="glJournalId" from-field="parameters.glJournalId"/> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="thruDate" from-field="parameters.thruDate"/> + <parameter param-name="paymentId" from-field="parameters.paymentId"/> + </link> <include-form name="ListFindAcctgTransEntriesByDate" location="component://accounting/widget/GlForms.xml"/> </container> </container> @@ -693,4 +791,116 @@ </widgets> </section> </screen> + + <screen name="AcctgTransSearchResultsCsv"> + <section> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> + </actions> + <widgets> + <container> + <include-form name="AcctgTransSearchResultsCsv" location="component://accounting/widget/GlForms.xml"/> + </container> + </widgets> + </section> + </screen> + + <screen name="AcctgTransEntriesSearchResultsCsv"> + <section> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> + </actions> + <widgets> + <container> + <include-form name="AcctgTransEntriesSearchResultsCsv" location="component://accounting/widget/GlForms.xml"/> + </container> + </widgets> + </section> + </screen> + + <screen name="AcctgTransEntriesSearchResultsPdf"> + <section> + <actions> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> + <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/> + <entity-condition entity-name="AcctgTransAndEntries" list="acctgTransEntryList"> + <condition-list> + <condition-expr field-name="organizationPartyId" operator="equals" from-field="parameters.organizationPartyId"/> + <condition-expr field-name="glAccountId" operator="equals" from-field="parameters.glAccountId" ignore-if-empty="true"/> + <condition-expr field-name="acctgTransTypeId" operator="equals" from-field="parameters.acctgTransTypeId" ignore-if-empty="true"/> + <condition-expr field-name="glFiscalTypeId" operator="equals" from-field="parameters.glFiscalTypeId" ignore-if-empty="true"/> + <condition-expr field-name="glJournalId" operator="equals" from-field="parameters.glJournalId" ignore-if-empty="true"/> + <condition-expr field-name="isPosted" operator="equals" from-field="parameters.isPosted" ignore-if-empty="true"/> + <condition-expr field-name="partyId" operator="equals" from-field="parameters.partyId" ignore-if-empty="true"/> + <condition-expr field-name="invoiceId" operator="equals" from-field="parameters.invoiceId" ignore-if-empty="true"/> + <condition-expr field-name="paymentId" operator="equals" from-field="parameters.paymentId" ignore-if-empty="true"/> + <condition-expr field-name="productId" operator="equals" from-field="parameters.productId" ignore-if-empty="true"/> + <condition-expr field-name="workEffortId" operator="equals" from-field="parameters.workEffortId" ignore-if-empty="true"/> + <condition-expr field-name="shipmentId" operator="equals" from-field="parameters.shipmentId" ignore-if-empty="true"/> + <condition-expr field-name="acctgTransId" operator="equals" from-field="parameters.acctgTransId" ignore-if-empty="true"/> + <condition-expr field-name="transactionDate" operator="greater-equals" from-field="parameters.fromDate" ignore-if-empty="true"/> + <condition-expr field-name="transactionDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/> + </condition-list> + <order-by field-name="-transactionDate"/> + </entity-condition> + </actions> + <widgets> + <platform-specific> + <xsl-fo> + <html-template location="component://accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl"/> + </xsl-fo> + </platform-specific> + </widgets> + </section> + </screen> + <screen name="AcctgTransSearchResultPdf"> + <section> + <actions> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> + <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/> + <entity-condition entity-name="AcctgTransAndEntries" list="acctgTransList" distinct="true" > + <condition-list> + <condition-expr field-name="organizationPartyId" operator="equals" from-field="organizationPartyId"/> + <condition-expr field-name="acctgTransTypeId" operator="equals" from-field="parameters.acctgTransTypeId" ignore-if-empty="true"/> + <condition-expr field-name="glFiscalTypeId" operator="equals" from-field="parameters.glFiscalTypeId" ignore-if-empty="true"/> + <condition-expr field-name="glJournalId" operator="equals" from-field="parameters.glJournalId" ignore-if-empty="true"/> + <condition-expr field-name="isPosted" operator="equals" from-field="parameters.isPosted" ignore-if-empty="true"/> + <condition-expr field-name="invoiceId" operator="equals" from-field="parameters.invoiceId" ignore-if-empty="true"/> + <condition-expr field-name="paymentId" operator="equals" from-field="parameters.paymentId" ignore-if-empty="true"/> + <condition-expr field-name="productId" operator="equals" from-field="parameters.productId" ignore-if-empty="true"/> + <condition-expr field-name="workEffortId" operator="equals" from-field="parameters.workEffortId" ignore-if-empty="true"/> + <condition-expr field-name="shipmentId" operator="equals" from-field="parameters.shipmentId" ignore-if-empty="true"/> + <condition-expr field-name="acctgTransId" operator="equals" from-field="parameters.acctgTransId" ignore-if-empty="true"/> + <condition-expr field-name="transactionDate" operator="greater-equals" from-field="parameters.fromDate" ignore-if-empty="true"/> + <condition-expr field-name="transactionDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/> + </condition-list> + <select-field field-name="acctgTransId"/> + <select-field field-name="transactionDate"/> + <select-field field-name="acctgTransTypeId"/> + <select-field field-name="glFiscalTypeId"/> + <select-field field-name="invoiceId"/> + <select-field field-name="paymentId"/> + <select-field field-name="workEffortId"/> + <select-field field-name="shipmentId"/> + <select-field field-name="isPosted"/> + <select-field field-name="postedDate"/> + <order-by field-name="-transactionDate"/> + </entity-condition> + </actions> + <widgets> + <platform-specific> + <xsl-fo> + <html-template location="component://accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl"/> + </xsl-fo> + </platform-specific> + </widgets> + </section> + + </screen> </screens> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |