Author: ashish
Date: Sat Jan 29 10:24:49 2011
New Revision: 1064994
URL: http://svn.apache.org/viewvc?rev=1064994&view=rev
Log:
Applied fix from trunk for revision: 1064993
===
Bug fix. My recent commit r1064953 was creating problem while running test
case. Thanks Divesh for providing the fix.
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/order/servicedef/services.xml
ofbiz/branches/release10.04/applications/order/servicedef/services_quote.xml
ofbiz/branches/release10.04/applications/order/servicedef/services_return.xml
ofbiz/branches/release10.04/applications/product/servicedef/services_shipment.xml
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 29 10:24:49 2011
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993
Modified: ofbiz/branches/release10.04/applications/order/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/servicedef/services.xml?rev=1064994&r1=1064993&r2=1064994&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/servicedef/services.xml
(original)
+++ ofbiz/branches/release10.04/applications/order/servicedef/services.xml Sat
Jan 29 10:24:49 2011
@@ -44,6 +44,7 @@ under the License.
<attribute name="messageWrapper"
type="org.ofbiz.service.mail.MimeMessageWrapper" mode="OUT" optional="true"/>
<attribute name="orderId" type="String" mode="OUT" optional="true"/>
<attribute name="subject" type="String" mode="OUT" optional="true"/>
+ <attribute name="communicationEventId" type="String" mode="OUT"
optional="true"/>
</service>
<service name="sendOrderConfirmation" engine="java"
require-new-transaction="true" max-retry="3"
location="org.ofbiz.order.order.OrderServices"
invoke="sendOrderConfirmNotification">
Modified:
ofbiz/branches/release10.04/applications/order/servicedef/services_quote.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/servicedef/services_quote.xml?rev=1064994&r1=1064993&r2=1064994&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/order/servicedef/services_quote.xml
(original)
+++
ofbiz/branches/release10.04/applications/order/servicedef/services_quote.xml
Sat Jan 29 10:24:49 2011
@@ -226,6 +226,7 @@ under the License.
<attribute name="body" type="String" mode="OUT" optional="true"/>
<attribute name="subject" type="String" mode="OUT" optional="true"/>
<attribute name="messageWrapper"
type="org.ofbiz.service.mail.MimeMessageWrapper" mode="OUT" optional="true"/>
+ <attribute name="communicationEventId" type="String" mode="OUT"
optional="true"/>
</service>
<service name="storeQuote" engine="java" default-entity-name="Quote"
validate="true" auth="true"
location="org.ofbiz.order.quote.QuoteServices" invoke="storeQuote">
Modified:
ofbiz/branches/release10.04/applications/order/servicedef/services_return.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/servicedef/services_return.xml?rev=1064994&r1=1064993&r2=1064994&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/order/servicedef/services_return.xml
(original)
+++
ofbiz/branches/release10.04/applications/order/servicedef/services_return.xml
Sat Jan 29 10:24:49 2011
@@ -197,16 +197,19 @@ under the License.
location="org.ofbiz.order.order.OrderReturnServices"
invoke="sendReturnAcceptNotification">
<description>Send a notification that a return has been
accepted</description>
<attribute name="returnId" type="String" mode="IN" optional="false"/>
+ <attribute name="communicationEventId" type="String" mode="OUT"
optional="true"/>
</service>
<service name="sendReturnCompleteNotification" engine="java" max-retry="3"
location="org.ofbiz.order.order.OrderReturnServices"
invoke="sendReturnCompleteNotification">
<description>Send a notification that a return has been
completed</description>
<attribute name="returnId" type="String" mode="IN" optional="false"/>
+ <attribute name="communicationEventId" type="String" mode="OUT"
optional="true"/>
</service>
<service name="sendReturnCancelNotification" engine="java" max-retry="3"
location="org.ofbiz.order.order.OrderReturnServices"
invoke="sendReturnCancelNotification">
<description>Send a notification that a return has been
cancelled</description>
<attribute name="returnId" type="String" mode="IN" optional="false"/>
+ <attribute name="communicationEventId" type="String" mode="OUT"
optional="true"/>
</service>
<service name="autoCancelReplacementOrders" engine="java" max-retry="3"
transaction-timeout="36000"
location="org.ofbiz.order.order.OrderReturnServices"
invoke="autoCancelReplacementOrders">
Modified:
ofbiz/branches/release10.04/applications/product/servicedef/services_shipment.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/servicedef/services_shipment.xml?rev=1064994&r1=1064993&r2=1064994&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/servicedef/services_shipment.xml
(original)
+++
ofbiz/branches/release10.04/applications/product/servicedef/services_shipment.xml
Sat Jan 29 10:24:49 2011
@@ -949,6 +949,7 @@ under the License.
<attribute name="subject" type="String" mode="OUT" optional="true"/>
<attribute name="orderId" type="String" mode="OUT" optional="true"/>
<attribute name="messageWrapper"
type="org.ofbiz.service.mail.MimeMessageWrapper" mode="OUT" optional="true"/>
+ <attribute name="communicationEventId" type="String" mode="OUT"
optional="true"/>
</service>
<service name="updateIssuanceShipmentAndPoOnReceiveInventory"
engine="simple"
location="component://product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml"
invoke="updateIssuanceShipmentAndPoOnReceiveInventory">
