Author: hansbak
Date: Sun Aug 31 07:00:49 2008
New Revision: 690695
URL: http://svn.apache.org/viewvc?rev=690695&view=rev
Log:
convert to screenlet, add field to timeentries
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.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=690695&r1=690694&r2=690695&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
Sun Aug 31 07:00:49 2008
@@ -493,8 +493,8 @@
</form>
<form name="ListTimeEntries" type="list" list-name="timeEntries"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
+ <field name="invoiceItemSeqId"><display/></field>
<auto-fields-service service-name="updateTimeEntry"
default-field-type="display"/>
-
<field name="invoiceId"><hidden/></field>
</form>
<form name="lookupInvoicesStatus" type="single"
target="BillingAccountInvoices" title=""
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=690695&r1=690694&r2=690695&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sun Aug 31
07:00:49 2008
@@ -208,7 +208,7 @@
</entity-and>
<entity-and entity-name="TimeEntry" list-name="timeEntries">
<field-map env-name="parameters.invoiceId"
field-name="invoiceId"/>
- <order-by field-name="timeEntryId"/>
+ <order-by field-name="invoiceItemSeqId"/>
</entity-and>
<script
location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy"/>
<script
location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy"/>
@@ -224,239 +224,65 @@
<if-compare field-name="invoice.statusId"
operator="equals" value="INVOICE_IN_PROCESS"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingInvoiceHeader}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container><link
target="editInvoice?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}"
style="buttontext"/></container>
- <include-form
name="invoiceHeader"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingInvoiceRoles}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container><link
target="invoiceRoles?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}"
style="buttontext"/></container>
- <include-form
name="invoiceRoles"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingInvoiceStatus}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="ListInvoiceStatus"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PartyTerms}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="ListInvoiceTerms"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <include-form
name="ListInvoicePaymentInfo"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingAppliedPayments}
${appliedAmount?currency(${invoice.currencyUomId})}
${uiLabelMap.AccountingOpenPayments}
${notAppliedAmount?currency(${invoice.currencyUomId})}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container><link
target="editInvoiceApplications?invoiceId=${invoiceId}"
text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
- <include-form
name="ListInvoiceApplications"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingInvoiceItems}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container><link
target="listInvoiceItems?invoiceId=${invoiceId}"
text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
- <include-form
name="invoiceItems"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingInvoiceTimeEntries}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container><link
target="editInvoiceTimeEntries?invoiceId=${invoiceId}"
text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
- <include-form
name="ListTimeEntries"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingTransactions}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="AcctgTransAndEntries"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet
title="${uiLabelMap.AccountingInvoiceHeader}">
+ <container><link
target="editInvoice?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}"
style="buttontext"/></container>
+ <include-form name="invoiceHeader"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingInvoiceRoles}"
navigation-form-name="invoiceRoles">
+ <container><link
target="invoiceRoles?invoiceId=${invoiceId}" text="${uiLabelMap.CommonUpdate}"
style="buttontext"/></container>
+ <include-form name="invoiceRoles"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingInvoiceStatus}"
navigation-form-name="ListInvoiceStatus">
+ <include-form name="ListInvoiceStatus"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PartyTerms}">
+ <include-form name="ListInvoiceTerms"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <include-form
name="ListInvoicePaymentInfo"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingAppliedPayments}
${appliedAmount?currency(${invoice.currencyUomId})}
${uiLabelMap.AccountingOpenPayments}
${notAppliedAmount?currency(${invoice.currencyUomId})}"
+
navigation-form-name="ListInvoiceApplications">
+ <container><link
target="editInvoiceApplications?invoiceId=${invoiceId}"
text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
+ <include-form
name="ListInvoiceApplications"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingInvoiceItems}"
navigation-form-name="invoiceItems">
+ <container><link
target="listInvoiceItems?invoiceId=${invoiceId}"
text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
+ <include-form name="invoiceItems"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingInvoiceTimeEntries}"
navigation-form-name="ListTimeEntries">
+ <container><link
target="editInvoiceTimeEntries?invoiceId=${invoiceId}"
text="${uiLabelMap.CommonUpdate}" style="buttontext"/></container>
+ <include-form name="ListTimeEntries"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingTransactions}"
navigation-form-name="AcctgTransAndEntries">
+ <include-form name="AcctgTransAndEntries"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
</widgets>
<fail-widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingInvoiceHeader}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="invoiceHeader"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingInvoiceRoles}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="invoiceRoles"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingInvoiceStatus}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="ListInvoiceStatus"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PartyTerms}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="ListInvoiceTerms"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- <include-form
name="ListInvoicePaymentInfo"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingAppliedPayments}
${appliedAmount?currency(${invoice.currencyUomId})}
${uiLabelMap.AccountingOpenPayments}
${notAppliedAmount?currency(${invoice.currencyUomId})}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="ListInvoiceApplications"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingInvoiceItems}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="invoiceItems"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingInvoiceTimeEntries}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="ListTimeEntries"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.AccountingTransactions}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="AcctgTransAndEntries"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet
title="${uiLabelMap.AccountingInvoiceHeader}">
+ <include-form name="invoiceHeader"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingInvoiceRoles}"
navigation-form-name="invoiceRoles">
+ <include-form name="invoiceRoles"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingInvoiceStatus}"
navigation-form-name="ListInvoiceStatus">
+ <include-form name="ListInvoiceStatus"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PartyTerms}">
+ <include-form name="ListInvoiceTerms"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ <include-form
name="ListInvoicePaymentInfo"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingAppliedPayments}
${appliedAmount?currency(${invoice.currencyUomId})}
${uiLabelMap.AccountingOpenPayments}
${notAppliedAmount?currency(${invoice.currencyUomId})}"
+
navigation-form-name="ListInvoiceApplications">
+ <include-form
name="ListInvoiceApplications"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingInvoiceItems}"
navigation-form-name="invoiceItems">
+ <include-form name="invoiceItems"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingInvoiceTimeEntries}"
navigation-form-name="ListTimeEntries">
+ <include-form name="ListTimeEntries"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingTransactions}"
navigation-form-name="AcctgTransAndEntries">
+ <include-form name="AcctgTransAndEntries"
location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/>
+ </screenlet>
</fail-widgets>
</section>
</decorator-section>
