This is an automated email from the ASF dual-hosted git repository.
wpaetzold pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit cd078dc75142a5d5f5fe4adb992cee2398937077
Author: Wiebke Pätzold <wiebke.paetz...@ecomify.de>
AuthorDate: Wed Jul 5 17:42:18 2023 +0200
Improved: Renames folder return to orderReturn (OFBIZ-12813)
This is a preprocessing step for the package declaration in groovy
scripts since return is not allowed in package declaration
---
.../{return => orderReturn}/QuickReturn.groovy | 0
.../{return => orderReturn}/ReturnHeader.groovy | 0
.../{return => orderReturn}/ReturnHistory.groovy | 0
.../{return => orderReturn}/ReturnItems.groovy | 0
.../order/widget/ordermgr/OrderPrintScreens.xml | 4 ++--
.../order/widget/ordermgr/OrderReturnScreens.xml | 18 +++++++++---------
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/applications/order/groovyScripts/return/QuickReturn.groovy
b/applications/order/groovyScripts/orderReturn/QuickReturn.groovy
similarity index 100%
rename from applications/order/groovyScripts/return/QuickReturn.groovy
rename to applications/order/groovyScripts/orderReturn/QuickReturn.groovy
diff --git a/applications/order/groovyScripts/return/ReturnHeader.groovy
b/applications/order/groovyScripts/orderReturn/ReturnHeader.groovy
similarity index 100%
rename from applications/order/groovyScripts/return/ReturnHeader.groovy
rename to applications/order/groovyScripts/orderReturn/ReturnHeader.groovy
diff --git a/applications/order/groovyScripts/return/ReturnHistory.groovy
b/applications/order/groovyScripts/orderReturn/ReturnHistory.groovy
similarity index 100%
rename from applications/order/groovyScripts/return/ReturnHistory.groovy
rename to applications/order/groovyScripts/orderReturn/ReturnHistory.groovy
diff --git a/applications/order/groovyScripts/return/ReturnItems.groovy
b/applications/order/groovyScripts/orderReturn/ReturnItems.groovy
similarity index 100%
rename from applications/order/groovyScripts/return/ReturnItems.groovy
rename to applications/order/groovyScripts/orderReturn/ReturnItems.groovy
diff --git a/applications/order/widget/ordermgr/OrderPrintScreens.xml
b/applications/order/widget/ordermgr/OrderPrintScreens.xml
index 0ed42615bf..9a9505906f 100644
--- a/applications/order/widget/ordermgr/OrderPrintScreens.xml
+++ b/applications/order/widget/ordermgr/OrderPrintScreens.xml
@@ -123,8 +123,8 @@ under the License.
<property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
- <script
location="component://order/groovyScripts/return/ReturnHeader.groovy"/>
- <script
location="component://order/groovyScripts/return/ReturnItems.groovy"/>
+ <script
location="component://order/groovyScripts/orderReturn/ReturnHeader.groovy"/>
+ <script
location="component://order/groovyScripts/orderReturn/ReturnItems.groovy"/>
</actions>
<widgets>
<decorator-screen name="FoReportDecorator"
location="component://common/widget/CommonScreens.xml">
diff --git a/applications/order/widget/ordermgr/OrderReturnScreens.xml
b/applications/order/widget/ordermgr/OrderReturnScreens.xml
index 96af57a2e0..0d5f3b2997 100644
--- a/applications/order/widget/ordermgr/OrderReturnScreens.xml
+++ b/applications/order/widget/ordermgr/OrderReturnScreens.xml
@@ -80,7 +80,7 @@ under the License.
<set field="titleProperty" value="PageTitleFindQuickReturn"/>
<set field="headerItem" value="return"/>
<set field="helpAnchor" value="_quick_return"/>
- <script
location="component://order/groovyScripts/return/QuickReturn.groovy"/>
+ <script
location="component://order/groovyScripts/orderReturn/QuickReturn.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderReturnDecorator"
location="${parameters.orderReturnDecoratorLocation}">
@@ -104,7 +104,7 @@ under the License.
<set field="helpAnchor" value="_create_return"/>
<set field="layoutSettings.javaScripts[+0]"
value="/ordermgr-js/return.js" global="true"/>
<property-to-field field="defaultCurrencyUomId"
resource="general" property="currency.uom.id.default" default="USD"/>
- <script
location="component://order/groovyScripts/return/ReturnHeader.groovy"/>
+ <script
location="component://order/groovyScripts/orderReturn/ReturnHeader.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderReturnDecorator"
location="${parameters.orderReturnDecoratorLocation}">
@@ -149,7 +149,7 @@ under the License.
<set field="headerItem" value="return"/>
<set field="tabButtonItem" value="OrderReturnItems"/>
<set field="helpAnchor" value="_create_return"/>
- <script
location="component://order/groovyScripts/return/ReturnItems.groovy"/>
+ <script
location="component://order/groovyScripts/orderReturn/ReturnItems.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderReturnDecorator"
location="${parameters.orderReturnDecoratorLocation}">
@@ -175,7 +175,7 @@ under the License.
<set field="headerItem" value="return"/>
<set field="tabButtonItem" value="OrderReturnHistory"/>
<set field="returnId" from-field="parameters.returnId"/>
- <script
location="component://order/groovyScripts/return/ReturnItems.groovy"/>
+ <script
location="component://order/groovyScripts/orderReturn/ReturnItems.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderReturnDecorator"
location="${parameters.orderReturnDecoratorLocation}">
@@ -223,7 +223,7 @@ under the License.
<section>
<actions>
<set field="entityField" value="returnTypeId"/>
- <script
location="component://order/groovyScripts/return/ReturnHistory.groovy"/>
+ <script
location="component://order/groovyScripts/orderReturn/ReturnHistory.groovy"/>
</actions>
<widgets>
<section>
@@ -250,7 +250,7 @@ under the License.
<section>
<actions>
<set field="entityField" value="returnReasonId"/>
- <script
location="component://order/groovyScripts/return/ReturnHistory.groovy"/>
+ <script
location="component://order/groovyScripts/orderReturn/ReturnHistory.groovy"/>
</actions>
<widgets>
<section>
@@ -277,7 +277,7 @@ under the License.
<section>
<actions>
<set field="entityField" value="returnQuantity"/>
- <script
location="component://order/groovyScripts/return/ReturnHistory.groovy"/>
+ <script
location="component://order/groovyScripts/orderReturn/ReturnHistory.groovy"/>
</actions>
<widgets>
<section>
@@ -304,7 +304,7 @@ under the License.
<section>
<actions>
<set field="entityField" value="receivedQuantity"/>
- <script
location="component://order/groovyScripts/return/ReturnHistory.groovy"/>
+ <script
location="component://order/groovyScripts/orderReturn/ReturnHistory.groovy"/>
</actions>
<widgets>
<section>
@@ -331,7 +331,7 @@ under the License.
<section>
<actions>
<set field="entityField" value="returnPrice"/>
- <script
location="component://order/groovyScripts/return/ReturnHistory.groovy"/>
+ <script
location="component://order/groovyScripts/orderReturn/ReturnHistory.groovy"/>
</actions>
<widgets>
<section>
