svn commit: r763135 - in /ofbiz/trunk: applications/order/ applications/order/config/ applications/order/data/ applications/order/script/org/
Locked
svn commit: r763135 - in /ofbiz/trunk: applications/order/ applications/order/config/ applications/order/data/ applications/order/script/org/
 
|
Author: hansbak
Date: Wed Apr 8 07:58:00 2009 New Revision: 763135 URL: http://svn.apache.org/viewvc?rev=763135&view=rev Log: moved custrequest notification from myportal to order,moved other programs around, reorganized customer request status handling, replaced cust request roles from ftl to form, removed other used programs from myportal. Now only the party registration is left in myportal. Added: ofbiz/trunk/applications/order/data/OrderDemoData.xml (with props) ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl (with props) ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl (with props) Removed: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestRoles.ftl ofbiz/trunk/specialpurpose/myportal/servicedef/secas.xml ofbiz/trunk/specialpurpose/myportal/templates/ Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml ofbiz/trunk/applications/order/ofbiz-component.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml ofbiz/trunk/applications/order/servicedef/secas.xml ofbiz/trunk/applications/order/servicedef/services_request.xml ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml ofbiz/trunk/framework/common/servicedef/services_email.xml ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml ofbiz/trunk/specialpurpose/myportal/servicedef/services.xml ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Wed Apr 8 07:58:00 2009 @@ -1684,6 +1684,9 @@ <value xml:lang="zh">(ä¸æ¸ é¤è®¢åçè¯ä¸è½ä¿®æ¹ã)</value> <value xml:lang="zh_CN">(å¿ é¡»æ¸ ç©ºè®¢åæè½æ¹å)</value> </property> + <property key="OrderCannotCancelRequestAlreadyWorkedOn"> + <value xml:lang="en">You cannot cancel this customer request, work has already started on it.</value> + </property> <property key="OrderCannotChangeQuantityInPromotion"> <value xml:lang="de">Sie können die Menge auf dem Aktionselement ${productName} (Produkt ID: ${productId}) nicht ändern, Menge nicht angepasst.</value> <value xml:lang="en">Sorry, you can't change the quantity on the promotion item ${productName} (product ID: ${productId}, not setting quantity.</value> @@ -2369,6 +2372,17 @@ <value xml:lang="th">หมายà¹à¸¥à¸à¸à¸¹à¹à¹à¸ªà¸µà¸¢à¸ าษี</value> <value xml:lang="zh">客æ·ç¨å¡æ è¯</value> </property> + <property key="OrderCustRequestNotificationMailCompleted"> + <value xml:lang="en">Customer Request Completed Notification Mai</value> + <value xml:lang="it">Notifica mail per richiesta cliente completata</value> + </property> + <property key="OrderCustRequestNotificationMailCreation"> + <value xml:lang="en">Customer Request Creation Notification Mail</value> + <value xml:lang="it">Notifica mail per richiesta cliente creata</value> + </property> + <property key="OrderCustRequestStatusList"> + <value xml:lang="en">Customer Request Status List</value> + </property> <property key="OrderDate"> <value xml:lang="de">Auftragsdatum</value> <value xml:lang="en">Order Date</value> Added: ofbiz/trunk/applications/order/data/OrderDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderDemoData.xml?rev=763135&view=auto ============================================================================== --- ofbiz/trunk/applications/order/data/OrderDemoData.xml (added) +++ ofbiz/trunk/applications/order/data/OrderDemoData.xml Wed Apr 8 07:58:00 2009 @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<entity-engine-xml> + + <EmailTemplateSetting + emailTemplateSettingId="CUST_REQ_ACCEPTED" + bodyScreenLocation="component://order/widget/ordermgr/RequestScreens.xml#CreateCustRequestNotification" + subject="OFBiz - Your Request Is Created[${custRequestId}]" + fromAddress="[hidden email]"/> + <EmailTemplateSetting emailTemplateSettingId="CUST_REQ_COMPLETED" + bodyScreenLocation="component://order/widget/ordermgr/RequestScreens.xml#CompletedCustRequestNotification" + subject="OFBiz - Your Request Is Complete[${custRequestId}]" + fromAddress="[hidden email]"/> + +</entity-engine-xml> Propchange: ofbiz/trunk/applications/order/data/OrderDemoData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/data/OrderDemoData.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/order/data/OrderDemoData.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/order/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/ofbiz-component.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/applications/order/ofbiz-component.xml (original) +++ ofbiz/trunk/applications/order/ofbiz-component.xml Wed Apr 8 07:58:00 2009 @@ -35,6 +35,7 @@ <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderScheduledServices.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoUser.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> <service-resource type="model" loader="main" location="servicedef/services_cart.xml"/> <service-resource type="model" loader="main" location="servicedef/services_shoppinglist.xml"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Wed Apr 8 07:58:00 2009 @@ -62,10 +62,6 @@ <set field="newEntity.custRequestDate" from-field="nowTimestamp"/> </if-empty> - <if-empty field="parameters.statusId"> - <set value="CRQ_SUBMITTED" field="newEntity.statusId"/> - </if-empty> - <if-not-empty field="parameters.custRequestId"> <set field="newEntity.custRequestId" from-field="parameters.custRequestId"/> <else> @@ -75,43 +71,14 @@ <create-value value-field="newEntity"/> <field-to-result field="newEntity.custRequestId" result-name="custRequestId"/> - - <!-- jacopoc: Commented out the following code because it is too specific and not valid as a - general rule: a user may enter the request from a customer even if he will not work - on it --> - <!-- If the logged in partyId that is creating the request is not equal to the fromPartyId - then we associate it to the request as the request taker. - This is not done if they are the same e.g. a logged in customer that is creating a request for its - own sake. --> - <!-- just in case the service is called by the "system" userLogin --> - <!-- - <if-not-empty field="userLogin.partyId"> - <if-compare-field field="parameters.fromPartyId" to-field="userLogin.partyId" operator="not-equals"> - <set from-field="newEntity.custRequestId" field="takerMap.custRequestId"/> - <set from-field="userLogin.partyId" field="takerMap.partyId"/> - <set value="REQ_TAKER" field="takerMap.roleTypeId"/> - <call-service service-name="createCustRequestParty" in-map-name="takerMap"/> - </if-compare-field> - </if-not-empty> - --> - - <!-- save the created status in the history --> - <set-service-fields to-map="statusMap" service-name="createCustRequestStatus" map="newEntity"/> - <call-service service-name="createCustRequestStatus" in-map-name="statusMap"/> - - <!-- This code is commented because the requester party is no more maintained in the CustRequestParty entity. - There is now the fromPartyId field in the CustRequest entity for this. --> - <!-- - <field-to-field field-name="custRequestId" map-name="newEntity" to-map-name="requesterMap"/> - <if-not-empty field="parameters.requestPartyId"> - <field-to-field field-name="requestPartyId" map-name="parameters" to-map-name="requesterMap" to-field-name="partyId"/> - <else> - <field-to-field field-name="partyId" map-name="userLogin" to-map-name="requesterMap"/> - </else> - </if-not-empty> - <string-to-field string="REQ_REQUESTER" map-name="requesterMap" field-name="roleTypeId"/> - <call-service service-name="createCustRequestParty" in-map-name="requesterMap"/> - --> + + <!-- set status fields and history --> + <if-empty field="parameters.statusId"> + <set field="parameters.statusId" value="CRQ_SUBMITTED"/> + </if-empty> + <set field="parameters.custRequestId" from-field="newEntity.custRequestId"/> + <set-service-fields service-name="setCustRequestStatus" map="parameters" to-map="setStat"/> + <call-service service-name="setCustRequestStatus" in-map-name="setStat"/> <!-- create also the item if key fields are provided --> <if> @@ -142,7 +109,7 @@ <entity-one entity-name="WorkEffort" value-field="lowInfo"> <field-map field-name="workEffortId" from-field="workEffort.workEffortId"/> </entity-one> - <call-simple-method method-name="getHours" xml-resource="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml"/> + <call-simple-method method-name="getHours" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/> <set field="actualHours" from-field="highInfo.actualHours"/> <!-- no hours recorded yet so custrequest can be cancelled --> <if-empty field="actualHours"> @@ -153,20 +120,17 @@ <call-service service-name="updateWorkEffort" in-map-name="updTask"/> <else> <set field="parameters.statusId" from-field="custRequest.statusId"/> - <property-to-field resource="ProjectMgrUiLabels" property="cannotCancelledRequest" field="errorMessage"/> + <property-to-field resource="OrderUiLabels" property="OrderCannotCancelRequestAlreadyWorkedOn" field="errorMessage"/> <field-to-result field="errorMessage"/> <set field="isShowEvent" value="N"/> </else> </if-empty> </iterate> </if-not-empty> - <else> - <set field="custRequest.statusId" from-field="parameters.statusId"/> - </else> </if-compare> - <!-- save the changed status in the history --> - <set-service-fields to-map="statusMap" service-name="createCustRequestStatus" map="custRequest"/> - <call-service service-name="createCustRequestStatus" in-map-name="statusMap"/> + <!-- update status and save the changed status in the history --> + <set-service-fields service-name="setCustRequestStatus" map="parameters" to-map="setStat"/> + <call-service service-name="setCustRequestStatus" in-map-name="setStat"/> <if-not-empty field="isShowEvent"> <clear-field field="successMessage"/> </if-not-empty> @@ -391,27 +355,29 @@ <set from-field="nowTimestamp" field="newEntity.statusDatetime"/> </if-empty> <create-value value-field="newEntity"/> - <field-to-result field="newEntity.custRequestStatusId" result-name="custRequestStatusId"/> </simple-method> <simple-method method-name="setCustRequestStatus" short-description="change the customer request Status"> <entity-one entity-name="CustRequest" value-field="custRequest"/> - <field-to-result field="custRequest.statusId" result-name="oldStatusId"/> - <if-compare-field field="custRequest.statusId" to-field="parameters.statusId" operator="not-equals"> - <entity-one entity-name="StatusValidChange" value-field="statusChange"> - <field-map field-name="statusId" from-field="custRequest.statusId"/> - <field-map field-name="statusIdTo" from-field="parameters.statusId"/> - </entity-one> - <if-empty field="statusChange"> - <add-error><fail-message message="Status is not a valid change"/></add-error> - <log level="error" message="Cannot change from ${custRequest.statusId} to ${parameters.statusId}"/> - <check-errors/> - <else> - <set field="custRequest.statusId" from-field="parameters.statusId"/> - <store-value value-field="custRequest"/> - </else> - </if-empty> - </if-compare-field> + <if-not-empty field="custRequest.statusId"> + <field-to-result field="custRequest.statusId" result-name="oldStatusId"/> + <if-compare-field field="custRequest.statusId" to-field="parameters.statusId" operator="not-equals"> + <entity-one entity-name="StatusValidChange" value-field="statusChange"> + <field-map field-name="statusId" from-field="custRequest.statusId"/> + <field-map field-name="statusIdTo" from-field="parameters.statusId"/> + </entity-one> + <if-empty field="statusChange"> + <set field="msg" value="Status is not a valid change: from ${custRequest.statusId} to ${parameters.statusId}"/> + <add-error><fail-message message="${msg}"/></add-error> + <log level="error" message="${msg}"/> + </if-empty> + </if-compare-field> + <check-errors/> + </if-not-empty> + <set field="custRequest.statusId" from-field="parameters.statusId"/> + <store-value value-field="custRequest"/> + <call-simple-method method-name="createCustRequestStatus"/> + <field-to-result field="custRequest.fromPartyId" result-name="fromPartyId"/><!-- for notification --> </simple-method> <simple-method method-name="createCustRequestFromCommEvent" short-description="Create a Customer request from a commEvent(email)"> Modified: ofbiz/trunk/applications/order/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/secas.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/applications/order/servicedef/secas.xml (original) +++ ofbiz/trunk/applications/order/servicedef/secas.xml Wed Apr 8 07:58:00 2009 @@ -321,4 +321,20 @@ <condition field-name="workEffortId" operator="is-empty"/> <action service="createWorkEffort" mode="sync"/> </eca> + + <!-- customer request notifications --> + <eca service="setCustRequestStatus" event="commit"> + <condition field-name="oldStatusId" operator="not-equals" value="CRQ_ACCEPTED"/> + <condition field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/> + <set field-name="partyIdTo" value="${fromPartyId}"/> + <set field-name="emailTemplateSettingId" value="CUST_REQ_ACCEPTED"/> + <action service="sendMailFromTemplateSetting" mode="sync"/> + </eca> + <eca service="setCustRequestStatus" event="commit"> + <condition field-name="oldStatusId" operator="not-equals" value="CRQ_COMPLETED"/> + <condition field-name="statusId" operator="equals" value="CRQ_COMPLETED"/> + <set field-name="partyIdTo" value="${fromPartyId}"/> + <set field-name="emailTemplateSettingId" value="CUST_REQ_COMPLETED"/> + <action service="sendMailFromTemplateSetting" mode="sync"/> + </eca> </service-eca> Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/applications/order/servicedef/services_request.xml (original) +++ ofbiz/trunk/applications/order/servicedef/services_request.xml Wed Apr 8 07:58:00 2009 @@ -38,9 +38,9 @@ location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequest" auth="true"> <description>Create a custRequest record and optionally create a custRequest item.</description> <permission-service service-name="custRequestPermissionCheck" main-action="CREATE"/> + <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <attribute name="fromPartyId" type="String" mode="IN" optional="false"/> - <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="all" mode="IN" entity-name="CustRequestItem" optional="true"/> </service> <service name="updateCustRequest" engine="simple" default-entity-name="CustRequest" @@ -143,15 +143,6 @@ <attribute name="shoppingListId" type="String" mode="IN" optional="false"/> <attribute name="custRequestId" type="String" mode="OUT" optional="false"/> </service> - <service name="createCustRequestStatus" engine="simple" auth="true" - location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequestStatus"> - <description>Creates a CustRequestStatus entry, which is a history of CustRequest status change.</description> - <attribute name="statusId" type="String" mode="IN" optional="false"/> - <attribute name="custRequestId" type="String" mode="IN" optional="false"/> - <attribute name="custRequestItemSeqId" type="String" mode="IN" optional="true"/> - <attribute name="statusDateTime" type="Timestamp" mode="IN" optional="true"/> - <attribute name="custRequestStatusId" type="String" mode="OUT" optional="false"/> - </service> <!-- Services for finding Associated CustRequests --> <service name="getCustRequestsByRole" engine="simple" @@ -166,6 +157,7 @@ <attribute name="custRequestId" type="String" mode="IN" optional="false"/> <attribute name="statusId" type="String" mode="IN" optional="false"/> <attribute name="oldStatusId" type="String" mode="OUT" optional="true"/> + <attribute name="fromPartyId" type="String" mode="OUT"/><!-- for notification --> </service> <service name="createCustRequestFromCommEvent" engine="simple" default-entity-name="CommunicationEvent" location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequestFromCommEvent" auth="true"> Added: ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl?rev=763135&view=auto ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl (added) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl Wed Apr 8 07:58:00 2009 @@ -0,0 +1,37 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title>${title}</title> + <link rel="stylesheet" href="${baseUrl?if_exists}/images/maincss.css" type="text/css"/> + </head> + <body> + <h1>${title}</h1> + <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> + <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been completed. + <br/><br/> + The status and used hours can always be checked at the url: <br/> + <a href="${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}">${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a> + <br/><br/> + Regards.<br/><br/> + Thank you for your business. + </body> +</html> Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl?rev=763135&view=auto ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl (added) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl Wed Apr 8 07:58:00 2009 @@ -0,0 +1,41 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title>${title}</title> + <link rel="stylesheet" href="${baseUrl?if_exists}/images/maincss.css" type="text/css"/> + </head> + <body> + <h1>${title}</h1> + <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> + <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been created successfully. + <br/><br/> + We will solve/implement the request as soon as possible + <br/><br/> + The status and used hours can always be checked at the url: <br/> + <a href="${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}">${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a> + <br/><br/> + Regards. + <br/><br/> + PS. we will notify you when the customer request is completed. + </p> + </body> +</html> Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Wed Apr 8 07:58:00 2009 @@ -182,6 +182,36 @@ </hyperlink> </field> </form> + <form name="ViewRequestStatus" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <actions> + <entity-and entity-name="CustRequestStatus"> + <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> + <order-by field-name="custRequestStatusId"/> + </entity-and> + </actions> + <auto-fields-entity entity-name="CustRequestStatus" default-field-type="display"/> + <field name="custRequestId"><hidden/></field> + <field name="custRequestStatusId"><hidden/></field> + <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field> + </form> + + <form name="ViewRequestRoles" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <actions> + <entity-and entity-name="CustRequestParty"> + <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> + <order-by field-name="partyId"/> + </entity-and> + </actions> + <auto-fields-entity entity-name="CustRequestParty" default-field-type="display"/> + <field name="custRequestId"><hidden/></field> + <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field> + <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field> + <field name="fromDate"><display type="date"/></field> + <field name="thruDate"><display type="date"/></field> + </form> + <form name="ViewRequestWorkEfforts" type="list" list-name="requestWorkEfforts" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -401,7 +431,7 @@ <submit button-type="button"/> </field> </form> - + <form name="ListRequestRoles" type="list" use-row-submit="true" title="" list-name="custRequestParties" target="updateCustRequestParty" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="RequestRoles"> <auto-fields-entity entity-name="CustRequestParty" default-field-type="display"/> @@ -428,7 +458,7 @@ </hyperlink> </field> </form> - + <form name="EditRequestRole" type="single" target="createCustRequestParty" title="" header-row-style="header-row" default-table-style="basic-table"> <field name="custRequestId"><hidden/></field> Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Wed Apr 8 07:58:00 2009 @@ -93,19 +93,22 @@ </screenlet> </container> <container style="righthalf"> + <screenlet title="${uiLabelMap.OrderCustRequestStatusList}" navigation-form-name="ViewRequest"> + <include-form name="ViewRequestStatus" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> + </screenlet> <platform-specific> <html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html> </platform-specific> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/requestRoles.ftl"/></html> - </platform-specific> - <screenlet title="${uiLabelMap.PartyListCommunicationEvents}" navigation-form-name="ViewRequestCommunicationEvents"> + <screenlet title="${uiLabelMap.OrderRequestRoles}"> + <include-form name="ViewRequestRoles" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PartyListCommunicationEvents}" navigation-form-name="ViewRequest"> <include-form name="ViewRequestCommunicationEvents" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </screenlet> - <screenlet title="${uiLabelMap.WorkEffortWorkEfforts}" navigation-form-name="ViewRequestWorkEfforts"> + <screenlet title="${uiLabelMap.WorkEffortWorkEfforts}" navigation-form-name="ViewRequest"> <include-form name="ViewRequestWorkEfforts" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </screenlet> - <screenlet title="${uiLabelMap.CommonContent}"> + <screenlet title="${uiLabelMap.CommonContent}" navigation-form-name="ViewRequest"> <include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </screenlet> </container> @@ -655,6 +658,33 @@ </widgets> </section> </screen> - + <screen name="CreateCustRequestNotification"> + <section> + <actions> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <entity-one entity-name="PartyNameView" value-field="person"> + <field-map field-name="partyId" from-field="custRequest.fromPartyId"/> + </entity-one> + <set field="title" value="${uiLabelMap.OrderCustRequestNotificationMailCreation} #${custRequestId}"/> + </actions> + <widgets> + <platform-specific><html><html-template location="component://order/webapp/ordermgr/request/CreateCustRequestNotification.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> + <screen name="CompletedCustRequestNotification"> + <section> + <actions> + <entity-one entity-name="CustRequest" value-field="custRequest"/> + <entity-one entity-name="PartyNameView" value-field="person"> + <field-map field-name="partyId" from-field="custRequest.fromPartyId"/> + </entity-one> + <set field="title" value="${uiLabelMap.OrderCustRequestNotificationMailCompleted} #${custRequestId}"/> + </actions> + <widgets> + <platform-specific><html><html-template location="component://order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> </screens> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Wed Apr 8 07:58:00 2009 @@ -1316,4 +1316,137 @@ </call-service> <check-errors/> </simple-method> + + <simple-method method-name="getHours" + short-description="get the planned and estimated hours for a task and add to the highInfo map"> + + <!-- input is 'lowInfo' map output is 'highInfo map --> + <!-- hoursPartyId: if provided only the hours of that party --> + <!-- add the planned hours together --> + <get-related value-field="lowInfo" relation-name="WorkEffortSkillStandard" list="estimates"/> + <if-not-empty field="estimates"> + <iterate entry="estimate" list="estimates"> + <if-not-empty field="estimate.estimatedDuration"> + <if-not-empty field="highInfo.plannedHours"> + <calculate field="highInfo.plannedHours" type="Double"> + <calcop operator="add" field="estimate.estimatedDuration"> + <calcop operator="get" field="highInfo.plannedHours"/> + </calcop> + </calculate> + <else> + <set field="highInfo.plannedHours" from-field="estimate.estimatedDuration" type="Double"/> + </else> + </if-not-empty> + </if-not-empty> + </iterate> + </if-not-empty> + <!-- get the actual billed / non billed hours --> + <get-related value-field="lowInfo" relation-name="TimeEntry" list="actuals"/> + <if-not-empty field="actuals"> + <iterate entry="actual" list="actuals"> + <if-not-empty field="actual.hours"> + <get-related-one value-field="actual" relation-name="Timesheet" to-value-field="timesheet"/> + + <!-- check if only a part of the registered hours need to be taken into account --> + <set field="originalActualHours" from-field="actual.hours" type="Double"/> + <entity-condition entity-name="PartyRate" list="partyRates"> + <condition-list combine="and"> + <condition-expr field-name="partyId" from-field="timesheet.partyId"/> + <condition-expr field-name="rateTypeId" from-field="actual.rateTypeId"/> + <condition-expr field-name="fromDate" operator="less-equals" from-field="actual.fromDate"/> + <condition-list combine="or"> + <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/> + <condition-expr field-name="thruDate" operator="greater-equals" from-field="actual.fromDate"/> + </condition-list> + </condition-list> + </entity-condition> + <if-not-empty field="partyRates"> + <first-from-list entry="partyRate" list="partyRates"/> + <if-not-empty field="partyRate.percentageUsed"> + <calculate field="actual.hours" type="Double"> + <calcop operator="multiply" field="actual.hours"> + <calcop operator="get" field="partyRate.percentageUsed"/> + </calcop> + </calculate> + <calculate field="actual.hours" type="Double"> + <calcop operator="divide" field="actual.hours"> + <number value="100"/> + </calcop> + </calculate> + </if-not-empty> + </if-not-empty> + <if> + <condition> + <or> + <if-empty field="parameters.hoursPartyId"/> + <and> + <not><if-empty field="parameters.hoursPartyId"/></not> + <if-compare-field field="timesheet.partyId" to-field="parameters.hoursPartyId" operator="equals"/> + </and> + </or> + </condition> + <then> + <if-not-empty field="highInfo.originalActualHours"> + <calculate field="highInfo.originalActualHours" type="Double"> + <calcop operator="get" field="highInfo.originalActualHours"> + <calcop operator="add" field="originalActualHours"/> + </calcop> + </calculate> + <else> + <set field="highInfo.originalActualHours" from-field="originalActualHours" type="Double"/> + </else> + </if-not-empty> + <if-not-empty field="highInfo.actualHours"> + <calculate field="highInfo.actualHours" type="Double"> + <calcop operator="get" field="highInfo.actualHours"> + <calcop operator="add" field="actual.hours"/> + </calcop> + </calculate> + <else> + <set field="highInfo.actualHours" from-field="actual.hours" type="Double"/> + </else> + </if-not-empty> + <if-empty field="actual.invoiceId"> + <if-not-empty field="highInfo.actualNonBilledHours"> + <calculate field="highInfo.actualNonBilledHours" type="Double"> + <calcop operator="get" field="highInfo.actualNonBilledHours"> + <calcop operator="add" field="actual.hours"/> + </calcop> + </calculate> + <else> + <set field="highInfo.actualNonBilledHours" from-field="actual.hours" type="Double"/> + </else> + </if-not-empty> + </if-empty> + </then> + </if> + <!-- keep also a general total for the actual hours of all participants --> + <if-not-empty field="highInfo.actualTotalHours"> + <calculate field="highInfo.actualTotalHours" type="Double"> + <calcop operator="add" field="actual.hours"> + <calcop operator="get" field="highInfo.actualTotalHours"/> + </calcop> + </calculate> + <else> + <set field="highInfo.actualTotalHours" from-field="actual.hours" type="Double"/> + </else> + </if-not-empty> + <!-- keep also a general total for the actual hours of all participants however not yet billed --> + <if-empty field="actual.invoiceId"> + <if-not-empty field="highInfo.actualNonBilledTotalHours"> + <calculate field="highInfo.actualNonBilledTotalHours" type="Double"> + <calcop operator="add" field="actual.hours"> + <calcop operator="get" field="highInfo.actualNonBilledTotalHours"/> + </calcop> + </calculate> + <else> + <set field="highInfo.actualNonBilledTotalHours" from-field="actual.hours" type="Double"/> + </else> + </if-not-empty> + </if-empty> + </if-not-empty> + </iterate> + </if-not-empty> + </simple-method> + </simple-methods> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml Wed Apr 8 07:58:00 2009 @@ -21,21 +21,35 @@ <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="sendMailFromTemplateSetting" short-description="Send Mail from Email Template Setting"> - <entity-one entity-name="EmailTemplateSetting" value-field="emailTemplateSetting"/> - <set field="emailParams.bodyScreenUri" from-field="emailTemplateSetting.bodyScreenLocation"/> - <set field="emailParams.xslfoAttachScreenLocation" from-field="emailTemplateSetting.xslfoAttachScreenLocation"/> - <set field="emailParams.sendFrom" from-field="emailTemplateSetting.fromAddress"/> - <set field="emailParams.sendCc" from-field="emailTemplateSetting.ccAddress"/> - <set field="emailParams.sendBcc" from-field="emailTemplateSetting.bccAddress"/> - <set field="emailParams.subject" from-field="emailTemplateSetting.subject"/> - <set field="emailParams.contentType" from-field="emailTemplateSetting.contentType" default-value="text/html"/> - - <!-- copy the incoming parameter fields AFTER setting the ones from EmailTemplateSetting so they can override things like subject, sendFrom, etc --> - <set-service-fields service-name="sendMailFromScreen" map="parameters" to-map="emailParams"/> + <if-not-empty field="parameters.partyId"> + <if-empty field="parameters.sendTo"> + <set-service-fields service-name="getPartyEmail" map="parameters" to-map="getEmail"/> + <call-service service-name="getPartyEmail" in-map-name="getEmail"> + <result-to-field result-name="emailAddress" field="parameters.sendTo"/> + </call-service> + </if-empty> + </if-not-empty> - <call-service service-name="sendMailFromScreen" in-map-name="emailParams"> - <result-to-result result-name="body"/> - </call-service> + <entity-one entity-name="EmailTemplateSetting" value-field="emailTemplateSetting"/> + <if-not-empty field="emailTemplateSetting"> + <set field="emailParams.bodyScreenUri" from-field="emailTemplateSetting.bodyScreenLocation"/> + <set field="emailParams.xslfoAttachScreenLocation" from-field="emailTemplateSetting.xslfoAttachScreenLocation"/> + <set field="emailParams.sendFrom" from-field="emailTemplateSetting.fromAddress"/> + <set field="emailParams.sendCc" from-field="emailTemplateSetting.ccAddress"/> + <set field="emailParams.sendBcc" from-field="emailTemplateSetting.bccAddress"/> + <set field="emailParams.subject" from-field="emailTemplateSetting.subject"/> + <set field="emailParams.contentType" from-field="emailTemplateSetting.contentType" default-value="text/html"/> + + <!-- copy the incoming parameter fields AFTER setting the ones from EmailTemplateSetting so they can override things like subject, sendFrom, etc --> + <set-service-fields service-name="sendMailFromScreen" map="parameters" to-map="emailParams"/> + + <call-service service-name="sendMailFromScreen" in-map-name="emailParams"> + <result-to-result result-name="body"/> + </call-service> + <else> + <log level="error" message="sendMailFromTemplateSetting service could not find the emailTemplateSettingId: ${parameters.emailTemplateSettingId}"></log> + </else> + </if-not-empty> </simple-method> </simple-methods> Modified: ofbiz/trunk/framework/common/servicedef/services_email.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services_email.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/framework/common/servicedef/services_email.xml (original) +++ ofbiz/trunk/framework/common/servicedef/services_email.xml Wed Apr 8 07:58:00 2009 @@ -30,7 +30,7 @@ <attribute name="sendTo" type="String" mode="IN" optional="true"/> <attribute name="sendCc" type="String" mode="IN" optional="true"/> <attribute name="sendBcc" type="String" mode="IN" optional="true"/> - <attribute name="sendFrom" type="String" mode="IN" optional="false"/> + <attribute name="sendFrom" type="String" mode="IN" optional="true"/> <attribute name="authUser" type="String" mode="IN" optional="true"/> <attribute name="authPass" type="String" mode="IN" optional="true"/> <attribute name="sendVia" type="String" mode="IN" optional="true"/> @@ -89,7 +89,7 @@ <attribute name="attachmentName" type="String" mode="IN" optional="true"/> <attribute name="bodyParameters" type="Map" mode="IN" optional="true"/> <attribute name="webSiteId" type="String" mode="IN" optional="true"/> - <attribute name="body" type="String" mode="OUT" optional="false"/> + <attribute name="body" type="String" mode="OUT" optional="true"/> </service> <service name="prepareNotificationInterface" engine="interface" Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Wed Apr 8 07:58:00 2009 @@ -59,14 +59,6 @@ <value xml:lang="it">Mie richieste cliente completate</value> <value xml:lang="th">à¸à¸²à¸à¸à¸µà¹à¹à¸à¹à¹à¸à¹à¸«à¹à¸¥à¸¹à¸à¸à¹à¸²à¹à¸£à¸µà¸¢à¸¢à¸£à¹à¸à¸¢à¹à¸¥à¹à¸§</value> </property> - <property key="MyPortalCustRequestNotificationMailCompleted"> - <value xml:lang="en">Customer Request Completed Notification Mai</value> - <value xml:lang="it">Notifica mail per richiesta cliente completata</value> - </property> - <property key="MyPortalCustRequestNotificationMailCreation"> - <value xml:lang="en">Customer Request Creation Notification Mail</value> - <value xml:lang="it">Notifica mail per richiesta cliente creata</value> - </property> <property key="MyPortalCustRequests"> <value xml:lang="en">My customer requests</value> <value xml:lang="fr">Mes demandes utilisateur</value> Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml Wed Apr 8 07:58:00 2009 @@ -59,16 +59,6 @@ <UserLoginSecurityGroup groupId="MYPORTAL_EMPLOYEE" userLoginId="admin" fromDate="2000-01-01 00:00:00.0"/> <UserLoginSecurityGroup groupId="MYPORTAL_EMPLOYEE" userLoginId="demoadmin" fromDate="2000-01-01 00:00:00.0"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_CONFIRM" bodyScreenLocation="component://myportal/widget/MyPortalScreens.xml#CompletedCustRequestNotification" subject="OFBiz - Your Request Is Complete[${custRequestId}]" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_CREATED" bodyScreenLocation="component://myportal/widget/MyPortalScreens.xml#CreateCustRequestNotification" subject="OFBiz - Your Request Is Created[${custRequestId}]" fromAddress="[hidden email]"/> - - <ProductStore productStoreId="MYPORTAL" storeName="Myportal" manualAuthIsCapture="N" prorateShipping="Y" prorateTaxes="Y" viewCartOnAdd="N" autoSaveCart="N" autoApproveReviews="N" isDemoStore="Y" isImmediatelyFulfilled="N" oneInventoryFacility="Y" checkInventory="Y" reserveInventory="Y" - requireInventory="N" balanceResOnOrderCreation="N" defaultCurrencyUomId="USD" allowPassword="Y" explodeOrderItems="N" checkGcBalance="N" retryFailedAuths="Y" headerApprovedStatus="ORDER_APPROVED" itemApprovedStatus="ITEM_APPROVED" digitalItemApprovedStatus="ITEM_APPROVED" - headerDeclinedStatus="ORDER_REJECTED" itemDeclinedStatus="ITEM_REJECTED" headerCancelStatus="ORDER_CANCELLED" itemCancelStatus="ITEM_CANCELLED" usePrimaryEmailUsername="N" requireCustomerRole="N" autoInvoiceDigitalItems="Y" reqShipAddrForDigItems="Y" showCheckoutGiftOptions="Y" - selectPaymentTypePerItem="N" showPricesWithVatTax="N" showTaxIsExempt="Y" enableAutoSuggestionList="N" enableDigProdUpload="N" prodSearchExcludeVariants="Y" autoOrderCcTryExp="Y" autoOrderCcTryOtherCards="Y" autoOrderCcTryLaterNsf="Y" autoApproveInvoice="Y" autoApproveOrder="Y" - shipIfCaptureFails="Y" addToCartRemoveIncompat="Y" addToCartReplaceUpsell="Y" splitPayPrefPerShpGrp="Y"/> + <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://myportal/widget/MyPortalScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="[hidden email]" fromAddress="[hidden email]"/> - <ProductStoreEmailSetting productStoreId="MYPORTAL" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://myportal/widget/MyPortalScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="[hidden email]" fromAddress="[hidden email]"/> - - <WebSite webSiteId="MYPORTAL" siteName="Myportal website" productStoreId="MYPORTAL" allowProductStoreChange="Y"/> </entity-engine-xml> Modified: ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/ofbiz-component.xml Wed Apr 8 07:58:00 2009 @@ -30,7 +30,6 @@ <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> - <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> <webapp name="myportal" title="MyPortal" Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml Wed Apr 8 07:58:00 2009 @@ -21,108 +21,6 @@ <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> - <simple-method method-name="sendEmailToCustomer" short-description="Send Mail When Customer Request is created or commpleted."> - <entity-one entity-name="CustRequest" value-field="custReq"/> - <if> - <condition> - <if-compare field="custReq.statusId" value="CRQ_COMPLETED" operator="equals"></if-compare> - </condition> - <then> - <if-not-empty field="custReq.fromPartyId"> - <entity-and entity-name="PartyAndUserLogin" list="partyUserLogin"> - <field-map field-name="partyId" from-field="custReq.fromPartyId"/> - </entity-and> - <first-from-list entry="partyUserLogin" list="partyUserLogin"/> - <entity-one entity-name="UserPreference" value-field="userPref"> - <field-map field-name="userLoginId" value="${partyUserLogin.userLoginId}"/> - <field-map field-name="userPrefTypeId" value="sendCustRequestEmail"/> - </entity-one> - <if-empty field="userPref.userPrefValue"> - <!-- set send customer requst email field to default--> - <set field="setUserPref.userPrefMap.sendCustRequestEmail" value="Y"/> - <entity-one entity-name="UserLogin" value-field="userLogin"> - <field-map field-name="userLoginId" value="system"/> - </entity-one> - <set field="setUserPref.userLoginId" from-field="userLogin.userLoginId"/> - <set field="setUserPref.userLogin" from-field="userLogin"/> - <set field="setUserPref.userPrefGroupTypeId" value="MyPortal"/> - <call-service service-name="setUserPreferenceGroup" in-map-name="setUserPref" include-user-login="false"/> - </if-empty> - <!-- if customer want to send email notification when customer request completed then send email--> - <if> - <condition> - <or> - <if-compare field="userPref.userPrefValue" value="Y" operator="equals"/> - <if-empty field="userPref.userPrefValue"></if-empty> - </or> - </condition> - <then> - <entity-and entity-name="ProductStoreEmailSetting" list="storeEmail"> - <field-map field-name="emailType" value="PRDS_CUST_CONFIRM"/> - </entity-and> - <first-from-list entry="storeEmail" list="storeEmail"/> - <set field="statusCustReq" value="COMPLETED"/> - </then> - </if> - </if-not-empty> - </then> - <else-if> - <condition> - <if-compare field="custReq.statusId" value="CRQ_ACCEPTED" operator="equals"></if-compare> - </condition> - <then> - <entity-and entity-name="ProductStoreEmailSetting" list="storeEmail"> - <field-map field-name="emailType" value="PRDS_CUST_CREATED"/> - </entity-and> - <first-from-list entry="storeEmail" list="storeEmail"/> - <set field="statusCustReq" value="ACCEPTED"/> - </then> - </else-if> - </if> - <!-- Send Email to Customer when Customer Request is Completed or Created--> - <if> - <condition> - <or> - <if-compare field="statusCustReq" value="COMPLETED" operator="equals"/> - <if-compare field="statusCustReq" value="ACCEPTED" operator="equals"/> - </or> - </condition> - <then> - <if-not-empty field="storeEmail.bodyScreenLocation"> - <entity-one entity-name="Person" value-field="person"> - <field-map field-name="partyId" from-field="custReq.fromPartyId"/> - </entity-one> - <set field="getPartyEmail.partyId" from-field="custReq.fromPartyId"/> - <call-service service-name="getPartyEmail" in-map-name="getPartyEmail"> - <result-to-field result-name="emailAddress" field="emailParams.sendTo"/> - </call-service> - <entity-and list="webSites" entity-name="WebSite"> - <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/> - </entity-and> - <first-from-list entry="webSite" list="webSites"/> - <entity-one entity-name="UserLogin" value-field="userLoginSystem"> - <field-map field-name="userLoginId" value="system"/> - </entity-one> - <if-not-empty field="emailParams.sendTo"> - <set field="bodyParameters.person" from-field="person"/> - <set field="bodyParameters.custRequest" from-field="custReq"/> - <set field="bodyParameters.partyId" from-field="custReq.fromPartyId"/> - <set field="emailParams.bodyParameters" from-field="bodyParameters"/> - <set field="emailParams.subject" from-field="storeEmail.subject"/> - <set field="emailParams.sendFrom" from-field="storeEmail.fromAddress"/> - <set field="emailParams.sendCc" from-field="storeEmail.ccAddress"/> - <set field="emailParams.sendBcc" from-field="storeEmail.bccAddress"/> - <set field="emailParams.contentType" value="text/html"/> - <set field="emailParams.bodyScreenUri" from-field="storeEmail.bodyScreenLocation"/> - <set field="emailParams.webSiteId" from-field="webSite.webSiteId"/> - <set field="emailParams.userLogin" from-field="userLoginSystem"/> - <call-service service-name="sendMailFromScreen" in-map-name="emailParams" include-user-login="false"/> - </if-not-empty> - </if-not-empty> - </then> - </if> - </simple-method> - <simple-method method-name="portalPermissionIsEmployee" short-description="check permission for Employee"> <set field="hasPermission" value="true" type="Boolean"/> <set field="hasNoPermission" value="false" type="Boolean"/> Modified: ofbiz/trunk/specialpurpose/myportal/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/servicedef/services.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/servicedef/services.xml Wed Apr 8 07:58:00 2009 @@ -22,14 +22,6 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd"> <description>Project Manager service definitions.</description> - <service name="sendEmailToCustomer" engine="simple" auth="true" default-entity-name="CustRequest" - location="component://myportal/script/org/ofbiz/myportal/MyPortalServices.xml" invoke="sendEmailToCustomer"> - <description>Send email to customer when customer request is Completed or Created. </description> - <attribute name="custRequestId" type="String" mode="IN"/> - <auto-attributes mode="IN" include="pk" optional="false"/> - <auto-attributes include="nonpk" mode="OUT" optional="true"/> - </service> - <!-- check access in permission service --> <service name="portalPermissionIsEmployee" engine="simple" location="component://myportal/script/org/ofbiz/myportal/MyPortalServices.xml" invoke="portalPermissionIsEmployee"> Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Wed Apr 8 07:58:00 2009 @@ -216,69 +216,4 @@ </section> </screen> - <screen name="MyCompanyComms"> - <section> - <widgets> - <decorator-screen name="main-decorator" - location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-screen name="MyCompanyComms" - location="component://myportal/widget/MyPortalScreens.xml"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - <screen name="MyTimesheet"> - <section> - <widgets> - <decorator-screen name="main-decorator" - location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-screen name="MyTimesheet" location="component://myportal/widget/MyPortalScreens.xml"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - <screen name="MyCommunications"> - <section> - <widgets> - <decorator-screen name="main-decorator" - location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-screen name="MyCommunications" - location="component://myportal/widget/MyPortalScreens.xml"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="MyTasks"> - <section> - <widgets> - <decorator-screen name="main-decorator" - location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-screen name="MyTasks" location="component://myportal/widget/MyPortalScreens.xml"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="OtherCommunications"> - <section> - <widgets> - <decorator-screen name="main-decorator" - location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-screen name="OtherCommunications" - location="component://myportal/widget/MyPortalScreens.xml"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Wed Apr 8 07:58:00 2009 @@ -20,26 +20,6 @@ <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="CreateCustRequestNotification"> - <section> - <actions> - <set field="title" value="${uiLabelMap.MyPortalCustRequestNotificationMailCreation} #${custRequestId}"/> - </actions> - <widgets> - <platform-specific><html><html-template location="component://myportal/templates/email/CreateCustRequestNotification.ftl"/></html></platform-specific> - </widgets> - </section> - </screen> - <screen name="CompletedCustRequestNotification"> - <section> - <actions> - <set field="title" value="${uiLabelMap.MyPortalCustRequestNotificationMailCompleted} #${custRequestId}"/> - </actions> - <widgets> - <platform-specific><html><html-template location="component://myportal/templates/email/CompletedCustRequestNotification.ftl"/></html></platform-specific> - </widgets> - </section> - </screen> <screen name="CreateUserNotification"> <section> <actions> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Wed Apr 8 07:58:00 2009 @@ -621,7 +621,7 @@ </if-compare> </if-compare> <call-simple-method method-name="combineInfo"/> - <call-simple-method method-name="getHours"/> + <call-simple-method method-name="getHours" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/> </iterate> </if-not-empty> </iterate> @@ -697,7 +697,7 @@ </if-compare> </if-compare> <call-simple-method method-name="combineInfo"/> - <call-simple-method method-name="getHours"/> + <call-simple-method method-name="getHours" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/> </iterate> </if-not-empty> @@ -756,7 +756,7 @@ <clear-field field="highInfo.sequenceId"/> <set field="highInfo.currentStatusId" from-field="lowInfo.currentStatusId"/> <call-simple-method method-name="createDates"/> - <call-simple-method method-name="getHours"/> + <call-simple-method method-name="getHours" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/> <set field="highInfo.workEffortId" from-field="lowInfo.workEffortId"/> <set field="highInfo.workEffortName" from-field="lowInfo.workEffortName"/> <field-to-list field="highInfo" list="taskList"/> @@ -778,7 +778,7 @@ <set field="highInfo.scopeEnumId" from-field="lowInfo.scopeEnumId"/> <set field="highInfo.workEffortParentId" from-field="lowInfo.workEffortParentId"/> <call-simple-method method-name="combineInfo"/> - <call-simple-method method-name="getHours"/> + <call-simple-method method-name="getHours" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/> <set field="highInfo.currentStatusId" from-field="lowInfo.currentStatusId"/> <field-to-result field="highInfo" result-name="taskInfo"/> </simple-method> @@ -825,7 +825,7 @@ <!-- get the planned/actual hours --> <set field="lowInfo" from-field="task"/> <set field="parameters.hoursPartyId" from-field="task.partyId"/> - <call-simple-method method-name="getHours"/> + <call-simple-method method-name="getHours" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/> <set field="projectParty.plannedHours" from-field="highInfo.plannedHours" type="Double"/> <set field="projectParty.actualHours" from-field="highInfo.actualHours" type="Double"/> @@ -885,7 +885,7 @@ <set field="lowInfo" from-field="task"/> <set field="parameters.hoursPartyId" from-field="task.partyId"/> <get-related-one value-field="task" relation-name="WorkEffort" to-value-field="lowInfo"/> - <call-simple-method method-name="getHours"/> + <call-simple-method method-name="getHours" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/> <set field="taskParty.plannedHours" from-field="highInfo.plannedHours" type="Double"/> <set field="taskParty.actualHours" from-field="highInfo.actualHours" type="Double"/> <set field="taskParty.originalActualHours" from-field="highInfo.originalActualHours" type="Double"/> @@ -1001,138 +1001,6 @@ </simple-method> - <simple-method method-name="getHours" - short-description="get the planned and estimated hours for a task and add to the highInfo map"> - - <!-- input is 'lowInfo' map output is 'highInfo map --> - <!-- hoursPartyId: if provided only the hours of that party --> - <!-- add the planned hours together --> - <get-related value-field="lowInfo" relation-name="WorkEffortSkillStandard" list="estimates"/> - <if-not-empty field="estimates"> - <iterate entry="estimate" list="estimates"> - <if-not-empty field="estimate.estimatedDuration"> - <if-not-empty field="highInfo.plannedHours"> - <calculate field="highInfo.plannedHours" type="Double"> - <calcop operator="add" field="estimate.estimatedDuration"> - <calcop operator="get" field="highInfo.plannedHours"/> - </calcop> - </calculate> - <else> - <set field="highInfo.plannedHours" from-field="estimate.estimatedDuration" type="Double"/> - </else> - </if-not-empty> - </if-not-empty> - </iterate> - </if-not-empty> - <!-- get the actual billed / non billed hours --> - <get-related value-field="lowInfo" relation-name="TimeEntry" list="actuals"/> - <if-not-empty field="actuals"> - <iterate entry="actual" list="actuals"> - <if-not-empty field="actual.hours"> - <get-related-one value-field="actual" relation-name="Timesheet" to-value-field="timesheet"/> - - <!-- check if only a part of the registered hours need to be taken into account --> - <set field="originalActualHours" from-field="actual.hours" type="Double"/> - <entity-condition entity-name="PartyRate" list="partyRates"> - <condition-list combine="and"> - <condition-expr field-name="partyId" from-field="timesheet.partyId"/> - <condition-expr field-name="rateTypeId" from-field="actual.rateTypeId"/> - <condition-expr field-name="fromDate" operator="less-equals" from-field="actual.fromDate"/> - <condition-list combine="or"> - <condition-expr field-name="thruDate" operator="equals" from-field="nullField"/> - <condition-expr field-name="thruDate" operator="greater-equals" from-field="actual.fromDate"/> - </condition-list> - </condition-list> - </entity-condition> - <if-not-empty field="partyRates"> - <first-from-list entry="partyRate" list="partyRates"/> - <if-not-empty field="partyRate.percentageUsed"> - <calculate field="actual.hours" type="Double"> - <calcop operator="multiply" field="actual.hours"> - <calcop operator="get" field="partyRate.percentageUsed"/> - </calcop> - </calculate> - <calculate field="actual.hours" type="Double"> - <calcop operator="divide" field="actual.hours"> - <number value="100"/> - </calcop> - </calculate> - </if-not-empty> - </if-not-empty> - <if> - <condition> - <or> - <if-empty field="parameters.hoursPartyId"/> - <and> - <not><if-empty field="parameters.hoursPartyId"/></not> - <if-compare-field field="timesheet.partyId" to-field="parameters.hoursPartyId" operator="equals"/> - </and> - </or> - </condition> - <then> - <if-not-empty field="highInfo.originalActualHours"> - <calculate field="highInfo.originalActualHours" type="Double"> - <calcop operator="get" field="highInfo.originalActualHours"> - <calcop operator="add" field="originalActualHours"/> - </calcop> - </calculate> - <else> - <set field="highInfo.originalActualHours" from-field="originalActualHours" type="Double"/> - </else> - </if-not-empty> - <if-not-empty field="highInfo.actualHours"> - <calculate field="highInfo.actualHours" type="Double"> - <calcop operator="get" field="highInfo.actualHours"> - <calcop operator="add" field="actual.hours"/> - </calcop> - </calculate> - <else> - <set field="highInfo.actualHours" from-field="actual.hours" type="Double"/> - </else> - </if-not-empty> - <if-empty field="actual.invoiceId"> - <if-not-empty field="highInfo.actualNonBilledHours"> - <calculate field="highInfo.actualNonBilledHours" type="Double"> - <calcop operator="get" field="highInfo.actualNonBilledHours"> - <calcop operator="add" field="actual.hours"/> - </calcop> - </calculate> - <else> - <set field="highInfo.actualNonBilledHours" from-field="actual.hours" type="Double"/> - </else> - </if-not-empty> - </if-empty> - </then> - </if> - <!-- keep also a general total for the actual hours of all participants --> - <if-not-empty field="highInfo.actualTotalHours"> - <calculate field="highInfo.actualTotalHours" type="Double"> - <calcop operator="add" field="actual.hours"> - <calcop operator="get" field="highInfo.actualTotalHours"/> - </calcop> - </calculate> - <else> - <set field="highInfo.actualTotalHours" from-field="actual.hours" type="Double"/> - </else> - </if-not-empty> - <!-- keep also a general total for the actual hours of all participants however not yet billed --> - <if-empty field="actual.invoiceId"> - <if-not-empty field="highInfo.actualNonBilledTotalHours"> - <calculate field="highInfo.actualNonBilledTotalHours" type="Double"> - <calcop operator="add" field="actual.hours"> - <calcop operator="get" field="highInfo.actualNonBilledTotalHours"/> - </calcop> - </calculate> - <else> - <set field="highInfo.actualNonBilledTotalHours" from-field="actual.hours" type="Double"/> - </else> - </if-not-empty> - </if-empty> - </if-not-empty> - </iterate> - </if-not-empty> - </simple-method> - <simple-method method-name="createDates" short-description="merge the estimated and actual dates"> <!-- input/output is 'highInfo map --> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Wed Apr 8 07:58:00 2009 @@ -20,9 +20,9 @@ <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="CreateCustRequestAndAssignTaskToPerson" short-description=""> - <set-service-fields service-name="createCustRequest" map="parameters" to-map="createCust"/> - <set field="createCust.statusId" value="CRQ_ACCEPTED"/><!-- entered by employee, should only enter accepted customer requests --> - <call-service service-name="createCustRequest" in-map-name="createCust"> + <set field="parameters.statusId" value="CRQ_ACCEPTED"/><!-- entered by employee, should only enter accepted customer requests --> + <set-service-fields service-name="createCustRequest" map="parameters" to-map="eventCreateCust"/> + <call-service service-name="createCustRequest" in-map-name="eventCreateCust"> <result-to-field result-name="custRequestId" field="custRequestId"/> </call-service> <if-not-empty field="parameters.workEffortParentId"> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Wed Apr 8 07:58:00 2009 @@ -505,13 +505,13 @@ <request-map uri="createrequest"> <security https="true" auth="true"/> <event type="simple" invoke="CreateCustRequestAndAssignTaskToPerson" path="org/ofbiz/project/ProjectSimpleEvents.xml"/> - <response name="success" type="view-home" value="requestlist"/> + <response name="success" type="view-home" value="RequestList"/> <response name="error" type="view" value="EditRequest"/> </request-map> <request-map uri="updaterequest"> <security https="true" auth="true"/> <event type="service" invoke="updateCustRequest"/> - <response name="success" type="request-redirect-noparam" value="requestlist"/> + <response name="success" type="view-home" value="RequestList"/> <response name="error" type="view" value="EditRequest"/> </request-map> <request-map uri="listResourcesTask"> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Wed Apr 8 07:58:00 2009 @@ -372,7 +372,9 @@ <section> <widgets> <decorator-screen name="CommonRequestDecorator" location="component://order/widget/ordermgr/CommonScreens.xml"> - <decorator-section name="body"/> + <decorator-section name="body"> + <decorator-section-include name="body"/> + </decorator-section> </decorator-screen> </widgets> </section> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=763135&r1=763134&r2=763135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Wed Apr 8 07:58:00 2009 @@ -121,9 +121,9 @@ <platform-specific> <html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html> </platform-specific> - <platform-specific> - <html><html-template location="component://order/webapp/ordermgr/request/requestRoles.ftl"/></html> - </platform-specific> + <screenlet title="${uiLabelMap.OrderRequestRoles}"> + <include-form name="ViewRequestRoles" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> + </screenlet> <screenlet title="${uiLabelMap.PartyListCommunicationEvents}" navigation-form-name="ViewRequestCommunicationEvents"> <include-form name="ViewRequestCommunicationEvents" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </screenlet> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |