You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2008/05/09 16:29:53 UTC
svn commit: r654824 - in /ofbiz/trunk/applications/accounting: ./ config/
webapp/ap/ webapp/ap/WEB-INF/ webapp/ar/WEB-INF/ widget/ap/
widget/ap/forms/ widget/ar/forms/
Author: mor
Date: Fri May 9 07:29:53 2008
New Revision: 654824
URL: http://svn.apache.org/viewvc?rev=654824&view=rev
Log:
Patch from Sumit Pandit for Add Application level menu/tools for AP, Jira issue OFBIZ-1668 (https://issues.apache.org/jira/browse/OFBIZ-1668)
Added:
ofbiz/trunk/applications/accounting/webapp/ap/
ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/
ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml (with props)
ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml (with props)
ofbiz/trunk/applications/accounting/widget/ap/
ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (with props)
ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (with props)
ofbiz/trunk/applications/accounting/widget/ap/Menus.xml (with props)
ofbiz/trunk/applications/accounting/widget/ap/forms/
ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml (with props)
ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml (with props)
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/ofbiz-component.xml
ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml
ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=654824&r1=654823&r2=654824&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Fri May 9 07:29:53 2008
@@ -444,6 +444,18 @@
<value xml:lang="th">สà¸à¸²à¸à¸°à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸à¸à¸·à¹à¸ à¹</value>
<value xml:lang="zh">ä»»ä¸æ¯ä»ç¶æ</value>
</property>
+ <property key="AccountingAp">
+ <value xml:lang="en">Account Payable</value>
+ </property>
+ <property key="AccountingApCompanyName">
+ <value xml:lang="en">OFBiz: AP Manager</value>
+ </property>
+ <property key="AccountingApPageTitleListVendors">
+ <value xml:lang="en">List Vendors</value>
+ </property>
+ <property key="AccountingApManagerApplication">
+ <value xml:lang="en">Account Payable Manager Application</value>
+ </property>
<property key="AccountingApplicationSuccess">
<value xml:lang="en">Applying ${amountApplied?currency(${isoCode})} from payment [${paymentId}] to ${toMessage}</value>
<value xml:lang="es">Aplicando ${amountApplied?currency(${isoCode})} de pago [${paymentId}] a ${toMessage}</value>
Modified: ofbiz/trunk/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/ofbiz-component.xml?rev=654824&r1=654823&r2=654824&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Fri May 9 07:29:53 2008
@@ -85,4 +85,11 @@
location="webapp/ar"
base-permission="OFBTOOLS,ACCOUNTING"
mount-point="/ar"/>
+
+ <webapp name="ap"
+ title="AP"
+ server="default-server"
+ location="webapp/ap"
+ base-permission="OFBTOOLS,ACCOUNTING"
+ mount-point="/ap"/>
</ofbiz-component>
Added: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml?rev=654824&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml (added)
+++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml Fri May 9 07:29:53 2008
@@ -0,0 +1,69 @@
+<?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.
+-->
+<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 : AP Module Site Configuration File</description>
+ <owner>Copyright 2001-2007 The Apache Software Foundation</owner>
+ <handler name="json" type="request" class="org.ofbiz.webapp.event.JSONServiceEventHandler"/>
+ <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
+ <handler name="bsf" type="request" class="org.ofbiz.webapp.event.BsfEventHandler"/>
+ <handler name="simplecontent" type="view" class="org.ofbiz.content.view.SimpleContentViewHandler"/>
+
+ <!-- Request Mappings -->
+ <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>
+ <!-- ================ Vendor requests ================ -->
+ <request-map uri="listVendors">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListVendors"/>
+ <response name="error" type="view" value="ListVendors"/>
+ </request-map>
+ <request-map uri="editVendor">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditVendor"/>
+ <response name="error" type="view" value="EditVendor"/>
+ </request-map>
+ <request-map uri="createVendor">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createVendor"></event>
+ <response name="success" type="view" value="ListVendors"/>
+ <response name="error" type="view" value="ListVendors"/>
+ </request-map>
+ <request-map uri="updateVendor">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateVendor"></event>
+ <response name="success" type="view" value="ListVendors"/>
+ <response name="error" type="view" value="ListVendors"/>
+ </request-map>
+ <!-- end of request mappings -->
+
+ <!-- View Mappings -->
+ <view-map name="main" type="screen" page="component://accounting/widget/ap/CommonScreens.xml#main"/>
+ <view-map name="ListReports" type="screen" page="component://accounting/widget/ap/InvoiceScreens.xml#ListReports"/>
+ <!-- Vendor Mappings -->
+ <view-map name="ListVendors" type="screen" page="component://accounting/widget/ap/CommonScreens.xml#ListVendors"/>
+ <view-map name="EditVendor" type="screen" page="component://accounting/widget/ap/CommonScreens.xml#EditVendor"/>
+</site-conf>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml?rev=654824&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml (added)
+++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml Fri May 9 07:29:53 2008
@@ -0,0 +1,91 @@
+<?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">
+<!--
+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.
+-->
+<web-app>
+ <display-name>Open For Business - Account Payable</display-name>
+ <description>Accounting Payable 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>ap</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/ap/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>
+ <!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface -->
+ <!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</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> <!-- in minutes -->
+ </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/ap/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: 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=654824&r1=654823&r2=654824&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml Fri May 9 07:29:53 2008
@@ -21,8 +21,8 @@
-->
<web-app>
- <display-name>Open For Business - Accounting Manager-AR</display-name>
- <description>Accounting Manager Module of the Open For Business Project</description>
+ <display-name>Open For Business - Account Receivable</display-name>
+ <description>Accounting Receivable Module of the Open For Business Project</description>
<context-param>
<param-name>entityDelegatorName</param-name>
Added: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=654824&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Fri May 9 07:29:53 2008
@@ -0,0 +1,218 @@
+<?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.
+-->
+<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.AccountingApCompanyName" global="true"/>
+ <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.AccountingCompanySubtitle" global="true"/>
+ <set field="applicationMenuName" value="ApAppBar" global="true"/>
+ <set field="applicationMenuLocation" value="component://accounting/widget/ap/Menus.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="tabButtonItem" value="main"></set>
+ <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="${parameter.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.AccountingAp} ${uiLabelMap.PageTitleMain}"/>
+ <container style="lefthalf">
+ <container style="left">
+ <label style="h1">${uiLabelMap.AccountingAgreements}</label>
+ <section>
+ <widgets>
+ <include-menu name="ApMainAgreementMenu" location="component://accounting/widget/ap/Menus.xml" />
+ </widgets>
+ </section>
+ </container>
+ <container style="right">
+ <label style="h1">${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}</label>
+ <section>
+ <widgets>
+ <include-menu name="ApMainVendorMenu" location="component://accounting/widget/ap/Menus.xml" />
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="righthalf">
+ <container style="right">
+ <label style="h1">${uiLabelMap.AccountingReports}</label>
+ <section>
+ <widgets>
+ <include-menu name="ApMainReportMenu" location="component://accounting/widget/ap/Menus.xml" />
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container>
+ <label style="h1">${uiLabelMap.AccountingPaymentsMenu}</label>
+ <container>
+ <container style="lefthalf">
+ <container style="lefthalf">
+ <iterate-section list-name="paymentTypes" entry-name="paymentType">
+ <section>
+ <widgets>
+ <include-menu name="ApMainPaymentTypeMenu" location="component://accounting/widget/ap/Menus.xml" />
+ </widgets>
+ </section>
+ </iterate-section>
+ </container>
+ <container style="righthalf">
+ <iterate-section list-name="paymentMethodTypes" entry-name="paymentMethodType">
+ <section>
+ <widgets>
+ <include-menu name="ApMainPaymentMethodTypeMenu" location="component://accounting/widget/ap/Menus.xml" />
+ </widgets>
+ </section>
+ </iterate-section>
+ </container>
+ </container>
+ <container style="righthalf">
+ <container style="left">
+ <iterate-section list-name="paymentStatus" entry-name="paymentsStatus">
+ <section>
+ <widgets>
+ <include-menu name="ApMainPaymentStatusMenu" location="component://accounting/widget/ap/Menus.xml" />
+ </widgets>
+ </section>
+ </iterate-section>
+ </container>
+ </container>
+ </container>
+ </container>
+ <container style="endcolumns"/>
+ <container>
+ <label style="h1">${uiLabelMap.AccountingInvoicesMenu}</label>
+ <container>
+ <container style="lefthalf">
+ <container style="lefthalf">
+ <iterate-section list-name="invoiceTypes" entry-name="invoiceType">
+ <section>
+ <widgets>
+ <include-menu name="ApMainInvoiceTypeMenu" location="component://accounting/widget/ap/Menus.xml" />
+ </widgets>
+ </section>
+ </iterate-section>
+ </container>
+ <container style="right">
+ <iterate-section list-name="invoiceStatus" entry-name="invoicesStatus">
+ <section>
+ <widgets>
+ <include-menu name="ApMainInvoiceStatusMenu" location="component://accounting/widget/ap/Menus.xml" />
+ </widgets>
+ </section>
+ </iterate-section>
+ </container>
+ </container>
+ </container>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ReportsDecorator">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="listReports"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameter.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <decorator-section-include name="body"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ListVendors">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="listVendors"/>
+ <set field="titleProperty" value="AccountingApPageTitleListVendors"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+ <entity-condition entity-name="Vendor" list-name="vendors">
+ <condition-expr field-name="partyId" value="${parameters.partyId}"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameter.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <container style="button-bar"><link target="editVendor" text="${uiLabelMap.CommonNew} ${uiLabelMap.PartyVendor}" style="buttontext"/></container>
+ <screenlet title="${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}" navigation-form-name="ListVendors">
+ <include-form name="ListVendors" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditVendor">
+ <section>
+ <actions>
+ <set field="partyId" from-field="parameters.partyId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameter.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.CommonEdit} ${uiLabelMap.PartyVendor}">
+ <include-form name="EditVendor" location="component://accounting/widget/ap/forms/VendorForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml?rev=654824&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml Fri May 9 07:29:53 2008
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<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="Reports"/>
+ <set field="titleProperty" value="AccountingArPageTitleListReports"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="ReportsDecorator" location="component://accounting/widget/ap/CommonScreens.xml">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.AccountingReports}" navigation-form-name="ListReports">
+ <include-form name="ListReports" location="component://accounting/widget/ap/forms/InvoiceForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/Menus.xml?rev=654824&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/Menus.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/ap/Menus.xml Fri May 9 07:29:53 2008
@@ -0,0 +1,62 @@
+<?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" default-menu-item-name="main" id="app-navigation" type="simple" title="${uiLabelMap.AccountingApManagerApplication}"
+ default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="main" title="${uiLabelMap.CommonMain}"><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="listVendors" title="${uiLabelMap.PartyVendor} ${uiLabelMap.CommonList}"><link target="listVendors"/></menu-item>
+ <menu-item name="listReports" 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.PageTitleLogin}" align-style="col-right" selected-style="selected">
+ <condition><if-empty field-name="userLogin"/></condition>
+ <link target="${checkLoginUrl}"/>
+ </menu-item>
+ </menu>
+ <menu name="ApMainAgreementMenu" type="simple" default-selected-style="tabButtonSelected">
+ <menu-item name="findAgreement" title="${uiLabelMap.AccountingAgreementAvailable}"><link target="FindAgreement"></link></menu-item>
+ </menu>
+ <menu name="ApMainVendorMenu" type="simple" default-selected-style="tabButtonSelected">
+ <menu-item name="listVendors" title="${uiLabelMap.CommonShowAll} ${uiLabelMap.PartyVendor}"><link target="listVendors"></link></menu-item>
+ </menu>
+ <menu name="ApMainReportMenu" type="simple" default-selected-style="tabButtonSelected">
+ <menu-item name="listReport" title="${uiLabelMap.CommonShowAll} ${uiLabelMap.AccountingReports}"><link target="listReports"></link></menu-item>
+ </menu>
+ <menu name="ApMainPaymentTypeMenu" type="simple" default-selected-style="tabButtonSelected">
+ <menu-item name="findPayment" title="${uiLabelMap.AccountingShowPayments} ${paymentType.description}"><link target="findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}"></link></menu-item>
+ </menu>
+ <menu name="ApMainPaymentMethodTypeMenu" type="simple" default-selected-style="tabButtonSelected">
+ <menu-item name="findPayment" title="${uiLabelMap.AccountingShowPayments} ${paymentMethodType.description}"><link target="findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}"></link></menu-item>
+ </menu>
+ <menu name="ApMainPaymentStatusMenu" type="simple" default-selected-style="tabButtonSelected">
+ <menu-item name="findPayment" title="${uiLabelMap.AccountingShowPayments} ${paymentsStatus.description}"><link target="findPayments?lookupFlag=Y&statusId=${paymentsStatus.statusId}"></link></menu-item>
+ </menu>
+ <menu name="ApMainInvoiceTypeMenu" type="simple" default-selected-style="tabButtonSelected">
+ <menu-item name="findInvoice" title="${uiLabelMap.AccountingShowInvoices} ${invoiceType.description}"><link target="findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}"></link></menu-item>
+ </menu>
+ <menu name="ApMainInvoiceStatusMenu" type="simple" default-selected-style="tabButtonSelected">
+ <menu-item name="findInvoice" title="${uiLabelMap.AccountingShowInvoices} ${invoicesStatus.description}"><link target="findInvoices?lookupFlag=Y&statusId=${invoicesStatus.statusId}"></link></menu-item>
+ </menu>
+</menus>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=654824&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml Fri May 9 07:29:53 2008
@@ -0,0 +1,67 @@
+<?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.
+-->
+
+<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="${uiLabelMap.AccountingInvoice} ${uiLabelMap.CommonList}" 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="greater" 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/></field>
+ <field name="dueDate"><display/></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/ap/forms/InvoiceForms.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml?rev=654824&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml Fri May 9 07:29:53 2008
@@ -0,0 +1,54 @@
+<?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.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+ <form name="ListVendors" type="list" list-name="listIt" paginate-target="listVendors" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <entity-condition entity-name="Vendor"><order-by field-name="partyId"/></entity-condition>
+ </actions>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${partyId}" target="editVendor?partyId=${partyId}"/>
+ </field>
+ <field name="manifestCompanyName" title="${uiLabelMap.PartyManifestCompanyName}"><display/></field>
+ <field name="manifestCompanyTitle" title="${uiLabelMap.PartyManifestCompanyTitle}"><display/></field>
+ <field name="manifestLogoUrl" title="${uiLabelMap.PartyManifestLogoUrl}"><display/></field>
+ <field name="manifestPolicies" title="${uiLabelMap.PartyManifestPolicies}"><display/></field>
+ </form>
+ <form name="EditVendor" type="single" target="updateVendor" title="" default-map-name="vendor">
+ <actions>
+ <entity-one entity-name="Vendor" value-name="vendor"/>
+ </actions>
+ <alt-target use-when="partyId==null" target="createVendor"/>
+ <alt-target use-when="partyId!=null&&vendor!=null" target="updateVendor"/>
+ <field use-when="partyId==null" name="partyId" title="${uiLabelMap.PartyPartyId}" required-field="true"><lookup target-form-name="LookupPerson"/></field>
+ <field use-when="partyId!=null&&vendor!=null" name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
+ <field use-when="partyId==null" name="manifestCompanyName" title="${uiLabelMap.PartyManifestCompanyName}"><text/></field>
+ <field use-when="partyId!=null&&vendor!=null" name="manifestCompanyName" title="${uiLabelMap.PartyManifestCompanyName}"><text default-value="${parameters.manifestCompanyName}"/></field>
+ <field use-when="partyId==null" name="manifestCompanyTitle" title="${uiLabelMap.PartyManifestCompanyTitle}"><text/></field>
+ <field use-when="partyId!=null&&vendor!=null" name="manifestCompanyTitle" title="${uiLabelMap.PartyManifestCompanyTitle}"><text default-value="${parameters.manifestCompanyTitle}"/></field>
+ <field use-when="partyId==null" name="manifestLogoUrl" title="${uiLabelMap.PartyManifestLogoUrl}"><text/></field>
+ <field use-when="partyId!=null&&vendor!=null" name="manifestLogoUrl" title="${uiLabelMap.PartyManifestLogoUrl}"><text default-value="${parameters.manifestLogoUrl}"/></field>
+ <field use-when="partyId==null" name="manifestPolicies" title="${uiLabelMap.PartyManifestPolicies}"><text/></field>
+ <field use-when="partyId!=null&&vendor!=null" name="manifestPolicies" title="${uiLabelMap.PartyManifestPolicies}"><text default-value="${parameters.manifestPolicies}"/></field>
+ <field name="submitButton" use-when="partyId==null" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
+ <field name="submitButton" use-when="partyId!=null&&vendor!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+ </form>
+</forms>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: 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=654824&r1=654823&r2=654824&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml Fri May 9 07:29:53 2008
@@ -60,8 +60,8 @@
<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="invoiceDate"><display/></field>
+ <field name="dueDate"><display/></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>