OFBiz › OFBiz - Commits

svn commit: r889851 [4/17] - in /ofbiz/branches/addbirt: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/data/helpdata/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/fina...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

doogie-3

svn commit: r889851 [4/17] - in /ofbiz/branches/addbirt: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/data/helpdata/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/fina...

Modified: ofbiz/branches/addbirt/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl (original)
+++ ofbiz/branches/addbirt/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.fo.ftl Fri Dec 11 23:11:39 2009
@@ -54,12 +54,8 @@
<fo:table-column/>
<fo:table-column/>
<fo:table-column/>
- <fo:table-column/>
<fo:table-header>
<fo:table-cell border="1pt solid" border-width=".1mm">
- <fo:block text-align="center">${uiLabelMap.Party}</fo:block>
- </fo:table-cell>
- <fo:table-cell border="1pt solid" border-width=".1mm">
<fo:block text-align="center">${uiLabelMap.FormFieldTitle_transactionDate}</fo:block>
</fo:table-cell>
<fo:table-cell border="1pt solid" border-width=".1mm">
@@ -96,12 +92,6 @@
<fo:table-row border="1pt solid" border-width=".1mm">
<fo:table-cell border="1pt solid" border-width=".1mm">
<fo:block text-align="center">
- <#assign partyNameFrom = (delegator.findOne("PartyNameView", {"partyId" : acctgTransAndEntry.organizationPartyId}, true))!>
- ${(partyNameFrom.firstName)!} ${(partyNameFrom.lastName)!} ${(partyNameFrom.groupName)!}
- </fo:block>
- </fo:table-cell>
- <fo:table-cell border="1pt solid" border-width=".1mm">
- <fo:block text-align="center">
<#if acctgTransAndEntry.transactionDate?has_content>
<#assign dateFormat = Static["java.text.DateFormat"].LONG/>
<#assign transactionDate = Static["java.text.DateFormat"].getDateInstance(dateFormat, locale).format((acctgTransAndEntry.transactionDate)!)/>

Modified: ofbiz/branches/addbirt/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl (original)
+++ ofbiz/branches/addbirt/applications/accounting/webapp/accounting/reports/GlAccountTrialBalanceReport.ftl Fri Dec 11 23:11:39 2009
@@ -23,49 +23,63 @@
<div>
<a href="<@ofbizUrl>GlAccountTrialBalanceReportPdf.pdf?organizationPartyId=${organizationPartyId}&timePeriod=${parameters.timePeriod}&isPosted=${parameters.isPosted}&glAccountId=${parameters.glAccountId}</@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingInvoicePDF}</a>
</div>
+ <h3>${uiLabelMap.AccountingSubsidiaryLedger}</h3>
+ <h3>${uiLabelMap.FormFieldTitle_companyName} : ${(currentOrganization.groupName)!}</h3>
+ <h3>${uiLabelMap.AccountingTimePeriod} : <#if currentTimePeriod?has_content>${(currentTimePeriod.fromDate)!} ${uiLabelMap.CommonTo} ${(currentTimePeriod.thruDate)!}</#if></h3>
+ <h3>${uiLabelMap.AccountingGlAccountNameAndGlAccountCode} : ${(glAccount.accountCode)!} - ${(glAccount.accountName)!}</h3>
<div style="width: 1210px;">
- <table border=1>
- <tr><th></th></tr>
- <tr><th colspan=9 style="height: 30px;" ALIGN="center">${uiLabelMap.AccountingSubsidiaryLedger}</th></tr>
- <tr><th colspan=9 style="height: 30px;" ALIGN="left">${uiLabelMap.FormFieldTitle_companyName} : ${(currentOrganization.groupName)!}</th></tr>
- <tr><th colspan=9 style="height: 30px;" ALIGN="left">${uiLabelMap.AccountingTimePeriod} : <#if currentTimePeriod?has_content>${(currentTimePeriod.fromDate)!} ${uiLabelMap.CommonTo} ${(currentTimePeriod.thruDate)!}</#if></th></tr>
- <tr><th colspan=9 style="height: 30px;" ALIGN="left">${uiLabelMap.AccountingGlAccountNameAndGlAccountCode} : ${(glAccount.accountCode)!} - ${(glAccount.accountName)!}</th></tr>
+ <table border=2>
<tr>
- <th>${uiLabelMap.Party}</th>
- <th>${uiLabelMap.FormFieldTitle_transactionDate}</th>
- <th>${uiLabelMap.AccountingAccountTransactionId}</th>
- <th>${uiLabelMap.CommonDescription}</th>
- <th>${uiLabelMap.AccountingTypeOfTheCurrency}</th>
- <th>${uiLabelMap.AccountingOriginalCurrency}</th>
- <th>${uiLabelMap.AccountingDebitAmount}</th>
- <th>${uiLabelMap.AccountingCreditAmount}</th>
- <th>${uiLabelMap.AccountingDebitOrCreditOfBalance}</th>
- <th>${uiLabelMap.AccountingBalanceOfTheAccount}</th>
+ <td align="left"><b>${uiLabelMap.FormFieldTitle_transactionDate}</b></td>
+ <td align="left"><b>${uiLabelMap.AccountingAccountTransactionId}</b></td>
+ <td align="left"><b>${uiLabelMap.CommonDescription}</b></td>
+ <td align="left"><b>${uiLabelMap.AccountingTypeOfTheCurrency}</b></td>
+ <td align="left"><b>${uiLabelMap.AccountingOriginalCurrency}</b></td>
+ <td align="right"><b>${uiLabelMap.AccountingDebitAmount}</b></td>
+ <td align="right"><b>${uiLabelMap.AccountingCreditAmount}</b></td>
+ <td align="right"><b>${uiLabelMap.AccountingDebitOrCreditOfBalance}</b></td>
+ <td align="right"><b>${uiLabelMap.AccountingBalanceOfTheAccount}</b></td>
+ </tr>
+ <tr class="header-row">
+ <td colspan=2></td>
+ <td colspan=3 align="center"><b>${uiLabelMap.AccountingTheBalanceOfLastYear}</b></td>
+ <td colspan=2></td>
+ <td ALIGN="right"><b><#if (isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></b></td>
+ <td ALIGN="right">${(openingBalance)!}</td>
</tr>
- <tr><th colspan=1><th colspan=1><th colspan=3>${uiLabelMap.AccountingTheBalanceOfLastYear}<th colspan=1></th></th></th></th><th></th><th ALIGN="center"><#if (isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></th><th ALIGN="center">${(openingBalance)!}</th></tr>
<#list glAcctgTrialBalanceList as glAcctgTrialBalance>

