Return-Path: 
 <commits-return-22672-apmail-ofbiz-commits-archive=ofbiz.apache.org@ofbiz.apache.org>
X-Original-To: apmail-ofbiz-commits-archive@www.apache.org
Delivered-To: apmail-ofbiz-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id F104E964A
	for <apmail-ofbiz-commits-archive@www.apache.org>;
 Wed,  2 Nov 2011 03:46:29 +0000 (UTC)
Received: (qmail 89097 invoked by uid 500); 2 Nov 2011 03:46:29 -0000
Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org
Received: (qmail 89003 invoked by uid 500); 2 Nov 2011 03:46:24 -0000
Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ofbiz.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ofbiz.apache.org>
List-Post: <mailto:commits@ofbiz.apache.org>
List-Id: <commits.ofbiz.apache.org>
Reply-To: dev@ofbiz.apache.org
Delivered-To: mailing list commits@ofbiz.apache.org
Received: (qmail 88996 invoked by uid 99); 2 Nov 2011 03:46:22 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Nov 2011 03:46:22 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Nov 2011 03:46:19 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4E63B23889FD
	for <commits@ofbiz.apache.org>; Wed,  2 Nov 2011 03:45:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1196444 - in /ofbiz/trunk/applications:
 marketing/webapp/sfa/WEB-INF/controller.xml
 marketing/widget/sfa/forms/OpportunityForms.xml
 order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
Date: Wed, 02 Nov 2011 03:45:58 -0000
To: commits@ofbiz.apache.org
From: hansbak@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111102034558.4E63B23889FD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hansbak
Date: Wed Nov  2 03:45:57 2011
New Revision: 1196444

URL: http://svn.apache.org/viewvc?rev=1196444&view=rev
Log:
on the opportunity find list change the edit button in a close button and set the close dat when not supplied, edit is available with clicking on the opportunity name/number

Modified:
    ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml

Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml?rev=1196444&r1=1196443&r2=1196444&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml Wed Nov  2 03:45:57 2011
@@ -56,6 +56,12 @@ under the License.
         <response name="success" type="request" value="ViewSalesOpportunity"/>
         <response name="error" type="view" value="EditSalesOpportunity"/>
     </request-map>
+    <request-map uri="closeSalesOpportunity">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateSalesOpportunity"/>
+        <response name="success" type="request" value="FindSalesOpportunity"/>
+        <response name="error" type="view" value="FindSalesOpportunity"/>
+    </request-map>
 
     <!-- Account Entry Requests -->
     <request-map uri="FindAccounts">

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=1196444&r1=1196443&r2=1196444&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Wed Nov  2 03:45:57 2011
@@ -55,6 +55,9 @@ under the License.
                 <field-map field-name="viewSize" from-field="viewSize"/>
             </service>
         </actions>
+        <row-actions>
+            <set field="isDateAfterNow" value="${groovy:org.ofbiz.base.util.UtilValidate.isDateAfterNow(estimatedCloseDate)}" type="Boolean"/>
+        </row-actions>
         <field name="salesOpportunityId"><hidden/></field>
         <field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}">
             <hyperlink target="ViewSalesOpportunity" description="${opportunityName}[${salesOpportunityId}]">
@@ -65,9 +68,10 @@ under the License.
         <field name="nextStep"><display/></field>
         <field name="estimatedAmount" title="${uiLabelMap.SfaEstimatedAmount}"><display/></field>
         <field name="estimatedCloseDate" title="${uiLabelMap.SfaCloseDate}"><display/></field>
-        <field name="editButton" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink target="EditSalesOpportunity" description="${uiLabelMap.CommonEdit}">
+        <field name="editButton" title="${uiLabelMap.CommonClose}" use-when="${groovy: estimatedCloseDate == null || isDateAfterNow == true || opportunityStageId != &quot;SOSTG_CLOSED&quot;}" widget-style="buttontext">
+            <hyperlink target="closeSalesOpportunity" description="${uiLabelMap.CommonClose}">
                 <parameter param-name="salesOpportunityId"/>
+                <parameter param-name="opportunityStageId" value="SOSTG_CLOSED"/>
             </hyperlink>
         </field>
     </form>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml?rev=1196444&r1=1196443&r2=1196444&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml Wed Nov  2 03:45:57 2011
@@ -114,6 +114,14 @@ This file contains basic services for Sa
     </simple-method>
     <simple-method method-name="updateSalesOpportunity" short-description="Update an Sales opportunity">
         <entity-one entity-name="SalesOpportunity" value-field="lookedUpValue"/>
+        <if-compare field="parameters.opportunityStageId" operator="equals" value="SOSTG_CLOSED">
+            <if-empty field="parameters.estimatedCloseDate">
+                <now-timestamp field="nowTimestamp"/>
+                <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayStart" ret-field="parameters.estimatedCloseDate">
+                    <field field="nowTimestamp" type="java.sql.Timestamp"/>
+                </call-class-method>
+            </if-empty>
+        </if-compare>
         <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-field="lookedUpValue"/>
     </simple-method>