You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/04/05 12:02:33 UTC
svn commit: r762061 - in /ofbiz/trunk: applications/accounting/
applications/accounting/data/
applications/accounting/webapp/accounting/invoice/
applications/accounting/widget/ specialpurpose/myportal/data/
specialpurpose/myportal/widget/
Author: hansbak
Date: Sun Apr 5 10:02:32 2009
New Revision: 762061
URL: http://svn.apache.org/viewvc?rev=762061&view=rev
Log:
move list customer invoices from myportal into accounting
Added:
ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml (with props)
Modified:
ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml
ofbiz/trunk/applications/accounting/ofbiz-component.xml
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
Added: ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml?rev=762061&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml (added)
+++ ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml Sun Apr 5 10:02:32 2009
@@ -0,0 +1,31 @@
+<?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.
+-->
+<entity-engine-xml>
+
+ <PortletCategory portletCategoryId="ACCOUNTING" description="Accounting related data"/>
+
+ <PortalPortlet portalPortletId="ListCustomerInvoices" portletName="List Customer Invoices"
+ screenName="ListCustomerInvoices"
+ screenLocation="component://accounting/widget/InvoiceScreens.xml"
+ description="List Invoices for a certain customer who is just logged in"
+ securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" />
+ <PortletPortletCategory portalPortletId="ListCustomerInvoices" portletCategoryId="ACCOUNTING"/>
+
+</entity-engine-xml>
Propchange: ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/data/AccountingPortletData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml?rev=762061&r1=762060&r2=762061&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml (original)
+++ ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml Sun Apr 5 10:02:32 2009
@@ -58,5 +58,12 @@
<Payment paymentId="demo10001" paymentTypeId="CUSTOMER_PAYMENT" paymentMethodTypeId="EFT_ACCOUNT" partyIdFrom="EuroCustomer" partyIdTo="Company" statusId="PMNT_RECEIVED" effectiveDate="2006-04-25 12:56:54.292" amount="820.97" currencyUomId="USD" actualCurrencyAmount="543.23" actualCurrencyUomId="EUR"/>
<PaymentApplication paymentApplicationId="demo11000" paymentId="demo10001" invoiceId="demo11001" amountApplied="543.23"/>
+ <!-- show on customer invoice list when DemoCustomer logs on to myportal -->
+ <Invoice invoiceId="demo1200" invoiceTypeId="SALES_INVOICE" partyIdFrom="Company" partyId="DemoCustCompany" statusId="INVOICE_APPROVED" invoiceDate="2006-04-25 12:46:27.122" description="This is an invoice to DemoCustomer" currencyUomId="USD" />
+ <InvoiceItem invoiceId="demo1200" invoiceItemSeqId="00001" invoiceItemTypeId="INV_SPROD_ITEM" uomId="USD" taxableFlag="Y" amount="511.23" description="this was e service for a product" />
+ <InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="demo1200" statusDate="2006-04-25 12:46:27.122" />
+ <InvoiceStatus statusId="INVOICE_APPROVED" invoiceId="demo1200" statusDate="2006-04-25 12:46:27.122" />
+
+
</entity-engine-xml>
Modified: ofbiz/trunk/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/ofbiz-component.xml?rev=762061&r1=762060&r2=762061&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Sun Apr 5 10:02:32 2009
@@ -39,6 +39,7 @@
<entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/UsTaxAccountGroups.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingPortletData.xml"/>
<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/InvoiceScheduledServiceData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGeneralChartOfAccounts.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoOrganizationData.xml"/>
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=762061&r1=762060&r2=762061&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Sun Apr 5 10:02:32 2009
@@ -624,4 +624,12 @@
<field name="paidAmount"><display/></field>
<field name="outstandingAmount"><display/></field>
</form>
+
+ <form name="ListCustomerInvoices" extends="ListInvoices" list-name="invoices"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <field name="partyIdFrom"><ignored/></field>
+ <field name="partyIdTo"><ignored/></field>
+ <field name="amountToApply"><ignored/></field>
+ </form>
+
</forms>
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=762061&r1=762060&r2=762061&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sun Apr 5 10:02:32 2009
@@ -636,4 +636,30 @@
</widgets>
</section>
</screen>
+
+ <screen name="ListCustomerInvoices">
+ <section>
+ <actions>
+ <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/>
+ <entity-condition list="invoices" entity-name="Invoice">
+ <condition-list combine="and">
+ <condition-expr field-name="partyId" operator="equals" from-field="myCompanyId"/>
+ <condition-list combine="or">
+ <condition-expr field-name="statusId" operator="equals" value="INVOICE_APPROVED"/>
+ <condition-expr field-name="statusId" operator="equals" value="INVOICE_SEND"/>
+ <condition-expr field-name="statusId" operator="equals" value="INVOICE_READY"/>
+ <condition-expr field-name="statusId" operator="equals" value="INVOICE_PAID"/>
+ </condition-list>
+ </condition-list>
+ <order-by field-name="invoiceDate DESC"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <screenlet title="${uiLabelMap.PageTitleListInvoices}" navigation-form-name="ListInvoices">
+ <include-form name="ListCustomerInvoices" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=762061&r1=762060&r2=762061&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Sun Apr 5 10:02:32 2009
@@ -75,7 +75,6 @@
<PortalPageColumn portalPageId="MYPORTAL_CUSTOMER3" columnSeqId="00001" />
<PortalPortlet portalPortletId="mycompanycomms" portletName="My Company Comms" screenName="MyCompanyComms" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Company Comms From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
- <PortalPortlet portalPortletId="ListInvoices" portletName="List Invoices" screenName="ListInvoices" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Invoices From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" />
<PortalPortlet portalPortletId="ListProjects" portletName="List Projects" screenName="ListProjects" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Projects From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" />
<PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" />
@@ -137,13 +136,11 @@
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" sequenceNum="6"/>
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" sequenceNum="7"/>
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/>
- <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER2" portalPortletId="ListInvoices" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER2" portalPortletId="ListCustomerInvoices" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER3" portalPortletId="ListProjects" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortletPortletCategory portalPortletId="mycompanycomms" portletCategoryId="COMMUNICATIONS"/>
-
- <PortletPortletCategory portalPortletId="ListInvoices" portletCategoryId="LIST_CUSTOMER"/>
<PortletPortletCategory portalPortletId="ListProjects" portletCategoryId="LIST_CUSTOMER"/>
<WebSite webSiteId="MYPORTAL" siteName="My Portal" visualThemeSetId="BACKOFFICE" />
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=762061&r1=762060&r2=762061&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Sun Apr 5 10:02:32 2009
@@ -66,37 +66,6 @@
<field name="partyId"><ignored/></field>
</form>
- <form name="ListInvoices" type="list" separate-columns="true" paginate-target="listInvoices" list-name="invoices"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <row-actions>
- <service service-name="getPartyNameForDate" result-map="partyNameResultFrom">
- <field-map field-name="partyId" from-field="partyIdFrom"/>
- <field-map field-name="compareDate" from-field="invoiceDate"/>
- <field-map field-name="lastNameFirst" value="Y"/>
- </service>
- <service service-name="getPartyNameForDate" result-map="partyNameResultTo">
- <field-map field-name="partyId" from-field="partyId"/>
- <field-map field-name="compareDate" from-field="invoiceDate"/>
- <field-map field-name="lastNameFirst" value="Y"/>
- </service>
- <script location="component://myportal/webapp/myportal/WEB-INF/actions/ConvertInvoiceCurrency.groovy"/>
- </row-actions>
- <field name="invoiceId" widget-style="buttontext">
- <hyperlink description="${invoiceId}" target="invoice.pdf">
- <parameter param-name="invoiceId" from-field="invoiceId"/>
- </hyperlink>
- </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="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>
-
<form name="ListPhaseInfo" extends="ListPhaseInfo" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml">
<field name="phase"><display description="${phaseName}"/></field>
</form>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=762061&r1=762060&r2=762061&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Sun Apr 5 10:02:32 2009
@@ -56,31 +56,6 @@
</widgets>
</section>
</screen>
- <screen name="ListInvoices">
- <section>
- <actions>
- <set field="headerItem" value="invoices"/>
- <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/>
- <entity-condition list="invoices" entity-name="Invoice">
- <condition-list combine="and">
- <condition-expr field-name="partyId" operator="equals" from-field="myCompanyId"/>
- <condition-list combine="or">
- <condition-expr field-name="statusId" operator="equals" value="INVOICE_APPROVED"/>
- <condition-expr field-name="statusId" operator="equals" value="INVOICE_SEND"/>
- <condition-expr field-name="statusId" operator="equals" value="INVOICE_READY"/>
- <condition-expr field-name="statusId" operator="equals" value="INVOICE_PAID"/>
- </condition-list>
- </condition-list>
- <order-by field-name="invoiceDate DESC"/>
- </entity-condition>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.PageTitleListInvoices}" navigation-form-name="ListInvoices">
- <include-form name="ListInvoices" location="component://myportal/widget/MyPortalForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
<screen name="CreateCustRequestNotification">
<section>
<actions>