<#assign acctgTransAndEntries = glAcctgTrialBalance.acctgTransAndEntries/>
<#if acctgTransAndEntries?has_content>
<#list acctgTransAndEntries as acctgTransAndEntry>
<tr>
- <td>
- <#assign partyNameFrom = (delegator.findOne("PartyNameView", {"partyId" : acctgTransAndEntry.organizationPartyId}, true))!>
- <a href="/partymgr/control/viewprofile?partyId=${(partyNameFrom.partyId)!}&organizationPartyId=${(partyNameFrom.partyId)!}">${(partyNameFrom.firstName)!} ${(partyNameFrom.lastName)!} ${(partyNameFrom.groupName)!}</a>
- </td>
- <td ALIGN="center">${(acctgTransAndEntry.transactionDate)!}</td>
- <td ALIGN="center">${(acctgTransAndEntry.acctgTransId)!}</td>
- <td ALIGN="center">${(acctgTransAndEntry.transDescription)!}</td>
- <td ALIGN="center">${(acctgTransAndEntry.currencyUomId)!}</td>
- <td ALIGN="center">${(acctgTransAndEntry.origCurrencyUomId)!}</td>
- <td ALIGN="center"><#if (acctgTransAndEntry.debitCreditFlag)! == "D">${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
- <td ALIGN="center"><#if (acctgTransAndEntry.debitCreditFlag)! == "C">${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
- <td ALIGN="center"></td>
- <td ALIGN="center"></td>
+ <td ALIGN="left">${(acctgTransAndEntry.transactionDate)!}</td>
+ <td ALIGN="left">${(acctgTransAndEntry.acctgTransId)!}</td>
+ <td ALIGN="left">${(acctgTransAndEntry.transDescription)!}</td>
+ <td ALIGN="left">${(acctgTransAndEntry.currencyUomId)!}</td>
+ <td ALIGN="left">${(acctgTransAndEntry.origCurrencyUomId)!}</td>
+ <td ALIGN="right"><#if (acctgTransAndEntry.debitCreditFlag)! == "D">${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
+ <td ALIGN="right"><#if (acctgTransAndEntry.debitCreditFlag)! == "C">${(acctgTransAndEntry.amount)!}<#else>0</#if></td>
+ <td ALIGN="right"></td>
+ <td ALIGN="right"></td>
</tr>
</#list>
- <tr><td colspan = 1 ALIGN="center" ALIGN="center"><td colspan = 1 ALIGN="center"><td colspan=3 ALIGN="center"><b>${uiLabelMap.AccountingTotalOfTheCurrentMonth}</b></td></td></td><td ALIGN="center" colspan=1><b>${(glAcctgTrialBalance.debitTotal)!}</b></td><td ALIGN="center" colspan=1><b>${(glAcctgTrialBalance.creditTotal)!}</b></td><td ALIGN="center" colspan=1><b><#if (isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></b></td><td ALIGN="center" colspan=1><b>${(glAcctgTrialBalance.debitCreditDifference)!}</b></td></tr>
- <tr><td colspan = 1 ALIGN="center"><td ALIGN="center" colspan = 1><td ALIGN="center" colspan=3><b>${uiLabelMap.AccountingTotalOfYearToDate}</b></td></td></td></td><td ALIGN="center" colspan=1><b>${glAcctgTrialBalance.totalOfYearToDateDebit}</b></td><td ALIGN="center" colspan=1><b>${glAcctgTrialBalance.totalOfYearToDateCredit}</b></td><td ALIGN="center" colspan=1><b><#if (isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></b></td><td ALIGN="center" colspan=1><b>${(glAcctgTrialBalance.balanceOfTheAcctgForYear)!}</b></td></tr>
+ <tr class="header-row">
+ <td colspan=2></td>
+ <td colspan=3 ALIGN="center"><b>${uiLabelMap.AccountingTotalOfTheCurrentMonth}</b></td>
+ <td ALIGN="right" colspan=1><b>${(glAcctgTrialBalance.debitTotal)!}</b></td>
+ <td ALIGN="right" colspan=1><b>${(glAcctgTrialBalance.creditTotal)!}</b></td>
+ <td ALIGN="right" colspan=1><b><#if (isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></b></td>
+ <td ALIGN="right" colspan=1><b>${(glAcctgTrialBalance.debitCreditDifference)!}</b></td>
+ </tr>
+ <tr class="header-row">
+ <td colspan=2></td>
+ <td ALIGN="center" colspan=3><b>${uiLabelMap.AccountingTotalOfYearToDate}</b></td>
+ <td ALIGN="right"><b>${glAcctgTrialBalance.totalOfYearToDateDebit}</b></td>
+ <td ALIGN="right"><b>${glAcctgTrialBalance.totalOfYearToDateCredit}</b></td>
+ <td ALIGN="right"><b><#if (isDebitAccount)??>${uiLabelMap.AccountingDebitFlag}<#else>${uiLabelMap.AccountingCreditFlag}</#if></b></td>
+ <td ALIGN="right"><b>${(glAcctgTrialBalance.balanceOfTheAcctgForYear)!}</b></td>
+ </tr>
</#if>
</#list>
</table>

