Author: lektran
Date: Sat Jul 4 13:41:22 2009
New Revision: 791127
URL: http://svn.apache.org/viewvc?rev=791127&view=rev
Log:
Reverted r790567 and altered the invoice sub menu to use the new
request-confirmation link attribute
OFBIZ-2688
Removed:
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceSubTabBar.ftl
Modified:
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=791127&r1=791126&r2=791127&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sat Jul 4
13:41:22 2009
@@ -41,8 +41,7 @@
<condition><not><if-empty
field="parameters.invoiceId"/></not></condition>
<widgets>
<include-menu name="InvoiceTabBar"
location="component://accounting/widget/Menus.xml"/>
- <!-- include-menu
name="InvoiceSubTabBar" location="component://accounting/widget/Menus.xml"/-->
-
<platform-specific><html><html-template
location="component://accounting/webapp/accounting/invoice/InvoiceSubTabBar.ftl"/></html></platform-specific>
+ <include-menu name="InvoiceSubTabBar"
location="component://accounting/widget/Menus.xml"/>
<container style="leftclear">
<label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${invoice.description} [${invoiceId}] ${${extraFunctionName}}"/>
</container>
@@ -74,8 +73,7 @@
<widgets>
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
- <!-- include-menu
name="InvoiceSubTabBar" location="component://accounting/widget/Menus.xml"/-->
-
<platform-specific><html><html-template
location="component://accounting/webapp/accounting/invoice/InvoiceSubTabBar.ftl"/></html></platform-specific>
+ <include-menu name="InvoiceSubTabBar"
location="component://accounting/widget/Menus.xml"/>
<container style="clear"/>
</decorator-section>
<decorator-section name="search-options">
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=791127&r1=791126&r2=791127&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Sat Jul 4 13:41:22
2009
@@ -269,7 +269,7 @@
</or>
</and>
</condition>
- <link target="javascript:confirmActionLink('You want to writeoff
this invoice number ${invoice.invoiceId}?','setInvoiceStatus')"
url-mode="plain">
+ <link target="setInvoiceStatus" request-confirmation="true"
confirmation-message="You want to writeoff this invoice number
${invoice.invoiceId}?">
<parameter param-name="invoiceId"
from-field="invoice.invoiceId"/>
<parameter param-name="statusId" value="INVOICE_WRITEOFF"/>
</link>
@@ -300,7 +300,7 @@
</or>
</and>
</condition>
- <link target="javascript:confirmActionLink('You want to cancel
this invoice number ${invoice.invoiceId}?','setInvoiceStatus')"
url-mode="plain">
+ <link target="setInvoiceStatus" request-confirmation="true"
confirmation-message="You want to cancel this invoice number
${invoice.invoiceId}?">
<parameter param-name="invoiceId"
from-field="invoice.invoiceId"/>
<parameter param-name="statusId" value="INVOICE_CANCELLED"/>
</link>
@@ -414,7 +414,7 @@
<if-compare field="payment.statusId" operator="equals"
value="PMNT_NOT_PAID"/>
</and>
</condition>
- <link target="javascript:confirmActionLink('You want to cancel
this payment number ${payment.paymentId}?','setPaymentStatus')"
url-mode="plain">
+ <link target="setPaymentStatus" request-confirmation="true"
confirmation-message="You want to cancel this payment number
${payment.paymentId}?">
<parameter param-name="paymentId"
from-field="payment.paymentId"/>
<parameter param-name="statusId" value="PMNT_CANCELLED"/>
</link>
