Author: jleroux
Date: Tue May 3 10:42:53 2016
New Revision: 1742087
URL: http://svn.apache.org/viewvc?rev=1742087&view=rev
Log:
A patch from Pierre Smits for "Add links to edit/delete a term, for instance
from the list" https://issues.apache.org/jira/browse/OFBIZ-6866
This patch addresses the visibility of the 'add/edit' terms form. Additionally
it reorders the sequence of the roles form and removes a wrong screenlet title.
Modified:
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1742087&r1=1742086&r2=1742087&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Tue May 3
10:42:53 2016
@@ -462,9 +462,6 @@ under the License.
<widgets>
<decorator-screen name="CommonInvoiceDecorator"
location="${parameters.invoiceDecoratorLocation}">
<decorator-section name="body">
- <screenlet
title="${uiLabelMap.AccountingInvoiceItems}">
- <include-form name="EditInvoiceItems"
location="component://accounting/widget/InvoiceForms.xml"/>
- </screenlet>
<screenlet
title="${uiLabelMap.AccountingInvoiceItemAdd}">
<section>
<condition>
@@ -478,6 +475,9 @@ under the License.
</fail-widgets>
</section>
</screenlet>
+ <screenlet
title="${uiLabelMap.AccountingInvoiceItems}">
+ <include-form name="EditInvoiceItems"
location="component://accounting/widget/InvoiceForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -550,9 +550,18 @@ under the License.
<widgets>
<decorator-screen name="CommonInvoiceDecorator"
location="${parameters.invoiceDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="PartyInvoiceTermPanel"
title="${uiLabelMap.AccountingPartyRoleAdd}" collapsible="true">
- <include-form name="EditInvoiceTerm"
location="component://accounting/widget/InvoiceForms.xml"/>
- </screenlet>
+ <section>
+ <condition>
+ <not>
+ <if-compare field="invoice.statusId"
operator="equals" value="INVOICE_APPROVED"/>
+ </not>
+ </condition>
+ <widgets>
+ <screenlet id="PartyInvoiceTermPanel"
collapsible="true">
+ <include-form name="EditInvoiceTerm"
location="component://accounting/widget/InvoiceForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
<include-form name="ListInvoiceTerms"
location="component://accounting/widget/InvoiceForms.xml"/>
</decorator-section>
</decorator-screen>
