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/2089 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: downstream Build Source Stamp: [branch trunk] 59e50880e9b1a403ae4410ff225e0c96e663d97c Blamelist: holivier BUILD FAILED: exception upload test-results part 1 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/2193 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] 59e50880e9b1a403ae4410ff225e0c96e663d97c Blamelist: holivier Build succeeded! Sincerely, -The Buildbot
buildbot success in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/2088 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: forced: by IRC user (privmsg): forces manual build because of INFRA-21829 Build Source Stamp: HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Documented: Order online Documentation and help (OFBIZ-12224)
This is an automated email from the ASF dual-hosted git repository. holivier 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 59e5088 Documented: Order online Documentation and help (OFBIZ-12224) 59e5088 is described below commit 59e50880e9b1a403ae4410ff225e0c96e663d97c Author: holivier AuthorDate: Tue May 4 16:14:27 2021 +0200 Documented: Order online Documentation and help (OFBIZ-12224) forgot image about order-status-change in the previous commit --- .../docs/asciidoc/images/order/manage-order-status.png | Bin 0 -> 44527 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/applications/order/src/docs/asciidoc/images/order/manage-order-status.png b/applications/order/src/docs/asciidoc/images/order/manage-order-status.png new file mode 100644 index 000..1ee9477 Binary files /dev/null and b/applications/order/src/docs/asciidoc/images/order/manage-order-status.png differ
buildbot exception in on ofbizTrunkFramework
The Buildbot has detected a build exception on builder ofbizTrunkFramework while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/2192 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] 462b871f186d0fc9623bc9f059ca5e5ddf1f9907 Blamelist: holivier BUILD FAILED: exception upload test-results part 1 Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Documented: Order online Documentation and help (OFBIZ-12224)
This is an automated email from the ASF dual-hosted git repository.
holivier 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 462b871 Documented: Order online Documentation and help (OFBIZ-12224)
462b871 is described below
commit 462b871f186d0fc9623bc9f059ca5e5ddf1f9907
Author: holivier
AuthorDate: Thu Apr 15 15:21:52 2021 +0200
Documented: Order online Documentation and help (OFBIZ-12224)
Migration of OFBiz wiki 3.1-3.2-3.3 Order Entry page and Sales Order
Management page
Create Order Diagrams
Order Status Diagrams
Add link from screen to help
---
.../_include/Help-order-bill-settings.adoc | 36
.../asciidoc/_include/Help-order-check-inits.adoc | 49 ++
.../docs/asciidoc/_include/Help-order-confirm.adoc | 34
.../docs/asciidoc/_include/Help-order-entry.adoc | 56 +++
.../_include/Help-order-option-settings.adoc | 45 +
.../Help-order-ship-setting.adoc} | 32 +---
.../asciidoc/_include/Help-order-show-cart.adoc| 135 +++
.../docs/asciidoc/_include/Help-order-view.adoc| 186 +
.../_include/order-create-order-diagrams.adoc | 65 +++
.../_include/order-ecommerce-entry-path.adoc | 154 +
.../{order.adoc => _include/order-glossary.adoc} | 33 +---
.../asciidoc/_include/order-status-diagrams.adoc | 48 ++
.../images/order/create-sales-order_level1.png | Bin 0 -> 16673 bytes
.../images/order/create-sales-order_level2.png | Bin 0 -> 56915 bytes
.../images/order/create-sales-order_level3.png | Bin 0 -> 81329 bytes
applications/order/src/docs/asciidoc/order.adoc| 146 +++-
.../widget/ordermgr/OrderEntryCartScreens.xml | 1 +
.../widget/ordermgr/OrderEntryOrderScreens.xml | 12 +-
.../order/widget/ordermgr/OrderEntryScreens.xml| 2 +
.../order/widget/ordermgr/OrderViewScreens.xml | 4 +
applications/party/src/docs/asciidoc/party.adoc| 13 ++
21 files changed, 993 insertions(+), 58 deletions(-)
diff --git
a/applications/order/src/docs/asciidoc/_include/Help-order-bill-settings.adoc
b/applications/order/src/docs/asciidoc/_include/Help-order-bill-settings.adoc
new file mode 100644
index 000..7860417
--- /dev/null
+++
b/applications/order/src/docs/asciidoc/_include/Help-order-bill-settings.adoc
@@ -0,0 +1,36 @@
+
+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.
+
+= Order Term
+
+If there are multiple "payment" term, it's the place to enter them. It's
optional and you can enter as many as you want.
+
+= Payment setting
+
+How will the customer pay ? Select the radio button to correspond with he
payment method preferred by the customer. +
+Billing information is to completed when credit card or eft payments are not
used.
+
+= Additional Party Entry
+
+There may be reasons for associating another Party or Group with the order.
For example, the person placing the order
+might be an member of an existing customer group, such as a shopping club, or
they might be a purchasing agent for
+a company and need to be identified with that company.
+
+When you select to identify another group or individual for association, a
process will be followed. +
+Select a Party (use the lookup or auto-completion in field) and after the
apply button you have to select which role for this
+party for this order. Only Existing role associated with the party selected
appear.
\ No newline at end of file
diff --git
a/applications/order/src/docs/asciidoc/_include/Help-order-check-inits.adoc
b/applications/order/src/docs/asciidoc/_include/Help-order-check-inits.adoc
new file mode 100644
index 000..7825b52
--- /dev/null
+++ b/applications/order/src/docs/asciidoc/_include/Help-order-check-inits.adoc
@@ -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
buildbot failure in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a new failure on builder ofbizTrunkFrameworkPlugins while building ofbiz-plugins. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/2087 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkPluginsCommit' triggered this build Build Source Stamp: [branch trunk] dbfa4f0ca0620896a2313d5b784d197bbc25d4d3 Blamelist: Jacques Le Roux BUILD FAILED: failed testIntegration Sincerely, -The Buildbot
[ofbiz-plugins] branch trunk updated: Improved: Handle remaining checkstyle errors (OFBIZ-12169)
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-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new dbfa4f0 Improved: Handle remaining checkstyle errors (OFBIZ-12169)
dbfa4f0 is described below
commit dbfa4f0ca0620896a2313d5b784d197bbc25d4d3
Author: Jacques Le Roux
AuthorDate: Tue May 4 10:34:58 2021 +0200
Improved: Handle remaining checkstyle errors (OFBIZ-12169)
This handles the "'(' should be on the previous line?" rule of
MethodParamPad
Actually not completely, because there are still some cases that can't be
handled by changing code, notably when a casting is necessary. I believe
there
is an error in checkstyle code. I'll discuss that in dev ML before sending
checkstyle team a report.
---
.../org/apache/ofbiz/htmlreport/AbstractReportThread.java| 12 ++--
.../main/java/org/apache/ofbiz/htmlreport/HtmlReport.java| 5 +
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git
a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
index a33521e..46df69c 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
@@ -166,8 +166,8 @@ public abstract class AbstractReportThread extends Thread
implements InterfaceRe
*/
protected void initHtmlReport(HttpServletRequest request,
HttpServletResponse response) {
-report = HtmlReport.getInstance(request, response);
-((HtmlReport) report).setParamThread(getUUID().toString());
+HtmlReport report = HtmlReport.getInstance(request, response);
+report.setParamThread(getUUID().toString());
}
/**
@@ -175,8 +175,8 @@ public abstract class AbstractReportThread extends Thread
implements InterfaceRe
*/
protected void initHtmlReport(HttpServletRequest request,
HttpServletResponse response, boolean writeHtml, boolean isTransient) {
-report = HtmlReport.getInstance(request, response, writeHtml,
isTransient);
-((HtmlReport) report).setParamThread(getUUID().toString());
+HtmlReport report = HtmlReport.getInstance(request, response,
writeHtml, isTransient);
+report.setParamThread(getUUID().toString());
}
/**
@@ -189,8 +189,8 @@ public abstract class AbstractReportThread extends Thread
implements InterfaceRe
*/
protected void initHtmlReport(HttpServletRequest request,
HttpServletResponse response, boolean writeHtml, boolean isTransient,
String logFileName) {
-report = HtmlReport.getInstance(request, response, writeHtml,
isTransient, logFileName);
-((HtmlReport) report).setParamThread(getUUID().toString());
+HtmlReport report = HtmlReport.getInstance(request, response,
writeHtml, isTransient, logFileName);
+report.setParamThread(getUUID().toString());
}
/**
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
b/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
index 34b2da4..a5aa404 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
@@ -96,16 +96,13 @@ public class HtmlReport extends AbstractReport {
/** The thread to display in this report. */
private String paramThread;
-/** The next thread to display after this report. */
-private String paramThreadHasNext;
-
private String paramAction;
private String paramTitle;
private String paramResource;
-/** Flag for refreching workplace .*/
+/** Flag for refreshing workplace. */
private String paramRefreshWorkplace;
/** Constant for the "OK" button in the build button methods. */
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/2191 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: forced: by IRC user (privmsg): forces manual build because of INFRA-21829 Build Source Stamp: HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot exception in on ofbizTrunkFramework
The Buildbot has detected a build exception on builder ofbizTrunkFramework while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/2190 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] 45f50c910d64c12a2601164fbc64a4a02ef1d833 Blamelist: Jacques Le Roux BUILD FAILED: exception upload test-results part 1 Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Improved: Handle remaining checkstyle errors (OFBIZ-12169)
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 45f50c9 Improved: Handle remaining checkstyle errors (OFBIZ-12169)
45f50c9 is described below
commit 45f50c910d64c12a2601164fbc64a4a02ef1d833
Author: Jacques Le Roux
AuthorDate: Tue May 4 10:34:52 2021 +0200
Improved: Handle remaining checkstyle errors (OFBIZ-12169)
This handles the "'(' should be on the previous line?" rule of
MethodParamPad
Actually not completely, because there are still some cases that can't be
handled by changing code, notably when a casting is necessary. I believe
there
is an error in checkstyle code. I'll discuss that in dev ML before sending
checkstyle team a report.
---
.../java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java | 4 ++--
.../java/org/apache/ofbiz/order/order/OrderReturnServices.java | 3 ++-
.../java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java | 4 ++--
build.gradle | 2 +-
.../common/src/main/java/org/apache/ofbiz/common/CommonEvents.java | 7 +++
.../main/java/org/apache/ofbiz/webapp/control/ContextFilter.java | 2 +-
.../src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
index 9c956e8..7ee585a 100644
---
a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
+++
b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
@@ -457,8 +457,8 @@ public class InvoiceServices {
Map createInvoiceItemContext = new HashMap<>();
createInvoiceItemContext.put("invoiceId", invoiceId);
createInvoiceItemContext.put("invoiceItemSeqId",
invoiceItemSeqId);
-createInvoiceItemContext.put("invoiceItemTypeId",
getInvoiceItemType(delegator, (orderItem.getString("orderItemTypeId")),
-(product == null ? null :
product.getString("productTypeId")), invoiceType, "INV_FPROD_ITEM"));
+createInvoiceItemContext.put("invoiceItemTypeId",
getInvoiceItemType(delegator, orderItem.getString("orderItemTypeId"),
+product == null ? null :
product.getString("productTypeId"), invoiceType, "INV_FPROD_ITEM"));
createInvoiceItemContext.put("description",
orderItem.get("itemDescription"));
createInvoiceItemContext.put("quantity", billingQuantity);
createInvoiceItemContext.put("amount", billingAmount);
diff --git
a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
index d8b469b..17f43b2 100644
---
a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
+++
b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java
@@ -1325,7 +1325,8 @@ public class OrderReturnServices {
orderPayPrefDetails.put("orderPaymentPreference",
orderPayPref);
orderPayPrefDetails.put("availableTotal",
orderPayPrefAvailableTotal);
if (prefSplitMap.containsKey(paymentMethodTypeId)) {
-
(prefSplitMap.get(paymentMethodTypeId)).add(orderPayPrefDetails);
+List> paymentMethodTypeIds =
prefSplitMap.get(paymentMethodTypeId);
+paymentMethodTypeIds.add(orderPayPrefDetails);
} else {
prefSplitMap.put(paymentMethodTypeId,
UtilMisc.toList(orderPayPrefDetails));
}
diff --git
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
index d8e9885..1fff629 100644
---
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
+++
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
@@ -1759,8 +1759,8 @@ public class ShoppingCart implements
Iterable, Serializable {
this.orderAttributes.clear();
// clear the additionalPartyRole Map
-for (Map.Entry> me :
this.additionalPartyRole.entrySet()) {
-((LinkedList) me.getValue()).clear();
+for (Entry> me :
this.additionalPartyRole.entrySet()) {
+me.getValue().clear();
}
