Re: svn commit: r943172 - in /ofbiz/branches/release09.04: ./ applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java mergefromtrunk.sh

Thu, 13 May 2010 11:02:22 -0700

I don't know if anything was voted on, but my guess would be that we would just create tags in the release branch. 

-Adrian

On 5/13/2010 10:58 AM, BJ Freeman wrote:

so do we have a new location for the release 9.04, that was voted on?
and if I understand the release branch is the current 9.04 location and
not the 9.04 that is suppose to be frozen.


=========================
BJ Freeman
http://bjfreeman.elance.com
Strategic Power Office with Supplier 
Automation<http://www.businessesnetwork.com/automation/viewforum.php?f=93>
Specialtymarket.com<http://www.specialtymarket.com/>

Systems Integrator-- Glad to Assist

Chat  Y! messenger: bjfr33man
Linkedin
<http://www.linkedin.com/profile?viewProfile=&key=1237480&locale=en_US&trk=tab_pro>


Jacopo Cappellato sent the following on 5/13/2010 7:23 AM:

Just think at the "release9.04 branch" as a "branch" of a tree.
The branch continuously grows and from time to time a leaf is created in its 
tip.
Leafs are "releases" and never change after they are created.

Jacopo

On May 13, 2010, at 3:47 PM, BJ Freeman wrote:


I am confused.
the vote was
This is the vote thread to transform our release candidate 09.04 into an
official release.
at what stage does it become permanent.

=========================
BJ Freeman
http://bjfreeman.elance.com
Strategic Power Office with Supplier 
Automation<http://www.businessesnetwork.com/automation/viewforum.php?f=93>
Specialtymarket.com<http://www.specialtymarket.com/>

Systems Integrator-- Glad to Assist

Chat  Y! messenger: bjfr33man
Linkedin
<http://www.linkedin.com/profile?viewProfile=&key=1237480&locale=en_US&trk=tab_pro>


Jacopo Cappellato sent the following on 5/13/2010 6:38 AM:

Hi BJ,

that commit is on the release branch, not the release 9.04 that has been issued and will 
never be modified. In the future we will issue a release 9.04.1 (as you have mentioned) 
that will include all the bug fixes committed to the release branch "9.04" 
after the release date of release 9.04.

Kind regards,

Jacopo

On May 13, 2010, at 3:11 PM, BJ Freeman wrote:


following Jacopo statement should not there be a 9.04.1 for changes
since it is now a release?


=========================
BJ Freeman
http://bjfreeman.elance.com
Strategic Power Office with Supplier 
Automation<http://www.businessesnetwork.com/automation/viewforum.php?f=93>
Specialtymarket.com<http://www.specialtymarket.com/>

Systems Integrator-- Glad to Assist

Chat  Y! messenger: bjfr33man
Linkedin
<http://www.linkedin.com/profile?viewProfile=&key=1237480&locale=en_US&trk=tab_pro>


doo...@apache.org sent the following on 5/11/2010 9:47 AM:

Author: doogie
Date: Tue May 11 16:47:04 2010
New Revision: 943172

URL: http://svn.apache.org/viewvc?rev=943172&view=rev
Log:
Applied fix from trunk for revision: 943168
Fix parsing of otherValue(it was condValue), in PPIP_ORST_HIST.

Modified:
   ofbiz/branches/release09.04/   (props changed)
   
ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
   ofbiz/branches/release09.04/mergefromtrunk.sh

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 16:47:04 2010
@@ -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,770308,770997,771073,771477,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,778273,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,799185,800461,800846,801023,802346,804364,805307,806127,806377,806914,808786-808787,808792,809141,810370,810438,81

0

46

5,

810

807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,92803

7

,9

2

816

6,928171,928180,928470,928477,929582,933157,935494,936817,941431,941440
+/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,770308,770997,771073,771477,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,778273,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,799185,800461,800846,801023,802346,804364,805307,806127,806377,806914,808786-808787,808792,809141,810370,810438,81

0

46

5,

810

807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,92803

7

,9

2

816

6,928171,928180,928470,928477,929582,933157,935494,936817,941431,941440,943168

Modified: 
ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=943172&r1=943171&r2=943172&view=diff
==============================================================================
--- 
ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
 (original)
+++ 
ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
 Tue May 11 16:47:04 2010
@@ -1026,7 +1026,7 @@ public class ProductPromoWorker {
                // call the getOrderedSummaryInformation service to get the 
sub-total
                int monthsToInclude = 12;
                if (otherValue != null) {
-                    monthsToInclude = Integer.parseInt(condValue);
+                    monthsToInclude = Integer.parseInt(otherValue);
                }
                Map serviceIn = UtilMisc.toMap("partyId", partyId, "roleTypeId", "PLACING_CUSTOMER", "orderTypeId", 
"SALES_ORDER", "statusId", "ORDER_COMPLETED", "monthsToInclude", new Integer(monthsToInclude), "userLogin", userLogin);
                try {

Modified: ofbiz/branches/release09.04/mergefromtrunk.sh
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/mergefromtrunk.sh?rev=943172&r1=943171&r2=943172&view=diff
==============================================================================
--- ofbiz/branches/release09.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release09.04/mergefromtrunk.sh Tue May 11 16:47:04 2010
@@ -1,5 +1,6 @@
#!/bin/sh

+set -e
prevRev=`expr $1 - 1`
svn merge -r $prevRev:$1 https://svn.apache.org/repos/asf/ofbiz/trunk
trunkLog=runtime/trunkLog.xml

Reply via email to