Author: jacopoc
Date: Wed Feb 22 15:38:26 2012
New Revision: 1292350
URL: http://svn.apache.org/viewvc?rev=1292350&view=rev
Log:
Applied fix from trunk for revision: 1226378
===
Fixed tests that were going to fail after the new year switch; with this fix
the tests will work until 2020.
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/accounting/data/DemoGlSetupData.xml
ofbiz/branches/release11.04/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml
ofbiz/branches/release11.04/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml
ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
(props changed)
ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
(props changed)
ofbiz/branches/release11.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
(props changed)
ofbiz/branches/release11.04/framework/common/widget/HelpScreens.xml
(props changed)
ofbiz/branches/release11.04/framework/security/data/PasswordSecurityData.xml
(props changed)
ofbiz/branches/release11.04/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
(props changed)
ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
(props changed)
ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
(props changed)
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 15:38:26 2012
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4:951708-952957
/ofbiz/branches/jquery:952958-1044489
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1139860,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362,1210193,1210211,1212147,1214124,1220298,1221889,1221913,1222105,1222478,1226055,1226065,1226223,1226231,1227965,1229304,1229952,1231004,1231444,1232053,1232539,1244139,1291472,1292331
+/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1139860,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362,1210193,1210211,1212147,1214124,1220298,1221889,1221913,1222105,1222478,1226055,1226065,1226223,1226231,1226378,1227965,1229304,1229952,1231004,1231444,1232053,1232539,1244139,1291472,1292331
Modified:
ofbiz/branches/release11.04/applications/accounting/data/DemoGlSetupData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/data/DemoGlSetupData.xml?rev=1292350&r1=1292349&r2=1292350&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/accounting/data/DemoGlSetupData.xml
(original)
+++
ofbiz/branches/release11.04/applications/accounting/data/DemoGlSetupData.xml
Wed Feb 22 15:38:26 2012
@@ -398,7 +398,7 @@ under the License.
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6012"
periodTypeId="FISCAL_QUARTER" fromDate="2010-04-01" thruDate="2010-07-01"
isClosed="N" periodNum="3" periodName="2010/Q2" parentPeriodId="6010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6013"
periodTypeId="FISCAL_QUARTER" fromDate="2010-07-01" thruDate="2010-10-01"
isClosed="N" periodNum="4" periodName="2010/Q3" parentPeriodId="6010"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6014"
periodTypeId="FISCAL_QUARTER" fromDate="2010-10-01" thruDate="2011-01-01"
isClosed="N" periodNum="5" periodName="2010/Q4" parentPeriodId="6010"/>
- <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6015"
periodTypeId="FISCAL_YEAR" fromDate="2011-01-01" thruDate="2012-01-01"
isClosed="N" periodNum="1" periodName="2011"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6015"
periodTypeId="FISCAL_YEAR" fromDate="2011-01-01" thruDate="2020-01-01"
isClosed="N" periodNum="1" periodName="2011-2020"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6016"
periodTypeId="FISCAL_QUARTER" fromDate="2011-01-01" thruDate="2011-04-01"
isClosed="N" periodNum="2" periodName="2011/Q1" parentPeriodId="6015"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6017"
periodTypeId="FISCAL_QUARTER" fromDate="2011-04-01" thruDate="2011-07-01"
isClosed="N" periodNum="3" periodName="2011/Q2" parentPeriodId="6015"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6018"
periodTypeId="FISCAL_QUARTER" fromDate="2011-07-01" thruDate="2011-10-01"
isClosed="N" periodNum="4" periodName="2011/Q3" parentPeriodId="6015"/>
Modified:
ofbiz/branches/release11.04/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml?rev=1292350&r1=1292349&r2=1292350&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml
(original)
+++
ofbiz/branches/release11.04/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml
Wed Feb 22 15:38:26 2012
@@ -176,10 +176,20 @@ under the License.
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
+
+ <now-timestamp field="nowTimestamp"/>
+ <set field="findCustomTimePeriodsMap.userLogin"
from-field="userLogin"/>
+ <set field="findCustomTimePeriodsMap.findDate"
from-field="nowTimestamp" type="Timestamp"/>
+ <set field="findCustomTimePeriodsMap.organizationPartyId"
value="Company"/>
+ <call-service service-name="findCustomTimePeriods"
in-map-name="findCustomTimePeriodsMap">
+ <result-to-field result-name="customTimePeriodList"/>
+ </call-service>
+ <first-from-list list="customTimePeriodList" entry="customTimePeriod"/>
+
<set field="getAcctgTransEntriesAndTransTotalMap.userLogin"
from-field="userLogin"/>
<set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId"
value="Company"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
value="2011-01-01 16:55:01.0" type="Timestamp"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
value="2011-12-31 16:55:01.0" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
from-field="customTimePeriod.fromDate" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
from-field="customTimePeriod.thruDate" type="Timestamp"/>
<set field="getAcctgTransEntriesAndTransTotalMap.glAccountId"
value="210000"/>
<call-service service-name="getAcctgTransEntriesAndTransTotal"
in-map-name="getAcctgTransEntriesAndTransTotalMap">
<result-to-field result-name="debitTotal"
field="payableDebitTotal"/>
@@ -244,10 +254,20 @@ under the License.
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
+
+ <now-timestamp field="nowTimestamp"/>
+ <set field="findCustomTimePeriodsMap.userLogin"
from-field="userLogin"/>
+ <set field="findCustomTimePeriodsMap.findDate"
from-field="nowTimestamp" type="Timestamp"/>
+ <set field="findCustomTimePeriodsMap.organizationPartyId"
value="Company"/>
+ <call-service service-name="findCustomTimePeriods"
in-map-name="findCustomTimePeriodsMap">
+ <result-to-field result-name="customTimePeriodList"/>
+ </call-service>
+ <first-from-list list="customTimePeriodList" entry="customTimePeriod"/>
+
<set field="getAcctgTransEntriesAndTransTotalMap.userLogin"
from-field="userLogin"/>
<set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId"
value="Company"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
value="2011-01-01 16:55:01.0" type="Timestamp"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
value="2011-12-31 16:55:01.0" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
from-field="customTimePeriod.fromDate" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
from-field="customTimePeriod.thruDate" type="Timestamp"/>
<set field="getAcctgTransEntriesAndTransTotalMap.glAccountId"
value="210000"/>
<call-service service-name="getAcctgTransEntriesAndTransTotal"
in-map-name="getAcctgTransEntriesAndTransTotalMap">
<result-to-field result-name="debitTotal"
field="payableDebitTotal"/>
Modified:
ofbiz/branches/release11.04/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml?rev=1292350&r1=1292349&r2=1292350&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml
(original)
+++
ofbiz/branches/release11.04/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml
Wed Feb 22 15:38:26 2012
@@ -348,10 +348,20 @@ under the License.
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
+
+ <now-timestamp field="nowTimestamp"/>
+ <set field="findCustomTimePeriodsMap.userLogin"
from-field="userLogin"/>
+ <set field="findCustomTimePeriodsMap.findDate"
from-field="nowTimestamp" type="Timestamp"/>
+ <set field="findCustomTimePeriodsMap.organizationPartyId"
value="Company"/>
+ <call-service service-name="findCustomTimePeriods"
in-map-name="findCustomTimePeriodsMap">
+ <result-to-field result-name="customTimePeriodList"/>
+ </call-service>
+ <first-from-list list="customTimePeriodList" entry="customTimePeriod"/>
+
<set field="getAcctgTransEntriesAndTransTotalMap.userLogin"
from-field="userLogin"/>
<set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId"
value="Company"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
value="2011-01-01 16:55:01.0" type="Timestamp"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
value="2011-12-31 16:55:01.0" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
from-field="customTimePeriod.fromDate" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
from-field="customTimePeriod.thruDate" type="Timestamp"/>
<set field="getAcctgTransEntriesAndTransTotalMap.glAccountId"
value="120000"/>
<call-service service-name="getAcctgTransEntriesAndTransTotal"
in-map-name="getAcctgTransEntriesAndTransTotalMap">
<result-to-field result-name="debitTotal"
field="receivableDebitTotal"/>
@@ -420,10 +430,20 @@ under the License.
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
+
+ <now-timestamp field="nowTimestamp"/>
+ <set field="findCustomTimePeriodsMap.userLogin"
from-field="userLogin"/>
+ <set field="findCustomTimePeriodsMap.findDate"
from-field="nowTimestamp" type="Timestamp"/>
+ <set field="findCustomTimePeriodsMap.organizationPartyId"
value="Company"/>
+ <call-service service-name="findCustomTimePeriods"
in-map-name="findCustomTimePeriodsMap">
+ <result-to-field result-name="customTimePeriodList"/>
+ </call-service>
+ <first-from-list list="customTimePeriodList" entry="customTimePeriod"/>
+
<set field="getAcctgTransEntriesAndTransTotalMap.userLogin"
from-field="userLogin"/>
<set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId"
value="Company"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
value="2011-01-01 16:55:01.0" type="Timestamp"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
value="2011-12-31 16:55:01.0" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
from-field="customTimePeriod.fromDate" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
from-field="customTimePeriod.thruDate" type="Timestamp"/>
<set field="getAcctgTransEntriesAndTransTotalMap.glAccountId"
value="210000"/>
<call-service service-name="getAcctgTransEntriesAndTransTotal"
in-map-name="getAcctgTransEntriesAndTransTotalMap">
<result-to-field result-name="debitTotal"
field="payableDebitTotal"/>
Propchange:
ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 15:38:26 2012
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957
/ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
-/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1229304,1231004,1292331
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1226378,1229304,1231004,1292331
Propchange:
ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 15:38:26 2012
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957
/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1229304,1231004,1292331
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1226378,1229304,1231004,1292331
Propchange:
ofbiz/branches/release11.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 15:38:26 2012
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957
/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
-/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1229304,1231004,1292331
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1226378,1229304,1231004,1292331
Propchange: ofbiz/branches/release11.04/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 15:38:26 2012
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957
/ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489
/ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
-/ofbiz/trunk/framework/common/widget/HelpScreens.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1229304,1231004,1292331
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1226378,1229304,1231004,1292331
Propchange:
ofbiz/branches/release11.04/framework/security/data/PasswordSecurityData.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 15:38:26 2012
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/securityext/data/PasswordSecurityData.xml:951708-952957
/ofbiz/branches/jquery/applications/securityext/data/PasswordSecurityData.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/securityext/data/PasswordSecurityData.xml:921280-927264
-/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1229304,1231004,1292331
+/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1226378,1229304,1231004,1292331
Propchange: ofbiz/branches/release11.04/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 15:38:26 2012
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957
/ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1229304,1231004,1292331
+/ofbiz/trunk/specialpurpose/ebaystore/lib:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1226378,1229304,1231004,1292331
Propchange:
ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 15:38:26 2012
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1229304,1231004,1292331
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1226378,1229304,1231004,1292331
Propchange:
ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 15:38:26 2012
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1229304,1231004,1292331
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1226378,1229304,1231004,1292331
Propchange:
ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 15:38:26 2012
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1229304,1231004,1292331
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1194958,1196778,1203776,1226378,1229304,1231004,1292331
