Author: jleroux
Date: Sat Oct 14 21:51:37 2006
New Revision: 464114
URL: http://svn.apache.org/viewvc?view=rev&rev=464114
Log:
A patch from Ashish Vijaywargiya to standarise the Communication tab with the
other tab in Edit Profile(of Party Component).
(https://issues.apache.org/jira/browse/OFBIZ-376)
Thanks Ashish
Modified:
incubator/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
incubator/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
Modified:
incubator/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?view=diff&rev=464114&r1=464113&r2=464114
==============================================================================
---
incubator/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
(original)
+++
incubator/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
Sat Oct 14 21:51:37 2006
@@ -74,7 +74,7 @@
<set field="donePage" from-field="parameters.DONE_PAGE"
default-value="ListPartyCommEvents?partyId=${partyId}"/>
</actions>
<widgets>
- <decorator-screen
location="component://party/widget/partymgr/CommonScreens.xml"
name="main-decorator">
+ <decorator-screen name="CommonCommunicationEventDecorator">
<decorator-section name="body">
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
@@ -82,22 +82,6 @@
<if-has-permission action="_VIEW"
permission="PARTYMGR"/>
</condition>
<widgets>
- <section>
- <condition>
- <not><if-empty
field-name="partyId"/></not>
- </condition>
- <widgets>
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="ProfileTabBar"/>
- </widgets>
- </section>
- <section>
- <condition>
- <not><if-empty
field-name="communicationEventId"/></not>
- </condition>
- <widgets>
- <include-menu
location="component://party/webapp/partymgr/communication/CommMenus.xml"
name="CommEventTabBar"/>
- </widgets>
- </section>
<container><label style="head1"
text="${uiLabelMap.PartyFoundCommunicationEvents}"/></container>
<container><link style="buttontext"
target="EditCommunicationEvent?partyId=${partyId}"
text="${uiLabelMap.PartyNewCommunication}"/></container>
<include-form
location="component://party/webapp/partymgr/communication/CommForms.xml"
name="ListPartyCommEvents"/>
@@ -238,6 +222,33 @@
</condition>
<widgets>
<include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="ProfileTabBar"/>
+ <container>
+ <link
target="/accounting/control/FindBillingAccount?partyId=${partyId}"
url-mode="inter-app"
+
text="${uiLabelMap.AccountingBillingAccount}" style="buttontext"/>
+ <section>
+ <condition><if-has-permission
permission="ORDERMGR" action="_VIEW"/></condition>
+ <widgets>
+ <link
target="/ordermgr/control/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}"
url-mode="inter-app"
+
text="${uiLabelMap.OrderOrders}" style="buttontext"/>
+ </widgets>
+ </section>
+ <section>
+ <condition><if-has-permission
permission="ORDERMGR" action="_CREATE"/></condition>
+ <widgets>
+ <link
target="/ordermgr/control/checkinits?partyId=${partyId}" url-mode="inter-app"
+
text="${uiLabelMap.OrderNewOrder}" style="buttontext"/>
+ </widgets>
+ </section>
+ <section>
+ <condition><if-has-permission
permission="ACCOUNTING" action="_VIEW"/></condition>
+ <widgets>
+ <link
target="/accounting/control/findPayments?lookupFlag=Y&hideFields=Y&partyIdTo=${partyId}"
url-mode="inter-app"
+
text="${uiLabelMap.AccountingPaymentsSent}" style="buttontext"/>
+ <link
target="/accounting/control/findPayments?lookupFlag=Y&hideFields=Y&partyIdFrom=${partyId}"
url-mode="inter-app"
+
text="${uiLabelMap.AccountingPaymentsReceived}" style="buttontext"/>
+ </widgets>
+ </section>
+ </container>
</widgets>
</section>
<section>
Modified:
incubator/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml?view=diff&rev=464114&r1=464113&r2=464114
==============================================================================
--- incubator/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
(original)
+++ incubator/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
Sat Oct 14 21:51:37 2006
@@ -29,7 +29,7 @@
<field name="groupId" title="${uiLabelMap.PartySecurityGroupId}"
widget-style="buttontext">
<hyperlink also-hidden="false" description="[${groupId}]"
target="EditSecurityGroup?groupId=${groupId}"/>
</field>
- <field name="description"
title="${uiLabelMap.CommonDescription}"><display/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"
widget-style="tabletext"><display/></field>
</form>
<form name="EditSecurityGroup" type="single"
target="updateSecurityGroup" title=""
default-map-name="securityGroup"
