[ofbiz-framework] branch trunk updated (803f7fa -> a6cfaf8)
This is an automated email from the ASF dual-hosted git repository. nmalin pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git. from 803f7fa Improved: widget tag (OFBIZ-11686) new 4ebdcdd Improved: Convert PriceServices.xml mini lang to groovy new b9b8c14 Improved: Convert PriceServices.xml mini lang to groovy new a6cfaf8 Improved: getAssociatedPriceRulesConds service return huge result The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../product/price/PriceServices.groovy | 272 + .../minilang/product/price/PriceServices.xml | 327 - applications/product/servicedef/services.xml | 26 +- .../product/servicedef/services_pricepromo.xml | 12 +- 4 files changed, 293 insertions(+), 344 deletions(-) create mode 100644 applications/product/groovyScripts/product/price/PriceServices.groovy delete mode 100644 applications/product/minilang/product/price/PriceServices.xml
[ofbiz-framework] 03/03: Improved: getAssociatedPriceRulesConds service return huge result
This is an automated email from the ASF dual-hosted git repository.
nmalin pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit a6cfaf87320dab2492502bc27d2c4007aab62b94
Author: Nicolas Malin
AuthorDate: Wed May 13 16:06:56 2020 +0200
Improved: getAssociatedPriceRulesConds service return huge result
(OFBIZ-11701)
The service getAssociatedPriceRulesConds return some element to help the
selection on product prise rule condition screen.
The problem: all query to resolve element are realized without filter :
from("Product").queryList()
On big database, a call on this service generate a server saturation (load
1 Million product to a dropdown, isn't logical)
To keep the benefit of this service as example to implement a custom
service with filter, I introduce a limit range to 200. For much more it's
better to improve the screen with a lookup.
I also simplify the list generation to homogenize and help the reader.
---
.../product/price/PriceServices.groovy | 174 ++---
1 file changed, 86 insertions(+), 88 deletions(-)
diff --git
a/applications/product/groovyScripts/product/price/PriceServices.groovy
b/applications/product/groovyScripts/product/price/PriceServices.groovy
index e5cef7d..54cc432 100644
--- a/applications/product/groovyScripts/product/price/PriceServices.groovy
+++ b/applications/product/groovyScripts/product/price/PriceServices.groovy
@@ -25,11 +25,7 @@ import org.apache.ofbiz.base.util.UtilProperties
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.condition.EntityCondition
import org.apache.ofbiz.entity.condition.EntityOperator
-import org.apache.ofbiz.product.product.ProductServices
-import org.apache.ofbiz.service.ServiceUtil
-
-
-
+import org.apache.ofbiz.party.party.PartyHelper
/**
* Create a Product Price
@@ -184,91 +180,93 @@ def updateProductPriceCond() {
def getAssociatedPriceRulesConds() {
Map result = success()
List productPriceRulesCondValues = []
-if ((parameters.inputParamEnumId == "PRIP_QUANTITY") ||
(parameters.inputParamEnumId == "PRIP_LIST_PRICE")) {
-return success()
-}
-if (parameters.inputParamEnumId == "PRIP_PRODUCT_ID") {
-List condValues = from("Product").queryList()
-// May prove more useful rather than an entity-and in custom cases
-for (GenericValue condValue : condValues) {
-String option = (condValue.internalName ?
"${condValue.internalName}: " : ": ") + (condValue.productId ?
"${condValue.productId}" : "")
-productPriceRulesCondValues << option
-}
-}
-if (parameters.inputParamEnumId == "PRIP_PROD_CAT_ID") {
-List condValues = from("ProductCategory").queryList()
-// May prove more useful rather than an entity-and in custom cases
-for (GenericValue condValue : condValues) {
-String option = (condValue.categoryName ?
"${condValue.categoryName} " : " ") + (condValue.description ?
"${condValue.description} " : " ") +
-(condValue.longDescription ?
condValue.longDescription.substring(0,10) : "") + (condValue.productCategoryId
? " [${condValue.productCategoryId}]: " : " []: ") +
-(condValue.productCategoryId ?
"${condValue.productCategoryId}" : "")
-productPriceRulesCondValues << option
-}
-}
-if (parameters.inputParamEnumId == "PRIP_PROD_FEAT_ID") {
-List condValues = from("ProductFeatureType").queryList()
-// May prove more useful rather than an entity-and in custom cases
-for (GenericValue condValue : condValues) {
-String option = (condValue.description ? "${condValue.description}
" : " ") + (condValue.productFeatureTypeId ? "
${condValue.productFeatureTypeId}" : "")
-productPriceRulesCondValues << option
-}
-}
-if ((parameters.inputParamEnumId == "PRIP_PARTY_ID") ||
(parameters.inputParamEnumId == "PRIP_PARTY_GRP_MEM")) {
-List condValues = from("PartyNameView").queryList()
-for (GenericValue condValue : condValues) {
-String option = (condValue.firstName ? "${condValue.firstName} " :
" ") + (condValue.lastName ? "${condValue.lastName}" : "") +
-(condValue.groupName ? "${condValue.groupName}: " : ": ")
+ (condValue.partyId ? "${condValue.partyId}" : "")
-productPriceRulesCondValues << option
-}
-}
-if (parameters.inputParamEnumId == "PRIP_PARTY_CLASS") {
-List condValues = from("PartyClassificationGroup").queryList()
-// May prove more useful rather than an entity-and in custom cases
-for (GenericValue condValue : condValues) {
-String option = (condValue.description ?
"${condValue.description}: " : ": ") + (condValue.partyClassificationGroupId ?
"${condValue.partyClassificationGroupId}" : "")
-
[ofbiz-framework] 02/03: Improved: Convert PriceServices.xml mini lang to groovy
This is an automated email from the ASF dual-hosted git repository.
nmalin pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit b9b8c1405b847a262ea866f0844ed05da33744c8
Author: Nicolas Malin
AuthorDate: Wed May 13 15:48:00 2020 +0200
Improved: Convert PriceServices.xml mini lang to groovy
(OFBIZ-11578)
Second pass:
* slimdown code
* move saveProductPriceChange to entity-auto
---
.../product/price/PriceServices.groovy | 46 --
applications/product/servicedef/services.xml | 8 ++--
2 files changed, 10 insertions(+), 44 deletions(-)
diff --git
a/applications/product/groovyScripts/product/price/PriceServices.groovy
b/applications/product/groovyScripts/product/price/PriceServices.groovy
index a9eb056..e5cef7d 100644
--- a/applications/product/groovyScripts/product/price/PriceServices.groovy
+++ b/applications/product/groovyScripts/product/price/PriceServices.groovy
@@ -17,7 +17,6 @@
* under the License.
*/
-
import java.math.RoundingMode
import java.sql.Timestamp
@@ -112,56 +111,28 @@ def inlineHandlePriceWithTaxIncluded() {
EntityCondition condition = EntityCondition.makeCondition([
EntityCondition.makeCondition("taxAuthGeoId",
parameters.taxAuthGeoId),
EntityCondition.makeCondition("taxAuthPartyId",
parameters.taxAuthPartyId),
-EntityCondition.makeCondition([
-EntityCondition.makeCondition("taxAuthorityRateTypeId",
"SALES_TAX"),
-EntityCondition.makeCondition("taxAuthorityRateTypeId",
"VAT_TAX")
-], EntityOperator.OR)
+EntityCondition.makeCondition("taxAuthorityRateTypeId",
EntityOperator.IN, ["SALES_TAX", "VAT_TAX"])
])
GenericValue taxAuthorityRateProduct =
from("TaxAuthorityRateProduct").where(condition).filterByDate().queryFirst()
parameters.taxPercentage = taxAuthorityRateProduct?.taxPercentage
}
if (!parameters.taxPercentage) {
-String errorMessage = UtilProperties.getMessage("ProductUiLabels",
"ProductPriceTaxPercentageNotFound", locale)
-logError(errorMessage)
-return error(errorMessage)
+return error(UtilProperties.getMessage("ProductUiLabels",
"ProductPriceTaxPercentageNotFound", locale))
}
// in short the formula is: taxAmount = priceWithTax -
(priceWithTax/(1+taxPercentage/100))
-BigDecimal taxAmount = parameters.priceWithTax -
(parameters.priceWithTax/(1 + parameters.taxPercentage/100))
+BigDecimal taxAmount = parameters.priceWithTax -
(parameters.priceWithTax / (1 + parameters.taxPercentage/100))
parameters.taxAmount = taxAmount.setScale(3, RoundingMode.HALF_UP)
BigDecimal priceWithoutTax = parameters.priceWithTax -
parameters.taxAmount
parameters.priceWithoutTax = priceWithoutTax.setScale(3,
RoundingMode.HALF_UP)
-if (parameters.taxInPrice == "Y") {
-// the price passed in has tax included, and we want to store it
with tax included
-parameters.price = parameters.priceWithTax
-} else {
-// the price passed in has tax included, but we want to store it
without tax included
-parameters.price = parameters.priceWithoutTax
-}
-
+parameters.price = parameters.taxInPrice == "Y" ?
+parameters.priceWithTax: // the price passed in has tax
included, and we want to store it with tax included
+parameters.priceWithoutTax // the price passed in has tax
included, but we want to store it without tax included
}
return success()
}
-// TODO NMA convert to entity auto when changed fileds are managed
-
-/**
- * Save History of ProductPrice Change
- * @return
- */
-def saveProductPriceChange() {
-// Note that this is kept pretty simple: if a price is specific but no
oldPrice, then it is generally a create,
-// if both are specified it is generally an update, if only the oldPrice
is specified it is generally a delete
-GenericValue newEntity = makeValue("ProductPriceChange")
-newEntity.setNonPKFields(parameters)
-newEntity.productPriceChangeId =
delegator.getNextSeqId("ProductPriceChange")
-newEntity.changedDate = UtilDateTime.nowTimestamp()
-newEntity.changedByUserLogin = userLogin.userLoginId
-newEntity.create()
-return success()
-}
-
// ProductPriceCond methods
/**
@@ -197,10 +168,7 @@ def updateProductPriceCond() {
if (!security.hasPermission("CATALOG_PRICE_MAINT", userLogin)) {
return error(UtilProperties.getMessage("ProductUiLabels",
"ProductPriceMaintPermissionError", locale))
}
-if (parameters.inputParamEnumId == "PRIP_QUANTITY") {
-parameters.condValue = parameters.condValueInput
-}
-if (parameters.inputParamEnumId == "PRIP_LIST_PRICE") {
+if
[ofbiz-framework] 01/03: Improved: Convert PriceServices.xml mini lang to groovy
This is an automated email from the ASF dual-hosted git repository.
nmalin pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 4ebdcdd9d03b6682f9f00397ef5d61d2f0bee08b
Author: Sebastian Berg
AuthorDate: Tue Apr 14 13:24:51 2020 +0200
Improved: Convert PriceServices.xml mini lang to groovy
(OFBIZ-11578)
---
.../product/price/PriceServices.groovy | 306 +++
.../minilang/product/price/PriceServices.xml | 327 -
applications/product/servicedef/services.xml | 22 +-
.../product/servicedef/services_pricepromo.xml | 12 +-
4 files changed, 326 insertions(+), 341 deletions(-)
diff --git
a/applications/product/groovyScripts/product/price/PriceServices.groovy
b/applications/product/groovyScripts/product/price/PriceServices.groovy
new file mode 100644
index 000..a9eb056
--- /dev/null
+++ b/applications/product/groovyScripts/product/price/PriceServices.groovy
@@ -0,0 +1,306 @@
+/*
+ * 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.
+ */
+
+
+import java.math.RoundingMode
+import java.sql.Timestamp
+
+import org.apache.ofbiz.base.util.UtilDateTime
+import org.apache.ofbiz.base.util.UtilProperties
+import org.apache.ofbiz.entity.GenericValue
+import org.apache.ofbiz.entity.condition.EntityCondition
+import org.apache.ofbiz.entity.condition.EntityOperator
+import org.apache.ofbiz.product.product.ProductServices
+import org.apache.ofbiz.service.ServiceUtil
+
+
+
+
+/**
+ * Create a Product Price
+ * @return
+ */
+def createProductPrice() {
+Map result = success()
+if (!security.hasPermission("CATALOG_PRICE_MAINT", userLogin)) {
+return error(UtilProperties.getMessage("ProductUiLabels",
"ProductPriceMaintPermissionError", locale))
+}
+inlineHandlePriceWithTaxIncluded()
+
+GenericValue newEntity = makeValue("ProductPrice", parameters)
+
+Timestamp nowTimestamp = UtilDateTime.nowTimestamp()
+if (!newEntity.fromDate) {
+newEntity.fromDate = nowTimestamp
+}
+result.fromDate = newEntity.fromDate
+newEntity.lastModifiedDate = nowTimestamp
+newEntity.createdDate = nowTimestamp
+newEntity.lastModifiedByUserLogin = userLogin.userLoginId
+newEntity.createdByUserLogin = userLogin.userLoginId
+newEntity.create()
+
+return result
+}
+
+/**
+ * Update an ProductPrice
+ * @return
+ */
+def updateProductPrice() {
+Map result = success()
+if (!security.hasPermission("CATALOG_PRICE_MAINT", userLogin)) {
+return error(UtilProperties.getMessage("ProductUiLabels",
"ProductPriceMaintPermissionError", locale))
+}
+inlineHandlePriceWithTaxIncluded()
+
+GenericValue lookedUpValue =
from("ProductPrice").where(parameters).queryOne()
+// grab the old price value before setting nonpk parameter fields
+result.oldPrice = lookedUpValue.price
+lookedUpValue.setNonPKFields(parameters)
+lookedUpValue.lastModifiedDate = UtilDateTime.nowTimestamp()
+lookedUpValue.lastModifiedByUserLogin = userLogin.userLoginId
+lookedUpValue.store()
+
+return result
+}
+
+/**
+ * Delete an ProductPrice
+ * @return
+ */
+def deleteProductPrice() {
+Map result = success()
+if (!security.hasPermission("CATALOG_PRICE_MAINT", userLogin)) {
+return error(UtilProperties.getMessage("ProductUiLabels",
"ProductPriceMaintPermissionError", locale))
+}
+GenericValue lookedUpValue =
from("ProductPrice").where(parameters).queryOne()
+// grab the old price value before setting nonpk parameter fields
+result.oldPrice = lookedUpValue.price
+lookedUpValue.remove()
+return result
+}
+
+/**
+ * Inline Handle Price with Tax Included
+ * @return
+ */
+def inlineHandlePriceWithTaxIncluded() {
+// handle price with tax included related fields (priceWithTax, taxAmount,
taxPercentage, taxAuthPartyId, taxAuthGeoId)
+if (parameters.taxAuthPartyId && parameters.taxAuthGeoId) {
+parameters.priceWithTax = parameters.price
+
+// if taxPercentage not passed in look it up based on taxAuthGeoId and
taxAuthPartyId
+if (!parameters.taxPercentage) {
+// we only have basic data to constrain by here, so
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/1350 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf947_ubuntu Build Reason: downstream Build Source Stamp: [branch trunk] 2b0166410dcb7165ba4493400db690810e540554 Blamelist: Suraj Khurana <64310724+surajkhur...@users.noreply.github.com> BUILD FAILED: exception shell_2 shell_3 upload_2 Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Improved: widget tag (OFBIZ-11686)
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 803f7fa Improved: widget tag (OFBIZ-11686)
803f7fa is described below
commit 803f7fa06048baa5c4246c80ff249cba2edb9451
Author: James Yong
AuthorDate: Wed May 13 20:19:05 2020 +0800
Improved: widget tag (OFBIZ-11686)
The new tag allows us to render a freemarker template containing javascript,
as external script in html instead of inline script.
This helps to reduce CSP errors.
---
applications/order/template/order/FindOrders.ftl | 74 -
.../order/template/order/FindOrders.js.ftl | 86
.../order/widget/ordermgr/OrderViewScreens.xml | 5 +-
.../java/org/apache/ofbiz/common/CommonEvents.java | 25 ++
.../common/webcommon/WEB-INF/common-controller.xml | 11 +++
.../webapp/ftl/ScriptTemplateListTransform.java| 81 +++
.../ofbiz/webapp/freemarkerTransforms.properties | 1 +
framework/widget/dtd/widget-screen.xsd | 8 ++
.../widget/artifact/ArtifactInfoGatherer.java | 5 ++
.../org/apache/ofbiz/widget/model/HtmlWidget.java | 72 +
.../ofbiz/widget/model/ModelWidgetVisitor.java | 2 +
.../ofbiz/widget/model/ScriptTemplateUtil.java | 92 ++
.../ofbiz/widget/model/XmlWidgetVisitor.java | 9 +++
.../widget/renderer/html/HtmlWidgetRenderer.java | 4 +
themes/flatgrey/template/Footer.ftl| 1 +
themes/rainbowstone/template/includes/Footer.ftl | 1 +
themes/tomahawk/template/Footer.ftl| 1 +
17 files changed, 403 insertions(+), 75 deletions(-)
diff --git a/applications/order/template/order/FindOrders.ftl
b/applications/order/template/order/FindOrders.ftl
index cb2c338..0d1923d 100644
--- a/applications/order/template/order/FindOrders.ftl
+++ b/applications/order/template/order/FindOrders.ftl
@@ -17,80 +17,6 @@ specific language governing permissions and limitations
under the License.
-->
-
-
-
-function paginateOrderList(viewSize, viewIndex, hideFields) {
-document.paginationForm.viewSize.value = viewSize;
-document.paginationForm.viewIndex.value = viewIndex;
-document.paginationForm.hideFields.value = hideFields;
-document.paginationForm.submit();
-}
-
-
-
<#if security.hasEntityPermission("ORDERMGR", "_VIEW", session)>
<#if parameters.hideFields?has_content>
diff --git a/applications/order/template/order/FindOrders.js.ftl
b/applications/order/template/order/FindOrders.js.ftl
new file mode 100644
index 000..0b98270
--- /dev/null
+++ b/applications/order/template/order/FindOrders.js.ftl
@@ -0,0 +1,86 @@
+/***
+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
[ofbiz-framework] branch trunk updated: Improved: Converted all GlReconciliationEntry related CRUD services from simple to entity-auto (#129)
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 2b01664 Improved: Converted all GlReconciliationEntry related CRUD services from simple to entity-auto (#129) 2b01664 is described below commit 2b0166410dcb7165ba4493400db690810e540554 Author: Suraj Khurana <64310724+surajkhur...@users.noreply.github.com> AuthorDate: Wed May 13 17:17:20 2020 +0530 Improved: Converted all GlReconciliationEntry related CRUD services from simple to entity-auto (#129) * Improved: Converted all GlReconciliationEntry related CRUD services from simple to entity-auto (OFBIZ-11662) --- .../minilang/ledger/GeneralLedgerServices.xml | 16 applications/accounting/servicedef/secas_ledger.xml| 10 -- applications/accounting/servicedef/services_ledger.xml | 18 +++--- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/applications/accounting/minilang/ledger/GeneralLedgerServices.xml b/applications/accounting/minilang/ledger/GeneralLedgerServices.xml index 87e6b00..a192a87 100644 --- a/applications/accounting/minilang/ledger/GeneralLedgerServices.xml +++ b/applications/accounting/minilang/ledger/GeneralLedgerServices.xml @@ -156,22 +156,6 @@ under the License. - - - - - - - - - - - - - - - - diff --git a/applications/accounting/servicedef/secas_ledger.xml b/applications/accounting/servicedef/secas_ledger.xml index 1e9..5916574 100644 --- a/applications/accounting/servicedef/secas_ledger.xml +++ b/applications/accounting/servicedef/secas_ledger.xml @@ -157,9 +157,15 @@ under the License. - + - + + + + + + + diff --git a/applications/accounting/servicedef/services_ledger.xml b/applications/accounting/servicedef/services_ledger.xml index 6d68e2a..e0bd432 100644 --- a/applications/accounting/servicedef/services_ledger.xml +++ b/applications/accounting/servicedef/services_ledger.xml @@ -147,7 +147,14 @@ under the License. - + +Update Gl Reconciliation Last Modified + + + + Add an Entry to a GlReconciliation @@ -156,21 +163,18 @@ under the License. - + Update an Entry to a GlReconciliation record - + Remove an Entry from a GlReconciliation - - + Completes, if possible, the AcctgTransEntries using the mappings defined in the gl setup
buildbot success in on ofbizTrunkFramework
The Buildbot has detected a restored build on builder ofbizTrunkFramework while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/1471 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: forced: by IRC user (privmsg): forces manual build after supposed BuildBot error Build Source Stamp: HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[ofbiz-tools] branch master updated: Improved: handle patches in demos
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git
The following commit(s) were added to refs/heads/master by this push:
new fa78bf6 Improved: handle patches in demos
fa78bf6 is described below
commit fa78bf633d8a10109d5067330023e830af96e7cf
Author: Jacques Le Roux
AuthorDate: Wed May 13 12:01:38 2020 +0200
Improved: handle patches in demos
I have decided to apply patches once and for all. The reason is else they
are
applied once and not later. So it's easier like that.
If we need to change the patches they will be reverted and applied again.
Hopefully only when changing stable and old.
But in R16 (old demo, still uses specialpurpose) the ones under plugins
must be
applied each time because pullAllPluginsSource removes the plugins dir,
hence
the patched files
---
demo-backup/old-manual.sh | 15 +++
.../old/{fop.xconf.old.patch => fop.xconf.patch} | 0
demo-backup/patch/old/solr.config.patch| 30 ++
...l.properties.old.patch => url.properties.patch} | 0
.../{fop.xconf.stable.patch => fop.xconf.patch}| 0
demo-backup/patch/stable/solr.config.patch | 30 ++
...roperties.stable.patch => url.properties.patch} | 0
demo-backup/patch/trunk/fop.xconf.patch| 16
demo-backup/patch/trunk/fop.xconf.trunk.patch | 13 --
...properties.trunk.patch => url.properties.patch} | 1 +
demo-backup/stable-manual.sh | 16
demo-backup/trunk.sh | 15 +++
12 files changed, 123 insertions(+), 13 deletions(-)
diff --git a/demo-backup/old-manual.sh b/demo-backup/old-manual.sh
index 917799f..2142924 100755
--- a/demo-backup/old-manual.sh
+++ b/demo-backup/old-manual.sh
@@ -5,6 +5,21 @@ echo This cant be used alone, see OFBIZ-10287. You need for
now to use all-manua
cd /home/ofbizDemo/branch16.11
svn up
rm /home/ofbizDemo/branch16.11/framework/base/config/*.jks
+
+# I have decided to apply patches once for all. The reason is else they are
+# applied once and not later. So it's easier like that.
+# If we need to change the patches they will be reverted and applied again.
+# Hopefully only when changing stable and old.
+
+
+#patch -p0 < /home/ofbizDemo/branch16.11/url.properties.patch
+#patch -p0 < /home/ofbizDemo/branch16.11/fop.xconf.patch
+
+#cd /home/ofbizDemo/branch16.11/specialpurpose
+#patch -p0 < /home/ofbizDemo/branch16.11/solr.config.patch
+#cd ..
+
+
./gradlew --no-daemon "ofbiz --shutdown --portoffset 2"
./gradlew --no-daemon cleanAll
./gradlew --no-daemon "ofbiz --load-data"
diff --git a/demo-backup/patch/old/fop.xconf.old.patch
b/demo-backup/patch/old/fop.xconf.patch
similarity index 100%
rename from demo-backup/patch/old/fop.xconf.old.patch
rename to demo-backup/patch/old/fop.xconf.patch
diff --git a/demo-backup/patch/old/solr.config.patch
b/demo-backup/patch/old/solr.config.patch
new file mode 100644
index 000..69d1f4e
--- /dev/null
+++ b/demo-backup/patch/old/solr.config.patch
@@ -0,0 +1,30 @@
+diff --git solr/config/solrconfig.properties solr/config/solrconfig.properties
+index b87a305..b87142b 100644
+--- solr/config/solrconfig.properties
solr/config/solrconfig.properties
+@@ -25,6 +25,10 @@ solr.webapp.domainName=localhost
+ solr.webapp.portOverride=
+ solr.webapp.path=/solr
+
++# complete url with protocol, domainName,port(if require), and webapp path
++# complete url will be given preference if set
++solr.complete.url=https://demo-old.ofbiz.apache.org/solr
++
+ # Global solr ECA service toggling
+ # Set to true to enable solr indexing using ECAs/SECAs.
+ # If set to false, solr services meant to be triggered by ECA/SECA will not
execute and will "succeed" silently.
+diff --git solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
+index 3e05b70..50c8bad 100644
+--- solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
+@@ -76,6 +76,10 @@ public final class SolrUtil {
+ private static final boolean trustSelfSignedCert =
getTrustSelfSignedCert();
+
+ public static String makeSolrWebappUrl() {
++final String solrCompleteUrl =
UtilProperties.getPropertyValue(solrConfigName, "solr.complete.url");
++if (UtilValidate.isNotEmpty(solrCompleteUrl)) {
++return solrCompleteUrl;
++}
+ final String solrWebappProtocol =
UtilProperties.getPropertyValue(solrConfigName, "solr.webapp.protocol");
+ final String solrWebappDomainName =
UtilProperties.getPropertyValue(solrConfigName, "solr.webapp.domainName");
+ final String solrWebappPath =
UtilProperties.getPropertyValue(solrConfigName, "solr.webapp.path");
diff --git
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/1470 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] ba04eda31a36db12bac6dd0f1607c91d31449e47 Blamelist: Suraj Khurana BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Improved: Converted CustomTimePeriod related services from simple to entity-auto (OFBIZ-11689) Thanks Pierre for reporting.
This is an automated email from the ASF dual-hosted git repository. nmalin 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 ba04eda Improved: Converted CustomTimePeriod related services from simple to entity-auto (OFBIZ-11689) Thanks Pierre for reporting. ba04eda is described below commit ba04eda31a36db12bac6dd0f1607c91d31449e47 Author: Suraj Khurana AuthorDate: Sun May 10 16:20:27 2020 +0530 Improved: Converted CustomTimePeriod related services from simple to entity-auto (OFBIZ-11689) Thanks Pierre for reporting. --- .../common/minilang/period/PeriodServices.xml | 62 -- framework/common/servicedef/services.xml | 12 ++--- 2 files changed, 6 insertions(+), 68 deletions(-) diff --git a/framework/common/minilang/period/PeriodServices.xml b/framework/common/minilang/period/PeriodServices.xml deleted file mode 100644 index 5974c70..000 --- a/framework/common/minilang/period/PeriodServices.xml +++ /dev/null @@ -1,62 +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/framework/common/servicedef/services.xml b/framework/common/servicedef/services.xml index baac0de..737617e 100644 --- a/framework/common/servicedef/services.xml +++ b/framework/common/servicedef/services.xml @@ -160,9 +160,9 @@ under the License. - + Create a CustomTimePeriod record + @@ -170,15 +170,15 @@ under the License. - + Update a CustomTimePeriod record + - + Delete a CustomTimePeriod record +
