[ofbiz-framework] branch trunk updated: Improved: Converted all RequirementCustRequest related CRUD services from simple to entity-auto (#102)
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 112a592 Improved: Converted all RequirementCustRequest related CRUD
services from simple to entity-auto (#102)
112a592 is described below
commit 112a5929e91ae85b34ac017dfa5420ee67c0f27a
Author: Suraj Khurana <64310724+surajkhur...@users.noreply.github.com>
AuthorDate: Thu May 7 11:09:34 2020 +0530
Improved: Converted all RequirementCustRequest related CRUD services from
simple to entity-auto (#102)
(OFBIZ-11638)
Also, renamed associatedRequirementWithRequestItem to proper name and
corrected occurences including tests.
---
.../order/minilang/requirement/RequirementServices.xml | 8
applications/order/servicedef/secas.xml| 2 +-
applications/order/servicedef/services_requirement.xml | 14 +-
.../org/apache/ofbiz/order/OrderRequirementTests.groovy| 5 ++---
4 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/applications/order/minilang/requirement/RequirementServices.xml
b/applications/order/minilang/requirement/RequirementServices.xml
index 0720f80..861c9ae 100644
--- a/applications/order/minilang/requirement/RequirementServices.xml
+++ b/applications/order/minilang/requirement/RequirementServices.xml
@@ -27,14 +27,6 @@ under the License.
-
-
-
-
-
-
-
-
diff --git a/applications/order/servicedef/secas.xml
b/applications/order/servicedef/secas.xml
index e241170..50c4e9d 100644
--- a/applications/order/servicedef/secas.xml
+++ b/applications/order/servicedef/secas.xml
@@ -347,7 +347,7 @@ under the License.
-
+
diff --git a/applications/order/servicedef/services_requirement.xml
b/applications/order/servicedef/services_requirement.xml
index 642941a..07cb297 100644
--- a/applications/order/servicedef/services_requirement.xml
+++ b/applications/order/servicedef/services_requirement.xml
@@ -77,14 +77,6 @@ under the License.
-
-Creates a CustRequestItem/Requirement
association
-
-
-
-
-
Associate an existing task w/ a requirement
@@ -279,8 +271,12 @@ under the License.
Delete a RequirementTypeAttr record
-
+
+Create a RequirementCustRequest record
+
+
+
Delete a RequirementCustRequest record
diff --git
a/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderRequirementTests.groovy
b/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderRequirementTests.groovy
index a050a86..85420a8 100644
---
a/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderRequirementTests.groovy
+++
b/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderRequirementTests.groovy
@@ -72,14 +72,14 @@ class OrderRequirementTests extends OFBizTestCase {
Map serviceResult =
dispatcher.runSync('autoAssignRequirementToSupplier', serviceCtx)
assert ServiceUtil.isSuccess(serviceResult)
}
-void testAssociatedRequirementWithRequestItem() {
+void testCreateRequirementCustRequest() {
Map serviceCtx = [
requirementId: '1000',
custRequestId: '9000',
custRequestItemSeqId: '1',
userLogin: userLogin
]
-Map serviceResult =
dispatcher.runSync('associatedRequirementWithRequestItem', serviceCtx)
+Map serviceResult = dispatcher.runSync('createRequirementCustRequest',
serviceCtx)
assert ServiceUtil.isSuccess(serviceResult)
}
void testAddRequirementTask() {
@@ -91,5 +91,4 @@ class OrderRequirementTests extends OFBizTestCase {
Map serviceResult = dispatcher.runSync("addRequirementTask",
serviceCtx)
assert ServiceUtil.isSuccess(serviceResult)
}
-
}
buildbot success in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1327 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: downstream Build Source Stamp: [branch trunk] 5ff7852e506f342cad63ec65f86910ea1c15d9bc Blamelist: Jacques Le Roux Build succeeded! Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Improved: Converted all TechDataCalendarWeek related CRUD services from simple to entity-auto (#109)
This is an automated email from the ASF dual-hosted git repository. surajk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 4cb9fc7 Improved: Converted all TechDataCalendarWeek related CRUD services from simple to entity-auto (#109) 4cb9fc7 is described below commit 4cb9fc7e8090cd2123f09986bbe25badcf0570f0 Author: Suraj Khurana <64310724+surajkhur...@users.noreply.github.com> AuthorDate: Wed May 6 18:56:19 2020 +0530 Improved: Converted all TechDataCalendarWeek related CRUD services from simple to entity-auto (#109) (OFBIZ-11644) --- .../manufacturing/minilang/techdata/RoutingSimpleServices.xml | 11 --- applications/manufacturing/servicedef/services_calendar.xml | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml b/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml index a8a6933..f58f278 100644 --- a/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml +++ b/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml @@ -107,17 +107,6 @@ under the License. - - - - - - - - - - - diff --git a/applications/manufacturing/servicedef/services_calendar.xml b/applications/manufacturing/servicedef/services_calendar.xml index d162a5c..ffd3238 100644 --- a/applications/manufacturing/servicedef/services_calendar.xml +++ b/applications/manufacturing/servicedef/services_calendar.xml @@ -48,9 +48,9 @@ under the License. - + Update a Calendar Week +
[ofbiz-framework] branch trunk updated: Improvement: Upgrade Gradle and Groovy
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5ff7852 Improvement: Upgrade Gradle and Groovy
5ff7852 is described below
commit 5ff7852e506f342cad63ec65f86910ea1c15d9bc
Author: Jacques Le Roux
AuthorDate: Wed May 6 15:12:43 2020 +0200
Improvement: Upgrade Gradle and Groovy
(OFBIZ-11661)
Increases tasks.checkstyleMain.maxErrors from 36894 to 37094
Too much detected after Gradle upgrade to fix manually
The checkstyle plugin is automatically updated with the Gradle version
(you don't define a checkstyle plugin version)
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 5625bd0..c8725cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -286,7 +286,7 @@ checkstyle {
// the sum of errors found last time it was changed after using the
// ‘checkstyle’ tool present in the framework and in the official
// plugins.
-tasks.checkstyleMain.maxErrors = 36894
+tasks.checkstyleMain.maxErrors = 37094
// Currently there are a lot of errors so we need to temporarily
// hide them to avoid polluting the terminal output.
showViolations = false
[ofbiz-framework] branch trunk updated: Improvement: Upgrade Gradle and Groovy
This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 00ec6c6 Improvement: Upgrade Gradle and Groovy 00ec6c6 is described below commit 00ec6c677b7948178e1232b3d463ce49b69d62eb Author: Jacques Le Roux AuthorDate: Wed May 6 15:08:57 2020 +0200 Improvement: Upgrade Gradle and Groovy (OFBIZ-11661) Fixes a known issue with config/checkstyle/checkstyle.xml: TreeWalker is not allowed as a parent of LineLength Please review 'Parent Module' section for this Check in web documentation if Check is standard --- config/checkstyle/checkstyle.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 0788c24..527945a 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -40,6 +40,9 @@ under the License. + + + @@ -62,9 +65,6 @@ under the License. - - -
buildbot exception in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a build exception on builder ofbizTrunkFrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1325 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: downstream Build Source Stamp: [branch trunk] a58d78a79efa54310d2d239d41fcff698be52608 Blamelist: Pierre Smits BUILD FAILED: exception shell_2 upload_2 Sincerely, -The Buildbot
buildbot success in on ofbizTrunkFramework
The Buildbot has detected a restored build on builder ofbizTrunkFramework while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/1447 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' triggered this build Build Source Stamp: [branch trunk] a58d78a79efa54310d2d239d41fcff698be52608 Blamelist: Pierre Smits Build succeeded! Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Improvement: Upgrade Gradle and Groovy
This is an automated email from the ASF dual-hosted git repository.
jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new ff21950 Improvement: Upgrade Gradle and Groovy
new 3da9ff4 Merge remote-tracking branch 'origin/trunk' into trunk
ff21950 is described below
commit ff219500248373fafb39ee57f12f30147df318a7
Author: James Yong
AuthorDate: Wed May 6 20:22:38 2020 +0800
Improvement: Upgrade Gradle and Groovy
(OFBIZ-11661)
Upgrade to Gradle 6.3 and Groovy 2.5.11. Both are current stable versions.
---
build.gradle | 4 ++--
gradle/wrapper/gradle-wrapper.jar| Bin 55616 -> 55741 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 18 +-
gradlew.bat | 18 +-
5 files changed, 5 insertions(+), 37 deletions(-)
diff --git a/build.gradle b/build.gradle
index df0952c..5625bd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -98,7 +98,7 @@ javadoc {
links(
'https://docs.oracle.com/javase/8/docs/api',
'https://tomcat.apache.org/tomcat-9.0-doc/servletapi/',
-'http://docs.groovy-lang.org/docs/groovy-2.5.8/html/api',
+'http://docs.groovy-lang.org/docs/groovy-2.5.11/html/api',
'https://commons.apache.org/proper/commons-cli/apidocs'
)
}
@@ -187,7 +187,7 @@ dependencies {
implementation 'org.apache.xmlgraphics:fop:2.3' // NOTE: in 2.4
dependencies are messed up. See
https://github.com/moqui/moqui-fop/blob/master/build.gradle
implementation 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
implementation 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
-implementation 'org.codehaus.groovy:groovy-all:2.5.8' // Compile issue
with commons-cli and Groovy 3. Remember to change the version number in javadoc
block.
+implementation 'org.codehaus.groovy:groovy-all:2.5.11' // Compile issue
with commons-cli and Groovy 3. Remember to change the version number in javadoc
block.
implementation 'org.freemarker:freemarker:2.3.30' // Remember to change
the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if
>= 2.4
implementation 'org.owasp.esapi:esapi:2.2.0.0'
implementation 'org.springframework:spring-test:5.2.5.RELEASE'
diff --git a/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..457aad0 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and
b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index 75b8c7c..a4b4429 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 8e25e6c..af6708f 100755
--- a/gradlew
+++ b/gradlew
@@ -1,21 +1,5 @@
#!/usr/bin/env sh
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
##
##
## Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to
pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
diff --git a/gradlew.bat b/gradlew.bat
index 9618d8d..6d57edc 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS"
[ofbiz-framework] branch trunk updated: Improved: Accounting seed data (OFBIZ-11652) (#116)
This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new a58d78a Improved: Accounting seed data (OFBIZ-11652) (#116) a58d78a is described below commit a58d78a79efa54310d2d239d41fcff698be52608 Author: Pierre Smits AuthorDate: Wed May 6 13:47:10 2020 +0200 Improved: Accounting seed data (OFBIZ-11652) (#116) * Improved: Accounting Component - improve seed data (OFBIZ-11652) Adding role type records relating to budget entities * Improved: Accounting Component - improve seed data (OFBIZ-11652) Adding role type records relating to budget entities --- applications/datamodel/data/seed/AccountingSeedData.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/applications/datamodel/data/seed/AccountingSeedData.xml b/applications/datamodel/data/seed/AccountingSeedData.xml index 3470c5e..e22acaf 100644 --- a/applications/datamodel/data/seed/AccountingSeedData.xml +++ b/applications/datamodel/data/seed/AccountingSeedData.xml @@ -195,7 +195,8 @@ under the License. - + +
buildbot failure in on ofbizTrunkFramework
The Buildbot has detected a new failure on builder ofbizTrunkFramework while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/1446 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' triggered this build Build Source Stamp: [branch trunk] a7328da044be3c03e41388232b7390a7727932de Blamelist: Pierre Smits BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Improved: Accounting Component - improve seed data
This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new a7328da Improved: Accounting Component - improve seed data a7328da is described below commit a7328da044be3c03e41388232b7390a7727932de Author: Pierre Smits AuthorDate: Wed May 6 12:40:19 2020 +0200 Improved: Accounting Component - improve seed data (OFBIZ-11652) Adding role type records relating to budget entities --- applications/datamodel/data/seed/AccountingSeedData.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/applications/datamodel/data/seed/AccountingSeedData.xml b/applications/datamodel/data/seed/AccountingSeedData.xml index 35fcd72..3470c5e 100644 --- a/applications/datamodel/data/seed/AccountingSeedData.xml +++ b/applications/datamodel/data/seed/AccountingSeedData.xml @@ -190,7 +190,14 @@ under the License. - + + + + + + + +
buildbot success in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1324 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: downstream Build Source Stamp: [branch trunk] 0393ebe994def0e3958c0d78f6e590e68ccdef88 Blamelist: Suraj Khurana Build succeeded! Sincerely, -The Buildbot
buildbot success in on ofbizTrunkFramework
The Buildbot has detected a restored build on builder ofbizTrunkFramework while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/1445 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf947_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' triggered this build Build Source Stamp: [branch trunk] 0393ebe994def0e3958c0d78f6e590e68ccdef88 Blamelist: Suraj Khurana Build succeeded! Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Fixed: testIntegrations caused due to invalid cust request status 'CRQ_SUBMITTED', so loaded QuoteTestData.xml with proper status before executing CustRequestTe
This is an automated email from the ASF dual-hosted git repository. surajk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 0393ebe Fixed: testIntegrations caused due to invalid cust request status 'CRQ_SUBMITTED', so loaded QuoteTestData.xml with proper status before executing CustRequestTests. Also fixed default dateValue for nowTimestamp as in case of overrided fromDate, entity-auto doesn't take care of it. 0393ebe is described below commit 0393ebe994def0e3958c0d78f6e590e68ccdef88 Author: Suraj Khurana AuthorDate: Wed May 6 12:16:12 2020 +0530 Fixed: testIntegrations caused due to invalid cust request status 'CRQ_SUBMITTED', so loaded QuoteTestData.xml with proper status before executing CustRequestTests. Also fixed default dateValue for nowTimestamp as in case of overrided fromDate, entity-auto doesn't take care of it. Thanks: Jacques Le Roux for reporting. --- applications/order/minilang/request/CustRequestServices.xml | 2 -- applications/order/servicedef/services_request.xml | 8 applications/order/testdef/CustRequestTests.xml | 7 +-- applications/order/testdef/data/QuoteTestData.xml | 4 ++-- applications/workeffort/servicedef/services_timesheet.xml | 7 ++- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/applications/order/minilang/request/CustRequestServices.xml b/applications/order/minilang/request/CustRequestServices.xml index 5351438..3cf814c 100644 --- a/applications/order/minilang/request/CustRequestServices.xml +++ b/applications/order/minilang/request/CustRequestServices.xml @@ -186,9 +186,7 @@ under the License. - - diff --git a/applications/order/servicedef/services_request.xml b/applications/order/servicedef/services_request.xml index 92610da..b7cc3f5 100644 --- a/applications/order/servicedef/services_request.xml +++ b/applications/order/servicedef/services_request.xml @@ -112,7 +112,7 @@ under the License. Create a CustRequestParty record - + Update CustRequestParty record @@ -127,12 +127,12 @@ under the License. Expires a CustRequestParty record - Check Status of Cust Request - Update Cust Request Last Modified Date @@ -221,7 +221,7 @@ under the License. Create a Customer Request Content - + Delete a Customer Request Content diff --git a/applications/order/testdef/CustRequestTests.xml b/applications/order/testdef/CustRequestTests.xml index bf313fb..b96c4a5 100644 --- a/applications/order/testdef/CustRequestTests.xml +++ b/applications/order/testdef/CustRequestTests.xml @@ -21,11 +21,14 @@ under the License. http://www.w3.org/2001/XMLSchema-instance; xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd;> - + + + + + - diff --git a/applications/order/testdef/data/QuoteTestData.xml b/applications/order/testdef/data/QuoteTestData.xml index f50b8f8..730595f 100644 --- a/applications/order/testdef/data/QuoteTestData.xml +++ b/applications/order/testdef/data/QuoteTestData.xml @@ -30,8 +30,8 @@ under the License. - - + + diff --git a/applications/workeffort/servicedef/services_timesheet.xml b/applications/workeffort/servicedef/services_timesheet.xml index 014faeb..e7e232b 100644 --- a/applications/workeffort/servicedef/services_timesheet.xml +++ b/applications/workeffort/servicedef/services_timesheet.xml @@ -117,7 +117,12 @@ under the License. - + + +Checks Timesheet status + + Creates TimeEntry
[ofbiz-framework] branch release17.12 updated: Fixed: Promised Datetime & Current Promised Date values not getting updated in OISGIR Entity (OFBIZ-10538)
This is an automated email from the ASF dual-hosted git repository. pawan pushed a commit to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/release17.12 by this push: new 454230e Fixed: Promised Datetime & Current Promised Date values not getting updated in OISGIR Entity (OFBIZ-10538) 454230e is described below commit 454230e6133445d73f24d29d5a38c34e5a5c5333 Author: Pawan Verma AuthorDate: Wed May 6 11:51:40 2020 +0530 Fixed: Promised Datetime & Current Promised Date values not getting updated in OISGIR Entity (OFBIZ-10538) Thanks: Deepak, Taher, Ravi, Amit, Suraj for the contribution. --- applications/order/minilang/order/OrderServices.xml | 12 1 file changed, 12 insertions(+) diff --git a/applications/order/minilang/order/OrderServices.xml b/applications/order/minilang/order/OrderServices.xml index a444c8e..a694051 100644 --- a/applications/order/minilang/order/OrderServices.xml +++ b/applications/order/minilang/order/OrderServices.xml @@ -763,6 +763,18 @@ under the License. + + + + + + + + + + + +
[ofbiz-framework] branch release18.12 updated: Fixed: Promised Datetime & Current Promised Date values not getting updated in OISGIR Entity (OFBIZ-10538)
This is an automated email from the ASF dual-hosted git repository. pawan pushed a commit to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/release18.12 by this push: new ae511e4 Fixed: Promised Datetime & Current Promised Date values not getting updated in OISGIR Entity (OFBIZ-10538) ae511e4 is described below commit ae511e474088c29883ce7c6df0d39484654d5e79 Author: Pawan Verma AuthorDate: Wed May 6 11:51:40 2020 +0530 Fixed: Promised Datetime & Current Promised Date values not getting updated in OISGIR Entity (OFBIZ-10538) Thanks: Deepak, Taher, Ravi, Amit, Suraj for the contribution. --- applications/order/minilang/order/OrderServices.xml | 12 1 file changed, 12 insertions(+) diff --git a/applications/order/minilang/order/OrderServices.xml b/applications/order/minilang/order/OrderServices.xml index 39bccb5..014b7f8 100644 --- a/applications/order/minilang/order/OrderServices.xml +++ b/applications/order/minilang/order/OrderServices.xml @@ -763,6 +763,18 @@ under the License. + + + + + + + + + + + +
[ofbiz-framework] branch trunk updated: Fixed: Promised Datetime & Current Promised Date values not getting updated in OISGIR Entity (OFBIZ-10538)
This is an automated email from the ASF dual-hosted git repository. pawan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new f216542 Fixed: Promised Datetime & Current Promised Date values not getting updated in OISGIR Entity (OFBIZ-10538) f216542 is described below commit f2165421f63d0d0847501cc5fc7ef4f2f96b8b6a Author: Pawan Verma AuthorDate: Wed May 6 11:51:40 2020 +0530 Fixed: Promised Datetime & Current Promised Date values not getting updated in OISGIR Entity (OFBIZ-10538) Thanks: Deepak, Taher, Ravi, Amit, Suraj for the contribution. --- applications/order/minilang/order/OrderServices.xml | 12 1 file changed, 12 insertions(+) diff --git a/applications/order/minilang/order/OrderServices.xml b/applications/order/minilang/order/OrderServices.xml index b4ab784..a0c7eb1 100644 --- a/applications/order/minilang/order/OrderServices.xml +++ b/applications/order/minilang/order/OrderServices.xml @@ -644,6 +644,18 @@ under the License. + + + + + + + + + + + +
[ofbiz-framework] branch trunk updated: Improved: Unit test case for service - createPartyPostalAddress (#106)
This is an automated email from the ASF dual-hosted git repository.
pawan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new d753c10 Improved: Unit test case for service -
createPartyPostalAddress (#106)
d753c10 is described below
commit d753c10265518d56167ab77c895ff31cfa969d57
Author: Pawan Verma
AuthorDate: Wed May 6 11:36:16 2020 +0530
Improved: Unit test case for service - createPartyPostalAddress (#106)
(OFBIZ-8522)
---
.../org/apache/ofbiz/party/PartyTests.groovy | 49 ++
applications/party/testdef/PartyTests.xml | 5 ++-
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git
a/applications/party/src/main/groovy/org/apache/ofbiz/party/PartyTests.groovy
b/applications/party/src/main/groovy/org/apache/ofbiz/party/PartyTests.groovy
new file mode 100644
index 000..3d55ba4
--- /dev/null
+++
b/applications/party/src/main/groovy/org/apache/ofbiz/party/PartyTests.groovy
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ofbiz.party
+
+import org.apache.ofbiz.entity.GenericValue
+import org.apache.ofbiz.service.ServiceUtil
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class PartyTests extends OFBizTestCase {
+public PartyTests(String name) {
+super(name)
+}
+
+void testCreatePartyPostalAddress() {
+Map serviceCtx = [
+contactMechId: 'TestPostalAddress',
+partyId: 'TestCustomer',
+toName: 'Test Address',
+address1: '2004 Factory Blvd',
+city: 'City of Industry',
+countryGeoId: 'USA',
+stateProvinceGeoId: 'CA',
+postalCode: '9',
+userLogin: userLogin
+]
+Map serviceResult = dispatcher.runSync("createPartyPostalAddress",
serviceCtx)
+assert ServiceUtil.isSuccess(serviceResult)
+
+GenericValue postalAddress =
from("PostalAddress").where('contactMechId',
serviceResult.contactMechId).queryOne()
+assert postalAddress != null
+postalAddress.city = 'City of Industry'
+}
+}
\ No newline at end of file
diff --git a/applications/party/testdef/PartyTests.xml
b/applications/party/testdef/PartyTests.xml
index 58abf61..afbad04 100644
--- a/applications/party/testdef/PartyTests.xml
+++ b/applications/party/testdef/PartyTests.xml
@@ -25,9 +25,10 @@
-
+
-
+
+
[ofbiz-framework] branch trunk updated: Improved: Groovy DSL test case for service addProductCategoryToCategory and getProductCategoryAndLimitedMembers (#111)
This is an automated email from the ASF dual-hosted git repository.
pawan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new ff53e54 Improved: Groovy DSL test case for service
addProductCategoryToCategory and getProductCategoryAndLimitedMembers (#111)
ff53e54 is described below
commit ff53e54a4ed487eed48067ab35b6faa5799b7db2
Author: Pawan Verma
AuthorDate: Wed May 6 11:33:44 2020 +0530
Improved: Groovy DSL test case for service addProductCategoryToCategory and
getProductCategoryAndLimitedMembers (#111)
* Improved: Groovy DSL test case for service addProductCategoryToCategory
and getProductCategoryAndLimitedMembers
(OFBIZ-9088)
Thanks: Pradhan Yash Sharma for report and initial patch and Suraj and
Jacques for the review.
---
.../minilang/product/test/CategoryTests.xml| 48
.../org/apache/ofbiz/product/CategoryTests.groovy | 67 ++
applications/product/testdef/CatalogTests.xml | 6 +-
.../CategoryTestData.xml} | 19 ++
4 files changed, 77 insertions(+), 63 deletions(-)
diff --git a/applications/product/minilang/product/test/CategoryTests.xml
b/applications/product/minilang/product/test/CategoryTests.xml
deleted file mode 100644
index 1358bc3..000
--- a/applications/product/minilang/product/test/CategoryTests.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-http://www.w3.org/2001/XMLSchema-instance;
-xmlns="http://ofbiz.apache.org/Simple-Method;
xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method
http://ofbiz.apache.org/dtds/simple-methods.xsd;>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git
a/applications/product/src/main/groovy/org/apache/ofbiz/product/CategoryTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/CategoryTests.groovy
new file mode 100644
index 000..a22bf53
--- /dev/null
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/CategoryTests.groovy
@@ -0,0 +1,67 @@
+/***
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
***/
+package org.apache.ofbiz.product
+
+import org.apache.ofbiz.base.util.UtilDateTime
+import org.apache.ofbiz.entity.GenericValue
+import org.apache.ofbiz.service.ServiceUtil
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class CategoryTests extends OFBizTestCase {
+public CategoryTests(String name) {
+super(name)
+}
+
+void testAddProductCategoryToCategory() {
+Map serviceCtx = [
+productCategoryId: 'TPC',
+parentProductCategoryId: 'TPCP',
+fromDate: UtilDateTime.nowTimestamp(),
+userLogin: userLogin
+]
+serviceCtx.userLogin = userLogin
+Map serviceResult = dispatcher.runSync('addProductCategoryToCategory',
serviceCtx)
+assert ServiceUtil.isSuccess(serviceResult)
+
+GenericValue prodCategory =
from('ProductCategoryRollup').where('productCategoryId', 'TPC',
'parentProductCategoryId', 'TPCP').queryFirst()
+assert prodCategory != null
+}
+
+void testGetProductCategoryAndLimitedMembers() {
+Map serviceCtx = [
+productCategoryId: '101',
+prodCatalogId: 'DemoCatalog',
+defaultViewSize: 10,
+limitView: true,
+userLogin: userLogin
+]
+serviceCtx.userLogin = userLogin
+Map serviceResult =
dispatcher.runSync('getProductCategoryAndLimitedMembers', serviceCtx)
+assert ServiceUtil.isSuccess(serviceResult)
+
+assert serviceResult.productCategoryMembers != null
+assert serviceResult.productCategory != null
+assert