Modified: ofbiz/branches/addbirt/applications/accounting/webapp/ap/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/webapp/ap/WEB-INF/controller.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/webapp/ap/WEB-INF/controller.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/webapp/ap/WEB-INF/controller.xml Fri Dec 11 23:11:39 2009
@@ -99,6 +99,12 @@
<event type="service" invoke="massChangeInvoiceStatus"/>
<response name="success" type="view" value="FindPurchaseInvoices"/>
</request-map>
+ <request-map uri="cancelCheckRunPayments">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="cancelCheckRunPayments"/>
+ <response name="success" type="view" value="PaymentGroupOverview"/>
+ <response name="error" type="view" value="FindApPaymentGroups"/>
+ </request-map>


<request-map uri="findVendors">

Modified: ofbiz/branches/addbirt/applications/accounting/webapp/ar/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/webapp/ar/WEB-INF/controller.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/webapp/ar/WEB-INF/controller.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/webapp/ar/WEB-INF/controller.xml Fri Dec 11 23:11:39 2009
@@ -95,6 +95,12 @@
<response name="success" type="view" value="FindArInvoices"/>
<response name="error" type="view" value="FindArInvoices"/>
</request-map>
+ <request-map uri="cancelPaymentGroup">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="cancelPaymentBatch"/>
+ <response name="success" type="view" value="PaymentGroupOverview"/>
+ <response name="error" type="view" value="FindArPaymentGroups"/>
+ </request-map>




