Author: adrianc
Date: Tue Aug 4 15:37:38 2009 New Revision: 800848 URL: http://svn.apache.org/viewvc?rev=800848&view=rev Log: Merged trunk revision 800846. Bug fix in setPaymentStatus service, reported by Anne Jessel - https://issues.apache.org/jira/browse/OFBIZ-2792. Modified: ofbiz/branches/release09.04/ (props changed) ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Propchange: ofbiz/branches/release09.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 4 15:37:38 2009 @@ -1 +1 @@ -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,800461 +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,800461,800846 Modified: ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=800848&r1=800847&r2=800848&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original) +++ ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Aug 4 15:37:38 2009 @@ -171,7 +171,7 @@ </check-permission> <entity-one entity-name="Payment" value-field="payment"/> - <field-to-result field="payment.paymentId" result-name="oldStatusId"/> + <field-to-result field="payment.statusId" result-name="oldStatusId"/> <if-compare-field field="payment.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-field="statusChange" auto-field-map="false"> |
Free forum by Nabble | Edit this page |