This is an automated email from the ASF dual-hosted git repository.
mridulpathak 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 2ea56e36a2 Remove the leftover BIRT references from the framework
2ea56e36a2 is described below
commit 2ea56e36a20df1e54d8bfa1d4c1fa8c45c5037e3
Author: Mridul Pathak <[email protected]>
AuthorDate: Wed Oct 28 12:04:00 2026 +0530
Remove the leftover BIRT references from the framework
- Remove BIRT_FLEXIBLE_REPORT_POLICY from UtilCodec, as the FLEXIBLE_REPORT
content type was only defined by the birt plugin
- Remove the BIRT reports warning label, the order report events that only
the BIRT reports called, and the help page for the BIRT reports
- Stop disabling plugins/birt by default in the Docker entrypoint and its
documentation
- Remove the Maven repository that was only needed by the BIRT runtime, and
the birt log entry in .gitignore
---
.gitignore | 1 -
DOCKER.adoc | 2 +-
applications/order/config/OrderUiLabels.xml | 5 -
.../reports/NetBeforeOverheadDateEvent.xml | 36 ---
.../minilang/reports/NetBeforeOverheadEvent.xml | 47 ----
.../reports/NetBeforeOverheadMonthlyEvent.xml | 113 ---------
.../minilang/reports/ProductDemandReportEvent.xml | 72 ------
.../order/minilang/reports/SalesReportEvent.xml | 282 ---------------------
.../src/docs/asciidoc/_include/order-report.adoc | 60 -----
applications/order/src/docs/asciidoc/order.adoc | 3 -
.../order/widget/ordermgr/ReportScreens.xml | 2 -
build.gradle | 10 -
docker/docker-entrypoint.sh | 4 +-
.../java/org/apache/ofbiz/base/util/UtilCodec.java | 22 --
14 files changed, 3 insertions(+), 656 deletions(-)
diff --git a/.gitignore b/.gitignore
index ee7f950633..da5f02821d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ runtime/logs/*.log*
runtime/logs/*.html*
runtime/logs/test-results/*
runtime/logs/test-reports-history/
-runtime/logs/birt
runtime/data/h2/*
runtime/data/utilcache.*
runtime/catalina/work/*
diff --git a/DOCKER.adoc b/DOCKER.adoc
index d7bb598986..5a6b072af2 100644
--- a/DOCKER.adoc
+++ b/DOCKER.adoc
@@ -107,7 +107,7 @@ this environment variable contains a non-empty value.
the docker-entrypoint.sh script to skip downloading of any database
drivers.
-|OFBIZ_DISABLE_COMPONENTS |plugins/birt/ofbiz-component.xml |Commas
+|OFBIZ_DISABLE_COMPONENTS |_empty_ |Commas
seperated list of paths to ofbiz-component.xml files of the components
that should not be loaded.
|===
diff --git a/applications/order/config/OrderUiLabels.xml
b/applications/order/config/OrderUiLabels.xml
index 5327859ae4..9c01d23d1a 100644
--- a/applications/order/config/OrderUiLabels.xml
+++ b/applications/order/config/OrderUiLabels.xml
@@ -19,11 +19,6 @@
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd";>
- <property key="BirtOrderReportsWarning">
- <value xml:lang="en">Four Birt reports (Last 3 Months Sales, Sales,
Sales Order Discount Code, Product Demand) require to feed the BI data base
(note that the bi.properties file will need to be updated after September
2026). Then only new approved orders will be taken into account.</value>
- <value xml:lang="fr">Quatre tableau créés par Birt (Ventes des 3
derniers mois, Ventes, Ventes par codes promotionels, Demandes par produit)
nécessitent d'alimenter la base de données d'Inform. décis. (notez aussi la
nécessaire màj du fichier bi.properties après septembre 2026). Ensuite seules
les commandes nouvellement approuvées seront prises en compte.</value>
- <value
xml:lang="zh">4个Birt报告（最近3个月销售、销售、销售订单折扣优惠码、产品需求）要求提供BI数据库（注意：bi.properites文件需要在2026年9月后进行更新）。只会统计新批准的那些订单。</value>
- </property>
<property key="DeleteOrderItemShipGroup">
<value xml:lang="de">Versandgruppe löschen</value>
<value xml:lang="en">Delete this ship group</value>
diff --git a/applications/order/minilang/reports/NetBeforeOverheadDateEvent.xml
b/applications/order/minilang/reports/NetBeforeOverheadDateEvent.xml
deleted file mode 100644
index e27736101a..0000000000
--- a/applications/order/minilang/reports/NetBeforeOverheadDateEvent.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-
-<simple-methods xmlns:xsi="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";>
-
- <simple-method method-name="getOrder" short-description="Get Orders"
login-required="false">
- <set field="DateDay" value="2009-12-03"/>
- <if-not-empty field="DateDay">
- <entity-condition entity-name="SalesOrderItemStarSchema"
list="Date_starschemas">
- <condition-list combine="and">
- <condition-expr field-name="orderDateYearMonthDay"
operator="equals" from-field="DateDay"/>
- <condition-expr field-name="productStoreId"
operator="equals" from-field="productStoreId"/>
- </condition-list>
- </entity-condition>
- </if-not-empty>
- </simple-method>
-
-</simple-methods>
diff --git a/applications/order/minilang/reports/NetBeforeOverheadEvent.xml
b/applications/order/minilang/reports/NetBeforeOverheadEvent.xml
deleted file mode 100644
index e11ee0a5cb..0000000000
--- a/applications/order/minilang/reports/NetBeforeOverheadEvent.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-
-<simple-methods xmlns:xsi="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";>
-
- <simple-method method-name="getOrder" short-description="Get Orders"
login-required="false">
- <if-not-empty field="DateMonth">
- <set field="DateYear" value="2009"/>
- <set field="DateMonth" value="12"/>
- <set field="mount1" from-field="DateMonth" type="Integer"/>
- <calculate field="mount2" type="Integer">
- <calcop operator="subtract" field="mount1">
- <number value="1"/>
- </calcop>
- </calculate>
- <entity-condition entity-name="SalesOrderItemStarSchema"
list="starschemas">
- <condition-list combine="and">
- <condition-list combine="or">
- <condition-expr field-name="orderDateMonthOfYear"
operator="equals" from-field="DateMonth"/>
- <condition-expr field-name="orderDateMonthOfYear"
operator="equals" from-field="mount2"/>
- </condition-list>
- <condition-expr field-name="orderDateYearName"
operator="equals" from-field="DateYear"/>
- <condition-expr field-name="productStoreId"
operator="equals" from-field="productStoreId"/>
- </condition-list>
- </entity-condition>
- </if-not-empty>
- </simple-method>
-
-</simple-methods>
diff --git
a/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml
b/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml
deleted file mode 100644
index dca40a5164..0000000000
--- a/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-
-<simple-methods xmlns:xsi="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";>
-
- <simple-method method-name="getOrder" short-description="Get Orders"
login-required="false">
- <if-not-empty field="DateMonth">
- <set field="DateYear" value="2009"/>
- <set field="DateMonth" value="12"/>
- <entity-condition entity-name="SalesOrderItemStarSchema"
list="countdates" distinct="true">
- <condition-list combine="and">
- <condition-expr field-name="orderDateYearName"
operator="equals" from-field="DateYear"/>
- <condition-expr field-name="orderDateMonthOfYear"
operator="equals" from-field="DateMonth"/>
- <condition-expr field-name="productStoreId"
operator="equals" from-field="productStoreId"/>
- </condition-list>
- <select-field field-name="orderDateYearMonthDay"/>
- <select-field field-name="salesChannelEnumId"/>
- </entity-condition>
- <entity-condition entity-name="SalesOrderItemStarSchema"
list="starschemas" distinct="true">
- <condition-list combine="and">
- <condition-expr field-name="orderDateYearName"
operator="equals" from-field="DateYear"/>
- <condition-expr field-name="orderDateMonthOfYear"
operator="equals" from-field="DateMonth"/>
- <condition-expr field-name="productStoreId"
operator="equals" from-field="productStoreId"/>
- </condition-list>
- <select-field field-name="orderDateMonthName"/>
- <select-field field-name="salesChannelEnumId"/>
- <select-field field-name="NBO"/>
- </entity-condition>
- <entity-condition entity-name="SalesOrderItemStarSchema"
list="saleschannels" distinct="true">
- <condition-list combine="and">
- <condition-expr field-name="orderDateYearName"
operator="equals" from-field="DateYear"/>
- <condition-expr field-name="orderDateMonthOfYear"
operator="equals" from-field="DateMonth"/>
- <condition-expr field-name="productStoreId"
operator="equals" from-field="productStoreId"/>
- </condition-list>
- <select-field field-name="salesChannelEnumId"/>
- </entity-condition>
- </if-not-empty>
-
- <set field="count1" value="-1"/>
- <iterate list="saleschannels" entry="saleschannel">
- <calculate field="count1">
- <calcop operator="add" field="count1">
- <number value="1"/>
- </calcop>
- </calculate>
- <set field="salesChannelId"
from-field="saleschannel.salesChannelEnumId"/>
- <set field="salesChannelMap.salesChannelList[]"
from-field="salesChannelId"/>
- </iterate>
-
- <set field="count2" value="0"/>
- <iterate list="countdates" entry="countdate">
- <set field="checksalesChannel1"
from-field="salesChannelMap.salesChannelList[count2]"/>
- <if-compare-field field="countdate.salesChannelEnumId"
to-field="checksalesChannel1" operator="equals">
- <calculate field="countdateMap.countsalesChannel[count2]">
- <calcop operator="add"
field="countdateMap.countsalesChannel[count2]">
- <number value="1"/>
- </calcop>
- </calculate>
- </if-compare-field>
- <if-compare-field field="countdate.salesChannelEnumId"
to-field="checksalesChannel1" operator="not-equals">
- <calculate field="count2">
- <calcop operator="add" field="count2">
- <number value="1"/>
- </calcop>
- </calculate>
- <calculate field="countdateMap.countsalesChannel[count2]">
- <calcop operator="add"
field="countdateMap.countsalesChannel[count2]">
- <number value="1"/>
- </calcop>
- </calculate>
- </if-compare-field>
- </iterate>
-
- <set field="count3" value="-1"/>
- <set field="count4" value="0"/>
- <iterate list="starschemas" entry="starschema">
- <calculate field="count3">
- <calcop operator="add" field="count3">
- <number value="1"/>
- </calcop>
- </calculate>
- <calculate field="count4">
- <calcop operator="add" field="count4">
- <number value="1"/>
- </calcop>
- </calculate>
- <set field="checksalesChannel2"
from-field="salesChannelMap.salesChannelList[count3]"/>
- <if-compare-field field="starschema.salesChannelEnumId"
to-field="checksalesChannel2" operator="equals">
- <set field="starschemacountdate"
from-field="countdateMap.countsalesChannel[count4]"/>
- <set field="starschema.CountDate"
from-field="starschemacountdate"/>
- </if-compare-field>
- </iterate>
- </simple-method>
-
-</simple-methods>
diff --git a/applications/order/minilang/reports/ProductDemandReportEvent.xml
b/applications/order/minilang/reports/ProductDemandReportEvent.xml
deleted file mode 100644
index 1bc445b2ab..0000000000
--- a/applications/order/minilang/reports/ProductDemandReportEvent.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-
-<simple-methods xmlns:xsi="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";>
-
- <simple-method method-name="getOrder" short-description="Get Orders"
login-required="false">
- <if-not-empty field="Week">
- <set field="year" from-field="Year" type="Integer"/>
- <set field="week1" from-field="Week" type="Integer"/>
- <calculate field="week2" type="Integer">
- <calcop operator="subtract" field="week1">
- <number value="1"/>
- </calcop>
- </calculate>
- <calculate field="week3" type="Integer">
- <calcop operator="subtract" field="week1">
- <number value="2"/>
- </calcop>
- </calculate>
- <calculate field="week4" type="Integer">
- <calcop operator="subtract" field="week1">
- <number value="3"/>
- </calcop>
- </calculate>
- <if-not-empty field="productStoreId">
- <entity-condition entity-name="SalesOrderItemStarSchema"
list="starschemas">
- <condition-list combine="and">
- <condition-list combine="or">
- <condition-expr field-name="orderDateWeekOfYear"
operator="equals" from-field="week1"/>
- <condition-expr field-name="orderDateWeekOfYear"
operator="equals" from-field="week2"/>
- <condition-expr field-name="orderDateWeekOfYear"
operator="equals" from-field="week3"/>
- <condition-expr field-name="orderDateWeekOfYear"
operator="equals" from-field="week4"/>
- </condition-list>
- <condition-expr field-name="productStoreId"
operator="equals" from-field="productStoreId"/>
- <condition-expr field-name="orderDateYearName"
operator="equals" from-field="year"/>
- </condition-list>
- </entity-condition>
- </if-not-empty>
- <if-empty field="productStoreId">
- <entity-condition entity-name="SalesOrderItemStarSchema"
list="starschemas">
- <condition-list combine="and">
- <condition-list combine="or">
- <condition-expr field-name="orderDateWeekOfYear"
operator="equals" from-field="week1"/>
- <condition-expr field-name="orderDateWeekOfYear"
operator="equals" from-field="week2"/>
- <condition-expr field-name="orderDateWeekOfYear"
operator="equals" from-field="week3"/>
- <condition-expr field-name="orderDateWeekOfYear"
operator="equals" from-field="week4"/>
- </condition-list>
- <condition-expr field-name="orderDateYearName"
operator="equals" from-field="year"/>
- </condition-list>
- </entity-condition>
- </if-empty>
- </if-not-empty>
- </simple-method>
-</simple-methods>
diff --git a/applications/order/minilang/reports/SalesReportEvent.xml
b/applications/order/minilang/reports/SalesReportEvent.xml
deleted file mode 100644
index a8123e150d..0000000000
--- a/applications/order/minilang/reports/SalesReportEvent.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-
-<simple-methods xmlns:xsi="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";>
-
- <simple-method method-name="getOrder" short-description="Get Orders"
login-required="false">
- <if-compare operator="equals" value="day" field="reportBy">
- <if-not-empty field="thruDate">
- <entity-condition entity-name="SalesOrderItemStarSchema"
list="starschemas">
- <condition-list combine="or">
- <condition-list combine="and">
- <condition-expr field-name="orderDateYearMonthDay"
operator="greater-equals" from-field="fromDate"/>
- <condition-expr field-name="orderDateYearMonthDay"
operator="less-equals" from-field="thruDate"/>
- </condition-list>
- <condition-expr field-name="orderDateYearMonthDay"
operator="equals" from-field="lastDate"/>
- </condition-list>
- <select-field field-name="orderDateDateValue"/>
- <select-field field-name="orderDateDescription"/>
- <select-field field-name="orderDateDayName"/>
- <select-field field-name="orderDateDayOfMonth"/>
- <select-field field-name="orderDateMonthName"/>
- <select-field field-name="orderDateYearName"/>
- <select-field field-name="orderDateWeekOfYear"/>
- <select-field field-name="orderDateYearMonthDay"/>
- <select-field field-name="orderDateMonthOfYear"/>
- <select-field field-name="salesChannelEnumId"/>
- <select-field field-name="brand"/>
- <select-field field-name="pod"/>
- <select-field field-name="account"/>
- <select-field field-name="quantity"/>
- <select-field field-name="GS"/>
- <select-field field-name="GMS"/>
- <select-field field-name="GMP"/>
- <select-field field-name="GSP"/>
- <select-field field-name="GP"/>
- <select-field field-name="countOrder"/>
- <order-by field-name="-orderDateDateValue"/>
- </entity-condition>
- </if-not-empty>
- </if-compare>
-
- <if-compare operator="equals" value="week" field="reportBy">
- <if-not-empty field="thruWeek">
- <if-compare field="thruWeek" operator="less-equals" value="3"
type="Integer">
- <calculate field="lastYear">
- <calcop operator="subtract" field="thisYear">
- <number value="1"/>
- </calcop>
- </calculate>
- <entity-condition entity-name="SalesOrderItemStarSchema"
list="starschemas">
- <condition-list combine="and">
- <condition-expr field-name="orderDateYearName"
operator="equals" from-field="thisYear"/>
- <condition-expr field-name="orderDateWeekOfYear"
operator="greater-equals" value="1"/>
- <condition-expr field-name="orderDateWeekOfYear"
operator="less-equals" from-field="thruWeek"/>
- </condition-list>
- <select-field field-name="orderDateDescription"/>
- <select-field field-name="orderDateDayName"/>
- <select-field field-name="orderDateDayOfMonth"/>
- <select-field field-name="orderDateMonthName"/>
- <select-field field-name="orderDateYearName"/>
- <select-field field-name="orderDateWeekOfYear"/>
- <select-field field-name="orderDateYearMonthDay"/>
- <select-field field-name="orderDateMonthOfYear"/>
- <select-field field-name="salesChannelEnumId"/>
- <select-field field-name="brand"/>
- <select-field field-name="pod"/>
- <select-field field-name="account"/>
- <select-field field-name="quantity"/>
- <select-field field-name="GS"/>
- <select-field field-name="GMS"/>
- <select-field field-name="GMP"/>
- <select-field field-name="GSP"/>
- <select-field field-name="GP"/>
- <select-field field-name="countOrder"/>
- </entity-condition>
- <else>
- <calculate field="fromWeek">
- <calcop operator="subtract" field="thruWeek">
- <number value="3"/>
- </calcop>
- </calculate>
- <entity-condition entity-name="SalesOrderItemStarSchema"
list="starschemas">
- <condition-list combine="and">
- <condition-expr field-name="orderDateYearName"
operator="equals" from-field="thisYear"/>
- <condition-expr field-name="orderDateWeekOfYear"
operator="greater-equals" from-field="fromWeek"/>
- <condition-expr field-name="orderDateWeekOfYear"
operator="less-equals" from-field="thruWeek"/>
- </condition-list>
- <select-field field-name="orderDateDescription"/>
- <select-field field-name="orderDateDayName"/>
- <select-field field-name="orderDateDayOfMonth"/>
- <select-field field-name="orderDateMonthName"/>
- <select-field field-name="orderDateYearName"/>
- <select-field field-name="orderDateWeekOfYear"/>
- <select-field field-name="orderDateYearMonthDay"/>
- <select-field field-name="orderDateMonthOfYear"/>
- <select-field field-name="salesChannelEnumId"/>
- <select-field field-name="brand"/>
- <select-field field-name="pod"/>
- <select-field field-name="account"/>
- <select-field field-name="quantity"/>
- <select-field field-name="GS"/>
- <select-field field-name="GMS"/>
- <select-field field-name="GMP"/>
- <select-field field-name="GSP"/>
- <select-field field-name="GP"/>
- <select-field field-name="countOrder"/>
- </entity-condition>
- </else>
- </if-compare>
- </if-not-empty>
- </if-compare>
-
- <if-compare operator="equals" value="month" field="reportBy">
- <if-not-empty field="thruMonth">
- <if-compare field="thruMonth" operator="less-equals" value="3"
type="Integer">
- <calculate field="lastYear">
- <calcop operator="subtract" field="thisYear">
- <number value="1"/>
- </calcop>
- </calculate>
-
- <if-compare field="thruMonth" operator="equals" value="3"
type="Integer">
- <entity-condition
entity-name="SalesOrderItemStarSchema" list="starschemas">
- <condition-list combine="or">
- <condition-list combine="and">
- <condition-expr
field-name="orderDateYearName" operator="equals" from-field="thisYear"/>
- <condition-expr
field-name="orderDateMonthOfYear" operator="greater-equals" value="1"/>
- <condition-expr
field-name="orderDateMonthOfYear" operator="less-equals" value="3"/>
- </condition-list>
- <condition-list combine="and">
- <condition-expr
field-name="orderDateYearName" operator="equals" from-field="lastYear"/>
- <condition-expr
field-name="orderDateMonthOfYear" operator="equals" value="12"/>
- </condition-list>
- </condition-list>
- <select-field field-name="orderDateDescription"/>
- <select-field field-name="orderDateDayName"/>
- <select-field field-name="orderDateDayOfMonth"/>
- <select-field field-name="orderDateMonthName"/>
- <select-field field-name="orderDateYearName"/>
- <select-field field-name="orderDateWeekOfYear"/>
- <select-field field-name="orderDateYearMonthDay"/>
- <select-field field-name="orderDateMonthOfYear"/>
- <select-field field-name="salesChannelEnumId"/>
- <select-field field-name="brand"/>
- <select-field field-name="pod"/>
- <select-field field-name="account"/>
- <select-field field-name="quantity"/>
- <select-field field-name="GS"/>
- <select-field field-name="GMS"/>
- <select-field field-name="GMP"/>
- <select-field field-name="GSP"/>
- <select-field field-name="GP"/>
- <select-field field-name="countOrder"/>
- </entity-condition>
- </if-compare>
-
- <if-compare field="thruMonth" operator="equals" value="2"
type="Integer">
- <entity-condition
entity-name="SalesOrderItemStarSchema" list="starschemas">
- <condition-list combine="or">
- <condition-list combine="and">
- <condition-expr
field-name="orderDateYearName" operator="equals" from-field="thisYear"/>
- <condition-expr
field-name="orderDateMonthOfYear" operator="greater-equals" value="1"/>
- <condition-expr
field-name="orderDateMonthOfYear" operator="less-equals" value="2"/>
- </condition-list>
- <condition-list combine="and">
- <condition-expr
field-name="orderDateYearName" operator="equals" from-field="lastYear"/>
- <condition-expr
field-name="orderDateMonthOfYear" operator="greater-equals" value="11"/>
- <condition-expr
field-name="orderDateMonthOfYear" operator="less-equals" value="12"/>
- </condition-list>
- </condition-list>
- <select-field field-name="orderDateDescription"/>
- <select-field field-name="orderDateDayName"/>
- <select-field field-name="orderDateDayOfMonth"/>
- <select-field field-name="orderDateMonthName"/>
- <select-field field-name="orderDateYearName"/>
- <select-field field-name="orderDateWeekOfYear"/>
- <select-field field-name="orderDateYearMonthDay"/>
- <select-field field-name="orderDateMonthOfYear"/>
- <select-field field-name="salesChannelEnumId"/>
- <select-field field-name="brand"/>
- <select-field field-name="pod"/>
- <select-field field-name="account"/>
- <select-field field-name="quantity"/>
- <select-field field-name="GS"/>
- <select-field field-name="GMS"/>
- <select-field field-name="GMP"/>
- <select-field field-name="GSP"/>
- <select-field field-name="GP"/>
- <select-field field-name="countOrder"/>
- </entity-condition>
- </if-compare>
-
- <if-compare field="thruMonth" operator="equals" value="1"
type="Integer">
- <entity-condition
entity-name="SalesOrderItemStarSchema" list="starschemas">
- <condition-list combine="or">
- <condition-list combine="and">
- <condition-expr
field-name="orderDateYearName" operator="equals" from-field="thisYear"/>
- <condition-expr
field-name="orderDateMonthOfYear" operator="equals" value="1"/>
- </condition-list>
- <condition-list combine="and">
- <condition-expr
field-name="orderDateYearName" operator="equals" from-field="lastYear"/>
- <condition-expr
field-name="orderDateMonthOfYear" operator="greater-equals" value="10"/>
- <condition-expr
field-name="orderDateMonthOfYear" operator="less-equals" value="12"/>
- </condition-list>
- </condition-list>
- <select-field field-name="orderDateDescription"/>
- <select-field field-name="orderDateDayName"/>
- <select-field field-name="orderDateDayOfMonth"/>
- <select-field field-name="orderDateMonthName"/>
- <select-field field-name="orderDateYearName"/>
- <select-field field-name="orderDateWeekOfYear"/>
- <select-field field-name="orderDateYearMonthDay"/>
- <select-field field-name="orderDateMonthOfYear"/>
- <select-field field-name="salesChannelEnumId"/>
- <select-field field-name="brand"/>
- <select-field field-name="pod"/>
- <select-field field-name="account"/>
- <select-field field-name="quantity"/>
- <select-field field-name="GS"/>
- <select-field field-name="GMS"/>
- <select-field field-name="GMP"/>
- <select-field field-name="GSP"/>
- <select-field field-name="GP"/>
- <select-field field-name="countOrder"/>
- </entity-condition>
- </if-compare>
- <else>
- <calculate field="fromMonth">
- <calcop operator="subtract" field="thruMonth">
- <number value="3"/>
- </calcop>
- </calculate>
- <entity-condition entity-name="SalesOrderItemStarSchema"
list="starschemas">
- <condition-list combine="and">
- <condition-expr field-name="orderDateYearName"
operator="equals" from-field="thisYear"/>
- <condition-expr field-name="orderDateMonthOfYear"
operator="greater-equals" from-field="fromMonth"/>
- <condition-expr field-name="orderDateMonthOfYear"
operator="less-equals" from-field="thruMonth"/>
- </condition-list>
- <select-field field-name="orderDateDescription"/>
- <select-field field-name="orderDateDayName"/>
- <select-field field-name="orderDateDayOfMonth"/>
- <select-field field-name="orderDateMonthName"/>
- <select-field field-name="orderDateYearName"/>
- <select-field field-name="orderDateWeekOfYear"/>
- <select-field field-name="orderDateYearMonthDay"/>
- <select-field field-name="orderDateMonthOfYear"/>
- <select-field field-name="salesChannelEnumId"/>
- <select-field field-name="brand"/>
- <select-field field-name="pod"/>
- <select-field field-name="account"/>
- <select-field field-name="quantity"/>
- <select-field field-name="GS"/>
- <select-field field-name="GMS"/>
- <select-field field-name="GMP"/>
- <select-field field-name="GSP"/>
- <select-field field-name="GP"/>
- <select-field field-name="countOrder"/>
- </entity-condition>
- </else>
- </if-compare>
- </if-not-empty>
- </if-compare>
- </simple-method>
-</simple-methods>
diff --git a/applications/order/src/docs/asciidoc/_include/order-report.adoc
b/applications/order/src/docs/asciidoc/_include/order-report.adoc
deleted file mode 100644
index e64859e722..0000000000
--- a/applications/order/src/docs/asciidoc/_include/order-report.adoc
+++ /dev/null
@@ -1,60 +0,0 @@
-////
-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.
-////
-= Help for Order Reports
-
-The Order Reports provide general information about orders in the system.
-
-== Initial steps.
-If your reports look empty it may be required to initialize the warehouse
entities in the BI component.
-
-. Go to :https://localhost:8443/bi/control/main[Business Intelligence]
-. Click "Quick Init DataWarehouse". System will automatic initial Data in the
warehouse for Reports
-. Go back to :
https://localhost:8443/ordermgr/control/OrderPurchaseReportOptions[Order
Reports.]
-
-== Reports List
-=== 1. Sales Order By Referrer Report
-There are referrers, link, totals orders, quantity totals and amount totals.
-They are grouped by referrer.
-
-=== 2. Sales Order By Channel Report
-There are total Orders, total Items, quantity totals and amount totals.
-They are grouped by Sales Channel.
-
-=== 3. Sale Orders Discount Code Report
-There are order, product, promotion and discount.
-This report is list of All orders.
-
-=== 4. Last Three Months Sales Report
-There are products, prices, stock, sale out quantity and sale out total amount.
-This report is list of all products, it contains the sales and movements in
last 3 months.
-
-=== 5. Coupon Sales Report
-This report lists promotions, total orders, percent of total orders, total
orders amount, percent of total orders amount and shipping amounts.
-
-=== 6. Sales Report
-This Sales report contains paid and unpaid sales orders.
-
-=== 7. Net Before Overhead Report
-Net Before Overhead Report is the profit calculation of paid-shipped orders
and all the occurred fee excluding the overhead cost.
-They are grouped by Product Store Id.(Demo data for Net Before Overhead Report
have in Product Store Id "B2CStore")
-
-=== 8. Product Demand Report
-Product Demand Report is the report to show us which product sells good and
which product doesn't sell good or
-not selling at all in one account as well as for all accounts in last 4 weeks.
-They are grouped by Product Store Id.(Demo data for Product Demand Report have
in Product Store Id "B2CStore")
diff --git a/applications/order/src/docs/asciidoc/order.adoc
b/applications/order/src/docs/asciidoc/order.adoc
index dd590cbc27..09ae26eb7c 100644
--- a/applications/order/src/docs/asciidoc/order.adoc
+++ b/applications/order/src/docs/asciidoc/order.adoc
@@ -170,9 +170,6 @@ and have a look at <<Create Order Diagrams>>
include::_include/order-ecommerce-entry-path.adoc[leveloffset=+3]
-
-include::_include/order-report.adoc[leveloffset=+1]
-
== Requests
== Quotes
diff --git a/applications/order/widget/ordermgr/ReportScreens.xml
b/applications/order/widget/ordermgr/ReportScreens.xml
index d84844aaec..fdd11012fe 100644
--- a/applications/order/widget/ordermgr/ReportScreens.xml
+++ b/applications/order/widget/ordermgr/ReportScreens.xml
@@ -26,12 +26,10 @@ under the License.
<actions>
<set field="titleProperty" value="OrderReports"/>
<set field="headerItem" value="reports"/>
- <set field="helpAnchor" value="_help_for_order_reports"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <label
style="h3">${uiLabelMap.BirtOrderReportsWarning}</label>
<include-portal-page id="OrderReportPage"/>
</decorator-section>
</decorator-screen>
diff --git a/build.gradle b/build.gradle
index 254b3b130e..c32d5c6809 100644
--- a/build.gradle
+++ b/build.gradle
@@ -271,16 +271,6 @@ allprojects {
// net.fortuna.ical4j:ical4j:1.0-rc3-atlassian-11
url = 'https://packages.atlassian.com/maven-3rdparty/'
}
- maven {
- // org/milyn/flute/1.3/flute-1.3.jar
- // need artifact only because of wrong pom metadata in maven
central
- // Required by: plugins:birt >
org.eclipse.birt.runtime:viewservlets:4.5.0 >
org.eclipse.birt.runtime:org.eclipse.birt.runtime:4.4.1
- // TODO Maybe this will no longer needed wheh upgrading
viewservlets to 4.9.0
- url = "https://repo1.maven.org/maven2";
- metadataSources {
- artifact()
- }
- }
maven {
url = 'https://clojars.org/repo'
}
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index a57ea5ac61..901407d716 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -84,7 +84,7 @@
# Prevents loading of ofbiz-components.
# Contains a comma separated list of relative paths from the ofbiz sources
directory to the ofbiz-component.xml files
# that should be prevented from loading.
-# Default: plugins/birt/ofbiz-component.xml
+# Default: none
#
# Hooks are executed at the various stages of the initialisation process by
executing scripts in the following
# directories. Scripts must be executable and have the .sh extension:
@@ -146,7 +146,7 @@ ofbiz_setup_env() {
OFBIZ_POSTGRES_TENANT_USER=${OFBIZ_POSTGRES_TENANT_USER:-ofbiztenant}
OFBIZ_POSTGRES_TENANT_PASSWORD=${OFBIZ_POSTGRES_TENANT_PASSWORD:-ofbiztenant}
-
OFBIZ_DISABLE_COMPONENTS=${OFBIZ_DISABLE_COMPONENTS-plugins/birt/ofbiz-component.xml}
+ OFBIZ_DISABLE_COMPONENTS=${OFBIZ_DISABLE_COMPONENTS-}
}
###############################################################################
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
index 8b4d08e0ed..50af0e5829 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
@@ -145,11 +145,6 @@ public class UtilCodec {
}
if (UtilProperties.getPropertyAsBoolean("owasp",
"sanitizer.enable", true)) {
PolicyFactory sanitizer = null;
- // TODO to be improved to use a (or several) contentTypeId/s
when necessary.
- // Below is an example with BIRT_FLEXIBLE_REPORT_POLICY
- if ("FLEXIBLE_REPORT".equals(contentTypeId)) {
- sanitizer = BIRT_FLEXIBLE_REPORT_POLICY;
- }
// Check if custom policy should be used and if so don't use
PERMISSIVE_POLICY
if ("CUSTOM".equals(UtilProperties.getPropertyValue("owasp",
"sanitizer.permissive.policy"))) {
@@ -210,23 +205,6 @@ public class UtilCodec {
.allowWithoutAttributes("html", "body", "div", "span",
"table", "td")
.allowAttributes("width").onElements("table")
.toFactory();
-
- // This is the PolicyFactory used for the Birt Report Builder usage
feature. ("FLEXIBLE_REPORT" contentTypeId)
- // It allows to use the OOTB Birt Report Builder example.
- // You might need to enhance it for your needs (when using a new
REPORT_MASTER) but normally you should not.
- // See PERMISSIVE_POLICY above for documentation and examples
- public static final PolicyFactory BIRT_FLEXIBLE_REPORT_POLICY = new
HtmlPolicyBuilder()
- .allowWithoutAttributes("html", "body")
- .allowElements("form", "div", "span", "table", "tr", "td",
"input", "textarea", "label", "select", "option")
- .allowAttributes("id", "class", "name", "value",
"onclick").globally()
- .allowAttributes("width", "cellspacing").onElements("table")
- .allowAttributes("type", "size",
"maxlength").onElements("input")
- .allowAttributes("cols", "rows").onElements("textarea")
- .allowAttributes("class").onElements("td")
- .allowAttributes("method").onElements("form")
- .allowAttributes("accept", "action", "accept-charset",
"autocomplete", "enctype", "method",
- "name", "novalidate", "target").onElements("form")
- .toFactory();
}
public static class XmlEncoder implements SimpleEncoder {