Modified: ofbiz/branches/addbirt/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/AccountingMenus.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/AccountingMenus.xml Fri Dec 11 23:11:39 2009
@@ -787,13 +787,13 @@
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="IncomeStatement" title="${uiLabelMap.AccountingIncomeStatement}">
- <link target="IncomeStatement">
+ <menu-item name="TransactionTotals" title="${uiLabelMap.AccountingTransactionTotals}">
+ <link target="TransactionTotals">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="ComparativeIncomeStatement" title="${uiLabelMap.AccountingComparativeIncomeStatement}">
- <link target="ComparativeIncomeStatement">
+ <menu-item name="IncomeStatement" title="${uiLabelMap.AccountingIncomeStatement}">
+ <link target="IncomeStatement">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
@@ -802,13 +802,13 @@
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="ComparativeBalanceSheet" title="${uiLabelMap.AccountingComparativeBalanceSheet}">
- <link target="ComparativeBalanceSheet">
+ <menu-item name="ComparativeIncomeStatement" title="${uiLabelMap.AccountingComparativeIncomeStatement}">
+ <link target="ComparativeIncomeStatement">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="TransactionTotals" title="${uiLabelMap.AccountingTransactionTotals}">
- <link target="TransactionTotals">
+ <menu-item name="ComparativeBalanceSheet" title="${uiLabelMap.AccountingComparativeBalanceSheet}">
+ <link target="ComparativeBalanceSheet">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
@@ -817,18 +817,18 @@
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="MonthlyTrialBalance" title="${uiLabelMap.AccountingMonthlyTrialBalance}">
- <link target="MonthlyTrialBalance">
+ <menu-item name="InventoryValuation" title="${uiLabelMap.AccountingInventoryValuation}">
+ <link target="InventoryValuation">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="CostCenterReport" title="${uiLabelMap.FormFieldTitle_costCenters}">
- <link target="CostCenterReport">
+ <menu-item name="GlAccountBalanceByCostCenter" title="${uiLabelMap.FormFieldTitle_costCenters}">
+ <link target="GlAccountBalanceByCostCenter">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="InventoryValuation" title="${uiLabelMap.AccountingInventoryValuation}">
- <link target="InventoryValuation">
+ <menu-item name="CashFlowStatement" title="${uiLabelMap.AccountingCashFlowStatement}">
+ <link target="CashFlowStatement">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
@@ -1237,10 +1237,16 @@
</menu-item>
<menu-item name="NewFinAccountReconciliations" title="${uiLabelMap.AccountingCreateNewFinAccountReconciliations}">
<condition>
- <or>
- <not><if-empty field="glReconciliationId"/></not>
- <if-compare field="tabButtonItem2" operator="equals" value="Find"/>
- </or>
+ <and>
+ <and>
+ <if-compare field="finAccount.statusId" operator="not-equals" value="FNACT_MANFROZEN"/>
+ <if-compare field="finAccount.statusId" operator="not-equals" value="FNACT_CANCELLED"/>
+ </and>
+ <or>
+ <not><if-empty field="glReconciliationId"/></not>
+ <if-compare field="tabButtonItem2" operator="equals" value="Find"/>
+ </or>
+ </and>
</condition>
<link target="EditFinAccountReconciliations">
<parameter param-name="finAccountId"/>

Modified: ofbiz/branches/addbirt/applications/accounting/widget/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/FieldLookupForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/FieldLookupForms.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/FieldLookupForms.xml Fri Dec 11 23:11:39 2009
@@ -34,7 +34,7 @@
</drop-down>
</field>
<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listLookupFixedAsset" list-name="listIt" title="" type="list" paginate-target="LookupFixedAsset"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -60,7 +60,7 @@
<field name="externalAccountId" title="${uiLabelMap.AccountingExternalAccountId}"><text-find/></field>

<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listBillingAccount" list-name="listIt" title="" type="list" paginate-target="LookupBillingAccount"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -100,7 +100,7 @@
</drop-down>
</field>
<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listLookupGlAccount" list-name="listIt" title="" type="list" paginate-target="LookupGlAccount"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -128,7 +128,7 @@
<field name="amountApplied"><text-find default-value=""></text-find> </field>

<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listPayment" list-name="listIt" title="" type="list" paginate-target="LookupPayment"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -172,7 +172,7 @@
<field position="2" name="DateThru" title="${uiLabelMap.CommonThruDate}"><date-time/></field>

<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listInvoice" list-name="listIt" title="" type="list" paginate-target="LookupInvoice"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -204,7 +204,7 @@
<field name="partyId" title="${uiLabelMap.AccountingPartyIdTo}"><text-find/></field>
<field name="agreementDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listAgreements" list-name="listIt" title="" type="list" target="LookupAgreement"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -235,7 +235,7 @@
</drop-down>
</field>
<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listAgreementItems" list-name="listIt" title="" type="list" target="LookupAgreementItem"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -262,7 +262,7 @@
<field name="thruDate" position="2"><date-time/></field>
<field name="sequenceNum"><text-find/></field>
<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listPaymentGroupMember" list-name="listIt" title="" type="list" target="LookupPaymentGroupMember"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -288,7 +288,7 @@
<field name="organizationPartyId" title="${uiLabelMap.FormFieldTitle_organizationPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>

<form name="ListLookupReconciliation" list-name="listIt" type="list" target="LookupGlReconciliation"

Modified: ofbiz/branches/addbirt/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/FinAccountForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/FinAccountForms.xml Fri Dec 11 23:11:39 2009
@@ -37,7 +37,7 @@
<field name="thruDate"><date-time/></field>
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="displayAdvancedSearch"><hidden value="true"></hidden></field>
- <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListFinAccounts" type="list" separate-columns="true" default-entity-name="FinAccount" list-name="listIt" paginate-target="FindFinAccount" paginate="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -255,7 +255,7 @@
<field name="finAccountId"><hidden/></field>
<field name="paymentGroupTypeId"><hidden value="BATCH_PAYMENT"/></field>
</form>
- <form name="ListDepositSlips" type="list" target="FindDepositSlips" extends="ListPaymentGroup" extends-resource="component://accounting/widget/PaymentGroupForms.xml"
+ <form name="ListDepositSlips" type="list" target="FindDepositSlips" extends="ListPaymentGroup" extends-resource="component://accounting/widget/PaymentGroupForms.xml" list-name="paymentGroupList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
<field name="paymentGroupId" widget-style="buttontext">
<hyperlink description="${paymentGroupId}" target="EditDepositSlipAndMembers">
@@ -263,7 +263,7 @@
<parameter param-name="finAccountId"/>
</hyperlink>
</field>
- <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroup.paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${paymentGroupMemberAndTransList[0].finAccountTransStatusId != 'FINACT_TRNS_APPROVED'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
<hyperlink target="deleteDepositSlip" description="${uiLabelMap.CommonCancel}" also-hidden="false">
<parameter param-name="paymentGroupId"/>
<parameter param-name="finAccountId"/>
@@ -307,7 +307,7 @@
</field>
<field name="finAccountName"><text-find ignore-case="true"/></field>
<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="FindFinAccountTransactions" type="single" target="FindFinAccountTrans">
<actions>

Modified: ofbiz/branches/addbirt/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/FinAccountScreens.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/FinAccountScreens.xml Fri Dec 11 23:11:39 2009
@@ -305,6 +305,19 @@
<set field="tabButtonItem" value="findDepositSlips"/>
<set field="finAccountId" from-field="parameters.finAccountId"/>
<entity-one entity-name="FinAccount" value-field="finAccount"/>
+ <entity-condition entity-name="PmtGrpMembrPaymentAndFinAcctTrans" list="pmtGrpMembrPaymentAndFinAcctTransList">
+ <condition-list combine="and">
+ <condition-expr field-name="paymentGroupId" from-field="parameters.paymentGroupId" ignore-if-empty="true"/>
+ <condition-expr field-name="finAccountId" from-field="parameters.finAccountId"/>
+ </condition-list>
+ </entity-condition>
+ <set field="paymentGroupIds" value="${groovy:org.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(pmtGrpMembrPaymentAndFinAcctTransList, 'paymentGroupId', true);}" type="List"/>
+ <entity-condition entity-name="PaymentGroup" list="paymentGroupList">
+ <condition-list combine="and">
+ <condition-expr field-name="paymentGroupId" operator="in" from-field="paymentGroupIds" ignore-if-empty="true"/>
+ <condition-expr field-name="paymentGroupTypeId" value="BATCH_PAYMENT"/>
+ </condition-list>
+ </entity-condition>
</actions>
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">

Modified: ofbiz/branches/addbirt/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/GlSetupForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/GlSetupForms.xml Fri Dec 11 23:11:39 2009
@@ -1043,7 +1043,7 @@
<entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId" description="${description}"/>
</drop-down>
</field>
- <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>

<form name="ListGlAccountCategory" type="list" list-name="listIt" paginate-target="FindGlAccountCategory" default-entity-name="GlAccountCategory" separate-columns="true"

Modified: ofbiz/branches/addbirt/applications/accounting/widget/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/InvoiceForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/InvoiceForms.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/InvoiceForms.xml Fri Dec 11 23:11:39 2009
@@ -42,7 +42,7 @@
<field position="1" name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field>
<field position="2" name="partyIdTo" parameter-name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="billingAccountId"><lookup target-form-name="LookupBillingAccount"/></field>
- <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>

<form name="ListInvoices" type="list" separate-columns="true" title="Invoice List" list-name="listIt" target="" default-entity-name="Invoice" paginate-target="findInvoices"
@@ -649,5 +649,10 @@
<field name="partyIdFrom"><ignored/></field>
<field name="partyIdTo"><ignored/></field>
</form>
-
+
+ <form name="ListSupplierInvoices" extends="ListInvoices" list-name="invoiceslistexternal"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <field name="partyIdFrom"><ignored/></field>
+ <field name="partyIdTo"><ignored/></field>
+ </form>
</forms>

Modified: ofbiz/branches/addbirt/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/InvoiceScreens.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/InvoiceScreens.xml Fri Dec 11 23:11:39 2009
@@ -564,4 +564,29 @@
</section>
</screen>

+ <screen name="ListSupplierInvoices">
+ <section>
+ <actions>
+ <set field="myCompanyId" from-field="userLogin.partyId"/>
+ <entity-condition list="invoiceslistexternal" entity-name="Invoice">
+ <condition-list combine="and">
+ <condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId"/>
+ <condition-expr field-name="invoiceTypeId" operator="equals" value="PURCHASE_INVOICE"/>
+ <condition-list combine="or">
+ <condition-expr field-name="statusId" operator="equals" value="INVOICE_APPROVED"/>
+ <condition-expr field-name="statusId" operator="equals" value="INVOICE_SENT"/>
+ <condition-expr field-name="statusId" operator="equals" value="INVOICE_READY"/>
+ <condition-expr field-name="statusId" operator="equals" value="INVOICE_PAID"/>
+ </condition-list>
+ </condition-list>
+ <order-by field-name="invoiceDate DESC"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <screenlet title="${uiLabelMap.PageTitleListInvoices}" navigation-form-name="ListInvoices">
+ <include-form name="ListSupplierInvoices" location="component://accounting/widget/InvoiceForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file

Modified: ofbiz/branches/addbirt/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/PaymentForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/PaymentForms.xml Fri Dec 11 23:11:39 2009
@@ -46,7 +46,7 @@
<field position="1" name="amount"><text/></field>
<field name="paymentRefNum"><text-find ignore-case="true"/></field>
<field name="paymentGatewayResponseId"><text/></field>
- <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListPayments" type="list" separate-columns="true" default-entity-name="Payment" list-name="listIt" paginate-target="findPayments" paginate="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">

Modified: ofbiz/branches/addbirt/applications/accounting/widget/PaymentGatewayConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/PaymentGatewayConfigForms.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/PaymentGatewayConfigForms.xml Fri Dec 11 23:11:39 2009
@@ -32,7 +32,7 @@
</field>
<field name="performSearch"><hidden value="Y"/></field>
<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
</form>
@@ -367,7 +367,7 @@
<field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text-find ignore-case="true"/></field>
<field name="performSearch"><hidden value="Y"/></field>
<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
</form>

Modified: ofbiz/branches/addbirt/applications/accounting/widget/PaymentGroupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/PaymentGroupForms.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/PaymentGroupForms.xml Fri Dec 11 23:11:39 2009
@@ -26,28 +26,18 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="PaymentGroup" default-field-type="find"/>
<field name="noConditionFind"><hidden value="Y"/></field>
- <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>

- <form name="ListPaymentGroup" type="list" separate-columns="true" default-entity-name="PaymentGroup" list-name="listIt"
+ <form name="ListPaymentGroup" type="list" separate-columns="true" default-entity-name="PaymentGroup" list-name="paymentGroupList"
paginate-target="FindPaymentGroup" paginate="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <actions>
- <service service-name="performFind" result-map="result" result-map-list="listIt">
- <field-map field-name="inputFields" from-field="parameters"/>
- <field-map field-name="entityName" value="PmtGrpMembrPaymentAndFinAcctTrans"/>
- <field-map field-name="viewIndex" from-field="viewIndex"/>
- <field-map field-name="viewSize" from-field="viewSize"/>
- <field-map field-name="orderBy" value="effectiveDate DESC"/>
- </service>
- </actions>
<row-actions>
- <entity-one entity-name="PaymentGroup" value-field="paymentGroup">
- <field-map field-name="paymentGroupId"/>
- </entity-one>
- <set field="paymentGroupTypeId" from-field="paymentGroup.paymentGroupTypeId"/>
<entity-and entity-name="PaymentGroupMember" list="paymentGroupMembers" filter-by-date="true">
<field-map field-name="paymentGroupId"/>
</entity-and>
+ <entity-and entity-name="PmtGrpMembrPaymentAndFinAcctTrans" list="paymentGroupMemberAndTransList" filter-by-date="true">
+ <field-map field-name="paymentGroupId"/>
+ </entity-and>
</row-actions>
<field name="paymentGroupId" widget-style="buttontext">
<hyperlink description="${paymentGroupId}" target="PaymentGroupOverview">
@@ -55,25 +45,38 @@
</hyperlink>
</field>
<field name="paymentGroupTypeId" title="${uiLabelMap.FormFieldTitle_paymentGroupType}"><display-entity entity-name="PaymentGroupType"/></field>
- <field name="paymentGroupName"><display description="${paymentGroup.paymentGroupName}"/></field>
- <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="cancelPaymentGroup" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <field name="paymentGroupName"><display description="${paymentGroupName}"/></field>
+ <field name="depositSlip" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
+ <hyperlink target="DepositSlip.pdf" description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
- <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="cancelCheckRunPayments" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <field name="printCheck" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
+ <hyperlink target="printChecks.pdf" description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
- <field name="depositSlip" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
- <hyperlink target="DepositSlip.pdf" description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'} @and ${paymentGroupMemberAndTransList[0].finAccountTransStatusId != 'FINACT_TRNS_APPROVED'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
+ <hyperlink target="cancelPaymentGroup" description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <parameter param-name="paymentGroupId"/>
+ </hyperlink>
+ </field>
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'} @and ${paymentGroupMemberAndTransList[0].finAccountTransStatusId != 'FINACT_TRNS_APPROVED'} @and ${groovy:org.ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}">
+ <hyperlink target="cancelCheckRunPayments" description="${uiLabelMap.CommonCancel}" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
</form>

<form name="EditPaymentGroup" type="single" target="updatePaymentGroup" title="" default-map-name="paymentGroup">
+ <actions>
+ <entity-and entity-name="PmtGrpMembrPaymentAndFinAcctTrans" list="pmtGrpMembrPaymentAndFinAcctTransList">
+ <field-map field-name="paymentGroupId" from-field="paymentGroup.paymentGroupId"/>
+ </entity-and>
+ <entity-one entity-name="FinAccount" value-field="finAccount">
+ <field-map field-name="finAccountId" from-field="pmtGrpMembrPaymentAndFinAcctTransList[0].finAccountId"/>
+ </entity-one>
+ </actions>
<alt-target use-when="paymentGroup==null" target="createPaymentGroup"/>
<auto-fields-service service-name="updatePaymentGroup"/>
<field use-when="paymentGroup!=null" name="paymentGroupId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>

Modified: ofbiz/branches/addbirt/applications/accounting/widget/PaymentGroupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/widget/PaymentGroupScreens.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/widget/PaymentGroupScreens.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/widget/PaymentGroupScreens.xml Fri Dec 11 23:11:39 2009
@@ -27,6 +27,9 @@
<set field="titleProperty" value="AccountingFindPaymentGroup"/>
<set field="headerItem" value="PaymentGroup"/>
<set field="tabButtonItem" value="Find"/>
+ <entity-condition entity-name="PaymentGroup" list="paymentGroupList">
+ <condition-expr field-name="paymentGroupId" from-field="parameters.paymentGroupId" ignore-if-empty="true"/>
+ </entity-condition>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">