OFBiz - svn commit: r654551 - in /ofbiz/trunk/applications/accounting: ./ config/ webapp/ar/ webapp/ar/WEB-INF/ widget/ widget/ar/ widget/ar/forms/

svn commit: r654551 - in /ofbiz/trunk/applications/accounting: ./ config/ webapp/ar/ webapp/ar/WEB-INF/ widget/ widget/ar/ widget/ar/forms/

Posted by mor-2 on
URL: http://ofbiz.116.s1.nabble.com/svn-commit-r654551-in-ofbiz-trunk-applications-accounting-config-webapp-ar-webapp-ar-WEB-INF-widget--tp215286.html

Author: mor
Date: Thu May 8 08:31:21 2008
New Revision: 654551

URL: http://svn.apache.org/viewvc?rev=654551&view=rev
Log:
Add Application level menu/tools for AR - Applied patch for OFBIZ-1667 (https://issues.apache.org/jira/browse/OFBIZ-1667), Thanks SumitPandit for this patch

Added:
ofbiz/trunk/applications/accounting/webapp/ar/
ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/
ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml (with props)
ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml (with props)
ofbiz/trunk/applications/accounting/webapp/ar/main.ftl (with props)
ofbiz/trunk/applications/accounting/widget/ar/
ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml (with props)
ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (with props)
ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml (with props)
ofbiz/trunk/applications/accounting/widget/ar/forms/
ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml (with props)
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/ofbiz-component.xml
ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=654551&r1=654550&r2=654551&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu May 8 08:31:21 2008
@@ -578,6 +578,15 @@
<value xml:lang="th">Arithmetic properties for Invoice services not configured properly. Cannot proceed.</value>
<value xml:lang="zh">ç¨äºåç¥¨æå¡çç®æ³å±æ§éç½®ä¸æ£ç¡®ãæ æ³æä½ã</value>
</property>
+ <property key="AccountingArCompanyName">
+ <value xml:lang="en">OFBiz: AR Manager</value>
+ </property>
+ <property key="AccountingArManagerApplication">
+ <value xml:lang="en">Account Receivable Manager Application</value>
+ </property>
+ <property key="AccountingArPageTitleListReports">
+ <value xml:lang="en">List Reports</value>
+ </property>
<property key="AccountingAssets">
<value xml:lang="ar">Ø§ÙØ£ØµÙÙ</value>
<value xml:lang="en">Assets</value>

Modified: ofbiz/trunk/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/ofbiz-component.xml?rev=654551&r1=654550&r2=654551&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Thu May 8 08:31:21 2008
@@ -78,4 +78,11 @@
location="webapp/accounting"
base-permission="OFBTOOLS,ACCOUNTING"
mount-point="/accounting"/>
+
+ <webapp name="ar"
+ title="AR"
+ server="default-server"
+ location="webapp/ar"
+ base-permission="OFBTOOLS,ACCOUNTING"
+ mount-point="/ar"/>
</ofbiz-component>

Added: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml?rev=654551&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml (added)
+++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml Thu May 8 08:31:21 2008
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
+ <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://accounting/webapp/accounting/WEB-INF/controller.xml"/>
+ <description>Accounting Manager Module Site Configuration File</description>
+ <owner>Copyright 2001-2007 The Apache Software Foundation</owner>
+
+ 
+ <request-map uri="main">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="main"/>
+ </request-map>
+ <request-map uri="ListReports">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListReports"/>
+ </request-map>
+
+ 
+
+ 
+ <view-map name="main" type="screen" page="component://accounting/widget/ar/CommonScreens.xml#main"/>
+ <view-map name="ListReports" type="screen" page="component://accounting/widget/ar/InvoiceScreens.xml#ListReports"/>
+ 
+</site-conf>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml

Added: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml?rev=654551&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml (added)
+++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml Thu May 8 08:31:21 2008
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+
+
+<web-app>
+ <display-name>Open For Business - Accounting Manager-AR</display-name>
+ <description>Accounting Manager Module of the Open For Business Project</description>
+
+ <context-param>
+ <param-name>entityDelegatorName</param-name>
+ <param-value>default</param-value>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
+ </context-param>
+ <context-param>
+ <param-name>localDispatcherName</param-name>
+ <param-value>ar</param-value>
+ <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
+ </context-param>
+ <context-param>
+ <param-name>serviceReaderUrls</param-name>
+ <param-value>/WEB-INF/services.xml</param-value>
+ <description>Configuration File(s) For The Service Dispatcher</description>
+ </context-param>
+ <context-param>
+ <param-name>mainDecoratorLocation</param-name>
+ <param-value>component://accounting/widget/ar/CommonScreens.xml</param-value>
+ <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+ </context-param>
+
+ <filter>
+ <filter-name>ContextFilter</filter-name>
+ <display-name>ContextFilter</display-name>
+ <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
+ <init-param>
+ <param-name>disableContextSecurity</param-name>
+ <param-value>N</param-value>
+ </init-param>
+ <init-param>
+ <param-name>allowedPaths</param-name>
+ <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ </init-param>
+ <init-param>
+ <param-name>errorCode</param-name>
+ <param-value>403</param-value>
+ </init-param>
+ <init-param>
+ <param-name>redirectPath</param-name>
+ <param-value>/control/main</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>ContextFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <listener><listener-class>org.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
+ <listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
+ 
+ 
+
+ <servlet>
+ <servlet-name>ControlServlet</servlet-name>
+ <display-name>ControlServlet</display-name>
+ <description>Main Control Servlet</description>
+ <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ControlServlet</servlet-name>
+ <url-pattern>/control/*</url-pattern>
+ </servlet-mapping>
+
+ <session-config>
+ <session-timeout>60</session-timeout> 
+ </session-config>
+
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml

Added: ofbiz/trunk/applications/accounting/webapp/ar/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/main.ftl?rev=654551&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/main.ftl (added)
+++ ofbiz/trunk/applications/accounting/webapp/ar/main.ftl Thu May 8 08:31:21 2008
@@ -0,0 +1,98 @@
+<#--
+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.
+-->
+<div>
+ <table>
+ <tr>
+ <td colspan="3"><h1>${uiLabelMap.AccountingAgreements}</h1></td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <ul>
+ <li><a href="<@ofbizUrl>FindAgreement</@ofbizUrl>">${uiLabelMap.AccountingAgreementAvailable}</a></li>
+ </ul>
+ <br/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3"><h1 class="h1">${uiLabelMap.AccountingInvoicesMenu}</h1></td>
+ </tr>
+ <tr valign="top">
+ <td>
+ <ul>
+ <li><a href="<@ofbizUrl>findInvoices?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllInvoices}</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul>
+ <#list invoiceTypes as invoiceType>
+ <li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${invoiceType.get("description",locale)}</a></li>
+ </#list>
+ </ul>
+ </td>
+ <td>
+ <ul>
+ <#list invoiceStatus as status>
+ <li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${status.get("description",locale)}</a></li>
+ </#list>
+ </ul>
+ </td>
+ <tr>
+ <td colspan="3"><h1 class="h1">${uiLabelMap.AccountingPaymentsMenu}</h1></td>
+ </tr>
+ <tr valign="top">
+ <td>
+ <ul>
+ <li><a href="<@ofbizUrl>findPayments?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllPayments}</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul>
+ <#list paymentTypes as paymentType>
+ <li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentType.get("description",locale)}</a></li>
+ </#list>
+ </ul>
+ </td>
+ <td>
+ <ul>
+ <#list paymentMethodTypes as paymentMethodType>
+ <li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentMethodType.get("description",locale)}</a></li>
+ </#list>
+ </ul>
+ </td>
+ <td>
+ <ul>
+ <#list paymentStatus as status>
+ <li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${status.get("description",locale)}</a></li>
+ </#list>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3"><h1>${uiLabelMap.Reports}</h1></td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <ul>
+ <li><a href="<@ofbizUrl>ListReports</@ofbizUrl>">${uiLabelMap.ReportsAvailable}</a></li>
+ </ul>
+ <br/>
+ </td>
+ </tr>
+ </table>
+</div>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/accounting/webapp/ar/main.ftl
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/webapp/ar/main.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/accounting/webapp/ar/main.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain

Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=654551&r1=654550&r2=654551&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Thu May 8 08:31:21 2008
@@ -64,6 +64,7 @@
<actions>
<set field="titleProperty" value="PageTitleFindAgreement"/>
<set field="headerItem" value="agreement"/>
+ <set field="tabButtonItem" value="agreement"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
</actions>

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=654551&r1=654550&r2=654551&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Thu May 8 08:31:21 2008
@@ -61,6 +61,7 @@
<actions>
<set field="headerItem" value="invoices"/>
<set field="titleProperty" value="PageTitleFindInvoice"/>
+ <set field="tabButtonItem" value="invoices"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="30"/>
</actions>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=654551&r1=654550&r2=654551&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Thu May 8 08:31:21 2008
@@ -25,6 +25,7 @@
<actions>
<set field="titleProperty" value="PageTitleFindPayment"/>
<set field="headerItem" value="payments"/>
+ <set field="tabButtonItem" value="payments"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
</actions>

Added: ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml?rev=654551&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml Thu May 8 08:31:21 2008
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
+ <menu name="ArAppBar" default-menu-item-name="main" id="app-navigation" type="simple" title="${uiLabelMap.AccountingArManagerApplication}"
+ default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="main" title="${uiLabelMap.AccountingMainMenu}"><link target="main"/></menu-item>
+ <menu-item name="agreements" title="${uiLabelMap.AccountingAgreements}"><link target="FindAgreement"/></menu-item>
+ <menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}"><link target="findInvoices"/></menu-item>
+ <menu-item name="payments" title="${uiLabelMap.AccountingPaymentsMenu}"><link target="findPayments"/></menu-item>
+ <menu-item name="reports" title="${uiLabelMap.AccountingReports}"><link target="ListReports"/></menu-item>
+ <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
+ <condition><not><if-empty field-name="userLogin"/></not></condition>
+ <link target="logout"/>
+ </menu-item>
+ <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="col-right" selected-style="selected">
+ <condition><if-empty field-name="userLogin"/></condition>
+ <link target="${checkLoginUrl}"/>
+ </menu-item>
+ </menu>
+</menus>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml

Added: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=654551&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Thu May 8 08:31:21 2008
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+ <screen name="main-decorator">
+ <section>
+ <actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+
+ <set field="layoutSettings.companyName" from-field="uiLabelMap.AccountingArCompanyName" global="true"/>
+ <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.AccountingCompanySubtitle" global="true"/>
+ <set field="applicationMenuName" value="ArAppBar" global="true"/>
+ <set field="applicationMenuLocation" value="component://accounting/widget/ar/ArMenus.xml" global="true"/>
+ </actions>
+ <widgets>
+ <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="main">
+ <section>
+ <actions>
+ <set field="headerItem" value="main"/>
+ <entity-condition entity-name="PaymentType" list-name="paymentTypes">
+ <order-by field-name="paymentTypeId"/>
+ </entity-condition>
+ <entity-condition entity-name="InvoiceType" list-name="invoiceTypes">
+ <order-by field-name="invoiceTypeId"/>
+ </entity-condition>
+ <entity-condition entity-name="PaymentMethodType" list-name="paymentMethodTypes">
+ <order-by field-name="paymentMethodTypeId"/>
+ </entity-condition>
+ <entity-condition entity-name="StatusItem" list-name="invoiceStatus">
+ <condition-expr field-name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
+ <order-by field-name="statusId"/>
+ </entity-condition>
+ <entity-condition entity-name="StatusItem" list-name="paymentStatus">
+ <condition-expr field-name="statusTypeId" operator="equals" value="PMNT_STATUS"/>
+ <order-by field-name="statusId"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.AccountingMainMenu}">
+ <platform-specific><html><html-template location="component://accounting/webapp/ar/main.ftl"/></html></platform-specific>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ReportsDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="${uiLabelMap.AccountingReports}"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <decorator-section-include name="body"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="CommonPaymentDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="payments"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ 
+ <condition>
+ <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <include-menu name="PaymentTabBar" location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="PaymentSubTabBar" location="component://accounting/widget/Menus.xml"/>
+ <label style="h2" text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonId}:[${paymentId}] ${${extraFunctionName}}"/>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="h3" text="${uiLabelMap.AcccountingViewPermissionError}"/>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml

Added: ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml?rev=654551&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml Thu May 8 08:31:21 2008
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+ <screen name="ListReports">
+ <section>
+ <actions>
+ <set field="headerItem" value="${uiLabelMap.CommonList} ${uiLabelMap.AccountingReports}"/>
+ <set field="tabButtonItem" value="reports"/>
+ <set field="titleProperty" value="AccountingArPageTitleListReports"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="ReportsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.AccountingReports}">
+ <section>
+ <widgets>
+ <include-form name="ListReports" location="component://accounting/widget/ar/forms/InvoiceForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+</screens>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/accounting/widget/ar/InvoiceScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml

Added: ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=654551&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml Thu May 8 08:31:21 2008
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+ 
+ <form name="ListReports" type="list" separate-columns="true" title="Invoice List" list-name="listIt" target="" default-entity-name="Invoice"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <entity-condition entity-name="Invoice" list-name="invoices">
+ <condition-list>
+ <condition-expr field-name="statusId" value="INVOICE_SENT"/>
+ <condition-expr field-name="dueDate" operator="less" value="${nowTimestamp}"/>
+ </condition-list>
+ <order-by field-name="dueDate"/>
+ <limit-range start="0" size="10"/>
+ </entity-condition>
+ </actions>
+ <row-actions>
+ <service service-name="getPartyNameForDate" result-map-name="partyNameResultFrom">
+ <field-map field-name="partyId" env-name="partyIdFrom"/>
+ <field-map field-name="compareDate" env-name="invoiceDate"/>
+ <field-map field-name="lastNameFirst" value="Y"/>
+ </service>
+ <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo">
+ <field-map field-name="partyId" env-name="partyId"/>
+ <field-map field-name="compareDate" env-name="invoiceDate"/>
+ <field-map field-name="lastNameFirst" value="Y"/>
+ </service>
+ <set field="amountToApply" value="${bsh:
+ import java.text.NumberFormat;
+ return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/>
+ <set field="total" value="${bsh:
+ import java.text.NumberFormat;
+ return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotalBd(delegator,invoiceId)));}"/>
+ </row-actions>
+ <field name="invoiceId" widget-style="buttontext">
+ <hyperlink description="${invoiceId}" target="invoiceOverview?invoiceId=${invoiceId}"/>
+ </field>
+ <field name="invoiceTypeId"><display-entity entity-name="InvoiceType" description="${description}"/></field>
+ <field name="invoiceDate"><display/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="description"><display/></field>
+ <field name="partyIdFrom"><display description="${partyNameResultFrom.fullName} [${partyIdFrom}]"/></field>
+ <field name="partyIdTo" parameter-name="partyId"><display description="${partyNameResultTo.fullName} [${partyId}]"/></field>
+ <field name="invoiceDate"><display description="${bsh:invoiceDate.toString().substring(0,10)}"/></field>
+ <field name="dueDate"><display description="${bsh:dueDate.toString().substring(0,10)}"/></field>
+ <field name="total" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
+ <field name="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
+ </form>
+</forms>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml