svn commit: r880795 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: ashish
Date: Mon Nov 16 15:27:11 2009 New Revision: 880795 URL: http://svn.apache.org/viewvc?rev=880795&view=rev Log: Applied patch from jira issue OFBIZ-3209 - Modify AR/AP main screen to be a portal page. Modify AR/AP main screen to be a portal page. Show list of "Past Due Invoices" and "Invoices Due Soon" in different portlets in AR/AP. Thanks Anurag for the contribution. Removed: ofbiz/trunk/applications/accounting/webapp/ar/main.ftl Modified: ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml ofbiz/trunk/applications/accounting/widget/ap/ApMenus.xml ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Modified: ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml?rev=880795&r1=880794&r2=880795&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml (original) +++ ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml Mon Nov 16 15:27:11 2009 @@ -36,4 +36,36 @@ <PortalPage portalPageId="FinAccountPortalPage" sequenceNum="0" portalPageName="Fin account portal page" description="Fin account main screen using flexible portal technology" ownerUserLoginId="_NA_"/> <PortalPageColumn portalPageId="FinAccountPortalPage" columnSeqId="00001"/> <PortalPagePortlet portalPageId="FinAccountPortalPage" portalPortletId="ListBankAccount" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> + + <!--Portlet data for AP --> + <PortalPortlet portalPortletId="ArPastDueInvoices" portletName="AR Past Due Invoices" screenName="ArPastDueInvoices" + screenLocation="component://accounting/widget/ar/CommonScreens.xml" description="List of Past Due Invoices in AR"/> + <PortalPortlet portalPortletId="ArInvoicesDueSoon" portletName="AR Invoices Due Soon" screenName="ArInvoicesDueSoon" + screenLocation="component://accounting/widget/ar/CommonScreens.xml" description="List of Invoices Due Soon in AR"/> + + <PortletPortletCategory portalPortletId="ArPastDueInvoices" portletCategoryId="ACCOUNTING"/> + <PortletPortletCategory portalPortletId="ArInvoicesDueSoon" portletCategoryId="ACCOUNTING"/> + + <PortalPage portalPageId="ArPortalPage" sequenceNum="0" portalPageName="Portal Page in AR" description="Portal page for Past Due Invoices and Invoices Due Soon in AR" ownerUserLoginId="_NA_"/> + + <PortalPageColumn portalPageId="ArPortalPage" columnSeqId="00001"/> + + <PortalPagePortlet portalPageId="ArPortalPage" portalPortletId="ArPastDueInvoices" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> + <PortalPagePortlet portalPageId="ArPortalPage" portalPortletId="ArInvoicesDueSoon" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> + + <!--Portlet data for AP --> + <PortalPortlet portalPortletId="ApPastDueInvoices" portletName="Ap Past Due Invoices" screenName="ApPastDueInvoices" + screenLocation="component://accounting/widget/ap/CommonScreens.xml" description="List of Past Due Invoices in AP"/> + <PortalPortlet portalPortletId="ApInvoicesDueSoon" portletName="AP Invoices Due Soon" screenName="ApInvoicesDueSoon" + screenLocation="component://accounting/widget/ap/CommonScreens.xml" description="List of Invoices Due Soon in AP"/> + + <PortletPortletCategory portalPortletId="ApPastDueInvoices" portletCategoryId="ACCOUNTING"/> + <PortletPortletCategory portalPortletId="ApInvoicesDueSoon" portletCategoryId="ACCOUNTING"/> + + <PortalPage portalPageId="ApPortalPage" sequenceNum="0" portalPageName="Portal Page in AP" description="Portal page for Past Due Invoices and Invoices Due Soon in AP" ownerUserLoginId="_NA_"/> + + <PortalPageColumn portalPageId="ApPortalPage" columnSeqId="00001"/> + + <PortalPagePortlet portalPageId="ApPortalPage" portalPortletId="ApPastDueInvoices" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> + <PortalPagePortlet portalPageId="ApPortalPage" portalPortletId="ApInvoicesDueSoon" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/accounting/widget/ap/ApMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/ApMenus.xml?rev=880795&r1=880794&r2=880795&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/ApMenus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/ApMenus.xml Mon Nov 16 15:27:11 2009 @@ -1,96 +1,52 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> - <menu name="ApAppBar" title="${uiLabelMap.AccountingApManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="agreements" title="${uiLabelMap.AccountingAgreements}"><link target="FindAgreement"/></menu-item> - <menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}"><link target="FindApInvoices"/></menu-item> - <menu-item name="payments" title="${uiLabelMap.AccountingPaymentsMenu}"><link target="findPayments"/></menu-item> - <menu-item name="apPaymentGroups" title="${uiLabelMap.AccountingApPaymentGroupMenu}"><link target="FindApPaymentGroups"/></menu-item> - <menu-item name="findVendors" title="${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}"><link target="findVendors"/></menu-item> - <menu-item name="reports" title="${uiLabelMap.AccountingReports}"><link target="listReports"/></menu-item> - </menu> - <menu name="ApMainAgreementMenu" type="simple" default-selected-style="selected"> - <menu-item name="findAgreement" title="${uiLabelMap.AccountingAgreementAvailable}"><link target="FindAgreement"></link></menu-item> - </menu> - <menu name="ApMainVendorMenu" type="simple" default-selected-style="selected"> - <menu-item name="listVendors" title="${uiLabelMap.CommonShowAll} ${uiLabelMap.PartyVendor}"><link target="findVendors"></link></menu-item> - </menu> - <menu name="ApMainReportMenu" type="simple" default-selected-style="selected"> - <menu-item name="listReport" title="${uiLabelMap.CommonShowAll} ${uiLabelMap.AccountingReports}"><link target="listReports"></link></menu-item> - </menu> - <menu name="ApMainPaymentTypeMenu" type="simple" default-selected-style="selected"> - <menu-item name="findPayment" title="${uiLabelMap.AccountingShowPayments} ${paymentType.description}"> - <link target="findPayments"> - <parameter param-name="lookupFlag" value="Y"/> - </link> - </menu-item> - </menu> - <menu name="ApMainPaymentMethodTypeMenu" type="simple" default-selected-style="selected"> - <menu-item name="findPayment" title="${uiLabelMap.AccountingShowPayments} ${paymentMethodType.description}"> - <link target="findPayments"> - <parameter param-name="lookupFlag" value="Y"/> - </link> - </menu-item> - </menu> - <menu name="ApMainPaymentStatusMenu" type="simple" default-selected-style="selected"> - <menu-item name="findPayment" title="${uiLabelMap.AccountingShowPayments} ${paymentsStatus.description}"> - <link target="findPayments"> - <parameter param-name="lookupFlag" value="Y"/> - </link> - </menu-item> - </menu> - <menu name="ApMainInvoiceTypeMenu" type="simple" default-selected-style="selected"> - <menu-item name="findInvoice" title="${uiLabelMap.AccountingShowInvoices} ${invoiceType.description}"> - <link target="FindApInvoices"> - <parameter param-name="lookupFlag" value="Y"/> - </link> - </menu-item> - </menu> - <menu name="ApMainInvoiceStatusMenu" type="simple" default-selected-style="selected"> - <menu-item name="findInvoice" title="${uiLabelMap.AccountingShowInvoices} ${invoicesStatus.description}"> - <link target="FindApInvoices"> - <parameter param-name="lookupFlag" value="Y"/> - </link> - </menu-item> - </menu> - - <menu name="ApInvoiceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" - default-menu-item-name="viewInvoices"> - <menu-item name="viewInvoices" title="${uiLabelMap.CommonMain}"> - <link target="FindApInvoices"/> - </menu-item> - <menu-item name="purchaseInvoices" title="${uiLabelMap.AccountingPurchaseInvoices}"> - <link target="FindPurchaseInvoices"/> - </menu-item> - <menu-item name="commissionRun" title="${uiLabelMap.AccountingCommissionRun}"> - <link target="CommissionRun"/> - </menu-item> - </menu> - - <menu name="ApReportTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" - default-menu-item-name="viewInvoices"> - <menu-item name="viewReports" title="${uiLabelMap.CommonMain}"> - <link target="listReports"/> - </menu-item> - <menu-item name="commissionReport" title="${uiLabelMap.AccountingCommissionReport}"> - <link target="FindCommissions"/> - </menu-item> - </menu> -</menus> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> + <menu name="ApAppBar" title="${uiLabelMap.AccountingApManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="agreements" title="${uiLabelMap.AccountingAgreements}"><link target="FindAgreement"/></menu-item> + <menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}"><link target="FindApInvoices"/></menu-item> + <menu-item name="payments" title="${uiLabelMap.AccountingPaymentsMenu}"><link target="findPayments"/></menu-item> + <menu-item name="apPaymentGroups" title="${uiLabelMap.AccountingApPaymentGroupMenu}"><link target="FindApPaymentGroups"/></menu-item> + <menu-item name="findVendors" title="${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}"><link target="findVendors"/></menu-item> + <menu-item name="reports" title="${uiLabelMap.AccountingReports}"><link target="listReports"/></menu-item> + </menu> + + <menu name="ApInvoiceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" + default-menu-item-name="viewInvoices"> + <menu-item name="viewInvoices" title="${uiLabelMap.CommonMain}"> + <link target="FindApInvoices"/> + </menu-item> + <menu-item name="purchaseInvoices" title="${uiLabelMap.AccountingPurchaseInvoices}"> + <link target="FindPurchaseInvoices"/> + </menu-item> + <menu-item name="commissionRun" title="${uiLabelMap.AccountingCommissionRun}"> + <link target="CommissionRun"/> + </menu-item> + </menu> + + <menu name="ApReportTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" + default-menu-item-name="viewInvoices"> + <menu-item name="viewReports" title="${uiLabelMap.CommonMain}"> + <link target="listReports"/> + </menu-item> + <menu-item name="commissionReport" title="${uiLabelMap.AccountingCommissionReport}"> + <link target="FindCommissions"/> + </menu-item> + </menu> +</menus> Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=880795&r1=880794&r2=880795&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Mon Nov 16 15:27:11 2009 @@ -42,123 +42,64 @@ <section> <actions> <set field="tabButtonItem" value="main"></set> - <entity-condition entity-name="PaymentType" list="paymentTypes"> - <order-by field-name="paymentTypeId"/> - </entity-condition> - <entity-condition entity-name="InvoiceType" list="invoiceTypes"> - <order-by field-name="invoiceTypeId"/> - </entity-condition> - <entity-condition entity-name="PaymentMethodType" list="paymentMethodTypes"> - <order-by field-name="paymentMethodTypeId"/> - </entity-condition> - <entity-condition entity-name="StatusItem" list="invoiceStatus"> - <condition-expr field-name="statusTypeId" operator="equals" value="INVOICE_STATUS"/> - <order-by field-name="statusId"/> - </entity-condition> - <entity-condition entity-name="StatusItem" list="paymentStatus"> - <condition-expr field-name="statusTypeId" operator="equals" value="PMNT_STATUS"/> - <order-by field-name="statusId"/> - </entity-condition> + <set field="parameters.portalPageId" value="ApPortalPage"/> + <set field="invoiceTypeId" value="PURCHASE_INVOICE"/> + <set field="organizationPartyId" from-field="organizationPartyId" default-value="${defaultOrganizationPartyId}"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.AccountingAp}"> - <container style="lefthalf"> - <container style="lefthalf"> - <label style="h1">${uiLabelMap.AccountingAgreements}</label> - <section> - <widgets> - <include-menu name="ApMainAgreementMenu" location="component://accounting/widget/ap/ApMenus.xml"/> - </widgets> - </section> - </container> - <container style="righthalf"> - <label style="h1">${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}</label> - <section> - <widgets> - <include-menu name="ApMainVendorMenu" location="component://accounting/widget/ap/ApMenus.xml"/> - </widgets> - </section> - </container> - </container> - <container style="righthalf"> - <container style="lefthalf"> - <label style="h1">${uiLabelMap.AccountingReports}</label> - <section> - <widgets> - <include-menu name="ApMainReportMenu" location="component://accounting/widget/ap/ApMenus.xml"/> - </widgets> - </section> - </container> - </container> - <container style="clear"/> - <container> - <label style="h1">${uiLabelMap.AccountingPaymentsMenu}</label> - <container style="lefthalf"> - <container style="lefthalf"> - <iterate-section list="paymentTypes" entry="paymentType"> - <section> - <widgets> - <include-menu name="ApMainPaymentTypeMenu" location="component://accounting/widget/ap/ApMenus.xml"/> - </widgets> - </section> - </iterate-section> - </container> - <container style="righthalf"> - <iterate-section list="paymentMethodTypes" entry="paymentMethodType"> - <section> - <widgets> - <include-menu name="ApMainPaymentMethodTypeMenu" location="component://accounting/widget/ap/ApMenus.xml"/> - </widgets> - </section> - </iterate-section> - </container> - </container> - <container style="righthalf"> - <container style="lefthalf"> - <iterate-section list="paymentStatus" entry="paymentsStatus"> - <section> - <widgets> - <include-menu name="ApMainPaymentStatusMenu" location="component://accounting/widget/ap/ApMenus.xml"/> - </widgets> - </section> - </iterate-section> - </container> - </container> - </container> - <container style="clear"/> - <container> - <label style="h1">${uiLabelMap.AccountingInvoicesMenu}</label> - <container style="lefthalf"> - <container style="lefthalf"> - <iterate-section list="invoiceTypes" entry="invoiceType"> - <section> - <widgets> - <include-menu name="ApMainInvoiceTypeMenu" location="component://accounting/widget/ap/ApMenus.xml"/> - </widgets> - </section> - </iterate-section> - </container> - <container style="righthalf"> - <iterate-section list="invoiceStatus" entry="invoicesStatus"> - <section> - <widgets> - <include-menu name="ApMainInvoiceStatusMenu" location="component://accounting/widget/ap/ApMenus.xml"/> - </widgets> - </section> - </iterate-section> - </container> - </container> - </container> - <container style="clear"/> - </screenlet> + <section> + <actions> + <entity-one entity-name="PortalPage" value-field="portalPage"/> + <entity-and entity-name="PortalPageColumn" list="portalPageColumns"> + <field-map field-name="portalPageId" from-field="parameters.portalPageId"/> + <order-by field-name="columnSeqId"/> + </entity-and> + <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets"> + <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/> + <order-by field-name="columnSeqId"/> + <order-by field-name="sequenceNum"/> + </entity-and> + </actions> + <widgets> + <platform-specific> + <html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html> + </platform-specific> + </widgets> + </section> </decorator-section> </decorator-screen> </widgets> </section> </screen> + <screen name="ApPastDueInvoices"> + <section> + <actions> + <set field="invoices" from-field="PastDueInvoices"/> + </actions> + <widgets> + <screenlet title="${uiLabelMap.AccountingPastDueInvoices}: (${PastDueInvoicestotalAmount})"> + <include-form name="ListReports" location="component://accounting/widget/ap/forms/InvoiceForms.xml"/> + </screenlet> + </widgets> + </section> + </screen> + <screen name="ApInvoicesDueSoon"> + <section> + <actions> + <set field="invoices" from-field="InvoicesDueSoon"/> + </actions> + <widgets> + <screenlet title="${uiLabelMap.AccountingInvoicesDueSoon}: (${InvoicesDueSoonTotalAmount})"> + <include-form name="ListReports" location="component://accounting/widget/ap/forms/InvoiceForms.xml"/> + </screenlet> + </widgets> + </section> + </screen> + <screen name="EditVendor"> <section> <actions> Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=880795&r1=880794&r2=880795&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Mon Nov 16 15:27:11 2009 @@ -44,36 +44,64 @@ <section> <actions> <set field="headerItem" value="main"/> - <entity-condition entity-name="PaymentType" list="paymentTypes"> - <order-by field-name="paymentTypeId"/> - </entity-condition> - <entity-condition entity-name="InvoiceType" list="invoiceTypes"> - <order-by field-name="invoiceTypeId"/> - </entity-condition> - <entity-condition entity-name="PaymentMethodType" list="paymentMethodTypes"> - <order-by field-name="paymentMethodTypeId"/> - </entity-condition> - <entity-condition entity-name="StatusItem" list="invoiceStatus"> - <condition-expr field-name="statusTypeId" operator="equals" value="INVOICE_STATUS"/> - <order-by field-name="statusId"/> - </entity-condition> - <entity-condition entity-name="StatusItem" list="paymentStatus"> - <condition-expr field-name="statusTypeId" operator="equals" value="PMNT_STATUS"/> - <order-by field-name="statusId"/> - </entity-condition> + <set field="parameters.portalPageId" value="ArPortalPage"/> + <set field="invoiceTypeId" value="SALES_INVOICE"/> + <set field="organizationPartyId" from-field="organizationPartyId" default-value="${defaultOrganizationPartyId}"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.AccountingAr}"> - <platform-specific><html><html-template location="component://accounting/webapp/ar/main.ftl"/></html></platform-specific> - </screenlet> + <section> + <actions> + <entity-one entity-name="PortalPage" value-field="portalPage"/> + <entity-and entity-name="PortalPageColumn" list="portalPageColumns"> + <field-map field-name="portalPageId" from-field="parameters.portalPageId"/> + <order-by field-name="columnSeqId"/> + </entity-and> + <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets"> + <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/> + <order-by field-name="columnSeqId"/> + <order-by field-name="sequenceNum"/> + </entity-and> + </actions> + <widgets> + <platform-specific> + <html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html> + </platform-specific> + </widgets> + </section> </decorator-section> </decorator-screen> </widgets> </section> </screen> + <screen name="ArPastDueInvoices"> + <section> + <actions> + <set field="invoices" from-field="PastDueInvoices"/> + </actions> + <widgets> + <screenlet title="${uiLabelMap.AccountingPastDueInvoices}: (${PastDueInvoicestotalAmount})"> + <include-form name="ListReports" location="component://accounting/widget/ar/forms/InvoiceForms.xml"/> + </screenlet> + </widgets> + </section> + </screen> + <screen name="ArInvoicesDueSoon"> + <section> + <actions> + <set field="invoices" from-field="InvoicesDueSoon"/> + </actions> + <widgets> + <screenlet title="${uiLabelMap.AccountingInvoicesDueSoon}: (${InvoicesDueSoonTotalAmount})"> + <include-form name="ListReports" location="component://accounting/widget/ar/forms/InvoiceForms.xml"/> + </screenlet> + </widgets> + </section> + </screen> + <screen name="CommonPaymentDecorator"> <section> <actions> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |