Author: jleroux
Date: Fri Feb 20 10:52:08 2009
New Revision: 746199
URL:
http://svn.apache.org/viewvc?rev=746199&view=revLog:
A patch from Karim Rahimpur "Error in request overview screen when no party is given"
https://issues.apache.org/jira/browse/OFBIZ-2119 OFBIZ-2119
Modified:
ofbiz/trunk/applications/order/servicedef/secas.xml
ofbiz/trunk/applications/order/servicedef/services_request.xml
ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
Modified: ofbiz/trunk/applications/order/servicedef/secas.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/secas.xml?rev=746199&r1=746198&r2=746199&view=diff==============================================================================
--- ofbiz/trunk/applications/order/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/secas.xml Fri Feb 20 10:52:08 2009
@@ -255,7 +255,7 @@
<action service="updateCommunicationEvent" mode="sync"/>
</eca>
- <eca service="createCustRequest" event="commit">
+ <eca service="updateCustRequest" event="commit">
<condition field-name="communicationEventId" operator="is-not-empty"/>
<condition field-name="custRequestId" operator="is-not-empty"/>
<action service="updateCommunicationEvent" mode="sync"/>
Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=746199&r1=746198&r2=746199&view=diff==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_request.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_request.xml Fri Feb 20 10:52:08 2009
@@ -39,6 +39,7 @@
<description>Create a custRequest record and optionally create a custRequest item.</description>
<permission-service service-name="custRequestPermissionCheck" main-action="CREATE"/>
<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>
@@ -46,6 +47,7 @@
location="org/ofbiz/order/request/CustRequestServices.xml" invoke="updateCustRequest" auth="true">
<description>Update a custRequest record</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
+ <attribute name="fromPartyId" type="String" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<attribute name="oldStatusId" type="String" mode="OUT"/>
</service>
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=746199&r1=746198&r2=746199&view=diff==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Fri Feb 20 10:52:08 2009
@@ -448,9 +448,10 @@
<!-- request form -->
<form name="requestInfo" type="single" title="request information" default-map-name="custRequest"
header-row-style="header-row" default-table-style="basic-table">
- <actions>
+ <actions>
+ <set field="lookupPartyId" from-field="custRequest.fromPartyId" default-value="_NA_"/>
<service service-name="getPartyNameForDate" result-map="partyNameResultTo">
- <field-map field-name="partyId" from-field="custRequest.fromPartyId"/>
+ <field-map field-name="partyId" from-field="lookupPartyId"/>
<field-map field-name="compareDate" from-field="custRequest.custRequestDate"/>
<field-map field-name="lastNameFirst" value="Y"/>
</service>
Locked
