svn commit: r778544 - in /ofbiz/trunk/applications: marketing/widget/sfa/CommonScreens.xml order/config/OrderUiLabels.xml order/entitydef/entitymodel.xml party/webapp/partymgr/party/PartyForms.xml party/widget/partymgr/ProfileScreens.xml

[apatel-2]

Author: apatel
Date: Tue May 26 01:22:10 2009
New Revision: 778544

URL: http://svn.apache.org/viewvc?rev=778544&view=rev
Log:
Add screenlet to show list of opportunity for an account.

Modified:
    ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/entitydef/entitymodel.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml

Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=778544&r1=778543&r2=778544&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Tue May 26 01:22:10 2009
@@ -299,6 +299,7 @@
                                             <include-screen name="Attributes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                             <include-screen name="Content" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                             <include-screen name="Notes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+                                            <include-screen name="AccountSalesOpportunities" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                         </container>
                                     </widgets>
                                 </section>
@@ -350,6 +351,7 @@
                                                 <widgets>
                                                     <include-screen name="Content" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                                     <include-screen name="Notes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+                                                    <include-screen name="AccountSalesOpportunities" location="component://party/widget/partymgr/ProfileScreens.xml"/>
                                                 </widgets>
                                             </section>
                                         </container>

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=778544&r1=778543&r2=778544&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Tue May 26 01:22:10 2009
@@ -4625,6 +4625,11 @@
         <value xml:lang="th">ลักษณะการสั่งซื้อ</value>
         <value xml:lang="zh">订单选项</value>
     </property>
+    <property key="OrderOpportunities">
+        <value xml:lang="en">Opportunities</value>
+        <value xml:lang="fr">Opportunités</value>
+        <value xml:lang="it">Opportunità</value>
+    </property>
     <property key="OrderOrder">
         <value xml:lang="cs">Objednávka</value>
         <value xml:lang="de">Bestellung</value>

Modified: ofbiz/trunk/applications/order/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel.xml?rev=778544&r1=778543&r2=778544&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel.xml Tue May 26 01:22:10 2009
@@ -2904,6 +2904,17 @@
         </relation>
     </entity>
 
+    <view-entity entity-name="SalesOpportunityAndRole" package-name="org.ofbiz.order.opportunity" title="SalesOpportunity And Role View Entity">
+      <member-entity entity-alias="SO" entity-name="SalesOpportunity"/>
+      <member-entity entity-alias="SR" entity-name="SalesOpportunityRole"/>
+      <alias-all entity-alias="SO"/>
+      <alias name="partyId" entity-alias="SR"/>
+      <alias name="roleTypeId" entity-alias="SR"/>
+      <view-link entity-alias="SO" rel-entity-alias="SR">
+        <key-map field-name="salesOpportunityId"/>
+      </view-link>
+    </view-entity>
+
     <entity entity-name="SalesOpportunityStage"
             package-name="org.ofbiz.order.opportunity"
             title="Describes stages of a sales opportunity with associated probability factors.">

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=778544&r1=778543&r2=778544&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Tue May 26 01:22:10 2009
@@ -1025,4 +1025,10 @@
         <field name="fromPartyId"><display/></field>
         <field name="toPartyId"><display/></field>
     </form>
+    <form name="PartySalesOpportunities" type="list" list-name="salesOpportunities" default-table-style="basic-table hover-bar">
+        <field name="salesOpportunityId"><display/></field>
+        <field name="opportunityName"><display/></field>
+        <field name="estimatedAmount"><display/></field>
+        <field name="partyId"><display/></field>
+    </form>
 </forms>

Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=778544&r1=778543&r2=778544&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Tue May 26 01:22:10 2009
@@ -524,4 +524,21 @@
         </section>
     </screen>
 
+    <screen name="AccountSalesOpportunities">
+        <section>
+            <actions>
+                <set field="partyId" from-field="parameters.partyId"/>
+                <entity-and entity-name="SalesOpportunityAndRole" list="salesOpportunities">
+                    <field-map field-name="partyId" from-field="partyId"/>
+                    <order-by field-name="salesOpportunityId"/>
+                </entity-and>
+            </actions>
+            <widgets>
+                <screenlet title="${uiLabelMap.OrderOpportunities}" >
+                    <include-form name="PartySalesOpportunities" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+                </screenlet>
+            </widgets>
+        </section>
+    </screen>
+
 </screens>