Compare commits
262
Commits
release22.01
...
trunk
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c85550e306 | ||
|
|
783e91f2bd | ||
|
|
9b79d38ec5 | ||
|
|
6013c74c22 | ||
|
|
b7b981993c | ||
|
|
df98889c7b | ||
|
|
9351b641e8 | ||
|
|
7c45738700 | ||
|
|
ead5f29146 | ||
|
|
7875045e5a | ||
|
|
d82626974a | ||
|
|
20ccb4dcfd | ||
|
|
c42d580304 | ||
|
|
e12c98ac5b | ||
|
|
54c86fd53c | ||
|
|
2c7d552840 | ||
|
|
735048f6be | ||
|
|
d532548e4c | ||
|
|
c696d232cb | ||
|
|
80c0676fa6 | ||
|
|
38230e4262 | ||
|
|
d41d8168c1 | ||
|
|
f1c2e8732e | ||
|
|
87f86c21ae | ||
|
|
5923280441 | ||
|
|
8ee85ec390 | ||
|
|
576307ac5c | ||
|
|
e0f61dceb7 | ||
|
|
8015dcb02d | ||
|
|
7ea371bde3 | ||
|
|
78ee6f8792 | ||
|
|
415b0124fe | ||
|
|
9abd236284 | ||
|
|
56fd07118b | ||
|
|
5dc416c3c6 | ||
|
|
1bce4deb5e | ||
|
|
e4777decb4 | ||
|
|
a5d949ecde | ||
|
|
65c766e0c9 | ||
|
|
18d0d75f43 | ||
|
|
80fc052d22 | ||
|
|
14c58a11c8 | ||
|
|
a2dbc689fe | ||
|
|
a88bd3b410 | ||
|
|
427bc85666 | ||
|
|
59617b38ac | ||
|
|
41dd06b72f | ||
|
|
1042b0fc47 | ||
|
|
84d30a5abc | ||
|
|
26c209f8b4 | ||
|
|
e4f1abfbdc | ||
|
|
bf12a58826 | ||
|
|
658552e4fb | ||
|
|
e3f5d31db1 | ||
|
|
61645a72c4 | ||
|
|
5e29578ad6 | ||
|
|
d52ded8f54 | ||
|
|
a70342279f | ||
|
|
ae146e02ef | ||
|
|
253515f3a5 | ||
|
|
6e85417469 | ||
|
|
812aaae07c | ||
|
|
3cc30333d0 | ||
|
|
088b22235d | ||
|
|
b94b6aecaf | ||
|
|
09cf6eb499 | ||
|
|
82f25f6192 | ||
|
|
4d035a554b | ||
|
|
3f5536dc54 | ||
|
|
c5acfa0892 | ||
|
|
5d8d7e9f55 | ||
|
|
708a3b9afe | ||
|
|
7464332b2b | ||
|
|
c35aadbd59 | ||
|
|
7973f09eb3 | ||
|
|
7a3504eb8a | ||
|
|
869a1ea4e4 | ||
|
|
bdf21f3450 | ||
|
|
484063bb1d | ||
|
|
a4cbdec636 | ||
|
|
7abdb9e8ee | ||
|
|
118558239b | ||
|
|
9152fbbdec | ||
|
|
f66f856020 | ||
|
|
592199ba86 | ||
|
|
785ce5c956 | ||
|
|
188ae8795c | ||
|
|
7177fea650 | ||
|
|
277b530338 | ||
|
|
edf58cfbb9 | ||
|
|
ad019a2217 | ||
|
|
4caa0dce12 | ||
|
|
6244ad93ce | ||
|
|
8d8b66aadf | ||
|
|
7c9d583e5c | ||
|
|
5408ddb449 | ||
|
|
428caa1026 | ||
|
|
6f890a656c | ||
|
|
f57e35fe1f | ||
|
|
1514824b7d | ||
|
|
6f7f03b742 | ||
|
|
b3ee0ecc30 | ||
|
|
4d0827503d | ||
|
|
bbe05496fb | ||
|
|
9f36c2dc86 | ||
|
|
58d05e2e43 | ||
|
|
389f90cbb6 | ||
|
|
3de52be907 | ||
|
|
c4206b2806 | ||
|
|
d3eba54196 | ||
|
|
fa9a94ecf8 | ||
|
|
bbc9e2fe9b | ||
|
|
20306613c7 | ||
|
|
1a567ed42e | ||
|
|
da45698dc5 | ||
|
|
c7071d2431 | ||
|
|
07eb980cab | ||
|
|
08cd4d01be | ||
|
|
b063216cde | ||
|
|
6b44e97271 | ||
|
|
6c1265ca06 | ||
|
|
3369051768 | ||
|
|
d5f21f38b8 | ||
|
|
b5370cbf51 | ||
|
|
e5b0d63b65 | ||
|
|
a3068004a1 | ||
|
|
2aeb282cdc | ||
|
|
5d4dcd2ed4 | ||
|
|
fcf0e456b6 | ||
|
|
455bfbe8b8 | ||
|
|
691c74c66b | ||
|
|
0e6732b526 | ||
|
|
54842fce0f | ||
|
|
724ea1ffea | ||
|
|
cf7729157a | ||
|
|
1af04a78a8 | ||
|
|
9a52393829 | ||
|
|
9a61ffddaa | ||
|
|
f49bb67662 | ||
|
|
86703f0063 | ||
|
|
38bbdf151b | ||
|
|
c522a7efd7 | ||
|
|
9991c9ec63 | ||
|
|
65ae69185c | ||
|
|
33fe2aaba5 | ||
|
|
0380ab85fd | ||
|
|
9bc5f2b4d4 | ||
|
|
cf72d425d3 | ||
|
|
d45795b916 | ||
|
|
44534438af | ||
|
|
2752e4e16b | ||
|
|
fe4cefd590 | ||
|
|
72405ab981 | ||
|
|
53dc91aa0e | ||
|
|
835934a9c9 | ||
|
|
6cb9b12df1 | ||
|
|
f3a9f05a30 | ||
|
|
7eec89d523 | ||
|
|
fac2485b2e | ||
|
|
3c9cd7139a | ||
|
|
b7f1d28142 | ||
|
|
04e4433b78 | ||
|
|
9b497d55cb | ||
|
|
30cb6da0b1 | ||
|
|
3f69a54891 | ||
|
|
9a5e1c5efc | ||
|
|
54e544d302 | ||
|
|
756b5d237e | ||
|
|
0e83f09323 | ||
|
|
887515beef | ||
|
|
4fa50c87b7 | ||
|
|
2e0a6e4f8c | ||
|
|
719ca41467 | ||
|
|
88b5c40fdb | ||
|
|
d473e3f481 | ||
|
|
0f804b86c8 | ||
|
|
9c9c175c96 | ||
|
|
8792b05c73 | ||
|
|
b52091d4b9 | ||
|
|
8aab702d8b | ||
|
|
28092f2a75 | ||
|
|
97b3627341 | ||
|
|
1878e99a7b | ||
|
|
f2cf262cf5 | ||
|
|
ff5e473109 | ||
|
|
03359240f9 | ||
|
|
aa1547314b | ||
|
|
8c5100d83b | ||
|
|
30770e1cea | ||
|
|
036a1fde29 | ||
|
|
5b1843f1c0 | ||
|
|
b0b02034ee | ||
|
|
6889ed1c9f | ||
|
|
c6e44d143f | ||
|
|
850a32df17 | ||
|
|
884864b07f | ||
|
|
9ea7afe97a | ||
|
|
023a89e29e | ||
|
|
418d6e03d4 | ||
|
|
9d4f29292e | ||
|
|
d30d362aa6 | ||
|
|
7df68996a7 | ||
|
|
b1c0465202 | ||
|
|
1f3229c3f9 | ||
|
|
7562476e1e | ||
|
|
90995f090f | ||
|
|
b2dd912794 | ||
|
|
65dfc407cb | ||
|
|
3c1e659b5e | ||
|
|
acf0730c8d | ||
|
|
b16065c0bd | ||
|
|
74b9146178 | ||
|
|
6ed30b7665 | ||
|
|
d57e889a6a | ||
|
|
f05bd47646 | ||
|
|
986cb1357f | ||
|
|
2f3f451a46 | ||
|
|
52c3e61a95 | ||
|
|
bbdeb09f67 | ||
|
|
9f978262f5 | ||
|
|
de8fb7fda9 | ||
|
|
f444aa3477 | ||
|
|
f1c9e0ef03 | ||
|
|
c78c1f10e3 | ||
|
|
1359cf8d44 | ||
|
|
ceac361521 | ||
|
|
76d53d1bbb | ||
|
|
ee8a4008b5 | ||
|
|
5fe736d828 | ||
|
|
609af860c8 | ||
|
|
b3ae505714 | ||
|
|
f3775bde2d | ||
|
|
935dbbbb78 | ||
|
|
f34a796857 | ||
|
|
761a56f23e | ||
|
|
81df0433bb | ||
|
|
456df81cfe | ||
|
|
f6625639b5 | ||
|
|
2a1438acc7 | ||
|
|
906f0637bb | ||
|
|
b53d56f8eb | ||
|
|
343438784c | ||
|
|
8c37ca2664 | ||
|
|
7787757d8f | ||
|
|
a4602d33fc | ||
|
|
495733f764 | ||
|
|
d088f954b5 | ||
|
|
8fbc698542 | ||
|
|
4b19137635 | ||
|
|
092f8f532a | ||
|
|
5b909e41e2 | ||
|
|
1ba999e528 | ||
|
|
d599d7718b | ||
|
|
8a9596be84 | ||
|
|
c3fa39ce8e | ||
|
|
5115b9b29e | ||
|
|
52678afeae | ||
|
|
0f77436a53 | ||
|
|
fcf7c725c0 | ||
|
|
a5dc85c2a5 | ||
|
|
afa56b0d24 | ||
|
|
0202b2b090 |
@@ -16,6 +16,8 @@
|
||||
github:
|
||||
description: "Apache OFBiz is an open source product for the automation of enterprise processes. It includes framework components and business applications for ERP, CRM, E-Business/E-Commerce, Supply Chain Management and Manufacturing Resource Planning. OFBiz provides a foundation and starting point for reliable, secure and scalable enterprise solutions."
|
||||
homepage: https://ofbiz.apache.org/
|
||||
dependabot_alerts: true
|
||||
dependabot_updates: false
|
||||
labels:
|
||||
- ofbiz
|
||||
- plugins
|
||||
@@ -29,3 +31,7 @@ github:
|
||||
- https
|
||||
- content
|
||||
- geospatial
|
||||
|
||||
notifications:
|
||||
jobs: notifications@ofbiz.apache.org
|
||||
jira_options: link label
|
||||
@@ -0,0 +1,26 @@
|
||||
# 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.
|
||||
|
||||
# To get started with Dependabot version updates, you'll need to specify which
|
||||
# package ecosystems to update and where the package manifests are located.
|
||||
# Please see the documentation for all configuration options:
|
||||
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
|
||||
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "npm" # See documentation for possible values
|
||||
directory: "themes/common-theme/webapp/common-theme/js" # Location of package manifests
|
||||
schedule:
|
||||
interval: "daily"
|
||||
@@ -57,7 +57,7 @@ jobs:
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v1
|
||||
uses: github/codeql-action/init@v2
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
debug: true
|
||||
@@ -69,7 +69,7 @@ jobs:
|
||||
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
|
||||
# If this step fails, then you should remove it and run the build manually (see below)
|
||||
- name: Autobuild
|
||||
uses: github/codeql-action/autobuild@v1
|
||||
uses: github/codeql-action/autobuild@v2
|
||||
|
||||
# ℹ️ Command-line programs to run using the OS shell.
|
||||
# 📚 https://git.io/JvXDl
|
||||
@@ -83,4 +83,4 @@ jobs:
|
||||
# make release
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v1
|
||||
uses: github/codeql-action/analyze@v2
|
||||
|
||||
@@ -32,11 +32,14 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Set up JDK 1.8
|
||||
- name: Set up JDK 11
|
||||
uses: actions/setup-java@v1
|
||||
with:
|
||||
java-version: 1.8
|
||||
java-version: 11
|
||||
- name: Grant execute permission for gradlew
|
||||
run: chmod +x gradlew
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew pullAllPluginsSource check
|
||||
run: ./gradlew pullAllPluginsSource check javadoc
|
||||
# Below does not work, see see https://lists.apache.org/thread/80wzf4kclfk5nh2fss56jd6otf7y4n2f
|
||||
# - name: Builds with Gradle, checks style and run integration tests (just to know if they pass)
|
||||
# run: ./gradlew pullAllPluginsSource check javadoc loadAll testIntegration
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
[[apache-ofbiz-framework-changelog]]
|
||||
= Apache OFBiz Framework Changelog
|
||||
@@ -6,7 +6,7 @@ your business.
|
||||
System requirements
|
||||
|
||||
The only requirement to run OFBiz is to have the Java Development Kit (JDK)
|
||||
version 8 installed on your system (not just the JRE, but the full JDK) which
|
||||
version 11 installed on your system (not just the JRE, but the full JDK) which
|
||||
you can download from the below link. Make sure of setting the $JAVA_HOME
|
||||
environment variable.
|
||||
|
||||
|
||||
@@ -209,10 +209,10 @@ For details, see framework/resources/fonts/NotoSans/.
|
||||
=========================================================================
|
||||
|
||||
This product bundles "timezones" files, which are available in the "Public Domain".
|
||||
For details, see themes/common/webapp/common/js/plugins/date/timezones.
|
||||
For details, see themes/common/webapp/common-theme/js/plugins/date/timezones.
|
||||
|
||||
=========================================================================
|
||||
|
||||
This product bundles "jQuery Input Mask plugin", which is available
|
||||
under the "MIT" license.
|
||||
For details, see themes/common-theme/webapp/common/js/jquery/plugins/inputmask/jquery.inputmask*
|
||||
For details, see themes/common-theme/webapp/common-theme/js/jquery/plugins/inputmask/jquery.inputmask*
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
DESCRIPTION
|
||||
This file contains information about libraries that are supported
|
||||
by code in OFBiz but that are left out of SVN because of licensing issues.
|
||||
by code in OFBiz but that are left out of Git because of licensing issues.
|
||||
What is below is a list of jar files and where to put them, and the file(s)
|
||||
to change to include them in the OFBiz build and/or run-time configuration.
|
||||
|
||||
|
||||
+7
-4
@@ -22,9 +22,11 @@ The Apache OFBiz Project
|
||||
|
||||
image:https://img.shields.io/badge/License-Apache%202.0-blue.svg[link=http://www.apache.org/licenses/LICENSE-2.0]
|
||||
image:https://img.shields.io/badge/Version-trunk-blue.svg[link=https://github.com/apache/ofbiz-framework]
|
||||
image:https://ci2.apache.org/badges/ofbizTrunkFramework.svg[link=https://ci2.apache.org/badges/ofbizTrunkFramework.svg]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml/badge.svg?branch=trunk[link=https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml]
|
||||
image:https://sonarcloud.io/api/project_badges/measure?project=apache_ofbiz-framework&metric=alert_status[link=https://sonarcloud.io/dashboard?id=apache_ofbiz-framework]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml/badge.svg[link=https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml]
|
||||
image:https://qpkb254zxeu.montastic.io/badge[link=https://qpkb254zxeu.montastic.io]
|
||||
|
||||
If you are reading this file in AsciiDoc format you may want to see it at
|
||||
https://nightlies.apache.org/ofbiz/trunk/readme/html5/[HTML]
|
||||
@@ -68,7 +70,7 @@ ________________________________________________________________________________
|
||||
|
||||
The only requirements to run OFBiz is
|
||||
|
||||
* to have the Java Development Kit (JDK) version 8 installed on your system
|
||||
* to have the Java Development Kit (JDK) version 11 installed on your system
|
||||
(not just the JRE, but the full JDK) that you can download from the below link.
|
||||
Make sure of setting the $JAVA_HOME environment variable. +
|
||||
https://adoptopenjdk.net/[JDK download].
|
||||
@@ -95,7 +97,7 @@ the command line at the OFBiz top level directory (folder).
|
||||
MS Windows: `init-gradle-wrapper`
|
||||
[IMPORTANT]
|
||||
====
|
||||
* If you cross the error
|
||||
* If you cross the error
|
||||
[quote]
|
||||
____
|
||||
"Powershell is not recognized as an internal or external command, operable program or batch file"
|
||||
@@ -166,7 +168,8 @@ Once proper mitigations to the security issues are complete the OFBiz team will
|
||||
disclose this information to the public mailing list.
|
||||
* If you find a post-auth security issue, please https://s.apache.org/dsj2p[create a bug in our issue tracker (Jira)] .
|
||||
|
||||
|
||||
* If you want to use AJP on a non localhost OFBiz instance, you need to set the value of allowedRequestAttributesPattern
|
||||
in framework/catalina/ofbiz-component.xml
|
||||
|
||||
You can find more information about security in OFBiz at
|
||||
https://cwiki.apache.org/confluence/display/OFBIZ/Keeping+OFBiz+secure[Keeping OFBiz secure]
|
||||
@@ -834,7 +837,7 @@ options:
|
||||
|
||||
* Search for the JDBC driver in https://bintray.com/bintray/jcenter[jcenter] and
|
||||
place it in build.gradle dependencies e.g.
|
||||
`runtime 'mysql:mysql-connector-java:5.1.36'`
|
||||
`runtime 'mysql:mysql-connector-java:8.0.30'`
|
||||
+
|
||||
OR
|
||||
* Download the JDBC driver jar and place it in $OFBIZ_HOME/lib or the lib
|
||||
|
||||
@@ -7312,7 +7312,7 @@
|
||||
<property key="AccountingInvNr">
|
||||
<value xml:lang="ar">رقم الفاتورة</value>
|
||||
<value xml:lang="cs">Číslo faktury</value>
|
||||
<value xml:lang="de">Inv.Nr</value>
|
||||
<value xml:lang="de">Rg.Nr</value>
|
||||
<value xml:lang="en">Inv.Nr</value>
|
||||
<value xml:lang="es">Nr.Fact</value>
|
||||
<value xml:lang="es-CL">Factura N°</value>
|
||||
@@ -22296,7 +22296,7 @@
|
||||
<value xml:lang="de">Hauptbuch Transaktion</value>
|
||||
<value xml:lang="en">a Gl Transaction</value>
|
||||
<value xml:lang="es">uno Transaccione GL</value>
|
||||
<value xml:lang="fr">une opération comptable</value>
|
||||
<value xml:lang="fr">une transaction comptable</value>
|
||||
<value xml:lang="ja">GLトランザクション</value>
|
||||
<value xml:lang="pt">Transaçõe contábei</value>
|
||||
</property>
|
||||
|
||||
@@ -48,6 +48,6 @@ under the License.
|
||||
systemPropertyValue="Y"
|
||||
description="Create a 'not-paid' payment record if the sales order is completed and no payment exist yet. Options:: Y, N"/>
|
||||
|
||||
<!-- <SystemProperty systemResourceId="accounting" systemPropertyId="create.invoice.per.shipment" systemPropertyValue="Y"
|
||||
description="create invoice per shipment. Options: = Y (Invoice per shipment), N (Invoice per order)"/> -->
|
||||
<SystemProperty systemResourceId="accounting" systemPropertyId="create.invoice.per.shipment" systemPropertyValue="Y"
|
||||
description="create invoice per shipment. Options: = Y (Invoice per shipment), N (Invoice per order)"/>
|
||||
</entity-engine-xml>
|
||||
|
||||
+21
-26
@@ -19,6 +19,7 @@
|
||||
package org.apache.ofbiz.accounting
|
||||
|
||||
import javax.servlet.http.HttpSession
|
||||
|
||||
import org.apache.ofbiz.base.util.UtilProperties
|
||||
import org.apache.ofbiz.base.util.UtilValidate
|
||||
import org.apache.ofbiz.entity.GenericValue
|
||||
@@ -142,49 +143,43 @@ public class InvoicePerShipmentTests extends OFBizTestCase {
|
||||
}
|
||||
void testInvoicePerShipmentSetFalse() {
|
||||
/* Test Invoice Per Shipment
|
||||
Step 1) Set create.invoice.per.shipment=N in accounting.properties file.
|
||||
Step 2) Create order and approve order.
|
||||
Step 3) Pack Shipment For Ship Group.
|
||||
Step 4) Check invoice should not created.
|
||||
*/
|
||||
UtilProperties.setPropertyValueInMemory("accounting", "create.invoice.per.shipment", "N")
|
||||
logInfo("===== >>> Set Accounting.properties / create.invoice.per.shipment = N")
|
||||
|
||||
List invoices = testInvoicePerShipment("GZ-1000", null)
|
||||
Step 1) Set create.invoice.per.shipment=N in accounting.properties file.
|
||||
Step 2) Create order and approve order.
|
||||
Step 3) Pack Shipment For Ship Group.
|
||||
Step 4) Check invoice should not created.
|
||||
*/
|
||||
List invoices = testInvoicePerShipment("GZ-1000", "N")
|
||||
assert UtilValidate.isEmpty(invoices)
|
||||
}
|
||||
|
||||
void testInvoicePerShipmentSetTrue() {
|
||||
/* Test Invoice Per Shipment
|
||||
Step 1) Set create.invoice.per.shipment=Y in accounting.properties file.
|
||||
Step 2) Create order and approve order.
|
||||
Step 3) Pack Shipment For Ship Group.
|
||||
Step 4) Check invoice should be created.
|
||||
Step 1) Set create.invoice.per.shipment=Y in accounting.properties file.
|
||||
Step 2) Create order and approve order.
|
||||
Step 3) Pack Shipment For Ship Group.
|
||||
Step 4) Check invoice should be created.
|
||||
*/
|
||||
UtilProperties.setPropertyValueInMemory("accounting", "create.invoice.per.shipment", "Y")
|
||||
logInfo("===== >>> Set Accounting.properties / create.invoice.per.shipment = Y")
|
||||
|
||||
List invoices = testInvoicePerShipment("GZ-1000", null)
|
||||
List invoices = testInvoicePerShipment("GZ-1000", "Y")
|
||||
assert UtilValidate.isNotEmpty(invoices)
|
||||
}
|
||||
|
||||
void testInvoicePerShipmentSetOrderFalse() {
|
||||
/* Test Invoice Per Shipment
|
||||
Step 1) Create order and set invoicePerShipment=N.
|
||||
Step 2) Pack Shipment For Ship Group.
|
||||
Step 3) Check invoice should not be created.
|
||||
*/
|
||||
Step 1) Create order and set invoicePerShipment=N.
|
||||
Step 2) Pack Shipment For Ship Group.
|
||||
Step 3) Check invoice should not be created.
|
||||
*/
|
||||
List invoices = testInvoicePerShipment("GZ-2644", "N")
|
||||
assert UtilValidate.isEmpty(invoices)
|
||||
}
|
||||
|
||||
void testInvoicePerShipmentSetOrderTrue() {
|
||||
/* Test Invoice Per Shipment
|
||||
Step 1) Create order and set invoicePerShipment=Y
|
||||
Step 2) Pack Shipment For Ship Group.
|
||||
Step 3) Check invoice should be created.
|
||||
*/
|
||||
Step 1) Create order and set invoicePerShipment=Y
|
||||
Step 2) Pack Shipment For Ship Group.
|
||||
Step 3) Check invoice should be created.
|
||||
*/
|
||||
List invoices = testInvoicePerShipment("GZ-2644", "Y")
|
||||
assert UtilValidate.isNotEmpty(invoices)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ under the License.
|
||||
<parameter param-name="organizationPartyId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="NewInvoice" title="${uiLabelMap.CommonCreate} ${uiLabelMap.CommonInvoice}">
|
||||
<menu-item name="NewInvoice" title="${uiLabelMap.AccountingCreateNewInvoice}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="ACCOUNTING" action="_CREATE"/>
|
||||
@@ -688,38 +688,53 @@ under the License.
|
||||
</link>
|
||||
</menu-item>
|
||||
</menu>
|
||||
|
||||
<menu name="PaymentGroupTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
|
||||
<menu-item name="PaymentGroupOverview" title="${uiLabelMap.AccountingPaymentTabOverview}">
|
||||
<link target="PaymentGroupOverview">
|
||||
<parameter param-name="paymentGroupId" from-field="paymentGroup.paymentGroupId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="EditPaymentGroup" title="${uiLabelMap.CommonGroup}">
|
||||
<condition><not><if-empty field="paymentGroup.paymentGroupId"/></not></condition>
|
||||
<link target="EditPaymentGroup">
|
||||
<parameter param-name="paymentGroupId" from-field="paymentGroup.paymentGroupId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="EditPaymentGroupMember" title="${uiLabelMap.AccountingGroupMembers}">
|
||||
<menu-item name="EditPaymentGroupMember" title="${uiLabelMap.CommonPayments}">
|
||||
<condition><not><if-empty field="paymentGroup.paymentGroupId"/></not></condition>
|
||||
<link target="EditPaymentGroupMember">
|
||||
<parameter param-name="paymentGroupId" from-field="paymentGroup.paymentGroupId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
</menu>
|
||||
|
||||
<menu name="PaymentGroupSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
|
||||
menu-container-style="button-bar button-style-2">
|
||||
<menu-item name="createNew" title="${uiLabelMap.CommonCreate}" widget-style="buttontext create">
|
||||
<condition>
|
||||
<not><if-empty field="paymentGroup"/></not>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ACCOUNTING" action="_CREATE"/>
|
||||
</or>
|
||||
<not><if-empty field="paymentGroup"/></not>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="EditPaymentGroup"/>
|
||||
</menu-item>
|
||||
<menu-item name="EditPaymentGroup" title="${uiLabelMap.CommonEdit}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ACCOUNTING" action="_CREATE"/>
|
||||
<if-has-permission permission="ACCOUNTING" action="_UPDATE"/>
|
||||
</or>
|
||||
<not><if-empty field="paymentGroup"/></not>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="EditPaymentGroup">
|
||||
<parameter param-name="paymentGroupId" from-field="paymentGroup.paymentGroupId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="depositSlip" title="${uiLabelMap.AccountingDepositSlip}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ACCOUNTING" action="_CREATE"/>
|
||||
<if-has-permission permission="ACCOUNTING" action="_UPDATE"/>
|
||||
</or>
|
||||
<if-compare field="display" operator="equals" value="true"/>
|
||||
<if-compare field="paymentGroup.paymentGroupTypeId" operator="equals" value="BATCH_PAYMENT"/>
|
||||
<not><if-empty field="paymentGroupMembers"/></not>
|
||||
@@ -732,6 +747,10 @@ under the License.
|
||||
<menu-item name="printCheck" title="${uiLabelMap.AccountingPrintChecks}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ACCOUNTING" action="_CREATE"/>
|
||||
<if-has-permission permission="ACCOUNTING" action="_UPDATE"/>
|
||||
</or>
|
||||
<if-compare field="display" operator="equals" value="true"/>
|
||||
<if-compare field="paymentGroup.paymentGroupTypeId" operator="equals" value="CHECK_RUN"/>
|
||||
<not><if-empty field="paymentGroupMembers"/></not>
|
||||
@@ -744,6 +763,10 @@ under the License.
|
||||
<menu-item name="cancelpaymentGroup" title="${uiLabelMap.AccountingCancelBatchPayments}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ACCOUNTING" action="_CREATE"/>
|
||||
<if-has-permission permission="ACCOUNTING" action="_UPDATE"/>
|
||||
</or>
|
||||
<not><if-empty field="paymentGroupMembers"/></not>
|
||||
<not><if-empty field="paymentGroup"/></not>
|
||||
<if-empty field="glReconciliationId"/>
|
||||
@@ -757,6 +780,10 @@ under the License.
|
||||
<menu-item name="cancelCheckRunPayments" title="${uiLabelMap.AccountingCancelCheckRun}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ACCOUNTING" action="_CREATE"/>
|
||||
<if-has-permission permission="ACCOUNTING" action="_UPDATE"/>
|
||||
</or>
|
||||
<not><if-empty field="paymentGroupMembers"/></not>
|
||||
<not><if-empty field="paymentGroup"/></not>
|
||||
<if-compare field="paymentGroup.paymentGroupTypeId" operator="equals" value="CHECK_RUN"/>
|
||||
@@ -767,7 +794,6 @@ under the License.
|
||||
</link>
|
||||
</menu-item>
|
||||
</menu>
|
||||
|
||||
<menu name="FixedAssetMaintTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
|
||||
selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint" default-menu-item-name="EditFixedAssetMaint">
|
||||
<menu-item name="EditFixedAssetMaint" title="${uiLabelMap.AccountingFixedAssetMaint}">
|
||||
|
||||
@@ -25,6 +25,19 @@ under the License.
|
||||
|
||||
<!-- generate a PDF for the invoice. Sharing the same script file as the HTML page for viewing invoice -->
|
||||
<screen name="InvoicePDF">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="defaultTemplateLocation" value="component://accounting/widget/AccountingPrintScreens.xml"/>
|
||||
<set field="defaultTemplateName" value="DefaultInvoicePDF"/>
|
||||
<script location="component://commonext/groovyScripts/template/DocTypeTemplate.groovy"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
<include-screen name="${templateName}" location="${templateLocation}"/>
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="DefaultInvoicePDF">
|
||||
<section>
|
||||
<actions>
|
||||
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
|
||||
|
||||
@@ -99,7 +99,6 @@ under the License.
|
||||
</hyperlink>
|
||||
</field>
|
||||
</grid>
|
||||
|
||||
<form name="EditAgreement" type="single" target="updateAgreement" title="" default-map-name="agreement"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<alt-target use-when="agreement==null" target="createAgreement"/>
|
||||
@@ -136,7 +135,33 @@ under the License.
|
||||
<submit button-type="button"/>
|
||||
</field>
|
||||
</form>
|
||||
|
||||
<form name="Agreement" type="single" default-map-name="agreement"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-service service-name="updateAgreement" default-field-type="display" map-name="agreement"/>
|
||||
<field name="agreementId" title="${uiLabelMap.CommonId}"><display/></field>
|
||||
<field name="agreementTypeId" title="${uiLabelMap.CommonType}" position="2"><display-entity entity-name="AgreementType"/></field>
|
||||
<field name="agreementDate" title="${uiLabelMap.CommonDate}"><display type="date-time"/></field>
|
||||
<field name="productId" title="${uiLabelMap.CommonProduct}">
|
||||
<display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/>
|
||||
</field>
|
||||
<field name="partyIdFrom" title="${uiLabelMap.AccountingPartyIdFrom}">
|
||||
<display-entity also-hidden="false" entity-name="PartyNameView"
|
||||
key-field-name="partyId" description="[${partyId}] ${groupName}${firstName} ${lastName}"/>
|
||||
</field>
|
||||
<field name="partyIdTo" title="${uiLabelMap.AccountingPartyIdTo}" position="2">
|
||||
<display-entity entity-name="PartyNameView"
|
||||
key-field-name="partyId" description="[${partyId}] ${groupName}${firstName} ${lastName}"/>
|
||||
</field>
|
||||
<field name="roleTypeIdFrom" title="${uiLabelMap.AccountingRoleTypeIdFrom}">
|
||||
<display-entity entity-name="RoleType" key-field-name="roleTypeId" description="[${roleTypeId}] ${description}"/>
|
||||
</field>
|
||||
<field name="roleTypeIdTo" title="${uiLabelMap.AccountingRoleTypeIdTo}" position="2">
|
||||
<display-entity entity-name="RoleType" key-field-name="roleTypeId" description="[${roleTypeId}] ${description}"/>
|
||||
</field>
|
||||
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><display type="date-time"/></field>
|
||||
<field name="thruDate" title="${uiLabelMap.CommonThru}" position="2"><display type="date-time"/></field>
|
||||
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
|
||||
</form>
|
||||
<grid name="ListAgreementItems" list-name="agreementItems" target="" title="" paginate-target="ListAgreementItems"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<auto-fields-entity entity-name="AgreementItem" default-field-type="display"/>
|
||||
|
||||
@@ -131,17 +131,33 @@ under the License.
|
||||
<set field="helpAnchor" value="_help_for_edit_agreement"/>
|
||||
<set field="agreementId" from-field="parameters.agreementId"/>
|
||||
<entity-one entity-name="Agreement" value-field="agreement"/>
|
||||
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.PageTitleEditAgreement}">
|
||||
<include-form name="EditAgreement" location="component://accounting/widget/AgreementForms.xml"/>
|
||||
</screenlet>
|
||||
<platform-specific>
|
||||
<html><html-template location="component://accounting/template/agreement/CopyAgreement.ftl"/></html>
|
||||
</platform-specific>
|
||||
<section>
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ACCOUNTING" action="_CREATE"/>
|
||||
<if-has-permission permission="ACCOUNTING" action="_UPDATE"/>
|
||||
</or>
|
||||
</and>
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet title="${uiLabelMap.PageTitleEditAgreement}">
|
||||
<include-form name="EditAgreement" location="component://accounting/widget/AgreementForms.xml"/>
|
||||
</screenlet>
|
||||
<platform-specific>
|
||||
<html><html-template location="component://accounting/template/agreement/CopyAgreement.ftl"/></html>
|
||||
</platform-specific>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<screenlet id="agreement">
|
||||
<include-form name="Agreement" location="component://accounting/widget/AgreementForms.xml"/>
|
||||
</screenlet>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
|
||||
@@ -185,18 +185,18 @@ under the License.
|
||||
</actions>
|
||||
<auto-fields-service service-name="updateBillingAccountRole" default-field-type="edit"/>
|
||||
<field name="billingAccountId"><hidden/></field>
|
||||
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
|
||||
<field name="partyId" title="${uiLabelMap.CommonParty}">
|
||||
<display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
|
||||
<sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
|
||||
<parameter param-name="partyId"/>
|
||||
</sub-hyperlink>
|
||||
</display-entity>
|
||||
</field>
|
||||
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
|
||||
<field name="roleTypeId" title="${uiLabelMap.CommonRole}">
|
||||
<display-entity entity-name="RoleType"/>
|
||||
</field>
|
||||
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
|
||||
|
||||
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><display type="date-time"/></field>
|
||||
<field name="thruDate" title="${uiLabelMap.CommonThru}"><date-time/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
<field name="deleteLink" title=" " widget-style="buttontext">
|
||||
<hyperlink description="${uiLabelMap.CommonDelete}" target="deleteBillingAccountRole" also-hidden="false">
|
||||
@@ -207,19 +207,43 @@ under the License.
|
||||
</hyperlink>
|
||||
</field>
|
||||
</grid>
|
||||
<grid name="BillingAccountRoles" list-name="billingAccountRoleList"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"
|
||||
paginate-target="EditBillingAccountRoles" separate-columns="true">
|
||||
<actions>
|
||||
<entity-condition entity-name="BillingAccountRole" list="billingAccountRoleList">
|
||||
<condition-expr field-name="billingAccountId" from-field="billingAccountId"/>
|
||||
<order-by field-name="roleTypeId"/>
|
||||
</entity-condition>
|
||||
</actions>
|
||||
<field name="billingAccountId"><hidden/></field>
|
||||
<field name="partyId" title="${uiLabelMap.CommonParty}">
|
||||
<display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
|
||||
<sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext">
|
||||
<parameter param-name="partyId"/>
|
||||
</sub-hyperlink>
|
||||
</display-entity>
|
||||
</field>
|
||||
<field name="roleTypeId" title="${uiLabelMap.CommonRole}">
|
||||
<display-entity entity-name="RoleType"/>
|
||||
</field>
|
||||
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><display type="date-time"/></field>
|
||||
<field name="thruDate" title="${uiLabelMap.CommonThru}"><display type="date-time"/></field>
|
||||
</grid>
|
||||
<form name="AddBillingAccountRole" type="single" target="createBillingAccountRole" default-map-name="billingAccountRole"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-service service-name="createBillingAccountRole"/>
|
||||
<field name="billingAccountId"><hidden/></field>
|
||||
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
|
||||
<field name="roleTypeId" title="${uiLabelMap.CommonRole}">
|
||||
<drop-down allow-empty="false" no-current-selected-key="BILL_TO_CUSTOMER">
|
||||
<entity-options entity-name="RoleType">
|
||||
<entity-order-by field-name="description"/>
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
<field name="fromDate"><date-time default-value="${nowTimestamp}"/></field>
|
||||
<field name="partyId" title="${uiLabelMap.PartyPartyId}" required-field="true"><lookup target-form-name="LookupPartyName"/></field>
|
||||
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><date-time default-value="${nowTimestamp}"/></field>
|
||||
<field name="thruDate" title="${uiLabelMap.CommonThru}"><date-time/></field>
|
||||
<field name="partyId" title="${uiLabelMap.CommonParty}" required-field="true"><lookup target-form-name="LookupPartyName"/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<grid name="ListBillingAccountTerms" list-name="billingAccountTermsList" default-entity-name="BillingAccountTerm" paginate-target="EditBillingAccountTerms"
|
||||
|
||||
@@ -169,17 +169,32 @@ under the License.
|
||||
<set field="headerItem" value="billingaccount"/>
|
||||
<set field="tabButtonItem" value="EditBillingAccountRoles"/>
|
||||
<set field="helpAnchor" value="_help_for_billing_account_roles"/>
|
||||
|
||||
<set field="billingAccountId" from-field="parameters.billingAccountId"/>
|
||||
<entity-one entity-name="BillingAccount" value-field="billingAccount"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="CommonBillingAccountDecorator" location="${parameters.billingAccountDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<screenlet id="BllingAccountRolePanel" title="${uiLabelMap.PageTitleAddBillingAccountRoles}" collapsible="true">
|
||||
<include-form name="AddBillingAccountRole" location="component://accounting/widget/BillingAccountForms.xml"/>
|
||||
</screenlet>
|
||||
<include-grid name="ListBillingAccountRoles" location="component://accounting/widget/BillingAccountForms.xml"/>
|
||||
<section>
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="ACCOUNTING" action="_CREATE"/>
|
||||
<if-has-permission permission="ACCOUNTING" action="_UPDATE"/>
|
||||
</or>
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet id="BllingAccountRolePanel" title="${uiLabelMap.PageTitleAddBillingAccountRoles}" collapsible="true">
|
||||
<include-form name="AddBillingAccountRole" location="component://accounting/widget/BillingAccountForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet>
|
||||
<include-grid name="ListBillingAccountRoles" location="component://accounting/widget/BillingAccountForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<include-grid name="BillingAccountRoles" location="component://accounting/widget/BillingAccountForms.xml"/>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -290,9 +305,16 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="CommonBillingAccountDecorator" location="${parameters.billingAccountDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<screenlet id="BillingAccountPaymentPanel" title="${uiLabelMap.AccountingCreatePayment}" collapsible="true">
|
||||
<include-form name="CreateIncomingBillingAccountPayment" location="component://accounting/widget/BillingAccountForms.xml"/>
|
||||
</screenlet>
|
||||
<section>
|
||||
<condition>
|
||||
<if-has-permission permission="ACCOUNTING" action="CREATE"/>
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet id="BillingAccountPaymentPanel" title="${uiLabelMap.AccountingCreatePayment}" collapsible="true">
|
||||
<include-form name="CreateIncomingBillingAccountPayment" location="component://accounting/widget/BillingAccountForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
</section>
|
||||
<include-grid name="ListBillingAccountPayments" location="component://accounting/widget/BillingAccountForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
|
||||
@@ -30,7 +30,6 @@ under the License.
|
||||
<property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
|
||||
<property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
|
||||
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
|
||||
|
||||
<set field="layoutSettings.companyName" from-field="uiLabelMap.AccountingCompanyName" global="true"/>
|
||||
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.AccountingCompanySubtitle" global="true"/>
|
||||
<!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
|
||||
@@ -104,7 +103,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="CommonPaymentDecorator">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -126,7 +124,6 @@ under the License.
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<!-- do check for ACCOUNTING, _VIEW permission -->
|
||||
<condition>
|
||||
<if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
|
||||
</condition>
|
||||
@@ -153,7 +150,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="CommonPaymentGroupDecorator">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -176,29 +172,21 @@ under the License.
|
||||
</and>
|
||||
</condition>
|
||||
<widgets>
|
||||
<label style="h1">${uiLabelMap.AccountingPaymentGroup}: ${paymentGroupId}</label>
|
||||
<include-menu name="PaymentGroupTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
|
||||
<include-menu name="PaymentGroupSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<label style="h1">${uiLabelMap.AccountingNewPaymentGroup}</label>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<!-- do check for ACCOUNTING, _VIEW permission -->
|
||||
<condition>
|
||||
<if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
|
||||
</condition>
|
||||
<widgets>
|
||||
<section>
|
||||
<condition>
|
||||
<not><if-empty field="paymentGroup"/></not>
|
||||
</condition>
|
||||
<widgets>
|
||||
<include-menu name="PaymentGroupSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
|
||||
<label style="h1">${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${paymenGroup.paymentGroupName} [${paymentGroupId}]</label>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<label style="h1">${uiLabelMap.AccountingNewPaymentGroup}</label>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
<decorator-section-include name="body"/>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
@@ -210,7 +198,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="CommonPartyDecorator">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -243,7 +230,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="CommonOrganizationAccountingReportsDecorator">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -263,7 +249,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="CommonAdminChecksDecorator">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -284,7 +269,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="main">
|
||||
<section>
|
||||
<condition>
|
||||
@@ -325,7 +309,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="creditCardFields">
|
||||
<section>
|
||||
<widgets>
|
||||
@@ -333,7 +316,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="GlobalGLSettingsDecorator">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -352,7 +334,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="CommonInvoiceDecorator"><!-- used for invoice commission runs -->
|
||||
<section>
|
||||
<widgets>
|
||||
@@ -360,5 +341,4 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
</screens>
|
||||
|
||||
@@ -67,6 +67,9 @@ under the License.
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://accounting/widget/AccountingMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.AccountingAvailableInternalOrganizations}" navigation-menu-name="NewAccountOrganization">
|
||||
<include-menu name="NewAccountOrganization" location="component://accounting/widget/AccountingMenus.xml"/>
|
||||
@@ -84,6 +87,9 @@ under the License.
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://accounting/widget/AccountingMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.AccountingNewCompany}">
|
||||
<include-form name="AddCompany" location="component://accounting/widget/GlSetupForms.xml"/>
|
||||
@@ -103,6 +109,9 @@ under the License.
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://accounting/widget/AccountingMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.AccountingInvoice} ${uiLabelMap.CommonImportExport} ${uiLabelMap.CommonFor}: ${partyGroup.groupName} [${organizationPartyId}]">
|
||||
<container style="lefthalf">
|
||||
|
||||
@@ -710,12 +710,12 @@ under the License.
|
||||
<screenlet id="PartyInvoiceRolePanel" title="${uiLabelMap.AccountingPartyRoleAdd}" collapsible="true">
|
||||
<include-form name="EditInvoiceRole" location="component://accounting/widget/InvoiceForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet>
|
||||
<screenlet title="${uiLabelMap.CommonRoles}">
|
||||
<include-grid name="ListInvoiceRoles" location="component://accounting/widget/InvoiceForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<screenlet>
|
||||
<screenlet title="${uiLabelMap.CommonRoles}">
|
||||
<include-grid name="InvoiceRoles" location="component://accounting/widget/InvoiceForms.xml"/>
|
||||
</screenlet>
|
||||
</fail-widgets>
|
||||
@@ -765,10 +765,14 @@ under the License.
|
||||
</screenlet>
|
||||
</widgets>
|
||||
</section>
|
||||
<include-grid name="ListInvoiceTerms" location="component://accounting/widget/InvoiceForms.xml"/>
|
||||
<screenlet title="${uiLabelMap.PartyTerms}">
|
||||
<include-grid name="ListInvoiceTerms" location="component://accounting/widget/InvoiceForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<include-grid name="InvoiceTerms" location="component://accounting/widget/InvoiceForms.xml"/>
|
||||
<screenlet title="${uiLabelMap.PartyTerms}">
|
||||
<include-grid name="InvoiceTerms" location="component://accounting/widget/InvoiceForms.xml"/>
|
||||
</screenlet>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
</decorator-section>
|
||||
|
||||
@@ -93,12 +93,30 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="CommonPaymentGroupDecorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<screenlet name="listPaymentGroupMember" title="${uiLabelMap.AccountingPaymentGroupMembers}" collapsible="true">
|
||||
<include-form name="ListPaymentGroupMember" location="component://accounting/widget/PaymentGroupForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet name="addPaymentGroupMember" title="${uiLabelMap.AccountingAddPaymentGroupMember}" collapsible="true">
|
||||
<include-form name="AddPaymentGroupMember" location="component://accounting/widget/PaymentGroupForms.xml"/>
|
||||
</screenlet>
|
||||
<section>
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ACCOUNTING" action="_CREATE"/>
|
||||
<if-has-permission permission="ACCOUNTING" action="_UPDATE"/>
|
||||
</or>
|
||||
<not><if-empty field="paymentGroupId"/></not>
|
||||
</and>
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet name="listPaymentGroupMember" title="${uiLabelMap.CommonPayments}" collapsible="true">
|
||||
<include-form name="ListPaymentGroupMember" location="component://accounting/widget/PaymentGroupForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet name="addPaymentGroupMember" title="${uiLabelMap.AccountingAddPaymentGroupMember}" collapsible="true">
|
||||
<include-form name="AddPaymentGroupMember" location="component://accounting/widget/PaymentGroupForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<screenlet name="listPaymentGroupMember" title="${uiLabelMap.CommonPayments}" collapsible="true">
|
||||
<include-form name="PaymentGroupMembers" location="component://accounting/widget/PaymentGroupForms.xml"/>
|
||||
</screenlet>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
package org.apache.ofbiz.common.template
|
||||
/*
|
||||
* 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 org.apache.ofbiz.entity.GenericValue
|
||||
import org.apache.ofbiz.entity.model.ModelUtil
|
||||
|
||||
def getFieldTypeName(String entityName) {
|
||||
return ModelUtil.lowerFirstChar(entityName) + 'Id'
|
||||
}
|
||||
|
||||
/**
|
||||
* For a entityTypeName and a value return the matching templating document screen
|
||||
* If no value found, do a recursive search on parentType
|
||||
*/
|
||||
def getCustomScreenTemplate(String entityTypeName, String fieldTypeValue) {
|
||||
if (! fieldTypeValue) {
|
||||
return null
|
||||
}
|
||||
GenericValue tplCustScreen = from("PartyPrefDocTypeTplAndCustomScreen")
|
||||
.where(getFieldTypeName(entityTypeName), fieldTypeValue)
|
||||
.cache()
|
||||
.queryFirst()
|
||||
if (tplCustScreen) {
|
||||
return tplCustScreen
|
||||
}
|
||||
// No template found for this type, try if the parent had
|
||||
String parentTypeValue = from(entityTypeName).where().cache().queryFirst().parentTypeId
|
||||
return getCustomScreenTemplate(entityTypeName, parentTypeValue)
|
||||
}
|
||||
|
||||
// first resolve the document reference passed on the context
|
||||
String entityName = ""
|
||||
String entityTypeName = ""
|
||||
if (parameters.orderId) {
|
||||
entityName = "OrderHeader"
|
||||
entityTypeName = "OrderType"
|
||||
} else if (parameters.invoiceId) {
|
||||
entityName ="Invoice"
|
||||
} else if (parameters.quoteId) {
|
||||
entityName = "Quote"
|
||||
}
|
||||
|
||||
// second ask for this entity the custom screen to use
|
||||
GenericValue tplCustScreen
|
||||
if (entityName) {
|
||||
entityTypeName = entityTypeName ?: entityName + 'Type'
|
||||
GenericValue entityValue = from(entityName).where(parameters).queryOne()
|
||||
if (entityValue) {
|
||||
tplCustScreen = getCustomScreenTemplate(entityTypeName, entityValue[getFieldTypeName(entityTypeName)])
|
||||
}
|
||||
}
|
||||
context.templateLocation = tplCustScreen ? tplCustScreen.customScreenLocation : context.defaultTemplateLocation
|
||||
context.templateName = tplCustScreen ? tplCustScreen.customScreenName : context.defaultTemplateName
|
||||
@@ -3141,7 +3141,7 @@
|
||||
<value xml:lang="zh-TW">你沒有檢視本頁面的權限.(需要具備"CONTENTMGR_UPDATE"或"CONTENTMGR_ADMIN")</value>
|
||||
</property>
|
||||
<property key="ContentUploadFileTypeNotMatch">
|
||||
<value xml:lang="en">Upload file type not match your selected.</value>
|
||||
<value xml:lang="en">Upload file type not match your selection.</value>
|
||||
<value xml:lang="fr">Le type de fichier chargé ne correspond pas avec votre selection.</value>
|
||||
<value xml:lang="it">Tipo file da caricare non corrisponde alla tua selezione.</value>
|
||||
<value xml:lang="ja">選択したアップロードファイルの種類が一致しません。</value>
|
||||
@@ -7147,4 +7147,4 @@
|
||||
<value xml:lang="zh">生成缺失的搜索引擎优化的网址</value>
|
||||
<value xml:lang="zh-TW">產生缺失的搜尋引擎優化的網址</value>
|
||||
</property>
|
||||
</resource>
|
||||
</resource>
|
||||
|
||||
@@ -1,325 +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="createBlogEntry" short-description="Create a new Blog Entry">
|
||||
<set field="contentAssocTypeId" value="PUBLISH_LINK"/>
|
||||
<set field="ownerContentId" from-field="parameters.blogContentId"/>
|
||||
<set field="contentIdFrom" from-field="parameters.blogContentId"/>
|
||||
<if-empty field="parameters.statusId">
|
||||
<set field="parameters.statusId" value="CTNT_INITIAL_DRAFT"/>
|
||||
</if-empty>
|
||||
<if-empty field="parameters.templateDataResourceId">
|
||||
<set field="parameters.templateDataResourceId" value="BLOG_TPL_TOPLEFT"/>
|
||||
</if-empty>
|
||||
|
||||
<!-- determine of we need to create complex template structure or simple content structure -->
|
||||
<if-empty field="parameters.contentName">
|
||||
<add-error>
|
||||
<fail-property resource="ContentUiLabels" property="ContentArticleNameIsMissing"/>
|
||||
</add-error>
|
||||
</if-empty>
|
||||
<check-errors/>
|
||||
<!-- complex template structure (image & text) -->
|
||||
<set field="createMain.dataResourceId" from-field="parameters.templateDataResourceId"/>
|
||||
<set field="createMain.contentAssocTypeId" from-field="contentAssocTypeId"/>
|
||||
<set field="createMain.contentName" from-field="parameters.contentName"/>
|
||||
<set field="createMain.description" from-field="parameters.description"/>
|
||||
<set field="createMain.statusId" from-field="parameters.statusId"/>
|
||||
<set field="createMain.contentIdFrom" from-field="contentIdFrom"/>
|
||||
<set field="createMain.partyId" from-field="userLogin.partyId"/>
|
||||
<set field="createMain.ownerContentId" from-field="ownerContentId"/>
|
||||
<set field="createMain.dataTemplateTypeId" value="SCREEN_COMBINED"/>
|
||||
<set field="createMain.mapKey" value="MAIN"/>
|
||||
<call-service service-name="createContent" in-map-name="createMain">
|
||||
<result-to-field result-name="contentId" field="contentId"/>
|
||||
</call-service>
|
||||
<!-- reset contentIdFrom to new contentId -->
|
||||
<set field="contentAssocTypeId" value="SUB_CONTENT"/>
|
||||
<set field="contentIdFrom" from-field="contentId"/>
|
||||
|
||||
<if-not-empty field="parameters._uploadedFile_fileName">
|
||||
<!-- upload a picture -->
|
||||
<set field="createImage.dataResourceTypeId" value="LOCAL_FILE"/>
|
||||
<set field="createImage.dataTemplateTypeId" value="NONE"/>
|
||||
<set field="createImage.mapKey" value="IMAGE"/>
|
||||
<set field="createImage.ownerContentId" from-field="ownerContentId"/>
|
||||
<set field="createImage.contentName" from-field="parameters.contentName"/>
|
||||
<set field="createImage.description" from-field="parameters.description"/>
|
||||
<set field="createImage.statusId" from-field="parameters.statusId"/>
|
||||
<set field="createImage.contentAssocTypeId" from-field="contentAssocTypeId"/>
|
||||
<set field="createImage.contentIdFrom" from-field="contentIdFrom"/>
|
||||
<set field="createImage.partyId" from-field="userLogin.partyId"/>
|
||||
<set field="createImage.isPublic" value="Y"/>
|
||||
<set field="createImage.uploadedFile" from-field="parameters.uploadedFile"/>
|
||||
<set field="createImage._uploadedFile_fileName" from-field="parameters._uploadedFile_fileName"/>
|
||||
<set field="createImage._uploadedFile_contentType" from-field="parameters._uploadedFile_contentType"/>
|
||||
<call-service service-name="createContentFromUploadedFile" in-map-name="createImage">
|
||||
<result-to-field result-name="contentId" field="imageContentId"/>
|
||||
</call-service>
|
||||
</if-not-empty>
|
||||
|
||||
<if-not-empty field="parameters.articleData">
|
||||
<!-- create text data -->
|
||||
<set field="createText.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
|
||||
<set field="createText.contentPurposeTypeId" value="ARTICLE"/>
|
||||
<set field="createText.dataTemplateTypeId" value="NONE"/>
|
||||
<set field="createText.mapKey" value="MAIN"/>
|
||||
<set field="createText.ownerContentId" from-field="ownerContentId"/>
|
||||
<set field="createText.contentName" from-field="parameters.contentName"/>
|
||||
<set field="createText.description" from-field="parameters.description"/>
|
||||
<set field="createText.statusId" from-field="parameters.statusId"/>
|
||||
<set field="createText.contentAssocTypeId" from-field="contentAssocTypeId"/>
|
||||
<set field="createText.textData" from-field="parameters.articleData"/>
|
||||
<set field="createText.contentIdFrom" from-field="contentIdFrom"/>
|
||||
<set field="createText.partyId" from-field="userLogin.partyId"/>
|
||||
<set field="createText.mapKey" value="ARTICLE"/>
|
||||
<log level="info" message="calling createTextContent with map: ${createText}"/>
|
||||
<call-service service-name="createTextContent" in-map-name="createText">
|
||||
<result-to-field result-name="contentId" field="textContentId"/>
|
||||
</call-service>
|
||||
</if-not-empty>
|
||||
|
||||
<if-not-empty field="contentId">
|
||||
<if-not-empty field="parameters.summaryData">
|
||||
<!-- create the summary data -->
|
||||
<set field="createSummary.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
|
||||
<set field="createSummary.dataTemplateTypeId" value="NONE"/>
|
||||
<set field="createSummary.mapKey" value="SUMMARY"/>
|
||||
<set field="createSummary.ownerContentId" from-field="ownerContentId"/>
|
||||
<set field="createSummary.contentName" from-field="parameters.contentName"/>
|
||||
<set field="createSummary.description" from-field="parameters.description"/>
|
||||
<set field="createSummary.statusId" from-field="parameters.statusId"/>
|
||||
<set field="createSummary.contentAssocTypeId" from-field="contentAssocTypeId"/>
|
||||
<set field="createSummary.textData" from-field="parameters.summaryData"/>
|
||||
<set field="createSummary.contentIdFrom" from-field="contentIdFrom"/>
|
||||
<set field="createSummary.partyId" from-field="userLogin.partyId"/>
|
||||
<call-service service-name="createTextContent" in-map-name="createSummary"/>
|
||||
</if-not-empty>
|
||||
</if-not-empty>
|
||||
|
||||
<field-to-result field="contentIdFrom" result-name="contentId"/>
|
||||
<field-to-result field="parameters.blogContentId" result-name="blogContentId"/>
|
||||
</simple-method>
|
||||
|
||||
<simple-method method-name="updateBlogEntry" short-description="Update a existing Blog Entry">
|
||||
<set field="showNoResult" value="Y"/>
|
||||
<call-simple-method method-name="getBlogEntry"/>
|
||||
<if>
|
||||
<condition>
|
||||
<or>
|
||||
<if-compare-field field="parameters.contentName" operator="not-equals" to-field="contentName"/>
|
||||
<if-compare-field field="parameters.description" operator="not-equals" to-field="description"/>
|
||||
<if-compare-field field="parameters.summaryData" operator="not-equals" to-field="summaryData"/>
|
||||
<if-compare-field field="parameters.templateDataResourceId" operator="not-equals" to-field="templateDataResourceId"/>
|
||||
<if-compare-field field="parameters.statusId" operator="not-equals" to-field="statusId"/>
|
||||
</or>
|
||||
</condition>
|
||||
<then>
|
||||
<set-service-fields service-name="updateContent" map="parameters" to-map="updContent"/>
|
||||
<set field="updContent.dataResourceId" from-field="parameters.templateDataResourceId"/>
|
||||
<call-service service-name="updateContent" in-map-name="updContent"/>
|
||||
<if-compare-field field="parameters.statusId" operator="not-equals" to-field="statusId">
|
||||
<if-not-empty field="imageContent">
|
||||
<set field="imageContent.status.Id" from-field="parameters.statusId"/>
|
||||
<store-value value-field="imageContent"/>
|
||||
</if-not-empty>
|
||||
</if-compare-field>
|
||||
</then>
|
||||
</if>
|
||||
|
||||
<!-- new article text -->
|
||||
<if-empty field="articleText">
|
||||
<if-not-empty field="parameters.articleData">
|
||||
<set field="ownerContentId" from-field="parameters.blogContentId"/>
|
||||
<set field="contentAssocTypeId" value="SUB_CONTENT"/>
|
||||
<set field="contentIdFrom" from-field="contentId"/>
|
||||
<set field="createText.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
|
||||
<set field="createText.contentPurposeTypeId" value="ARTICLE"/>
|
||||
<set field="createText.dataTemplateTypeId" value="NONE"/>
|
||||
<set field="createText.mapKey" value="ARTICLE"/>
|
||||
<set field="createText.ownerContentId" from-field="ownerContentId"/>
|
||||
<set field="createText.contentName" from-field="parameters.contentName"/>
|
||||
<set field="createText.description" from-field="parameters.description"/>
|
||||
<set field="createText.statusId" from-field="parameters.statusId"/>
|
||||
<set field="createText.contentAssocTypeId" from-field="contentAssocTypeId"/>
|
||||
<set field="createText.textData" from-field="parameters.articleData"/>
|
||||
<set field="createText.contentIdFrom" from-field="contentIdFrom"/>
|
||||
<set field="createText.partyId" from-field="userLogin.partyId"/>
|
||||
<call-service service-name="createTextContent" in-map-name="createText"/>
|
||||
</if-not-empty>
|
||||
</if-empty>
|
||||
|
||||
<!-- update article text -->
|
||||
<if-not-empty field="articleText">
|
||||
<if-compare-field field="parameters.articleData" operator="not-equals" to-field="articleData">
|
||||
<set field="articleText.textData" from-field="parameters.articleData"/>
|
||||
<store-value value-field="articleText"/>
|
||||
</if-compare-field>
|
||||
</if-not-empty>
|
||||
|
||||
<!-- create summary text -->
|
||||
<if-empty field="summaryData">
|
||||
<if-not-empty field="parameters.summaryData">
|
||||
<!-- create the summary data -->
|
||||
<set field="ownerContentId" from-field="parameters.blogContentId"/>
|
||||
<set field="contentAssocTypeId" value="SUB_CONTENT"/>
|
||||
<set field="contentIdFrom" from-field="contentId"/>
|
||||
<set field="createSummary.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
|
||||
<set field="createSummary.contentPurposeTypeId" value="ARTICLE"/>
|
||||
<set field="createSummary.dataTemplateTypeId" value="NONE"/>
|
||||
<set field="createSummary.mapKey" value="SUMMARY"/>
|
||||
<set field="createSummary.ownerContentId" from-field="ownerContentId"/>
|
||||
<set field="createSummary.contentName" from-field="parameters.contentName"/>
|
||||
<set field="createSummary.description" from-field="parameters.description"/>
|
||||
<set field="createSummary.statusId" from-field="parameters.statusId"/>
|
||||
<set field="createSummary.contentAssocTypeId" from-field="contentAssocTypeId"/>
|
||||
<set field="createSummary.textData" from-field="parameters.summaryData"/>
|
||||
<set field="createSummary.contentIdFrom" from-field="contentIdFrom"/>
|
||||
<set field="createSummary.partyId" from-field="userLogin.partyId"/>
|
||||
<call-service service-name="createTextContent" in-map-name="createSummary"/>
|
||||
</if-not-empty>
|
||||
</if-empty>
|
||||
|
||||
<!-- update summary text -->
|
||||
<if-not-empty field="summaryData">
|
||||
<if-compare-field field="parameters.summaryData" operator="not-equals" to-field="summaryData">
|
||||
<set field="summaryText.textData" from-field="parameters.summaryData"/>
|
||||
<store-value value-field="summaryText"/>
|
||||
</if-compare-field>
|
||||
</if-not-empty>
|
||||
|
||||
<if-not-empty field="parameters._uploadedFile_fileName">
|
||||
<if-not-empty field="imageContent">
|
||||
<entity-and entity-name="ContentAssoc" list="oldAssocs" filter-by-date="true">
|
||||
<field-map field-name="contentId" from-field="contentId"/>
|
||||
<field-map field-name="contentIdTo" from-field="imageContent.contentId"/>
|
||||
<field-map field-name="mapKey" value="IMAGE"/>
|
||||
</entity-and>
|
||||
<first-from-list list="oldAssocs" entry="oldAssoc"/>
|
||||
<now-timestamp field="oldAssoc.thruDate"/>
|
||||
<store-value value-field="oldAssoc"/>
|
||||
</if-not-empty>
|
||||
<!-- upload a picture -->
|
||||
<set field="createImage.dataResourceTypeId" value="LOCAL_FILE"/>
|
||||
<set field="createImage.dataTemplateTypeId" value="NONE"/>
|
||||
<set field="createImage.mapKey" value="IMAGE"/>
|
||||
<set field="createImage.ownerContentId" from-field="parameters.contentId"/>
|
||||
<set field="createImage.contentName" from-field="parameters.contentName" default-value="${contentName}"/>
|
||||
<set field="createImage.description" from-field="parameters.description" default-value="${description}"/>
|
||||
<set field="createImage.statusId" from-field="parameters.statusId" default-value="${statusId}"/>
|
||||
<set field="createImage.contentAssocTypeId" value="SUB_CONTENT"/>
|
||||
<set field="createImage.contentIdFrom" from-field="parameters.contentId"/>
|
||||
<set field="createImage.partyId" from-field="userLogin.partyId"/>
|
||||
<set field="createImage.isPublic" value="Y"/>
|
||||
<set field="createImage.uploadedFile" from-field="parameters.uploadedFile"/>
|
||||
<set field="createImage._uploadedFile_fileName" from-field="parameters._uploadedFile_fileName"/>
|
||||
<set field="createImage._uploadedFile_contentType" from-field="parameters._uploadedFile_contentType"/>
|
||||
<call-service service-name="createContentFromUploadedFile" in-map-name="createImage"/>
|
||||
</if-not-empty>
|
||||
<field-to-result field="parameters.contentId" result-name="contentId"/>
|
||||
<field-to-result field="parameters.blogContentId" result-name="blogContentId"/>
|
||||
</simple-method>
|
||||
|
||||
<simple-method method-name="getOwnedOrPublishedBlogEntries" short-description="Get blog entries that the user owns or are published">
|
||||
<entity-condition entity-name="ContentAssocViewTo" use-cache="false" list="unfilteredList">
|
||||
<condition-list combine="and">
|
||||
<condition-expr field-name="contentIdStart" operator="equals" from-field="parameters.contentId"/>
|
||||
<condition-expr field-name="caContentAssocTypeId" operator="equals" value="PUBLISH_LINK"/>
|
||||
</condition-list>
|
||||
<order-by field-name="caFromDate DESC"/>
|
||||
</entity-condition>
|
||||
<filter-list-by-date list="unfilteredList" to-list="blogItems"/>
|
||||
<set field="blogList[]"/>
|
||||
<iterate list="blogItems" entry="blogItem">
|
||||
<set-service-fields service-name="genericContentPermission" map="blogItem" to-map="mapIn"/>
|
||||
<set field="mapIn.ownerContentId" from-field="parameters.contentId"/>
|
||||
<set field="mapIn.mainAction" value="VIEW"/>
|
||||
<call-service service-name="genericContentPermission" in-map-name="mapIn">
|
||||
<result-to-field result-name="hasPermission" field="hasPermission"/>
|
||||
</call-service>
|
||||
<if-compare field="hasPermission" operator="equals" value="true" type="Boolean">
|
||||
<set field="blogList[]" from-field="blogItem"/>
|
||||
<else>
|
||||
<set field="mapIn.mainAction" value="UPDATE"/>
|
||||
<call-service service-name="genericContentPermission" in-map-name="mapIn">
|
||||
<result-to-field result-name="hasPermission" field="hasPermission"/>
|
||||
</call-service>
|
||||
<if-compare field="hasPermission" operator="equals" value="true" type="Boolean">
|
||||
<set field="blogList[]" from-field="blogItem"/>
|
||||
</if-compare>
|
||||
</else>
|
||||
</if-compare>
|
||||
</iterate>
|
||||
<field-to-result field="blogList" result-name="blogList"/>
|
||||
<field-to-result field="parameters.blogContentId" result-name="blogContentId"/>
|
||||
</simple-method>
|
||||
|
||||
<simple-method method-name="getBlogEntry" short-description="Get all the info for a blog article">
|
||||
<if-empty field="parameters.contentId">
|
||||
<field-to-result field="parameters.blogContentId" result-name="blogContentId"/>
|
||||
<return/>
|
||||
</if-empty>
|
||||
<entity-one entity-name="Content" value-field="content"/>
|
||||
<get-related value-field="content" relation-name="FromContentAssoc" list="rawAssocs"/>
|
||||
<filter-list-by-date list="rawAssocs" to-list="assocs"/>
|
||||
<iterate list="assocs" entry="assoc">
|
||||
<if-compare field="assoc.mapKey" value="ARTICLE" operator="equals">
|
||||
<get-related-one value-field="assoc" relation-name="ToContent" to-value-field="mainContent"/>
|
||||
<get-related-one value-field="mainContent" relation-name="DataResource" to-value-field="dataResource"/>
|
||||
<get-related-one value-field="dataResource" relation-name="ElectronicText" to-value-field="articleText"/>
|
||||
</if-compare>
|
||||
<if-compare field="assoc.mapKey" value="SUMMARY" operator="equals">
|
||||
<get-related-one value-field="assoc" relation-name="ToContent" to-value-field="summaryContent"/>
|
||||
<get-related-one value-field="summaryContent" relation-name="DataResource" to-value-field="dataResource"/>
|
||||
<get-related-one value-field="dataResource" relation-name="ElectronicText" to-value-field="summaryText"/>
|
||||
</if-compare>
|
||||
<if-compare field="assoc.mapKey" value="IMAGE" operator="equals">
|
||||
<get-related-one value-field="assoc" relation-name="ToContent" to-value-field="imageContent"/>
|
||||
</if-compare>
|
||||
</iterate>
|
||||
<if-empty field="showNoResult">
|
||||
<field-to-result field="content.contentId" result-name="contentId"/>
|
||||
<field-to-result field="content.contentName" result-name="contentName"/>
|
||||
<field-to-result field="content.description" result-name="description"/>
|
||||
<field-to-result field="content.statusId" result-name="statusId"/>
|
||||
<if-not-empty field="imageContent">
|
||||
<field-to-result field="content.dataResourceId" result-name="templateDataResourceId"/>
|
||||
</if-not-empty>
|
||||
<field-to-result field="articleText.textData" result-name="articleData"/>
|
||||
<field-to-result field="summaryText.textData" result-name="summaryData"/>
|
||||
<field-to-result field="imageContent.contentId" result-name="imageContentId"/>
|
||||
<field-to-result field="mainContent.contentId" result-name="articleContentId"/>
|
||||
<field-to-result field="summaryContent.contentId" result-name="summaryContentId"/>
|
||||
<field-to-result field="parameters.blogContentId" result-name="blogContentId"/>
|
||||
<else>
|
||||
<set from-field="content.contentId" field="contentId"/>
|
||||
<set from-field="content.contentName" field="contentName"/>
|
||||
<set from-field="content.description" field="description"/>
|
||||
<set from-field="content.statusId" field="statusId"/>
|
||||
<set from-field="content.dataResourceId" field="templateDataResourceId"/>
|
||||
<set from-field="articleText.textData" field="articleData"/>
|
||||
<set from-field="summaryText.textData" field="summaryData"/>
|
||||
<set from-field="imageContent.dataResourceId" field="imageDataResourceId"/>
|
||||
</else>
|
||||
</if-empty>
|
||||
</simple-method>
|
||||
|
||||
</simple-methods>
|
||||
@@ -559,20 +559,27 @@
|
||||
<attribute name="fieldValue0" type="String" mode="IN" optional="true"/>
|
||||
</service>
|
||||
|
||||
<service name="resequence" auth="true" engine="java" validate="true" transaction-timeout="7200"
|
||||
location="org.apache.ofbiz.content.ContentManagementServices" invoke="resequence">
|
||||
<service name="resequence" auth="true" engine="group">
|
||||
<deprecated use-instead="resequenceContentAssocChildren" since="release22.01"/>
|
||||
<group>
|
||||
<invoke name="resequenceContentAssocChildren"/>
|
||||
</group>
|
||||
</service>
|
||||
<service name="resequenceContentAssocChildren" auth="true" engine="java" transaction-timeout="7200"
|
||||
location="org.apache.ofbiz.content.ContentManagementServices" invoke="resequence">
|
||||
<description>Reorder sequence numbers in ContentAssoc entities for a given parent id</description>
|
||||
<attribute mode="IN" name="contentIdTo" optional="false" type="String">
|
||||
<attribute mode="IN" name="contentId" optional="false" type="String">
|
||||
<type-validate>
|
||||
<fail-property resource="ContentErrorUiLabels" property="ContentRequiredFieldMissingContentIdTo"/>
|
||||
<fail-property resource="ContentErrorUiLabels" property="ContentRequiredFieldMissingContentId"/>
|
||||
</type-validate>
|
||||
</attribute>
|
||||
<attribute mode="IN" name="seqInc" optional="true" type="Integer"/>
|
||||
<attribute mode="IN" name="seqInc" optional="true" type="Integer" default-value="10"/>
|
||||
<attribute mode="IN" name="typeList" optional="true" type="List"/>
|
||||
<attribute mode="IN" name="contentId" optional="true" type="String"/>
|
||||
<attribute mode="IN" name="contentIdTo" optional="true" type="String"/>
|
||||
<attribute mode="IN" name="contentAssocTypeId" optional="true" type="String"/>
|
||||
<attribute mode="IN" name="dir" optional="true" type="String"/>
|
||||
</service>
|
||||
|
||||
<service name="changeLeafToNode" validate="true" auth="true" engine="java" transaction-timeout="7200"
|
||||
location="org.apache.ofbiz.content.ContentManagementServices" invoke="changeLeafToNode">
|
||||
<description>Moves dataResource to separate content associated with current content so that node can have only children, no content of its own</description>
|
||||
@@ -818,8 +825,8 @@
|
||||
</service>
|
||||
|
||||
<!-- blog services -->
|
||||
<service name="createBlogEntry" engine="simple" auth="true"
|
||||
location="component://content/minilang/blog/BlogServices.xml" invoke="createBlogEntry">
|
||||
<service name="createBlogEntry" engine="groovy" auth="true"
|
||||
location="component://content/src/main/groovy/org/apache/ofbiz/content/BlogServices.groovy" invoke="createBlogEntry">
|
||||
<description>Creates content records for a blog entry</description>
|
||||
<required-permissions join-type="AND">
|
||||
<check-permission permission="CONTENTMGR" action="_CREATE"/>
|
||||
@@ -838,8 +845,8 @@
|
||||
<attribute name="articleData" type="String" mode="IN" optional="true" allow-html="safe"/>
|
||||
<attribute name="summaryData" type="String" mode="IN" optional="true" allow-html="safe"/>
|
||||
</service>
|
||||
<service name="updateBlogEntry" engine="simple" auth="true"
|
||||
location="component://content/minilang/blog/BlogServices.xml" invoke="updateBlogEntry">
|
||||
<service name="updateBlogEntry" engine="groovy" auth="true"
|
||||
location="component://content/src/main/groovy/org/apache/ofbiz/content/BlogServices.groovy" invoke="updateBlogEntry">
|
||||
<description>Updates content records for a blog entry</description>
|
||||
<required-permissions join-type="AND">
|
||||
<check-permission permission="CONTENTMGR" action="_UPDATE"/>
|
||||
@@ -862,8 +869,8 @@
|
||||
<attribute name="articleData" type="String" mode="IN" optional="true" allow-html="safe"/>
|
||||
<attribute name="summaryData" type="String" mode="IN" optional="true" allow-html="safe"/>
|
||||
</service>
|
||||
<service name="getBlogEntry" engine="simple" auth="true"
|
||||
location="component://content/minilang/blog/BlogServices.xml" invoke="getBlogEntry">
|
||||
<service name="getBlogEntry" engine="groovy" auth="true"
|
||||
location="component://content/src/main/groovy/org/apache/ofbiz/content/BlogServices.groovy" invoke="getBlogEntry">
|
||||
<description>Retrieves content records for a blog entry</description>
|
||||
<attribute name="blogContentId" type="String" mode="INOUT" optional="false">
|
||||
<type-validate>
|
||||
@@ -875,25 +882,24 @@
|
||||
<attribute name="statusId" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="description" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="templateDataResourceId" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="summaryData" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="articleData" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="imageContentId" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="imageDataResourceId" type="String" mode="IN" optional="true"/>
|
||||
<attribute name="articleData" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="articleContentId" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="articleDataResourceId" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="summaryData" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="summaryContentId" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="summaryDataResourceId" type="String" mode="OUT" optional="true"/>
|
||||
</service>
|
||||
<service name="getOwnedOrPublishedBlogEntries" engine="simple" location="component://content/minilang/blog/BlogServices.xml" invoke="getOwnedOrPublishedBlogEntries"
|
||||
auth="true" transaction-timeout="7200">
|
||||
<attribute type="String" mode="IN" name="contentId" optional="false">
|
||||
<service name="getOwnedOrPublishedBlogEntries" engine="groovy" auth="true" transaction-timeout="7200"
|
||||
location="component://content/src/main/groovy/org/apache/ofbiz/content/BlogServices.groovy" invoke="getOwnedOrPublishedBlogEntries">
|
||||
<attribute name="contentId" type="String" mode="IN" >
|
||||
<type-validate>
|
||||
<fail-property resource="ContentErrorUiLabels" property="ContentRequiredFieldMissingContentId"/>
|
||||
</type-validate>
|
||||
</attribute>
|
||||
<attribute mode="IN" name="userLogin" optional="false" type="org.apache.ofbiz.entity.GenericValue">
|
||||
<type-validate>
|
||||
<fail-property resource="ContentErrorUiLabels" property="ContentRequiredFieldMissingUserLogin"/>
|
||||
</type-validate>
|
||||
</attribute>
|
||||
<attribute mode="OUT" name="blogList" optional="true" type="List"/>
|
||||
<attribute name="blogContentId" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="blogList" type="List" mode="OUT" optional="true"/>
|
||||
</service>
|
||||
|
||||
<!-- blog RSS services -->
|
||||
|
||||
@@ -0,0 +1,273 @@
|
||||
/*******************************************************************************
|
||||
* 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.content
|
||||
|
||||
import org.apache.ofbiz.base.util.UtilDateTime
|
||||
import org.apache.ofbiz.entity.GenericValue
|
||||
import org.apache.ofbiz.entity.condition.EntityCondition
|
||||
import org.apache.ofbiz.entity.condition.EntityConditionBuilder
|
||||
|
||||
def createBlogEntry() {
|
||||
String ownerContentId = parameters.blogContentId
|
||||
String contentIdFrom = parameters.blogContentId
|
||||
parameters.statusId = parameters.statusId ?: "CTNT_INITIAL_DRAFT"
|
||||
parameters.templateDataResourceId = parameters.templateDataResourceId ?: "BLOG_TPL_TOPLEFT"
|
||||
|
||||
if (!parameters.contentName) {
|
||||
return error(label("ContentUiLabels", "ContentArticleNameIsMissing"))
|
||||
}
|
||||
Map serviceResult = run service: "createContent",
|
||||
with: [dataResourceId : parameters.templateDataResourceId,
|
||||
contentAssocTypeId: "PUBLISH_LINK",
|
||||
contentName : parameters.contentName,
|
||||
description : parameters.description,
|
||||
statusId : parameters.statusId,
|
||||
contentIdFrom : contentIdFrom,
|
||||
partyId : userLogin.partyId,
|
||||
ownerContentId : ownerContentId,
|
||||
dataTemplateTypeId: "SCREEN_COMBINED",
|
||||
mapKey : "MAIN"]
|
||||
contentIdFrom = serviceResult.contentId
|
||||
|
||||
if (parameters._uploadedFile_fileName) {
|
||||
run service: "createContentFromUploadedFile",
|
||||
with: [
|
||||
dataResourceTypeId : "LOCAL_FILE",
|
||||
dataTemplateTypeId : "NONE",
|
||||
mapKey : "IMAGE",
|
||||
ownerContentId : ownerContentId,
|
||||
contentName : parameters.contentName,
|
||||
description : parameters.description,
|
||||
statusId : parameters.statusId,
|
||||
contentAssocTypeId : "SUB_CONTENT",
|
||||
contentIdFrom : contentIdFrom,
|
||||
partyId : userLogin.partyId,
|
||||
isPublic : "Y",
|
||||
uploadedFile : parameters.uploadedFile,
|
||||
_uploadedFile_fileName : parameters._uploadedFile_fileName,
|
||||
_uploadedFile_contentType: parameters._uploadedFile_contentType]
|
||||
}
|
||||
if (parameters.articleData) {
|
||||
run service: "createTextContent",
|
||||
with: [
|
||||
dataResourceTypeId : "ELECTRONIC_TEXT",
|
||||
contentPurposeTypeId: "ARTICLE",
|
||||
dataTemplateTypeId : "NONE",
|
||||
mapKey : "MAIN",
|
||||
ownerContentId : ownerContentId,
|
||||
contentName : parameters.contentName,
|
||||
description : parameters.description,
|
||||
statusId : parameters.statusId,
|
||||
contentAssocTypeId : "SUB_CONTENT",
|
||||
textData : parameters.articleData,
|
||||
contentIdFrom : contentIdFrom,
|
||||
partyId : userLogin.partyId,
|
||||
mapKey : "ARTICLE"]
|
||||
}
|
||||
if (parameters.summaryData) {
|
||||
run service: "createTextContent",
|
||||
with: [
|
||||
dataResourceTypeId: "ELECTRONIC_TEXT",
|
||||
dataTemplateTypeId: "NONE",
|
||||
mapKey : "SUMMARY",
|
||||
ownerContentId : ownerContentId,
|
||||
contentName : parameters.contentName,
|
||||
description : parameters.description,
|
||||
statusId : parameters.statusId,
|
||||
contentAssocTypeId: "SUB_CONTENT",
|
||||
textData : parameters.summaryData,
|
||||
contentIdFrom : contentIdFrom,
|
||||
partyId : userLogin.partyId]
|
||||
}
|
||||
return success([blogContentId: ownerContentId, contentId: contentIdFrom])
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all the info for a blog article
|
||||
*/
|
||||
def getBlogEntry() {
|
||||
if (!parameters.contentId) {
|
||||
return success([blogContentId: parameters.blogContentId])
|
||||
}
|
||||
GenericValue content = from("Content").where(parameters).cache().queryOne()
|
||||
GenericValue mainContent, articleText, dataResource, summaryContent, summaryText, imageContent
|
||||
from("ContentAssoc")
|
||||
.where(contentId: content.contentId)
|
||||
.filterByDate()
|
||||
.cache()
|
||||
.queryList()
|
||||
.each {
|
||||
switch (it.mapKey) {
|
||||
case "ARTICLE":
|
||||
mainContent = it.getRelatedOne("ToContent", true)
|
||||
dataResource = mainContent.getRelatedOne("DataResource", true)
|
||||
articleText = dataResource.getRelatedOne("ElectronicText", true)
|
||||
break
|
||||
case "SUMMARY":
|
||||
summaryContent = it.getRelatedOne("ToContent", true)
|
||||
dataResource = summaryContent.getRelatedOne("DataResource", true)
|
||||
summaryText = dataResource.getRelatedOne("ElectronicText", true)
|
||||
break
|
||||
case "IMAGE":
|
||||
imageContent = it.getRelatedOne("ToContent", true)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
Map resultMap = [blogContentId: parameters.blogContentId,
|
||||
contentId : content.contentId,
|
||||
contentName : content.contentName,
|
||||
description : content.description,
|
||||
statusId : content.statusId]
|
||||
if (imageContent) {
|
||||
resultMap.templateDataResourceId = content.dataResourceId
|
||||
resultMap.imageContentId = imageContent.contentId
|
||||
resultMap.imageDataResourceId = imageContent.dataResourceId
|
||||
}
|
||||
if (mainContent) {
|
||||
resultMap.articleData = articleText.textData
|
||||
resultMap.articleContentId = mainContent.contentId
|
||||
resultMap.articleDataResourceId = mainContent.dataResourceId
|
||||
}
|
||||
if (summaryContent) {
|
||||
resultMap.summaryData = summaryText.textData
|
||||
resultMap.summaryContentId = summaryContent.contentId
|
||||
resultMap.summaryDataResourceId = summaryContent.dataResourceId
|
||||
}
|
||||
return success(resultMap)
|
||||
}
|
||||
|
||||
/**
|
||||
* Update a existing Blog Entry
|
||||
*/
|
||||
def updateBlogEntry() {
|
||||
Map blog = run service: "getBlogEntry", with: parameters
|
||||
if (['contentName', 'description', 'summaryData', 'templateDataResourceId', 'statusId']
|
||||
.stream().anyMatch { blog[it] != parameters[it] }) {
|
||||
run service: "updateContent", with: [* : parameters,
|
||||
dataResourceId: parameters.templateDataResourceId]
|
||||
if (parameters.statusId != blog.statusId
|
||||
&& blog.imageContentId) {
|
||||
delegator.storeByCondition("Content", [statusId: parameters.statusId],
|
||||
EntityCondition.makeCondition("contentId", blog.imageContentId))
|
||||
}
|
||||
}
|
||||
|
||||
if (!blog.articleText && parameters.articleData) {
|
||||
run service: "createTextContent",
|
||||
with: [
|
||||
dataResourceTypeId : "ELECTRONIC_TEXT",
|
||||
contentPurposeTypeId: "ARTICLE",
|
||||
dataTemplateTypeId : "NONE",
|
||||
mapKey : "MAIN",
|
||||
ownerContentId : parameters.blogContentId,
|
||||
contentName : parameters.contentName,
|
||||
description : parameters.description,
|
||||
statusId : parameters.statusId,
|
||||
contentAssocTypeId : "SUB_CONTENT",
|
||||
textData : parameters.articleData,
|
||||
contentIdFrom : blog.contentId,
|
||||
partyId : userLogin.partyId,
|
||||
mapKey : "ARTICLE"]
|
||||
}
|
||||
if (blog.articleData && parameters.articleData != blog.articleData) {
|
||||
run service: 'updateElectronicText', with: [dataResourceId: blog.articleDataResourceId,
|
||||
textData : parameters.articleData]
|
||||
}
|
||||
if (!blog.summaryData && parameters.summaryData) {
|
||||
run service: "createTextContent",
|
||||
with: [
|
||||
dataResourceTypeId: "ELECTRONIC_TEXT",
|
||||
dataTemplateTypeId: "NONE",
|
||||
mapKey : "SUMMARY",
|
||||
ownerContentId : parameters.blogContentId,
|
||||
contentName : parameters.contentName,
|
||||
description : parameters.description,
|
||||
statusId : parameters.statusId,
|
||||
contentAssocTypeId: "SUB_CONTENT",
|
||||
textData : parameters.summaryData,
|
||||
contentIdFrom : blog.contentId,
|
||||
partyId : userLogin.partyId]
|
||||
}
|
||||
if (blog.summaryData && parameters.summaryData != blog.summaryData) {
|
||||
run service: 'updateElectronicText', with: [dataResourceId: blog.summaryDataResourceId,
|
||||
textData : parameters.summaryData]
|
||||
}
|
||||
|
||||
if (parameters._uploadedFile_fileName) {
|
||||
if (blog.imageContentId) {
|
||||
EntityCondition condition = new EntityConditionBuilder().AND() {
|
||||
EQUALS(contentId: blog.contentId)
|
||||
EQUALS(contentIdTo: blog.imageContentId)
|
||||
EQUALS(mapKey: "IMAGE")
|
||||
EQUALS(thruDate: null)
|
||||
}
|
||||
delegator.storeByCondition("ContentAssoc", [thruDate: UtilDateTime.nowTimestamp()], condition)
|
||||
}
|
||||
run service: "createContentFromUploadedFile",
|
||||
with: [
|
||||
isPublic : "Y",
|
||||
dataTemplateTypeId : "NONE",
|
||||
mapKey : "IMAGE",
|
||||
dataResourceTypeId : "LOCAL_FILE",
|
||||
contentAssocTypeId : "SUB_CONTENT",
|
||||
ownerContentId : parameters.blogContentId,
|
||||
contentName : parameters.contentName,
|
||||
description : parameters.description,
|
||||
statusId : parameters.statusId,
|
||||
contentIdFrom : blog.contentId,
|
||||
partyId : userLogin.partyId,
|
||||
uploadedFile : parameters.uploadedFile,
|
||||
_uploadedFile_fileName : parameters._uploadedFile_fileName,
|
||||
_uploadedFile_contentType: parameters._uploadedFile_contentType]
|
||||
}
|
||||
return success([blogContentId: parameters.blogContentId, contentId: blog.contentId])
|
||||
}
|
||||
|
||||
/**
|
||||
* Get blog entries that the user owns or are published
|
||||
* @return
|
||||
*/
|
||||
def getOwnedOrPublishedBlogEntries() {
|
||||
List blogList = []
|
||||
from("ContentAssocViewTo")
|
||||
.where(contentIdStart: parameters.contentId,
|
||||
caContentAssocTypeId: "PUBLISH_LINK")
|
||||
.orderBy("-caFromDate")
|
||||
.filterByDate()
|
||||
.cache()
|
||||
.queryList()
|
||||
.each {
|
||||
Map serviceResult = run service: "genericContentPermission",
|
||||
with: [* : it.getAllFields(),
|
||||
ownerContentId: parameters.contentId,
|
||||
mainAction : "VIEW"]
|
||||
if (!serviceResult.hasPermission) {
|
||||
serviceResult = run service: "genericContentPermission",
|
||||
with: [* : it.getAllFields(),
|
||||
ownerContentId: parameters.contentId,
|
||||
mainAction : "UPDATE"]
|
||||
}
|
||||
if (serviceResult.hasPermission) {
|
||||
blogList << it
|
||||
}
|
||||
}
|
||||
return success([blogList : blogList,
|
||||
blogContentId: parameters.blogContentId])
|
||||
}
|
||||
+68
-56
@@ -23,6 +23,7 @@ import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.sql.Timestamp;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashSet;
|
||||
@@ -50,6 +51,7 @@ import org.apache.ofbiz.entity.condition.EntityOperator;
|
||||
import org.apache.ofbiz.entity.model.ModelUtil;
|
||||
import org.apache.ofbiz.entity.util.EntityQuery;
|
||||
import org.apache.ofbiz.entity.util.EntityUtil;
|
||||
import org.apache.ofbiz.security.SecuredUpload;
|
||||
import org.apache.ofbiz.security.Security;
|
||||
import org.apache.ofbiz.service.DispatchContext;
|
||||
import org.apache.ofbiz.service.GenericServiceException;
|
||||
@@ -146,6 +148,20 @@ public class ContentManagementServices {
|
||||
Map<String, Object> context = UtilMisc.makeMapWritable(rcontext);
|
||||
Locale locale = (Locale) context.get("locale");
|
||||
|
||||
// Check if a webshell is not uploaded
|
||||
String textData = (String) context.get("textData");
|
||||
if (UtilValidate.isNotEmpty(textData)) {
|
||||
try {
|
||||
if (!SecuredUpload.isValidText(textData, Collections.emptyList())) {
|
||||
Debug.logError("================== Not saved for security reason ==================", MODULE);
|
||||
return ServiceUtil.returnError("================== Not saved for security reason ==================");
|
||||
}
|
||||
} catch (IOException e) {
|
||||
Debug.logError("================== Not saved for security reason ==================", MODULE);
|
||||
return ServiceUtil.returnError("================== Not saved for security reason ==================");
|
||||
}
|
||||
}
|
||||
|
||||
// Knowing why a request fails permission check is one of the more difficult
|
||||
// aspects of content management. Setting "displayFailCond" to true will
|
||||
// put an html table in result.errorMessage that will show what tests were performed
|
||||
@@ -176,7 +192,7 @@ public class ContentManagementServices {
|
||||
|
||||
if (Debug.infoOn()) {
|
||||
Debug.logInfo("in persist... contentPurposeList(0):" + contentPurposeList, MODULE);
|
||||
Debug.logInfo("in persist... textData(0):" + context.get("textData"), MODULE);
|
||||
Debug.logInfo("in persist... textData(0):" + textData, MODULE);
|
||||
}
|
||||
|
||||
GenericValue content = delegator.makeValue("Content");
|
||||
@@ -835,15 +851,23 @@ public class ContentManagementServices {
|
||||
return results;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reorder sequence numbers in ContentAssoc entities for a given parent id
|
||||
* if variable dir contains the string up or down, realize for the given contentIdTo switch
|
||||
* with the previous or the next
|
||||
* @param dctx
|
||||
* @param context
|
||||
* @return
|
||||
* @throws GenericServiceException
|
||||
*/
|
||||
public static Map<String, Object> resequence(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
Delegator delegator = dctx.getDelegator();
|
||||
String contentIdTo = (String) context.get("contentIdTo");
|
||||
Integer seqInc = (Integer) context.get("seqInc");
|
||||
if (seqInc == null) {
|
||||
seqInc = 100;
|
||||
}
|
||||
int seqIncrement = seqInc;
|
||||
String contentId = (String) context.get("contentId");
|
||||
|
||||
int seqStep = (Integer) context.get("seqInc");
|
||||
|
||||
// Resolve the association type to use for resolve content's child
|
||||
List<String> typeList = UtilGenerics.cast(context.get("typeList"));
|
||||
if (typeList == null) {
|
||||
typeList = new LinkedList<>();
|
||||
@@ -855,60 +879,45 @@ public class ContentManagementServices {
|
||||
if (UtilValidate.isEmpty(typeList)) {
|
||||
typeList = UtilMisc.toList("PUBLISH_LINK", "SUB_CONTENT");
|
||||
}
|
||||
EntityCondition conditionType = EntityCondition.makeCondition("contentAssocTypeId", EntityOperator.IN, typeList);
|
||||
EntityCondition conditionMain = EntityCondition.makeCondition(UtilMisc.toList(EntityCondition.makeCondition("contentIdTo",
|
||||
EntityOperator.EQUALS, contentIdTo), conditionType), EntityOperator.AND);
|
||||
|
||||
// Resolve all content assoc to resequence from the content
|
||||
try {
|
||||
List<GenericValue> listAll = EntityQuery.use(delegator).from("ContentAssoc")
|
||||
.where(conditionMain)
|
||||
List<GenericValue> contentAssocs = EntityQuery.use(delegator).from("ContentAssoc")
|
||||
.where(List.of(
|
||||
EntityCondition.makeCondition("contentId", contentId),
|
||||
EntityCondition.makeCondition("contentAssocTypeId", EntityOperator.IN, typeList)))
|
||||
.orderBy("sequenceNum", "fromDate", "createdDate")
|
||||
.filterByDate().queryList();
|
||||
String contentId = (String) context.get("contentId");
|
||||
.filterByDate()
|
||||
.queryList();
|
||||
String contentIdTo = (String) context.get("contentIdTo");
|
||||
String dir = (String) context.get("dir");
|
||||
int seqNum = seqIncrement;
|
||||
String thisContentId = null;
|
||||
for (int i = 0; i < listAll.size(); i++) {
|
||||
GenericValue contentAssoc = listAll.get(i);
|
||||
if (UtilValidate.isNotEmpty(contentId) && UtilValidate.isNotEmpty(dir)) {
|
||||
// move targeted entry up or down
|
||||
thisContentId = contentAssoc.getString("contentId");
|
||||
if (contentId.equals(thisContentId)) {
|
||||
if (dir.startsWith("up")) {
|
||||
if (i > 0) {
|
||||
// Swap with previous entry
|
||||
try {
|
||||
GenericValue prevValue = listAll.get(i - 1);
|
||||
Long prevSeqNum = (Long) prevValue.get("sequenceNum");
|
||||
prevValue.put("sequenceNum", (long) seqNum);
|
||||
prevValue.store();
|
||||
contentAssoc.put("sequenceNum", prevSeqNum);
|
||||
contentAssoc.store();
|
||||
} catch (GenericEntityException e) {
|
||||
return ServiceUtil.returnError(e.toString());
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (i < listAll.size()) {
|
||||
// Swap with next entry
|
||||
GenericValue nextValue = listAll.get(i + 1);
|
||||
nextValue.put("sequenceNum", (long) seqNum);
|
||||
nextValue.store();
|
||||
seqNum += seqIncrement;
|
||||
contentAssoc.put("sequenceNum", (long) seqNum);
|
||||
contentAssoc.store();
|
||||
i++; // skip next one
|
||||
}
|
||||
}
|
||||
} else {
|
||||
contentAssoc.put("sequenceNum", (long) seqNum);
|
||||
contentAssoc.store();
|
||||
}
|
||||
} else {
|
||||
contentAssoc.put("sequenceNum", (long) seqNum);
|
||||
contentAssoc.store();
|
||||
int seqNum = seqStep;
|
||||
boolean switchSequence = UtilValidate.isNotEmpty(contentIdTo) && UtilValidate.isNotEmpty(dir);
|
||||
boolean switchModeUp = switchSequence && dir.startsWith("up");
|
||||
int changePosition = -1;
|
||||
|
||||
// update the sequence for all element and check if we need switch two element
|
||||
for (int i = 0; i < contentAssocs.size(); i++) {
|
||||
boolean stopLimit = ((i <= 0 && switchModeUp) || (i + 1 >= contentAssocs.size() && !switchModeUp));
|
||||
GenericValue contentAssoc = contentAssocs.get(i);
|
||||
contentAssoc.put("sequenceNum", (long) seqNum);
|
||||
seqNum += seqStep;
|
||||
if (switchSequence
|
||||
&& contentIdTo.equals(contentAssoc.getString("contentIdTo"))
|
||||
&& !stopLimit) {
|
||||
changePosition = i;
|
||||
}
|
||||
seqNum += seqIncrement;
|
||||
}
|
||||
|
||||
// We need to switch, do it
|
||||
if (changePosition >= 0) {
|
||||
GenericValue currentContent = contentAssocs.get(changePosition);
|
||||
GenericValue destinationContent = contentAssocs.get(changePosition + (switchModeUp ? -1 : +1));
|
||||
long switchSeqNum = currentContent.getLong("sequenceNum");
|
||||
currentContent.put("sequenceNum", destinationContent.getLong("sequenceNum"));
|
||||
destinationContent.put("sequenceNum", switchSeqNum);
|
||||
}
|
||||
delegator.storeAll(contentAssocs);
|
||||
} catch (GenericEntityException e) {
|
||||
Debug.logError(e, MODULE);
|
||||
return ServiceUtil.returnError(e.toString());
|
||||
@@ -1594,6 +1603,9 @@ public class ContentManagementServices {
|
||||
File file = new File(objectInfo);
|
||||
if (file.isFile()) {
|
||||
try {
|
||||
// Check if a webshell is not uploaded
|
||||
// This should now be useless after the add of SecuredUpload::isValidFile in GroovyBaseScript for createAnonFile service.
|
||||
// But I prefer to keep it anyway, it's hard to test all cases, better safe than sorry
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(objectInfo, "All", delegator)) {
|
||||
errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ package org.apache.ofbiz.content.data;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.util.Collections;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -41,6 +42,7 @@ import org.apache.ofbiz.entity.GenericEntityException;
|
||||
import org.apache.ofbiz.entity.GenericValue;
|
||||
import org.apache.ofbiz.entity.util.EntityQuery;
|
||||
import org.apache.ofbiz.entity.util.EntityUtilProperties;
|
||||
import org.apache.ofbiz.security.SecuredUpload;
|
||||
import org.apache.ofbiz.service.GenericServiceException;
|
||||
import org.apache.ofbiz.service.LocalDispatcher;
|
||||
import org.apache.ofbiz.service.ServiceUtil;
|
||||
@@ -83,22 +85,16 @@ public class DataEvents {
|
||||
String permissionService = EntityUtilProperties.getPropertyValue("content", "stream.permission.service",
|
||||
"genericContentPermission", delegator);
|
||||
|
||||
// @formatter:off (prevent unwanted formatting in Eclipse)
|
||||
// For OFBIZ-11840. It's counterintuitive to return success but it makes sense if you thing about it. It simply returns a blank screen.
|
||||
// To illustrate, only few payloads, onLoad related, are handled because it works everytime.
|
||||
// It could be improved by checking for all payloads.
|
||||
// As listed at https://portswigger.net/web-security/cross-site-scripting/cheat-sheet, at 2020-11-11 there are 8979 of them.
|
||||
// So a way could be to read all of them and test...
|
||||
// @formatter:on
|
||||
|
||||
if (contentId.toLowerCase().contains("<svg")
|
||||
|| contentId.toLowerCase().contains("<body")
|
||||
|| contentId.toLowerCase().contains("<iframe")
|
||||
|| contentId.toLowerCase().contains("<object")
|
||||
|| contentId.toLowerCase().contains("<embed")
|
||||
|| contentId.toLowerCase().contains("<a href='javas")
|
||||
|| contentId.toLowerCase().contains("<a href=\"javas")
|
||||
|| contentId.toLowerCase().contains("<script")) {
|
||||
// For OFBIZ-11840, checks if a webshell is not uploaded
|
||||
// It's counterintuitive to return success but it makes sense if you thing about it.
|
||||
// It simply returns a blank screen.
|
||||
try {
|
||||
if (!SecuredUpload.isValidText(contentId, Collections.emptyList())) {
|
||||
Debug.logError("================== Not saved for security reason ==================", MODULE);
|
||||
return "success";
|
||||
}
|
||||
} catch (IOException e) {
|
||||
Debug.logError("================== Not saved for security reason ==================", MODULE);
|
||||
return "success";
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -411,7 +411,6 @@ public class DataResourceWorker implements org.apache.ofbiz.widget.content.DataR
|
||||
|
||||
public static String getMimeTypeWithByteBuffer(java.nio.ByteBuffer buffer) throws IOException {
|
||||
byte[] b = buffer.array();
|
||||
|
||||
Tika tika = new Tika();
|
||||
return tika.detect(b);
|
||||
}
|
||||
|
||||
@@ -49,6 +49,7 @@ import org.apache.ofbiz.entity.Delegator;
|
||||
import org.apache.ofbiz.entity.GenericEntityException;
|
||||
import org.apache.ofbiz.entity.GenericValue;
|
||||
import org.apache.ofbiz.entity.util.EntityQuery;
|
||||
import org.apache.ofbiz.security.SecuredUpload;
|
||||
import org.apache.ofbiz.service.DispatchContext;
|
||||
import org.apache.ofbiz.service.GenericServiceException;
|
||||
import org.apache.ofbiz.service.ModelService;
|
||||
@@ -195,7 +196,30 @@ public class DataServices {
|
||||
return createFileMethod(dctx, context);
|
||||
}
|
||||
|
||||
public static Map<String, Object> createFileNoPerm(DispatchContext dctx, Map<String, ? extends Object> rcontext) {
|
||||
public static Map<String, Object> createFileNoPerm(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws IOException,
|
||||
ImageReadException {
|
||||
String originalFileName = (String) rcontext.get("dataResourceName");
|
||||
String fileNameAndPath = (String) rcontext.get("objectInfo");
|
||||
Delegator delegator = dctx.getDelegator();
|
||||
Locale locale = (Locale) rcontext.get("locale");
|
||||
File file = new File(fileNameAndPath);
|
||||
if (!originalFileName.isEmpty()) {
|
||||
// Check the file name
|
||||
if (!SecuredUpload.isValidFileName(originalFileName, delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
// TODO we could verify the file type (here "All") with dataResourceTypeId. Anyway it's done with isValidFile()
|
||||
// We would just have a better error message
|
||||
if (file.exists()) {
|
||||
// Check if a webshell is not uploaded
|
||||
if (!SecuredUpload.isValidFile(fileNameAndPath, "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Map<String, Object> context = UtilMisc.makeMapWritable(rcontext);
|
||||
context.put("skipPermissionCheck", "true");
|
||||
return createFileMethod(dctx, context);
|
||||
@@ -254,7 +278,9 @@ public class DataServices {
|
||||
if (UtilValidate.isNotEmpty(textData)) {
|
||||
try (OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8);) {
|
||||
out.write(textData);
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "Text", delegator)) {
|
||||
// Check if a webshell is not uploaded
|
||||
// TODO I believe the call below to SecuredUpload::isValidFile is now useless because of the same in createFileNoPerm
|
||||
if (!SecuredUpload.isValidFile(file.getAbsolutePath(), "Text", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedTextFileFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
@@ -265,10 +291,11 @@ public class DataServices {
|
||||
}
|
||||
} else if (binData != null) {
|
||||
try {
|
||||
// Check if a webshell is not uploaded
|
||||
Path tempFile = Files.createTempFile(null, null);
|
||||
Files.write(tempFile, binData.array(), StandardOpenOption.APPEND);
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(tempFile.toString(), "All", delegator)) {
|
||||
// Check if a webshell is not uploaded
|
||||
// TODO I believe the call below to SecuredUpload::isValidFile is now useless because of the same in createFileNoPerm
|
||||
if (!SecuredUpload.isValidFile(tempFile.toString(), "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
@@ -460,7 +487,9 @@ public class DataServices {
|
||||
if (UtilValidate.isNotEmpty(textData)) {
|
||||
try (OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8);) {
|
||||
out.write(textData);
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "Text", delegator)) {
|
||||
// Check if a webshell is not uploaded
|
||||
// TODO I believe the call below to SecuredUpload::isValidFile is now useless because of the same in createFileNoPerm
|
||||
if (!SecuredUpload.isValidFile(file.getAbsolutePath(), "Text", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedTextFileFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
@@ -472,9 +501,10 @@ public class DataServices {
|
||||
} else if (binData != null) {
|
||||
try {
|
||||
// Check if a webshell is not uploaded
|
||||
// TODO I believe the call below to SecuredUpload::isValidFile is now useless because of the same in createFileNoPerm
|
||||
Path tempFile = Files.createTempFile(null, null);
|
||||
Files.write(tempFile, binData.array(), StandardOpenOption.APPEND);
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(tempFile.toString(), "Image", delegator)) {
|
||||
if (!SecuredUpload.isValidFile(tempFile.toString(), "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
@@ -647,7 +677,8 @@ public class DataServices {
|
||||
try (FileOutputStream out = new FileOutputStream(file);) {
|
||||
out.write(imageData);
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "All", delegator)) {
|
||||
// TODO I believe the call below to SecuredUpload::isValidFile is now useless because of the same in createFileNoPerm
|
||||
if (!SecuredUpload.isValidFile(file.getAbsolutePath(), "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
@@ -706,7 +737,8 @@ public class DataServices {
|
||||
try (FileOutputStream out = new FileOutputStream(file);) {
|
||||
out.write(imageData);
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "All", delegator)) {
|
||||
// TODO I believe the call below to SecuredUpload::isValidFile is now useless because of the same in createFileNoPerm
|
||||
if (!SecuredUpload.isValidFile(file.getAbsolutePath(), "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
/*******************************************************************************
|
||||
* 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.content.ftp;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import org.apache.sshd.client.ClientBuilder;
|
||||
import org.apache.sshd.client.SshClient;
|
||||
import org.apache.sshd.client.config.keys.ClientIdentityLoader;
|
||||
import org.apache.sshd.common.NamedFactory;
|
||||
import org.apache.sshd.common.kex.BuiltinDHFactories;
|
||||
import org.apache.sshd.common.signature.BuiltinSignatures;
|
||||
|
||||
public abstract class SshClientHelper {
|
||||
|
||||
private static SshClient client = null;
|
||||
|
||||
public static SshClient getSshClient() {
|
||||
if (client == null) {
|
||||
client = SshClient.setUpDefaultClient();
|
||||
client.setClientIdentityLoader(ClientIdentityLoader.DEFAULT);
|
||||
client.setKeyExchangeFactories(NamedFactory.setUpTransformedFactories(
|
||||
false,
|
||||
BuiltinDHFactories.VALUES,
|
||||
ClientBuilder.DH2KEX));
|
||||
client.setSignatureFactories(new ArrayList<>(BuiltinSignatures.VALUES));
|
||||
}
|
||||
if (!client.isStarted()) {
|
||||
client.start();
|
||||
}
|
||||
return client;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -28,7 +28,8 @@ import org.apache.commons.io.IOUtils;
|
||||
import org.apache.ofbiz.base.util.UtilValidate;
|
||||
import org.apache.sshd.client.SshClient;
|
||||
import org.apache.sshd.client.session.ClientSession;
|
||||
import org.apache.sshd.client.subsystem.sftp.SftpClient;
|
||||
import org.apache.sshd.sftp.client.SftpClient;
|
||||
import org.apache.sshd.sftp.client.SftpClientFactory;
|
||||
|
||||
/**
|
||||
* Basic client to copy files to an ssh ftp server
|
||||
@@ -37,12 +38,12 @@ public class SshFtpClient implements FtpClientInterface {
|
||||
|
||||
private static final String MODULE = SshFtpClient.class.getName();
|
||||
|
||||
private SshClient client;
|
||||
private final SshClient client;
|
||||
private SftpClient sftp;
|
||||
private ClientSession session;
|
||||
|
||||
public SshFtpClient() {
|
||||
client = SshClient.setUpDefaultClient();
|
||||
client.start();
|
||||
client = SshClientHelper.getSshClient();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -50,11 +51,10 @@ public class SshFtpClient implements FtpClientInterface {
|
||||
if (port == null) port = 22L;
|
||||
if (timeout == null) timeout = 10000L;
|
||||
|
||||
if (sftp != null) return;
|
||||
ClientSession session = client.connect(username, hostname, port.intValue()).verify(timeout.intValue()).getSession();
|
||||
session = client.connect(username, hostname, port.intValue()).verify(timeout.intValue()).getSession();
|
||||
session.addPasswordIdentity(password);
|
||||
session.auth().verify(timeout.intValue());
|
||||
sftp = session.createSftpClient();
|
||||
session.auth().verify();
|
||||
sftp = SftpClientFactory.instance().createSftpClient(session).singleSessionInstance();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -83,10 +83,8 @@ public class SshFtpClient implements FtpClientInterface {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void closeConnection() {
|
||||
if (sftp != null) {
|
||||
client.stop();
|
||||
sftp = null;
|
||||
}
|
||||
public void closeConnection() throws IOException {
|
||||
if (sftp != null) sftp.close();
|
||||
if (session != null) session.close();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1937,7 +1937,7 @@ under the License.
|
||||
<view-map name="EditAddContent" type="screen" page="component://content/widget/cms/CMSScreens.xml#EditAddContent"/>
|
||||
<view-map name="EditAddSubContent" type="screen" page="component://content/widget/cms/CMSScreens.xml#EditAddSubContent"/>
|
||||
|
||||
|
||||
<view-map name="ViewBinaryDataResource" page="" type="simplecontent"/>
|
||||
<view-map name="ViewSimpleContent" page="" type="simplecontent"/>
|
||||
|
||||
<!-- lookup content component -->
|
||||
|
||||
@@ -299,9 +299,10 @@ under the License.
|
||||
</sub-hyperlink>
|
||||
</display-entity>
|
||||
</field>
|
||||
<field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType"></display-entity></field>
|
||||
<field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType"/></field>
|
||||
<field name="mapKey"><display/></field>
|
||||
<field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field>
|
||||
<field name="sequenceNum"><display/></field>
|
||||
<field name="fromDate"><display type="date"/></field>
|
||||
<field name="deleteLink" title=" " widget-style="buttontext">
|
||||
<hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentAssoc" also-hidden="false">
|
||||
<parameter param-name="contentId"/>
|
||||
@@ -311,7 +312,7 @@ under the License.
|
||||
</hyperlink>
|
||||
</field>
|
||||
<field name="thruDate"><date-time/></field>
|
||||
<field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext">
|
||||
<field name="updateButton" widget-style="buttontext">
|
||||
<submit button-type="text-link"/>
|
||||
</field>
|
||||
</form>
|
||||
@@ -330,9 +331,10 @@ under the License.
|
||||
</display-entity>
|
||||
</field>
|
||||
<field name="contentIdTo"><hidden/></field>
|
||||
<field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType"></display-entity></field>
|
||||
<field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType"/></field>
|
||||
<field name="mapKey"><display/></field>
|
||||
<field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field>
|
||||
<field name="sequenceNum"><display/></field>
|
||||
<field name="fromDate"><display type="date"/></field>
|
||||
<field name="deleteLink" title=" " widget-style="buttontext">
|
||||
<hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentAssoc" also-hidden="false">
|
||||
<parameter param-name="contentId"/>
|
||||
@@ -342,7 +344,7 @@ under the License.
|
||||
</hyperlink>
|
||||
</field>
|
||||
<field name="thruDate"><date-time/></field>
|
||||
<field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext">
|
||||
<field name="updateButton" widget-style="buttontext">
|
||||
<submit button-type="text-link"/>
|
||||
</field>
|
||||
</form>
|
||||
|
||||
@@ -1609,5 +1609,9 @@ under the License.
|
||||
<InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL01" datetimeReceived="2008-08-01 08:00:00.000"
|
||||
inventoryItemId="9030" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="MAT_B_COST" ownerPartyId="Company" currencyUomId="USD" unitCost="7.0"/>
|
||||
<InventoryItemDetail inventoryItemId="9030" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="20" quantityOnHandDiff="20" accountingQuantityDiff="20"/>
|
||||
|
||||
<!-- defaut template screen use for Company -->
|
||||
<CustomScreen customScreenId="DEFAULT_INV_TPL" customScreenTypeId="CST_INVOICE_TPL" customScreenName="DefaultInvoicePDF" customScreenLocation="component://accounting/widget/AccountingPrintScreens.xml"/>
|
||||
<PartyPrefDocTypeTpl partyPrefDocTypeTplId="InvTplInvoice" partyId="Company" fromDate="2001-05-13 00:00:00" invoiceTypeId="INVOICE" customScreenId="DEFAULT_INV_TPL"/>
|
||||
|
||||
</entity-engine-xml>
|
||||
|
||||
@@ -218,4 +218,9 @@ under the License.
|
||||
<!-- Demo WebSiteContactList -->
|
||||
<WebSiteContactList webSiteId="WebStore" contactListId="9000" fromDate="2011-08-16 17:15:20.0"/>
|
||||
<WebSiteContactList webSiteId="WebStore" contactListId="9010" fromDate="2011-08-16 17:15:20.0"/>
|
||||
|
||||
<SalesForecast currencyUomId="USD" forecastAmount="1000000.00" internalPartyId="SALES" organizationPartyId="Company" salesForecastId="1000"/>
|
||||
<SalesForecastDetail amount="100000.00" productId="WG-9943" salesForecastDetailId="00001" salesForecastId="1000"/>
|
||||
<SalesForecast currencyUomId="EUR" forecastAmount="20000.00" internalPartyId="DemoRepAll" organizationPartyId="EuroCustomer" salesForecastId="2000"/>
|
||||
<SalesForecastDetail amount="20000.00" productCategoryId="SERV-001" salesForecastDetailId="00001" salesForecastId="2000"/>
|
||||
</entity-engine-xml>
|
||||
|
||||
@@ -2600,5 +2600,15 @@ under the License.
|
||||
<AgreementTerm agreementId="AGR_SALES" agreementItemSeqId="00001" agreementTermId="9000" description="Sales test agreement" termDays="30" termTypeId="FIN_PAYMENT_FIXDAY"/>
|
||||
<!-- An AgreementProductAppls aris related to an AgreementItem. AgreementProductAppls are optional. If a product id and a price are specified the price will override the ProductPrice if the agreement is selected in the order -->
|
||||
<AgreementProductAppl agreementId="AGR_SALES" agreementItemSeqId="00001" price="10.000" productId="GZ-1000"/>
|
||||
|
||||
<CustomScreen customScreenId="DEFAULT_ORD_TPL" customScreenTypeId="CST_ORDER_TPL" customScreenName="DefaultOrderPDF" customScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml"/>
|
||||
<PartyPrefDocTypeTpl partyPrefDocTypeTplId="OrdTplSales" partyId="Company" fromDate="2001-05-13 00:00:00" orderTypeId="SALES_ORDER" customScreenId="DEFAULT_ORD_TPL"/>
|
||||
<PartyPrefDocTypeTpl partyPrefDocTypeTplId="OrdTplPurchase" partyId="Company" fromDate="2001-05-13 00:00:00" orderTypeId="PURCHASE_ORDER" customScreenId="DEFAULT_ORD_TPL"/>
|
||||
|
||||
<CustomScreen customScreenId="DEFAULT_QUOTE_TPL" customScreenTypeId="CST_QUOTE_TPL" customScreenName="DefaultQuotePDF" customScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml"/>
|
||||
<PartyPrefDocTypeTpl partyPrefDocTypeTplId="QuoTplOther" partyId="Company" fromDate="2001-05-13 00:00:00" quoteTypeId="OTHER_QUOTE" customScreenId="DEFAULT_QUOTE_TPL"/>
|
||||
<PartyPrefDocTypeTpl partyPrefDocTypeTplId="QuoTplProposal" partyId="Company" fromDate="2001-05-13 00:00:00" quoteTypeId="PROPOSAL" customScreenId="DEFAULT_QUOTE_TPL"/>
|
||||
<PartyPrefDocTypeTpl partyPrefDocTypeTplId="QuoTplProduct" partyId="Company" fromDate="2001-05-13 00:00:00" quoteTypeId="PRODUCT_QUOTE" customScreenId="DEFAULT_QUOTE_TPL"/>
|
||||
<PartyPrefDocTypeTpl partyPrefDocTypeTplId="QuoTplPurchase" partyId="Company" fromDate="2001-05-13 00:00:00" quoteTypeId="PURCHASE_QUOTE" customScreenId="DEFAULT_QUOTE_TPL"/>
|
||||
|
||||
</entity-engine-xml>
|
||||
|
||||
@@ -856,7 +856,7 @@
|
||||
<value xml:lang="zh-TW">技能等級</value>
|
||||
</property>
|
||||
<property key="FormFieldTitle_skillTypeId">
|
||||
<value xml:lang="de">Fähigkeit Typ ID</value>
|
||||
<value xml:lang="de">Fähigkeit Typ ID</value>
|
||||
<value xml:lang="en">Skill Type ID</value>
|
||||
<value xml:lang="es">Id tipo de habilidad</value>
|
||||
<value xml:lang="fr">Compétence</value>
|
||||
@@ -882,7 +882,7 @@
|
||||
<value xml:lang="zh-TW">技能掌握日期</value>
|
||||
</property>
|
||||
<property key="FormFieldTitle_temporaryFlag">
|
||||
<value xml:lang="de">temporäres Kennzeichen</value>
|
||||
<value xml:lang="de">temporäres Kennzeichen</value>
|
||||
<value xml:lang="en">Temporary Flag</value>
|
||||
<value xml:lang="es">Indicador Principal</value>
|
||||
<value xml:lang="fr">Balise temporaire</value>
|
||||
@@ -895,7 +895,7 @@
|
||||
<value xml:lang="zh-TW">是否為臨時</value>
|
||||
</property>
|
||||
<property key="FormFieldTitle_terminationReasonId">
|
||||
<value xml:lang="de">Nummer des Kündigungsgrundes</value>
|
||||
<value xml:lang="de">Nummer des Kündigungsgrundes</value>
|
||||
<value xml:lang="en">Termination Reason ID</value>
|
||||
<value xml:lang="es">Id de razón de finiquito</value>
|
||||
<value xml:lang="fr">Motif de la fin de contrat</value>
|
||||
@@ -908,7 +908,7 @@
|
||||
<value xml:lang="zh-TW">雇佣終止原因識別</value>
|
||||
</property>
|
||||
<property key="FormFieldTitle_terminationTypeId">
|
||||
<value xml:lang="de">Kündigungsart ID</value>
|
||||
<value xml:lang="de">Kündigungsart ID</value>
|
||||
<value xml:lang="en">Termination Type ID</value>
|
||||
<value xml:lang="es">Id tipo de finiquito</value>
|
||||
<value xml:lang="fr">Type de fin de contrat</value>
|
||||
@@ -921,7 +921,7 @@
|
||||
<value xml:lang="zh-TW">雇佣終止類型識別</value>
|
||||
</property>
|
||||
<property key="FormFieldTitle_title">
|
||||
<value xml:lang="de">Titel</value>
|
||||
<value xml:lang="de">Titel</value>
|
||||
<value xml:lang="en">Title</value>
|
||||
<value xml:lang="es">Título</value>
|
||||
<value xml:lang="fr">Titre</value>
|
||||
@@ -931,7 +931,7 @@
|
||||
<value xml:lang="zh-TW">標題</value>
|
||||
</property>
|
||||
<property key="FormFieldTitle_trainingClassTypeId">
|
||||
<value xml:lang="de">Nummer der Schulungsklasse</value>
|
||||
<value xml:lang="de">Nummer der Schulungsklasse</value>
|
||||
<value xml:lang="en">Training Class Type ID</value>
|
||||
<value xml:lang="es">ID de tipo de clase de capacitación</value>
|
||||
<value xml:lang="fr">Type de formation</value>
|
||||
@@ -943,7 +943,7 @@
|
||||
<value xml:lang="zh-TW">教育訓練課程類型識別</value>
|
||||
</property>
|
||||
<property key="FormFieldTitle_trainingRequestId">
|
||||
<value xml:lang="de">Anfragenummer der Schulung</value>
|
||||
<value xml:lang="de">Anfragenummer der Schulung</value>
|
||||
<value xml:lang="en">Training Request ID</value>
|
||||
<value xml:lang="es">ID de solicitud de capacitación</value>
|
||||
<value xml:lang="fr">Approbation</value>
|
||||
@@ -953,7 +953,7 @@
|
||||
<value xml:lang="zh-TW">教育訓練請求標識</value>
|
||||
</property>
|
||||
<property key="FormFieldTitle_unemploymentClaimDate">
|
||||
<value xml:lang="de">Datum des Arbeitslosenanspruches</value>
|
||||
<value xml:lang="de">Datum des Arbeitslosenanspruches</value>
|
||||
<value xml:lang="en">Unemployment Claim Date</value>
|
||||
<value xml:lang="es">Fecha de reclamación por desempleo</value>
|
||||
<value xml:lang="fr">Date de demande du chômage</value>
|
||||
@@ -966,7 +966,7 @@
|
||||
<value xml:lang="zh-TW">解除雇佣聲明日期</value>
|
||||
</property>
|
||||
<property key="FormFieldTitle_unemploymentClaimId">
|
||||
<value xml:lang="de">Nummer Arbeitslosenanspruch</value>
|
||||
<value xml:lang="de">Nummer Arbeitslosenanspruch</value>
|
||||
<value xml:lang="en">Unemployment Claim ID</value>
|
||||
<value xml:lang="es">ID de reclamo de desempleo</value>
|
||||
<value xml:lang="fr">Date de demande du chômage</value>
|
||||
@@ -979,7 +979,7 @@
|
||||
<value xml:lang="zh-TW">解除雇佣聲明識別</value>
|
||||
</property>
|
||||
<property key="FormFieldTitle_verifStatusId">
|
||||
<value xml:lang="de">Nummer des Überprüfungsstatus</value>
|
||||
<value xml:lang="de">Nummer des Überprüfungsstatus</value>
|
||||
<value xml:lang="en">Verif Status ID</value>
|
||||
<value xml:lang="es">Id estado de verificación</value>
|
||||
<value xml:lang="fr">Verifié</value>
|
||||
@@ -1004,7 +1004,7 @@
|
||||
<value xml:lang="zh-TW">工作經驗(年)</value>
|
||||
</property>
|
||||
<property key="HumanHolidayName">
|
||||
<value xml:lang="de">Name des Feiertages</value>
|
||||
<value xml:lang="de">Name des Feiertages</value>
|
||||
<value xml:lang="en">Holiday Name</value>
|
||||
<value xml:lang="es">Nombre del día de festivo</value>
|
||||
<value xml:lang="ja">休日名</value>
|
||||
@@ -1013,7 +1013,7 @@
|
||||
<value xml:lang="zh-TW">假日名稱</value>
|
||||
</property>
|
||||
<property key="HumanResAddEmplLeave">
|
||||
<value xml:lang="de">einfügen Urlaubsantrag</value>
|
||||
<value xml:lang="de">einfügen Urlaubsantrag</value>
|
||||
<value xml:lang="en">Add Employee Leave</value>
|
||||
<value xml:lang="es">Agregar permiso de Empleado</value>
|
||||
<value xml:lang="fr">Ajouter le congé</value>
|
||||
@@ -1025,7 +1025,7 @@
|
||||
<value xml:lang="zh-TW">新建員工請假</value>
|
||||
</property>
|
||||
<property key="HumanResAddEmplLeaveReasonType">
|
||||
<value xml:lang="de">einfügen Urlaubsgrund Typ</value>
|
||||
<value xml:lang="de">einfügen Urlaubsgrund Typ</value>
|
||||
<value xml:lang="en">Add Employee Leave Reason</value>
|
||||
<value xml:lang="es">Añadir rason de permiso</value>
|
||||
<value xml:lang="fr">Ajouter un type de congé</value>
|
||||
@@ -1036,7 +1036,7 @@
|
||||
<value xml:lang="zh-TW">增加員工離職原因</value>
|
||||
</property>
|
||||
<property key="HumanResAddEmplLeaveType">
|
||||
<value xml:lang="de">einfügen Urlaub Typ</value>
|
||||
<value xml:lang="de">einfügen Urlaub Typ</value>
|
||||
<value xml:lang="en">Add EmplLeave Types</value>
|
||||
<value xml:lang="es">Agregar Tipo de permiso</value>
|
||||
<value xml:lang="fr">Ajouter un type de congé</value>
|
||||
@@ -1048,7 +1048,7 @@
|
||||
<value xml:lang="zh-TW">新建員工請假類型</value>
|
||||
</property>
|
||||
<property key="HumanResAddEmplPositionFulfillment">
|
||||
<value xml:lang="de">einfügen Erfüllung der Arbeitsposition</value>
|
||||
<value xml:lang="de">einfügen Erfüllung der Arbeitsposition</value>
|
||||
<value xml:lang="en">Add Position Fulfillment</value>
|
||||
<value xml:lang="es">Añadir cumplimiento de cargo</value>
|
||||
<value xml:lang="fr">Ajouter l'acquisition de position</value>
|
||||
@@ -1060,7 +1060,7 @@
|
||||
<value xml:lang="zh-TW">新建屬於該職位員工</value>
|
||||
</property>
|
||||
<property key="HumanResAddEmplPositionResponsibility">
|
||||
<value xml:lang="de">einfügen einer Verantwortung durch eine Arbeitsposition</value>
|
||||
<value xml:lang="de">einfügen einer Verantwortung durch eine Arbeitsposition</value>
|
||||
<value xml:lang="en">Add Position Responsibility</value>
|
||||
<value xml:lang="es">Añadir Cargo Responsabilidad</value>
|
||||
<value xml:lang="fr">Ajouter la responsabilité de la position</value>
|
||||
@@ -1072,7 +1072,7 @@
|
||||
<value xml:lang="zh-TW">新建職位職責</value>
|
||||
</property>
|
||||
<property key="HumanResAddJobInterviewType">
|
||||
<value xml:lang="de">einfügen Bewerbungsgespäch</value>
|
||||
<value xml:lang="de">einfügen Bewerbungsgespäch</value>
|
||||
<value xml:lang="en">Add Job Interview Type</value>
|
||||
<value xml:lang="es">Añadir tipo de entrevista de trabajo</value>
|
||||
<value xml:lang="fr">Ajouter un type d'entretien</value>
|
||||
@@ -1083,7 +1083,7 @@
|
||||
<value xml:lang="zh-TW">增加工作面試類型</value>
|
||||
</property>
|
||||
<property key="HumanResAddPartyBenefit">
|
||||
<value xml:lang="de">einfügen Akteur Vorteil</value>
|
||||
<value xml:lang="de">einfügen Akteur Vorteil</value>
|
||||
<value xml:lang="en">Add Party Benefit</value>
|
||||
<value xml:lang="es">Agregar beneficios de Participante</value>
|
||||
<value xml:lang="fr">Ajouter l'avantage</value>
|
||||
@@ -1095,7 +1095,7 @@
|
||||
<value xml:lang="zh-TW">新建團體福利</value>
|
||||
</property>
|
||||
<property key="HumanResAddPartyQual">
|
||||
<value xml:lang="de">einfügen Akteurqualifikation</value>
|
||||
<value xml:lang="de">einfügen Akteurqualifikation</value>
|
||||
<value xml:lang="en">Add Party Qualification</value>
|
||||
<value xml:lang="es">Agregar calificación de participante</value>
|
||||
<value xml:lang="fr">Ajouter la qualification</value>
|
||||
@@ -1107,7 +1107,7 @@
|
||||
<value xml:lang="zh-TW">增加團體資格</value>
|
||||
</property>
|
||||
<property key="HumanResAddPartySkill">
|
||||
<value xml:lang="de">einfügen Akteurfähigkeit</value>
|
||||
<value xml:lang="de">einfügen Akteurfähigkeit</value>
|
||||
<value xml:lang="en">Add Party Skill</value>
|
||||
<value xml:lang="es">Añadir habilidad del participante</value>
|
||||
<value xml:lang="fr">Ajoutez la compétence</value>
|
||||
@@ -1119,7 +1119,7 @@
|
||||
<value xml:lang="zh-TW">增加團體技能</value>
|
||||
</property>
|
||||
<property key="HumanResAddPayrollPreference">
|
||||
<value xml:lang="de">einfügen einer Abrechnungspräferenz</value>
|
||||
<value xml:lang="de">einfügen einer Abrechnungspräferenz</value>
|
||||
<value xml:lang="en">Add Payroll Preference</value>
|
||||
<value xml:lang="es">Agregar preferencia de nómina</value>
|
||||
<value xml:lang="fr">Ajouter la préférence de registre du personnel</value>
|
||||
@@ -1131,7 +1131,7 @@
|
||||
<value xml:lang="zh-TW">新建薪水支付方式</value>
|
||||
</property>
|
||||
<property key="HumanResAddPerfNote">
|
||||
<value xml:lang="de">einfügen Leistungsnotiz</value>
|
||||
<value xml:lang="de">einfügen Leistungsnotiz</value>
|
||||
<value xml:lang="en">Add Performance Note</value>
|
||||
<value xml:lang="es">Añadir nota de rendimiento</value>
|
||||
<value xml:lang="fr">Ajouter la note de performance</value>
|
||||
@@ -1143,7 +1143,7 @@
|
||||
<value xml:lang="zh-TW">新建績效注釋</value>
|
||||
</property>
|
||||
<property key="HumanResAddPerfReviewItems">
|
||||
<value xml:lang="de">einfügen einer Leistungsbewertung</value>
|
||||
<value xml:lang="de">einfügen einer Leistungsbewertung</value>
|
||||
<value xml:lang="en">Add PerfReview Items</value>
|
||||
<value xml:lang="es">Agregar artículos de PerfReview</value>
|
||||
<value xml:lang="fr">Ajouter des lignes d'évaluation de performance</value>
|
||||
@@ -1155,7 +1155,7 @@
|
||||
<value xml:lang="zh-TW">新建績效評定細項</value>
|
||||
</property>
|
||||
<property key="HumanResAddReportedToEmplPositionReportingStruct">
|
||||
<value xml:lang="de">einfügen einer Arbeitspositionsreportstruktur [erstattet Bericht an ${parameters.emplPositionId}]</value>
|
||||
<value xml:lang="de">einfügen einer Arbeitspositionsreportstruktur [erstattet Bericht an ${parameters.emplPositionId}]</value>
|
||||
<value xml:lang="en">Add Empl Position Reporting Struct [Reported To ${parameters.emplPositionId}]</value>
|
||||
<value xml:lang="es">Añadir estructura de informes de cargo de empleado [Reportar a ${parameters.emplPositionId}]</value>
|
||||
<value xml:lang="fr">Ajouter le compte-rendu de position [en rapport avec ${parameters.emplPositionId}</value>
|
||||
@@ -1167,7 +1167,7 @@
|
||||
<value xml:lang="zh-TW">新建員工職位級別結構 [上級為 ${parameters.emplPositionId}]</value>
|
||||
</property>
|
||||
<property key="HumanResAddReportsToEmplPositionReportingStruct">
|
||||
<value xml:lang="de">einfügen einer Arbeitspositionsreportstruktur [${parameters.emplPositionId} erstattet Bericht an]</value>
|
||||
<value xml:lang="de">einfügen einer Arbeitspositionsreportstruktur [${parameters.emplPositionId} erstattet Bericht an]</value>
|
||||
<value xml:lang="en">Add Empl Position Reporting Struct [${parameters.emplPositionId} Reports To]</value>
|
||||
<value xml:lang="es">Añadir estructura de informes de cargo de empleado [${parameters.emplPositionId} Reportes a]</value>
|
||||
<value xml:lang="fr">Ajouter le compte-rendu de position [${parameters.emplPositionId} qui se rapporte à]</value>
|
||||
@@ -1690,7 +1690,7 @@
|
||||
<value xml:lang="de">Stellenkürzel</value>
|
||||
<value xml:lang="en">EmployeePosition ID</value>
|
||||
<value xml:lang="es">Identificador del cargo del empleado</value>
|
||||
<value xml:lang="fr">Position d'employé</value>
|
||||
<value xml:lang="fr">Poste</value>
|
||||
<value xml:lang="it">Codice Posizione Impiegato</value>
|
||||
<value xml:lang="ja">従業員職位ID</value>
|
||||
<value xml:lang="pt-BR">Id da posição do empregado</value>
|
||||
@@ -1703,7 +1703,7 @@
|
||||
<value xml:lang="de">Stellen Typ ID</value>
|
||||
<value xml:lang="en">EmployeePosition Type ID</value>
|
||||
<value xml:lang="es">Identificador del cargo del empleado</value>
|
||||
<value xml:lang="fr">Type de position d'employé</value>
|
||||
<value xml:lang="fr">Type de poste</value>
|
||||
<value xml:lang="it">Codice Tipo Posizione Impiegato</value>
|
||||
<value xml:lang="ja">従業員職位種類ID</value>
|
||||
<value xml:lang="pt-BR">Id de tipo de posição do empregado</value>
|
||||
@@ -2136,7 +2136,7 @@
|
||||
<value xml:lang="zh-TW">離職請求新建成功</value>
|
||||
</property>
|
||||
<property key="HumanResLeaveStatus">
|
||||
<value xml:lang="de">Urlaubsstatus</value>
|
||||
<value xml:lang="de">Urlaubsstatus</value>
|
||||
<value xml:lang="en">Leave</value>
|
||||
<value xml:lang="es">Evento</value>
|
||||
<value xml:lang="ja">休職</value>
|
||||
@@ -2146,7 +2146,7 @@
|
||||
<value xml:lang="zh-TW">離職</value>
|
||||
</property>
|
||||
<property key="HumanResListEmployments">
|
||||
<value xml:lang="de">Liste der Anstellungen</value>
|
||||
<value xml:lang="de">Liste der Anstellungen</value>
|
||||
<value xml:lang="en">List Employment</value>
|
||||
<value xml:lang="es">Lista de empleados</value>
|
||||
<value xml:lang="fr">Liste d'emplois</value>
|
||||
@@ -2159,7 +2159,7 @@
|
||||
<value xml:lang="zh-TW">雇佣列表</value>
|
||||
</property>
|
||||
<property key="HumanResListPartyBenefits">
|
||||
<value xml:lang="de">Liste Akteurvorteile</value>
|
||||
<value xml:lang="de">Liste Akteurvorteile</value>
|
||||
<value xml:lang="en">List Party Benefits</value>
|
||||
<value xml:lang="es">List de Beneficios de Participante</value>
|
||||
<value xml:lang="fr">Liste d'avantages de l'acteur</value>
|
||||
@@ -2172,7 +2172,7 @@
|
||||
<value xml:lang="zh-TW">團體福利清單</value>
|
||||
</property>
|
||||
<property key="HumanResListPayHistories">
|
||||
<value xml:lang="de">Liste der Zahlhistorie</value>
|
||||
<value xml:lang="de">Liste der Zahlhistorie</value>
|
||||
<value xml:lang="en">List Pay Histories</value>
|
||||
<value xml:lang="es">Lista de historial de pago</value>
|
||||
<value xml:lang="fr">Liste d'historique de salaires</value>
|
||||
@@ -2185,7 +2185,7 @@
|
||||
<value xml:lang="zh-TW">薪水歷史清單</value>
|
||||
</property>
|
||||
<property key="HumanResListPayrollPreferences">
|
||||
<value xml:lang="de">Liste der Lohnzahlungspräferenzen</value>
|
||||
<value xml:lang="de">Liste der Lohnzahlungspräferenzen</value>
|
||||
<value xml:lang="en">List Payroll Preferences</value>
|
||||
<value xml:lang="es">Lista de preferencias de nómina</value>
|
||||
<value xml:lang="fr">Liste des préférences de registre du personnel</value>
|
||||
@@ -2198,7 +2198,7 @@
|
||||
<value xml:lang="zh-TW">薪水支付方式清單</value>
|
||||
</property>
|
||||
<property key="HumanResListSkillTypes">
|
||||
<value xml:lang="de">Liste der Fähigkeiten</value>
|
||||
<value xml:lang="de">Liste der Fähigkeiten</value>
|
||||
<value xml:lang="en">List Skill Types</value>
|
||||
<value xml:lang="es">Lista de tipos de habilidades</value>
|
||||
<value xml:lang="fr">Liste de types de compétence</value>
|
||||
@@ -2211,7 +2211,7 @@
|
||||
<value xml:lang="zh-TW">技能類型清單</value>
|
||||
</property>
|
||||
<property key="HumanResListValidResponsibility">
|
||||
<value xml:lang="de">Liste der gültigen Zuständigkeiten</value>
|
||||
<value xml:lang="de">Liste der gültigen Zuständigkeiten</value>
|
||||
<value xml:lang="en">List Valid Responsibility</value>
|
||||
<value xml:lang="es">Lista de validadeción de responsabilidades</value>
|
||||
<value xml:lang="fr">Liste de responsabilité valide</value>
|
||||
@@ -2224,7 +2224,7 @@
|
||||
<value xml:lang="zh-TW">有效責任清單</value>
|
||||
</property>
|
||||
<property key="HumanResLookupAgreement">
|
||||
<value xml:lang="de">ersuchte Vereinbarung</value>
|
||||
<value xml:lang="de">ersuchte Vereinbarung</value>
|
||||
<value xml:lang="en">Lookup Agreement</value>
|
||||
<value xml:lang="es">Búsqueda de contrato</value>
|
||||
<value xml:lang="fr">Consultation d'accord</value>
|
||||
@@ -2236,7 +2236,7 @@
|
||||
<value xml:lang="zh-TW">查詢合約</value>
|
||||
</property>
|
||||
<property key="HumanResLookupAgreementEmploymentAppl">
|
||||
<value xml:lang="de">Beratung bzgl des Arbeitsvertrages</value>
|
||||
<value xml:lang="de">Beratung bzgl des Arbeitsvertrages</value>
|
||||
<value xml:lang="en">Lookup AgreementEmploymentAppl</value>
|
||||
<value xml:lang="es">Busqueda AgreementEmploymentAppl</value>
|
||||
<value xml:lang="fr">Consultation d'accord sur demande d'emploi</value>
|
||||
@@ -2248,7 +2248,7 @@
|
||||
<value xml:lang="zh-TW">查詢雇佣合約</value>
|
||||
</property>
|
||||
<property key="HumanResLookupAgreementId">
|
||||
<value xml:lang="de">Beratungsnummer des Vertrages</value>
|
||||
<value xml:lang="de">Beratungsnummer des Vertrages</value>
|
||||
<value xml:lang="en">Lookup AgreementId</value>
|
||||
<value xml:lang="es">Id Contrato de busqueda</value>
|
||||
<value xml:lang="fr">Consultation d'accord</value>
|
||||
@@ -2260,7 +2260,7 @@
|
||||
<value xml:lang="zh-TW">查詢合約識別</value>
|
||||
</property>
|
||||
<property key="HumanResLookupAgreementItemSeqId">
|
||||
<value xml:lang="de">Beratungsindex des Vertrages</value>
|
||||
<value xml:lang="de">Beratungsindex des Vertrages</value>
|
||||
<value xml:lang="en">Lookup AgreementItemSeqId</value>
|
||||
<value xml:lang="es">Ver AgreementItemSeqId</value>
|
||||
<value xml:lang="fr">Consultation de ligne séq. d'accord</value>
|
||||
@@ -2272,7 +2272,7 @@
|
||||
<value xml:lang="zh-TW">查詢合約細項序號</value>
|
||||
</property>
|
||||
<property key="HumanResLookupApplicationId">
|
||||
<value xml:lang="de">Einsicht der Bewerbungnummer</value>
|
||||
<value xml:lang="de">Einsicht der Bewerbungnummer</value>
|
||||
<value xml:lang="en">Lookup ApplicationId</value>
|
||||
<value xml:lang="es">Ver solicitud Id</value>
|
||||
<value xml:lang="es-CL">ver solicitud Id</value>
|
||||
@@ -2285,7 +2285,7 @@
|
||||
<value xml:lang="zh-TW">查詢應聘求職識別</value>
|
||||
</property>
|
||||
<property key="HumanResLookupBudgetByName">
|
||||
<value xml:lang="de">Einsicht Budget nach Name </value>
|
||||
<value xml:lang="de">Einsicht Budget nach Name </value>
|
||||
<value xml:lang="en">Lookup Budget by Name</value>
|
||||
<value xml:lang="es">Ver presupuesto por nombre</value>
|
||||
<value xml:lang="fr">Consultation de budget par nom</value>
|
||||
@@ -2298,7 +2298,7 @@
|
||||
<value xml:lang="zh-TW">按名稱查詢預算</value>
|
||||
</property>
|
||||
<property key="HumanResLookupBudgetItemByName">
|
||||
<value xml:lang="de">Einsicht Budgetobjekt nach Name</value>
|
||||
<value xml:lang="de">Einsicht Budgetobjekt nach Name</value>
|
||||
<value xml:lang="en">Lookup Budget Item by Name</value>
|
||||
<value xml:lang="es">Ver un Item presupuesto por nombre</value>
|
||||
<value xml:lang="es-CL">ver un Item presupuesto por nombre</value>
|
||||
@@ -2312,7 +2312,7 @@
|
||||
<value xml:lang="zh-TW">按名稱查詢預算細項</value>
|
||||
</property>
|
||||
<property key="HumanResLookupEmploymentApp">
|
||||
<value xml:lang="de"></value>
|
||||
<value xml:lang="de"></value>
|
||||
<value xml:lang="en">Lookup EmploymentApp</value>
|
||||
<value xml:lang="es">Busqueda EmploymentApp</value>
|
||||
<value xml:lang="fr">Consultation des demandes d'emploi</value>
|
||||
@@ -2510,7 +2510,7 @@
|
||||
<value xml:lang="zh-TW">人力資源管理系統</value>
|
||||
</property>
|
||||
<property key="HumanResMyLeaves">
|
||||
<value xml:lang="de">Mein Urlaub</value>
|
||||
<value xml:lang="de">Mein Urlaub</value>
|
||||
<value xml:lang="en">My Leaves</value>
|
||||
<value xml:lang="es">Mis salidas</value>
|
||||
<value xml:lang="fr">Mes congés</value>
|
||||
@@ -2571,7 +2571,7 @@
|
||||
<value xml:lang="de">Stelle anlegen</value>
|
||||
<value xml:lang="en">New Employee Position</value>
|
||||
<value xml:lang="es">Nuevo cargo de empleado</value>
|
||||
<value xml:lang="fr">Nouvelle position d'employé</value>
|
||||
<value xml:lang="fr">Nouveau poste</value>
|
||||
<value xml:lang="it">Nuova Posizione Impiegato</value>
|
||||
<value xml:lang="ja">新規従業員職位</value>
|
||||
<value xml:lang="pt-BR">Nova posição de empregado</value>
|
||||
@@ -2584,7 +2584,7 @@
|
||||
<value xml:lang="de">Neue Stellenvorraussetzung</value>
|
||||
<value xml:lang="en">New Employee Position Fulfillment</value>
|
||||
<value xml:lang="es">Nuevo cumplimiento de cargo</value>
|
||||
<value xml:lang="fr">Nouveau pourvoiement de position d'employé</value>
|
||||
<value xml:lang="fr">Nouvelle offre d'emploi</value>
|
||||
<value xml:lang="it">Nuova Posizione Impiegato Adempimento</value>
|
||||
<value xml:lang="ja">新規従業員職位遂行</value>
|
||||
<value xml:lang="pt-BR">Novo Preenchimento de posição de empregado</value>
|
||||
@@ -2665,7 +2665,7 @@
|
||||
<value xml:lang="zh-TW">新建工作單</value>
|
||||
</property>
|
||||
<property key="HumanResNewLeave">
|
||||
<value xml:lang="de">Neu Urlaub</value>
|
||||
<value xml:lang="de">Neu Urlaub</value>
|
||||
<value xml:lang="en">New Leave</value>
|
||||
<value xml:lang="es">Nuevo Evento</value>
|
||||
<value xml:lang="fr">Nouveau congé</value>
|
||||
@@ -3097,7 +3097,7 @@
|
||||
<value xml:lang="de">Stellenkriterien</value>
|
||||
<value xml:lang="en">Fulfillments</value>
|
||||
<value xml:lang="es">Cumplimientos</value>
|
||||
<value xml:lang="fr">"Pourvoiements"</value>
|
||||
<value xml:lang="fr">Offres de postes</value>
|
||||
<value xml:lang="it">Adempimento</value>
|
||||
<value xml:lang="ja">遂行</value>
|
||||
<value xml:lang="pt-BR">Execuções</value>
|
||||
@@ -3128,7 +3128,7 @@
|
||||
<value xml:lang="zh-TW">招聘</value>
|
||||
</property>
|
||||
<property key="HumanResRelocation">
|
||||
<value xml:lang="de">Standortwechsel</value>
|
||||
<value xml:lang="de">Standortwechsel</value>
|
||||
<value xml:lang="en">Relocation</value>
|
||||
<value xml:lang="es">Reubicación</value>
|
||||
<value xml:lang="ja">配置転換</value>
|
||||
@@ -3237,6 +3237,11 @@
|
||||
<value xml:lang="zh">技能类型编号</value>
|
||||
<value xml:lang="zh-TW">技能類型識別</value>
|
||||
</property>
|
||||
<property key="HumanResSkill">
|
||||
<value xml:lang="de">Fähigkeit</value>
|
||||
<value xml:lang="en">Skill</value>
|
||||
<value xml:lang="nl">Vaardigheid</value>
|
||||
</property>
|
||||
<property key="HumanResSkills">
|
||||
<value xml:lang="de">Fähigkeiten</value>
|
||||
<value xml:lang="en">Skills</value>
|
||||
@@ -3244,6 +3249,7 @@
|
||||
<value xml:lang="fr">Compétences</value>
|
||||
<value xml:lang="it">Abilità</value>
|
||||
<value xml:lang="ja">スキル</value>
|
||||
<value xml:lang="nl">Vaardigheden</value>
|
||||
<value xml:lang="pt-BR">Habilidades</value>
|
||||
<value xml:lang="vi">Kỹ năng</value>
|
||||
<value xml:lang="zh">技能管理</value>
|
||||
@@ -3459,7 +3465,7 @@
|
||||
<value xml:lang="zh-TW">編輯面試</value>
|
||||
</property>
|
||||
<property key="PageTitleEditJobInterviewType">
|
||||
<value xml:lang="de">Bearbeitung Typ des Bewerbungsgespräches</value>
|
||||
<value xml:lang="de">Bearbeitung Typ des Bewerbungsgespräches</value>
|
||||
<value xml:lang="en">Edit Job Interview Type</value>
|
||||
<value xml:lang="es">Editar tipo de entrevista de trabajo</value>
|
||||
<value xml:lang="fr">Modifier les types d'entretiens</value>
|
||||
@@ -3566,7 +3572,7 @@
|
||||
<value xml:lang="zh-TW">尋找核准</value>
|
||||
</property>
|
||||
<property key="PageTitleFindInternalJobPosting">
|
||||
<value xml:lang="de">Suchmaske interne Stellenausschreibung</value>
|
||||
<value xml:lang="de">Suchmaske interne Stellenausschreibung</value>
|
||||
<value xml:lang="en">Find Internal Job Posting</value>
|
||||
<value xml:lang="es">Buscar publicaciones internas de trabajo</value>
|
||||
<value xml:lang="fr">Rechercher des offres d'emploi internes</value>
|
||||
@@ -3599,7 +3605,7 @@
|
||||
<value xml:lang="zh-TW">尋找工作單</value>
|
||||
</property>
|
||||
<property key="PageTitleFindRelocationDetails">
|
||||
<value xml:lang="de">Suchmaske Standortwechsel</value>
|
||||
<value xml:lang="de">Suchmaske Standortwechsel</value>
|
||||
<value xml:lang="en">Find Relocation Details</value>
|
||||
<value xml:lang="es">Buscar detalles de reubicaión</value>
|
||||
<value xml:lang="ja">配置転換詳細を検索</value>
|
||||
@@ -3669,7 +3675,7 @@
|
||||
<value xml:lang="de">Übersicht Stellenvorraussetzungen</value>
|
||||
<value xml:lang="en">List EmplPosition Fulfillments</value>
|
||||
<value xml:lang="es">Lista de cumplimientos de cargo</value>
|
||||
<value xml:lang="fr">Liste des "pourvoiements" de position</value>
|
||||
<value xml:lang="fr">Liste des offres de postes</value>
|
||||
<value xml:lang="it">Lista Posizione Impiegato Adempimenti</value>
|
||||
<value xml:lang="ja">従業員職位遂行一覧</value>
|
||||
<value xml:lang="pt-BR">Listar preenchimento de posições de empregado</value>
|
||||
|
||||
@@ -175,7 +175,9 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<include-form name="ListEmployeeSkills" location="component://humanres/widget/forms/EmployeeForms.xml"/>
|
||||
<screenlet>
|
||||
<include-grid name="ListEmployeeSkills" location="component://humanres/widget/forms/EmployeeForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet id="AddPartySkillPanel" title="${uiLabelMap.HumanResAddPartySkill}" collapsible="true">
|
||||
<include-form name="AddEmployeeSkills" location="component://humanres/widget/forms/EmployeeForms.xml"/>
|
||||
</screenlet>
|
||||
@@ -198,6 +200,9 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<screenlet>
|
||||
<include-grid name="ListEmployeeQualification" location="component://humanres/widget/forms/EmployeeForms.xml"/>
|
||||
</screenlet>
|
||||
<include-form name="ListEmployeeQualification" location="component://humanres/widget/forms/EmployeeForms.xml"/>
|
||||
<screenlet id="AddPartyQualPanel" title="${uiLabelMap.HumanResAddPartyQual}" collapsible="true">
|
||||
<include-form name="AddEmployeeQualification" location="component://humanres/widget/forms/EmployeeForms.xml"/>
|
||||
@@ -297,7 +302,9 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<include-form name="ListEmplLeaves" location="component://humanres/widget/forms/EmployeeForms.xml"/>
|
||||
<screenlet>
|
||||
<include-form name="ListEmplLeaves" location="component://humanres/widget/forms/EmployeeForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet id="AddEmplLeavePanel" title="${uiLabelMap.HumanResAddEmplLeave}" collapsible="true">
|
||||
<include-form name="AddEmplLeave" location="component://humanres/widget/forms/EmployeeForms.xml"/>
|
||||
</screenlet>
|
||||
@@ -318,17 +325,15 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="trainingsList">
|
||||
<section>
|
||||
<widgets>
|
||||
<screenlet title="${uiLabelMap.HumanResTrainings}">
|
||||
<include-form name="SimpleListTrainingStatus" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
|
||||
<include-grid name="SimpleListTrainingStatus" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="PayrollHistory">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -348,13 +353,14 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<include-form name="PayrollHistoryList" location="component://humanres/widget/forms/EmployeeForms.xml"/>
|
||||
<screenlet>
|
||||
<include-grid name="PayrollHistoryList" location="component://humanres/widget/forms/EmployeeForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="MyLeaveList">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -374,7 +380,7 @@ under the License.
|
||||
</actions>
|
||||
<widgets>
|
||||
<screenlet title="${uiLabelMap.HumanResMyTrainings}">
|
||||
<include-form name="ListEmplTrainings" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
|
||||
<include-grid name="ListEmplTrainings" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
</section>
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
<menu-item name="GlobalHRSettings" title="${uiLabelMap.HumanResGlobalHRSettings}" selected-style="selected"><link target="globalHRSettings"/></menu-item>
|
||||
</menu>
|
||||
<menu name="MainActionMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected">
|
||||
<menu-item name="NewEmployee" title="${uiLabelMap.CommonNew} ${uiLabelMap.Employee}">
|
||||
<menu-item name="NewEmployee" title="${uiLabelMap.HumanResNewEmployee}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="HUMANRES" action="_CREATE"/>
|
||||
@@ -43,7 +43,7 @@
|
||||
</condition>
|
||||
<link target="NewEmployee"/>
|
||||
</menu-item>
|
||||
<menu-item name="NewPosition" title="${uiLabelMap.CommonNew} ${uiLabelMap.Position}">
|
||||
<menu-item name="NewPosition" title="${uiLabelMap.HumanResNewEmplPosition}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="HUMANRES" action="_CREATE"/>
|
||||
@@ -51,7 +51,7 @@
|
||||
</condition>
|
||||
<link target="EditEmplPosition"/>
|
||||
</menu-item>
|
||||
<menu-item name="NewFulfilmennt" title="${uiLabelMap.CommonNew} ${uiLabelMap.Fulfilmnent}">
|
||||
<menu-item name="NewFulfilmennt" title="${uiLabelMap.HumanResNewEmplPositionFulfillment}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="HUMANRES" action="_CREATE"/>
|
||||
@@ -59,7 +59,7 @@
|
||||
</condition>
|
||||
<link target="EditEmplPositionFulfillments"/>
|
||||
</menu-item>
|
||||
<menu-item name="NewPerformanceReview" title="${uiLabelMap.CommonNew} ${uiLabelMap.CommonReview}">
|
||||
<menu-item name="NewPerformanceReview" title="${uiLabelMap.HumanResNewPartyReview}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="HUMANRES" action="_CREATE"/>
|
||||
@@ -67,7 +67,7 @@
|
||||
</condition>
|
||||
<link target="EditPerfReview"/>
|
||||
</menu-item>
|
||||
<menu-item name="NewLeave" title="${uiLabelMap.CommonNew} ${uiLabelMap.HumanResEmplLeave}">
|
||||
<menu-item name="NewLeave" title="${uiLabelMap.HumanResAddEmplLeave}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="HUMANRES" action="_CREATE"/>
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
<include-form name="FindPerfReviews" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-results">
|
||||
<include-form name="ListPerfReviews" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
|
||||
<include-grid name="ListPerfReviews" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</decorator-section>
|
||||
@@ -93,10 +93,12 @@
|
||||
<widgets>
|
||||
<decorator-screen name="CommonPerfReviewDecorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<include-form name="ListPerfReviewItems" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
|
||||
<screenlet id="AddPerfReviewItemPanel" title="${uiLabelMap.HumanResAddPerfReviewItems}" collapsible="true">
|
||||
<include-form name="AddPerfReviewItem" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.CommonItems}">
|
||||
<include-grid name="ListPerfReviewItems" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
</container>
|
||||
<container style="righthalf">
|
||||
<label style="h1" text="${uiLabelMap.WorkEffortParticipants}"/>
|
||||
<include-form name="ListTrainingParticipants" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
|
||||
<include-grid name="ListTrainingParticipants" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
|
||||
<section>
|
||||
<condition>
|
||||
<and>
|
||||
@@ -208,7 +208,7 @@
|
||||
<include-form name="FindTrainingApprovals" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-results">
|
||||
<include-form name="ListTrainingApprovals" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
|
||||
<include-grid name="ListTrainingApprovals" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</decorator-section>
|
||||
@@ -255,7 +255,7 @@
|
||||
<include-form name="FindTrainingStatus" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-results">
|
||||
<include-form name="ListTrainingStatus" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
|
||||
<include-grid name="ListTrainingStatus" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</decorator-section>
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd">
|
||||
<screen name="FindJobRequisitions">
|
||||
<section>
|
||||
<section>
|
||||
<actions>
|
||||
<set field="titleProperty" value="PageTitleFindJobRequisition"/>
|
||||
<set field="tabButtonItem" value="JobRequisition"/>
|
||||
@@ -54,7 +54,7 @@ under the License.
|
||||
<include-form name="FindJobRequisitions" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-results">
|
||||
<include-form name="ListJobRequisitions" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
<include-grid name="ListJobRequisitions" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -124,7 +124,7 @@ under the License.
|
||||
<include-form name="FindInternalJobPosting" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-results">
|
||||
<include-form name="ListInternalJobPosting" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
<include-grid name="ListInternalJobPosting" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -187,7 +187,7 @@ under the License.
|
||||
<include-form name="FindJobInterview" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-results">
|
||||
<include-form name="ListInterview" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
<include-grid name="ListInterview" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -249,7 +249,7 @@ under the License.
|
||||
<include-form name="FindApprovals" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-results">
|
||||
<include-form name="ListApprovals" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
<include-grid name="ListApprovals" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -302,7 +302,7 @@ under the License.
|
||||
<include-form name="FindRelocation" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-results">
|
||||
<include-form name="ListRelocation" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
<include-grid name="ListRelocation" location="component://humanres/widget/forms/RecruitmentForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
<field name="skillLevel"><text/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListEmployeeSkills" type="list" list-name="listIt" use-row-submit="true" separate-columns="true" target="updateEmployeeSkill" paginate-target="findPartySkills"
|
||||
<grid name="ListEmployeeSkills" list-name="listIt" use-row-submit="true" separate-columns="true" target="updateEmployeeSkill" paginate-target="findPartySkills"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<entity-condition entity-name="PartySkill">
|
||||
@@ -89,7 +89,7 @@
|
||||
</entity-condition>
|
||||
</actions>
|
||||
<auto-fields-service default-field-type="hidden" service-name="updatePartySkill"/>
|
||||
<field name="skillTypeId">
|
||||
<field name="skillTypeId" title="${uiLabelMap.CommonType}">
|
||||
<display-entity entity-name="SkillType"/>
|
||||
</field>
|
||||
<field name="yearsExperience"><text/></field>
|
||||
@@ -102,7 +102,7 @@
|
||||
</hyperlink>
|
||||
</field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="AddEmployeeQualification" type="single" target="createEmployeeQualification">
|
||||
<auto-fields-service service-name="createPartyQual"/>
|
||||
<field name="partyId"><hidden/></field>
|
||||
@@ -131,7 +131,7 @@
|
||||
</field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListEmployeeQualification" type="list" list-name="listIt" use-row-submit="true" separate-columns="true" target="updateEmployeeQualification" paginate-target="FindPartyQuals"
|
||||
<grid name="ListEmployeeQualification" list-name="listIt" use-row-submit="true" separate-columns="true" target="updateEmployeeQualification" paginate-target="FindPartyQuals"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<entity-condition entity-name="PartyQual">
|
||||
@@ -141,11 +141,11 @@
|
||||
</actions>
|
||||
<auto-fields-service service-name="updatePartyQual"/>
|
||||
<field name="partyId"><hidden/></field>
|
||||
<field name="partyQualTypeId"><display-entity entity-name="PartyQualType"/></field>
|
||||
<field name="fromDate"><display/></field>
|
||||
<field name="qualificationDesc"><text/></field>
|
||||
<field name="partyQualTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="PartyQualType"/></field>
|
||||
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field>
|
||||
<field name="qualificationDesc" title="${uiLabelMap.CommonDescription}"><text/></field>
|
||||
<field name="title"><text/></field>
|
||||
<field name="statusId">
|
||||
<field name="statusId" title="${uiLabelMap.CommonStatus}">
|
||||
<drop-down allow-empty="true">
|
||||
<entity-options key-field-name="statusId" entity-name="StatusItem">
|
||||
<entity-constraint name="statusTypeId" operator="equals" value="PARTY_INV_STATUS"/>
|
||||
@@ -170,7 +170,7 @@
|
||||
</hyperlink>
|
||||
</field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="AddEmployeeTraining" type="single" target="createEmployeeTraining">
|
||||
<field name="partyId"><hidden/></field>
|
||||
<field name="trainingClassTypeId" required-field="true">
|
||||
@@ -203,7 +203,7 @@
|
||||
<field name="approverPartyId" required-field="true"><lookup target-form-name="LookupPartyName"/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListEmplLeaves" type="list" list-name="listIt" separate-columns="true" target="updateEmplLeave" paginate-target="FindEmplLeaves"
|
||||
<grid name="ListEmplLeaves" list-name="listIt" separate-columns="true" target="updateEmplLeave" paginate-target="FindEmplLeaves"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<entity-condition entity-name="EmplLeave">
|
||||
@@ -216,10 +216,10 @@
|
||||
<field name="approverPartyId"><lookup target-form-name="LookupPartyName"/></field>
|
||||
<field name="leaveStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
|
||||
<field name="emplLeaveReasonTypeId"><display/></field>
|
||||
<field name="leaveTypeId"><display-entity entity-name="EmplLeaveType"/></field>
|
||||
<field name="fromDate"></field>
|
||||
<field name="leaveTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="EmplLeaveType"/></field>
|
||||
<field name="fromDate" title="${uiLabelMap.CommonGrom}"></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="CurrentEmploymentData" default-map-name="employmentData" type="single">
|
||||
<field name="company" entry-name="employment.partyIdFrom">
|
||||
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ">
|
||||
@@ -237,12 +237,12 @@
|
||||
<display type="currency" currency="${employmentData.emplPositionRateAmount.rateCurrencyUomId}"/>
|
||||
</field>
|
||||
</form>
|
||||
<form name="PayrollHistoryList" type="list" list-name="payroll" extends="ListInvoices" extends-resource="component://accounting/widget/InvoiceForms.xml" paginate-target="PayrollHistory">
|
||||
<grid name="PayrollHistoryList" list-name="payroll" extends="ListInvoices" extends-resource="component://accounting/widget/InvoiceForms.xml" paginate-target="PayrollHistory">
|
||||
<field name="invoiceId" widget-style="buttontext" sort-field="true">
|
||||
<hyperlink description="${invoiceId}" target="/accounting/control/invoiceOverview" target-type="inter-app">
|
||||
<parameter param-name="invoiceId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
</forms>
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ under the License.
|
||||
<field name="emplPositionId" title="${uiLabelMap.FormFieldTitle_emplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field>
|
||||
<field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListPerfReviews" type="list" title="" separate-columns="true" default-entity-name="PerfReview" list-name="listIt" paginate-target="FindPerfReviews" paginate="true"
|
||||
<grid name="ListPerfReviews" list-name="listIt" separate-columns="true" default-entity-name="PerfReview" paginate-target="FindPerfReviews" paginate="true"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
@@ -65,7 +65,7 @@ under the License.
|
||||
</field>
|
||||
<field name="fromDate"><display type="date"/></field>
|
||||
<field name="thruDate"><display type="date"/></field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="EditPerfReview" type="single" target="updatePerfReview" title="" default-map-name="perfReview"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<alt-target use-when="perfReview==null" target="createPerfReview"/>
|
||||
@@ -87,7 +87,7 @@ under the License.
|
||||
<field name="submitButton" use-when="perfReview==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
<field name="submitButton" use-when="perfReview!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListPerfReviewItems" type="list" target="updatePerfReviewItem" title="updatePerfReviewItem" paginate-target="findPerfReviewItems"
|
||||
<grid name="ListPerfReviewItems" target="updatePerfReviewItem" title="updatePerfReviewItem" paginate-target="findPerfReviewItems"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<entity-condition entity-name="PerfReviewItem">
|
||||
@@ -109,7 +109,7 @@ under the License.
|
||||
<parameter param-name="perfReviewItemSeqId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="AddPerfReviewItem" type="single" target="createPerfReviewItem" title=""
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-service service-name="createPerfReviewItem"/>
|
||||
|
||||
@@ -63,7 +63,8 @@ under the License.
|
||||
<field name="roleTypeId"> <hidden value="CAL_ATTENDEE"/></field>
|
||||
<field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
|
||||
</form>
|
||||
<form name="ListTrainingParticipants" list-name="listIt" title="" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<grid name="ListTrainingParticipants" list-name="listIt"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
<field-map field-name="inputFields" from-field="parameters"/>
|
||||
@@ -80,10 +81,10 @@ under the License.
|
||||
</sub-hyperlink>
|
||||
</display-entity>
|
||||
</field>
|
||||
<field name="approvalStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
|
||||
<field name="approvalStatus" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
|
||||
<field name="trainingRequestId" widget-style="buttontext"><display/></field>
|
||||
<field name="trainingClassTypeId"><display-entity entity-name="TrainingClassType"/></field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="FindTrainingApprovals" target="FindTrainingApprovals" title="" type="single" default-title-style="tableheadtext" default-widget-style="inputBox">
|
||||
<auto-fields-entity entity-name="PersonTraining" default-field-type="find"/>
|
||||
<field name="partyId" title="${uiLabelMap.FormFieldTitle_employeePartyId}"><lookup target-form-name="LookupPartyName"/></field>
|
||||
@@ -99,7 +100,8 @@ under the License.
|
||||
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListTrainingApprovals" type="list" list-name="listIt" target="updateTrainingStatus" title="" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<grid name="ListTrainingApprovals" list-name="listIt" target="updateTrainingStatus"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
<field-map field-name="inputFields" from-field="parameters"/>
|
||||
@@ -133,9 +135,9 @@ under the License.
|
||||
<parameter param-name="fromDate"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
<field name="approvalStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
|
||||
<field name="approvalStatus" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
|
||||
<field name="trainingClassTypeId"><display-entity entity-name="TrainingClassType"/></field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="EditTrainingApprovals" type="single" target="updateTrainingStatus" default-map-name="personTraining">
|
||||
<auto-fields-service service-name="updateTrainingStatus" default-field-type="display"/>
|
||||
<field name="partyId" title="${uiLabelMap.FormFieldTitle_employeePartyId}"/>
|
||||
@@ -169,7 +171,8 @@ under the License.
|
||||
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonSearch}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListTrainingStatus" list-name="listIt" title="" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<grid name="ListTrainingStatus" list-name="listIt"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
<field-map field-name="inputFields" from-field="parameters"/>
|
||||
@@ -193,13 +196,13 @@ under the License.
|
||||
</sub-hyperlink>
|
||||
</display-entity>
|
||||
</field>
|
||||
<field name="trainingRequestId" widget-style="buttontext"/>
|
||||
<field name="trainingRequestId" title="${uiLabelMap.CommmonRequest}" widget-style="buttontext"/>
|
||||
<field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}"/>
|
||||
<field name="approvalStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
|
||||
<field name="approvalStatus" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
|
||||
<field name="trainingClassTypeId"><display-entity entity-name="TrainingClassType"/></field>
|
||||
</form>
|
||||
|
||||
<form name="SimpleListTrainingStatus" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table">
|
||||
</grid>
|
||||
<grid name="SimpleListTrainingStatus" list-name="listIt"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table">
|
||||
<actions>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
<field-map field-name="inputFields" from-field="parameters"/>
|
||||
@@ -209,17 +212,16 @@ under the License.
|
||||
<field-map field-name="viewSize" from-field="viewSize"/>
|
||||
</service>
|
||||
</actions>
|
||||
<field name="fromDate"><display type="date-time"/></field>
|
||||
<field name="thruDate"><display type="date-time"/></field>
|
||||
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><display type="date-time"/></field>
|
||||
<field name="thruDate" title="${uiLabelMap.CommonThru}"><display type="date-time"/></field>
|
||||
<field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}"/>
|
||||
<field name="approvalStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
|
||||
<field name="approvalStatus" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
|
||||
<field name="trainingClassTypeId"><display-entity entity-name="TrainingClassType"/></field>
|
||||
<field name="approverId" widget-style="buttontext">
|
||||
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"/>
|
||||
</field>
|
||||
</form>
|
||||
|
||||
<form name="ListEmplTrainings" type="list" list-name="listIt" separate-columns="true" target="updateEmplLeave" paginate-target="FindEmplLeaves"
|
||||
</grid>
|
||||
<grid name="ListEmplTrainings" list-name="listIt" target="updateEmplLeave" paginate-target="FindEmplLeaves" separate-columns="true"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<entity-condition entity-name="PersonTraining">
|
||||
@@ -234,9 +236,9 @@ under the License.
|
||||
<field name="approverId">
|
||||
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"/>
|
||||
</field>
|
||||
<field name="trainingRequestId"/>
|
||||
<field name="trainingRequestId" title="${CommonRequest}"/>
|
||||
<field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}"/>
|
||||
<field name="approvalStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
|
||||
<field name="approvalStatus" title="${CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
|
||||
<field name="trainingClassTypeId"><display-entity entity-name="TrainingClassType"/></field>
|
||||
</form>
|
||||
</grid>
|
||||
</forms>
|
||||
|
||||
@@ -59,8 +59,8 @@ under the License.
|
||||
<field name="qualification"><hidden/></field>
|
||||
<field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListJobRequisitions" list-name="listIt" type="list" odd-row-style="alternate-row" header-row-style="header-row-2"
|
||||
paginate-target="FindJobRequisitions" default-table-style="basic-table hover-bar">
|
||||
<grid name="ListJobRequisitions" list-name="listIt" paginate-target="FindJobRequisitions"
|
||||
default-table-style="basic-table hover-bar" odd-row-style="alternate-row" header-row-style="header-row-2">
|
||||
<actions>
|
||||
<set field="entityName" value="JobRequisition"/>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
@@ -70,19 +70,19 @@ under the License.
|
||||
<field-map field-name="viewSize" from-field="viewSize"/>
|
||||
</service>
|
||||
</actions>
|
||||
<field name="jobRequisitionId" widget-style="buttontext" use-when="hasAdminPermission">
|
||||
<field name="jobRequisitionId" title="${uiLabelMap.CommonId}" widget-style="buttontext" use-when="hasAdminPermission">
|
||||
<hyperlink description="${jobRequisitionId}" target="EditJobRequisition">
|
||||
<parameter param-name="jobRequisitionId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
<field name="jobRequisitionId" use-when="!hasAdminPermission"><display/></field>
|
||||
<field name="jobRequisitionId" title="${uiLabelMap.CommonId}" use-when="!hasAdminPermission"><display/></field>
|
||||
<field name="skillTypeId">
|
||||
<display-entity entity-name="SkillType"/>
|
||||
</field>
|
||||
<field name="jobPostingTypeEnumId"><display/></field>
|
||||
<field name="examTypeEnumId"><display/></field>
|
||||
<field name="qualification"><display/></field>
|
||||
<field name="jobLocation"><display/></field>
|
||||
<field name="jobLocation" title="${uiLabelMap.CommonLocation}"><display/></field>
|
||||
<field name="experienceYears"><display/></field>
|
||||
<field name="experienceMonths"><display/></field>
|
||||
<field name="applyLink" title="${uiLabelMap.CommonApply}" widget-style="buttontext">
|
||||
@@ -95,7 +95,7 @@ under the License.
|
||||
<parameter param-name="jobRequisitionId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="EditJobRequisition" type="single" target="updateJobRequisition" default-map-name="jobRequisition">
|
||||
<alt-target use-when="jobRequisition==null" target="createJobRequisition"/>
|
||||
<field name="jobRequisitionId" use-when="jobRequisition==null"><ignored/></field>
|
||||
@@ -161,8 +161,8 @@ under the License.
|
||||
<field name="referredByPartyId"><hidden/></field>
|
||||
<field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListInternalJobPosting" list-name="listIt" type="list" odd-row-style="alternate-row" header-row-style="header-row-2"
|
||||
paginate-target="FindInternalJobPosting" default-table-style="basic-table hover-bar">
|
||||
<grid name="ListInternalJobPosting" list-name="listIt" paginate-target="FindInternalJobPosting"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<set field="entityName" value="EmploymentApp"/>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
@@ -177,16 +177,14 @@ under the License.
|
||||
<hyperlink description="${applicationId}" target="EditInternalJobPosting">
|
||||
<parameter param-name="applicationId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
|
||||
</field>
|
||||
<field name="approverPartyId">
|
||||
<display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" key-field-name="partyId">
|
||||
<sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${approverPartyId}" link-style="buttontext">
|
||||
<parameter param-name="partyId" from-field="approverPartyId"/>
|
||||
</sub-hyperlink>
|
||||
</display-entity>
|
||||
</field>
|
||||
|
||||
</field>
|
||||
<field name="applyingPartyId">
|
||||
<display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" key-field-name="partyId">
|
||||
<sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${applyingPartyId}" link-style="buttontext">
|
||||
@@ -194,7 +192,6 @@ under the License.
|
||||
</sub-hyperlink>
|
||||
</display-entity>
|
||||
</field>
|
||||
|
||||
<field name="statusId" title="${uiLabelMap.HumanResIJPStatus}"><display/></field>
|
||||
<field name="jobRequisitionId" widget-style="buttontext">
|
||||
<hyperlink description="${jobRequisitionId}" target="EditJobRequisition">
|
||||
@@ -209,7 +206,7 @@ under the License.
|
||||
<field name="emplPositionId"><hidden/></field>
|
||||
<field name="employmentAppSourceTypeId"><hidden/></field>
|
||||
<field name="referredByPartyId"><hidden/></field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="EditInternalJobPosting" type="single" target="updateInternalJobPosting">
|
||||
<alt-target use-when="employmentApp==null" target="createInternalJobPosting"/>
|
||||
<auto-fields-service service-name="updateInternalJobPosting" map-name="employmentApp"/>
|
||||
@@ -254,7 +251,8 @@ under the License.
|
||||
</field>
|
||||
<field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListInterview" type="list" list-name="listIt" paginate-target="FindJobInterview" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<grid name="ListInterview" list-name="listIt" paginate-target="FindJobInterview"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<set field="entityName" value="JobInterview"/>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
@@ -289,7 +287,7 @@ under the License.
|
||||
<parameter param-name="jobInterviewId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="EditJobInterview" type="single" target="updateJobInterview">
|
||||
<actions>
|
||||
<entity-one entity-name="JobInterview" value-field="JobInterview"/>
|
||||
@@ -345,7 +343,7 @@ under the License.
|
||||
<field name="jobRequisitionId"><lookup target-form-name="LookupJobRequisition"/></field>
|
||||
<field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListApprovals" list-name="listIt" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<grid name="ListApprovals" list-name="listIt" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<set field="entityName" value="EmploymentApp"/>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
@@ -363,7 +361,7 @@ under the License.
|
||||
</sub-hyperlink>
|
||||
</display-entity>
|
||||
</field>
|
||||
<field name="approverPartyId" field-name="partyId">
|
||||
<field name="approverPartyId">
|
||||
<display-entity entity-name="PartyNameView" description="${firstName} ${lastName}">
|
||||
<sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${approverPartyId}" link-style="buttontext">
|
||||
<parameter param-name="partyId" from-field="approverPartyId"/>
|
||||
@@ -378,7 +376,7 @@ under the License.
|
||||
<field name="emplPositionId"><hidden/></field>
|
||||
<field name="employmentAppSourceTypeId"><hidden/></field>
|
||||
<field name="referredByPartyId"><hidden/></field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="EditApprovalStatus" type="single" target="updateApprovalStatus" default-map-name="employmentApp">
|
||||
<auto-fields-service service-name="updateApprovalStatus" map-name="employmentApp"/>
|
||||
<field name="applicationId"><display/></field>
|
||||
@@ -417,7 +415,7 @@ under the License.
|
||||
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
|
||||
<field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListRelocation" list-name="listIt" type="list" odd-row-style="alternate-row" header-row-style="header-row-2"
|
||||
<grid name="ListRelocation" list-name="listIt" odd-row-style="alternate-row" header-row-style="header-row-2"
|
||||
default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
@@ -446,7 +444,7 @@ under the License.
|
||||
</field>
|
||||
<field name="internalOrganisation"><display/></field>
|
||||
<field name="reportingDate"><display/></field>
|
||||
<field name="location">
|
||||
<field name="location" title="${uiLabelMap.CommonLocation}">
|
||||
<display description="${groovy:
|
||||
import org.apache.ofbiz.entity.GenericValue;
|
||||
import org.apache.ofbiz.base.util.UtilMisc;
|
||||
@@ -457,5 +455,5 @@ under the License.
|
||||
return city;
|
||||
}"/>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
</forms>
|
||||
|
||||
@@ -3830,7 +3830,7 @@
|
||||
<value xml:lang="de">Geschätzte Ausführungszeit einer Einheit für Produktionsauftrag ist falsch formatiert</value>
|
||||
<value xml:lang="en">Production Run Estimated Unit Run Time field is not formatted correctly</value>
|
||||
<value xml:lang="es">El formato usado para indicar la Tiempo estimado unitario no es correcto</value>
|
||||
<value xml:lang="fr">Le champ Temps de production estimé de l'ordre de fabrication n'est pas formatté correctement</value>
|
||||
<value xml:lang="fr">Le champ temps de production estimé de l'ordre de fabrication n'est pas formatté correctement</value>
|
||||
<value xml:lang="it">Ordine di Produzione campo Tempo stimato esecuzione non è formattato correttamente</value>
|
||||
<value xml:lang="zh">生产运行预计单位运行时间数据项格式不正确</value>
|
||||
</property>
|
||||
@@ -3838,7 +3838,7 @@
|
||||
<value xml:lang="de">Geschätzte Rüstzeit für Produktionsauftrag ist falsch formatiert</value>
|
||||
<value xml:lang="en">Production Run Estimated Setup Time field is not formatted correctly</value>
|
||||
<value xml:lang="es">El formato usado para indicar la Tiempo estimado de preparación no es correcto</value>
|
||||
<value xml:lang="fr">Le champ Temps d'installation estimé de l'ordre de fabrication n'est pas formatté correctement</value>
|
||||
<value xml:lang="fr">Le champ temps d'installation estimé de l'ordre de fabrication n'est pas formatté correctement</value>
|
||||
<value xml:lang="it">Ordine di Produzione campo Tempo stimato configur non è formattato correttamente</value>
|
||||
<value xml:lang="zh">生产运行预计建立时间数据项格式不正确</value>
|
||||
</property>
|
||||
@@ -6018,4 +6018,4 @@
|
||||
<value xml:lang="zh">链接到生产运行</value>
|
||||
<value xml:lang="zh-TW">連結生產運行</value>
|
||||
</property>
|
||||
</resource>
|
||||
</resource>
|
||||
|
||||
@@ -70,7 +70,7 @@ function lookupInventory() {
|
||||
<td width='20%' align='right' class="label">${uiLabelMap.CommonFromDate}</td>
|
||||
<td width='5%'> </td>
|
||||
<td>
|
||||
<@htmlTemplate.renderDateTimeField name="eventDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.eventDate!nowTimestamp}" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
|
||||
<@htmlTemplate.renderDateTimeField name="eventDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -123,7 +123,7 @@ under the License.
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet title="${uiLabelMap.ManufacturingPrecedingProductionRun}">
|
||||
<include-form name="MandatoryWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="MandatoryWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
</section>
|
||||
@@ -133,24 +133,24 @@ under the License.
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet title="${uiLabelMap.ManufacturingSucceedingProductionRun}">
|
||||
<include-form name="DependentWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="DependentWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
</section>
|
||||
<screenlet title="${uiLabelMap.ManufacturingOrderItems}">
|
||||
<include-form name="ListProductionRunOrderItems" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListProductionRunOrderItems" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}">
|
||||
<include-form name="ViewListProductionRunRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ViewListProductionRunRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.ManufacturingMaterials}">
|
||||
<include-form name="ListProductionRunComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListProductionRunComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}">
|
||||
<include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListProductionRunTaskFixedAssets" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.ManufacturingListOfProductionRunNotes}">
|
||||
<include-form name="ListProductionRunNotes" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListProductionRunNotes" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
@@ -219,7 +219,7 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
<screenlet title="${uiLabelMap.ManufacturingInventoryItemsProduced}">
|
||||
<include-form name="ListProductionRunInventoryItems" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListProductionRunInventoryItems" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
<section>
|
||||
<condition>
|
||||
@@ -245,7 +245,7 @@ under the License.
|
||||
<include-form name="ListProductionRunOrderItems" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}">
|
||||
<include-form name="ListProductionRunDeclRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListProductionRunDeclRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
<section>
|
||||
<condition>
|
||||
@@ -253,7 +253,7 @@ under the License.
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet title="${uiLabelMap.ManufacturingMaterials}">
|
||||
<include-form name="ListProductionRunComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListProductionRunComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
</section>
|
||||
@@ -271,14 +271,13 @@ under the License.
|
||||
<section>
|
||||
<condition><not><if-empty field="prunInventoryProduced"/></not></condition>
|
||||
<widgets>
|
||||
<include-form name="ProductionRunTaskInventoryProducedList" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ProductionRunTaskInventoryProducedList" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</widgets>
|
||||
</section>
|
||||
</container>
|
||||
</widgets>
|
||||
</section>
|
||||
</screenlet>
|
||||
|
||||
<screenlet title="${uiLabelMap.ManufacturingMaterialsRequiredByRunningTask}">
|
||||
<include-form name="ListIssueProductionRunDeclComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
@@ -286,7 +285,7 @@ under the License.
|
||||
<include-form name="ListReturnProductionRunDeclComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}">
|
||||
<include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListProductionRunTaskFixedAssets" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
@@ -423,7 +422,7 @@ under the License.
|
||||
</actions>
|
||||
<widgets>
|
||||
<screenlet>
|
||||
<include-form name="ProductionRunPartyAssocs" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ProductionRunPartyAssocs" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
</section>
|
||||
@@ -439,7 +438,7 @@ under the License.
|
||||
</actions>
|
||||
<widgets>
|
||||
<screenlet>
|
||||
<include-form name="ProductionRunTaskPartyAssocs" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ProductionRunTaskPartyAssocs" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
</section>
|
||||
@@ -471,7 +470,7 @@ under the License.
|
||||
<screenlet id="EditProductionRunRoutingTaskPanel" title="${uiLabelMap.ManufacturingProductionRunTasks}" collapsible="true">
|
||||
<include-form name="EditProductionRunRoutingTask" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
<include-form name="ListProductionRunRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListProductionRunRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -625,7 +624,7 @@ under the License.
|
||||
<set field="taskCosts" value="${groovy: request.getAttribute('taskCosts');}"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
<include-form name="ProductionRunTaskCosts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ProductionRunTaskCosts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
@@ -648,7 +647,7 @@ under the License.
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<widgets>
|
||||
<include-form name="ListProductionRunContent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListProductionRunContent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<screenlet title="Import Content From Product ${delivProductId}">
|
||||
<include-form name="FindDelivProductContent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-form name="ListDelivProductContent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
@@ -715,7 +714,7 @@ under the License.
|
||||
<include-form name="FindProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-results">
|
||||
<include-form name="ListFindProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListFindProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -747,7 +746,7 @@ under the License.
|
||||
<decorator-screen name="CommonManufacturingDecorator" location="${parameters.commonManufacturingDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.ManufacturingWorkWithShipmentPlans}">
|
||||
<include-form name="ListShipmentPlans" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListShipmentPlans" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
<section>
|
||||
<condition>
|
||||
@@ -755,7 +754,7 @@ under the License.
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet title="${uiLabelMap.FormFieldTitle_shipmentId} ${shipment.shipmentId}">
|
||||
<include-form name="ListShipmentPlan" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
<include-grid name="ListShipmentPlan" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
|
||||
</screenlet>
|
||||
<section>
|
||||
<condition>
|
||||
|
||||
@@ -116,7 +116,7 @@ under the License.
|
||||
</condition>
|
||||
<link target="CreateProductionRun"/>
|
||||
</menu-item>
|
||||
<menu-item name="NewRouting" title="${uiLabelMap.CommonNew} ${uiLabelMap.ManufacturingRouting}">
|
||||
<menu-item name="NewRouting" title="${uiLabelMap.ManufacturingNewRouting}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="MANUFACTURING" action="_CREATE"/>
|
||||
@@ -124,7 +124,7 @@ under the License.
|
||||
</condition>
|
||||
<link target="EditRouting"/>
|
||||
</menu-item>
|
||||
<menu-item name="NewRoutingTask" title="${uiLabelMap.CommonNew} ${uiLabelMap.ManufacturingRoutingTask}">
|
||||
<menu-item name="NewRoutingTask" title="${uiLabelMap.ManufacturingNewRoutingTask}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="MANUFACTURING" action="_CREATE"/>
|
||||
|
||||
@@ -80,7 +80,7 @@ under the License.
|
||||
</field>
|
||||
<field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field>
|
||||
<field name="workEffortName" title="${uiLabelMap.ManufacturingProductionRunName}"><text-find/></field>
|
||||
<field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><date-find default-value="${nowTimestamp}"/></field>
|
||||
<field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><date-find/></field>
|
||||
<field name="facilityId" title="${uiLabelMap.ProductFacilityId}">
|
||||
<drop-down allow-empty="true">
|
||||
<entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName} [${facilityId}]">
|
||||
@@ -91,7 +91,7 @@ under the License.
|
||||
<field name="submitButton" title="${uiLabelMap.CommonFind}"><submit/></field>
|
||||
</form>
|
||||
|
||||
<form name="ListFindProductionRun" list-name="listIt" title="" type="list" paginate-target="FindProductionRun"
|
||||
<grid name="ListFindProductionRun" list-name="listIt" paginate-target="FindProductionRun"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
@@ -123,8 +123,7 @@ under the License.
|
||||
<field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><display/></field>
|
||||
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
|
||||
<field name="facilityId" title="${uiLabelMap.ProductFacilityId}"><display/></field>
|
||||
</form>
|
||||
|
||||
</grid>
|
||||
<form name="UpdateProductionRun" type="single" target="updateProductionRun" title="" default-map-name="productionRunData"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<field name="productionRunId"><hidden/></field>
|
||||
@@ -151,7 +150,7 @@ under the License.
|
||||
<field name="description"><text/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit/></field>
|
||||
</form>
|
||||
<form name="ListProductionRunOrderItems" type="list" target="EditProductionRun" title="" list-name="orderItems"
|
||||
<grid name="ListProductionRunOrderItems" list-name="orderItems" target="EditProductionRun"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<field name="orderId" widget-style="buttontext">
|
||||
<hyperlink description="${orderId}/${orderItemSeqId}" target="/ordermgr/control/orderview" also-hidden="false" target-type="inter-app">
|
||||
@@ -168,8 +167,8 @@ under the License.
|
||||
<field name="estimatedShipDate"><display/></field>
|
||||
<field name="estimatedDeliveryDate"><display/></field>
|
||||
-->
|
||||
</form>
|
||||
<form name="ListProductionRunInventoryItems" type="list" title="" list-name="inventoryItems"
|
||||
</grid>
|
||||
<grid name="ListProductionRunInventoryItems" list-name="inventoryItems"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<row-actions>
|
||||
<entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
|
||||
@@ -189,9 +188,8 @@ under the License.
|
||||
<field name="unitCost" map-name="inventoryItem"><display/></field>
|
||||
<field name="quantity" entry-name="quantityOnHandDiff"><display/></field>
|
||||
<field name="datetimeReceived" map-name="inventoryItem"><display/></field>
|
||||
</form>
|
||||
|
||||
<form name="ViewListProductionRunRoutingTasks" type="list" title="" list-name="productionRunRoutingTasks"
|
||||
</grid>
|
||||
<grid name="ViewListProductionRunRoutingTasks" list-name="productionRunRoutingTasks"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<row-actions>
|
||||
<set field="estimatedTotalMilliSeconds" value="${groovy:estimatedMilliSeconds * quantity}" type="BigDecimal"/>
|
||||
@@ -205,8 +203,8 @@ under the License.
|
||||
<field name="estimatedSetupMillis" title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}" ><display/></field>
|
||||
<!--<field name="estimatedMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}" ><display/></field>-->
|
||||
<field name="estimatedTotalMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedTotalMilliSeconds}" ><display/></field>
|
||||
</form>
|
||||
<form name="ListProductionRunRoutingTasks" type="list" target="ProductionRunTasks" title="" list-name="productionRunRoutingTasks"
|
||||
</grid>
|
||||
<grid name="ListProductionRunRoutingTasks" list-name="productionRunRoutingTasks" target="ProductionRunTasks"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<row-actions>
|
||||
<set field="estimatedTotalMilliSeconds" value="${groovy:estimatedMilliSeconds * quantity}" type="BigDecimal"/>
|
||||
@@ -238,9 +236,8 @@ under the License.
|
||||
<parameter param-name="productionRunId" from-field="workEffortParentId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
|
||||
<form name="ListProductionRunComponents" type="list" target="EditProductionRun" title="" list-name="productionRunComponents"
|
||||
</grid>
|
||||
<grid name="ListProductionRunComponents" list-name="productionRunComponents" target="EditProductionRun"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<row-actions>
|
||||
<entity-one entity-name="Product" value-field="product" use-cache="true"/>
|
||||
@@ -253,8 +250,7 @@ under the License.
|
||||
</field>
|
||||
<field name="estimatedQuantity" title="${uiLabelMap.ManufacturingQuantity}"><display/></field>
|
||||
<field name="quantityUomId" map-name="product" title="${uiLabelMap.CommonUom}"><display-entity entity-name="Uom" key-field-name="uomId" description="${abbreviation}"/></field>
|
||||
</form>
|
||||
|
||||
</grid>
|
||||
<form name="EditProductionRunRoutingTask" type="single" target="updateProductionRunRoutingTask" title="" default-map-name="productionRunTask"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<alt-target use-when="productionRunTask==null" target="addProductionRunRoutingTask"/>
|
||||
@@ -367,8 +363,7 @@ under the License.
|
||||
<field name="_rowSubmit"><hidden value="Y"/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit/></field>
|
||||
</form>
|
||||
|
||||
<form name="ListProductionRunDeclRoutingTasks" type="list" target="ProductionRunDeclaration" title="" list-name="productionRunRoutingTasks"
|
||||
<grid name="ListProductionRunDeclRoutingTasks" list-name="productionRunRoutingTasks" target="ProductionRunDeclaration"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<field name="actionForm"><hidden value="EditRoutingTask"/></field>
|
||||
<field name="productionRunId"><hidden value="${workEffortParentId}"/></field>
|
||||
@@ -417,7 +412,7 @@ under the License.
|
||||
<parameter param-name="productionRunId" from-field="workEffortParentId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
|
||||
<form name="ListIssueProductionRunDeclComponents" type="multi" target="issueProductionRunTaskComponents?productionRunId=${productionRunId}" title="" list-name="productionRunComponentsDataReadyForIssuance"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
@@ -522,14 +517,14 @@ under the License.
|
||||
<field name="lotId" title="${uiLabelMap.ProductLotId}"><text /></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ProductionRunTaskInventoryProducedList" type="list" title="" list-name="prunInventoryProduced"
|
||||
<grid name="ProductionRunTaskInventoryProducedList" list-name="prunInventoryProduced"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<field name="inventoryItemId" title="${uiLabelMap.ProductInventoryItem}" widget-style="buttontext">
|
||||
<hyperlink target="/facility/control/EditInventoryItem" description="${inventoryItemId}" also-hidden="false" target-type="inter-app">
|
||||
<parameter param-name="inventoryItemId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="FindDelivProductContent" type="single" target="ProductionRunContent">
|
||||
<field name="productionRunId"><hidden/></field>
|
||||
<field name="productId" entry-name="delivProductId"><hidden/></field>
|
||||
@@ -538,7 +533,7 @@ under the License.
|
||||
<field name="roleTypeId"><hidden value="CONTENT_USER"/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ListProductionRunContent" type="list" title="" list-name="productionRunContents">
|
||||
<grid name="ListProductionRunContent" list-name="productionRunContents">
|
||||
<actions>
|
||||
<entity-and entity-name="WorkEffortContentAndInfo" list="productionRunContents">
|
||||
<field-map field-name="workEffortId" from-field="productionRunId"/>
|
||||
@@ -574,7 +569,7 @@ under the License.
|
||||
<parameter param-name="productionRunId" from-field="productionRunId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="ListDelivProductContent" type="multi" use-row-submit="true" target="createProductionRunContents?productionRunId=${productionRunId}" title="" list-name="delivProductContentsForLocaleAndUser">
|
||||
<field name="productionRunId"><hidden/></field>
|
||||
<field name="workEffortId" entry-name="productionRunId"><hidden/></field>
|
||||
@@ -630,7 +625,7 @@ under the License.
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
<form name="ListProductionRunTaskFixedAssets" type="list" title="" list-name="productionRunFixedAssetsData"
|
||||
<grid name="ListProductionRunTaskFixedAssets" list-name="productionRunFixedAssetsData"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<auto-fields-entity entity-name="WorkEffortFixedAssetAssign" default-field-type="display"/>
|
||||
<field name="workEffortId">
|
||||
@@ -642,8 +637,8 @@ under the License.
|
||||
<field name="statusId">
|
||||
<display-entity entity-name="StatusItem"/>
|
||||
</field>
|
||||
</form>
|
||||
<form name="ListProductionRunNotes" type="list" title="" list-name="productionRunNoteData"
|
||||
</grid>
|
||||
<grid name="ListProductionRunNotes" list-name="productionRunNoteData"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<auto-fields-entity entity-name="WorkEffortNoteAndData" default-field-type="display"/>
|
||||
<field name="workEffortId"><hidden/></field>
|
||||
@@ -651,7 +646,7 @@ under the License.
|
||||
<field name="noteId"><hidden/></field>
|
||||
<field name="noteParty"><hidden/></field>
|
||||
<field name="noteDateTime"><hidden/></field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="EditProductionRunTaskFixedAsset" type="single" target="EditProductionRun" title="" default-map-name="fixedAssetData"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<alt-target use-when="declarationScreen.equals("Y")" target="ProductionRunDeclaration"/>
|
||||
@@ -725,12 +720,7 @@ under the License.
|
||||
</field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit/></field>
|
||||
</form>
|
||||
|
||||
<!-- ******************* -->
|
||||
<!-- Shipment Plan Forms -->
|
||||
<!-- ******************* -->
|
||||
<!-- List for Shipment Plan -->
|
||||
<form name="ListShipmentPlan" type="list" target="" title="" list-name="shipmentPlan"
|
||||
<grid name="ListShipmentPlan" list-name="shipmentPlan"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<field name="orderId" widget-style="buttontext">
|
||||
<hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
|
||||
@@ -739,17 +729,11 @@ under the License.
|
||||
</field>
|
||||
<field name="orderItemSeqId" title="${uiLabelMap.ProductOrderItem}"><display/></field>
|
||||
<field name="productId" title="${uiLabelMap.ProductProductId}"><display/></field>
|
||||
<!-- quantity planned in this shipment -->
|
||||
<field name="quantity" title="${uiLabelMap.ProductQuantity}"><display/></field>
|
||||
<!-- quantity issued in this shipment -->
|
||||
<field name="issuedQuantity"><display/></field>
|
||||
<!-- total ordered quantity -->
|
||||
<field name="totOrderedQuantity"><display/></field>
|
||||
<!-- total not available quantity -->
|
||||
<field name="notAvailableQuantity" title="${uiLabelMap.ProductNotAvailable}"><display/></field>
|
||||
<!-- total planned quantity not issued -->
|
||||
<field name="totPlannedQuantity"><display/></field>
|
||||
<!-- total issued quantity -->
|
||||
<field name="totIssuedQuantity"><display/></field>
|
||||
<field name="productionRunId" widget-style="buttontext">
|
||||
<hyperlink description="${productionRunId}" target="ShowProductionRun" also-hidden="false">
|
||||
@@ -759,9 +743,8 @@ under the License.
|
||||
<field name="productionRunStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
|
||||
<field name="productionRunEstimatedCompletionDate"><display/></field>
|
||||
<field name="productionRunQuantityProduced"><display/></field>
|
||||
</form>
|
||||
|
||||
<form name="ListShipmentPlans" type="list" target="" title="" list-name="shipmentPlans"
|
||||
</grid>
|
||||
<grid name="ListShipmentPlans" list-name="shipmentPlans"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
|
||||
<field name="shipmentId" widget-style="buttontext" sort-field="true">
|
||||
<hyperlink description="${shipmentId}" target="/facility/control/ViewShipment" target-type="inter-app">
|
||||
@@ -777,7 +760,7 @@ under the License.
|
||||
<parameter param-name="shipmentId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="SelectMrpName" type="single" target="ManufacturingReports" title=""
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<field name="mrpName" title="${uiLabelMap.ManufacturingMrpName}"><text size="20"/></field>
|
||||
@@ -805,7 +788,7 @@ under the License.
|
||||
</field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit/></field>
|
||||
</form>
|
||||
<form name="MandatoryWorkEfforts" type="list" target="" title="" list-name="mandatoryWorkEfforts"
|
||||
<grid name="MandatoryWorkEfforts" list-name="mandatoryWorkEfforts"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<field name="workEffortIdFrom" title=" " widget-style="buttontext">
|
||||
<hyperlink description="${workEffortIdFrom}" target="ShowProductionRun" also-hidden="false" link-type="anchor">
|
||||
@@ -842,8 +825,8 @@ under the License.
|
||||
<parameter param-name="productionRunId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
<form name="DependentWorkEfforts" type="list" target="" title="" list-name="dependentWorkEfforts"
|
||||
</grid>
|
||||
<grid name="DependentWorkEfforts" list-name="dependentWorkEfforts"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<field name="workEffortIdTo" title=" " widget-style="buttontext">
|
||||
<hyperlink description="${workEffortIdTo}" target="ShowProductionRun" also-hidden="false" link-type="anchor">
|
||||
@@ -880,8 +863,8 @@ under the License.
|
||||
<parameter param-name="productionRunId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
<form name="ProductionRunTaskCosts" type="list" target="" title="" list-name="taskCosts"
|
||||
</grid>
|
||||
<grid name="ProductionRunTaskCosts" list-name="taskCosts"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<auto-fields-entity entity-name="CostComponent" default-field-type="display"/>
|
||||
<field name="workEffortId"><hidden/></field>
|
||||
@@ -895,7 +878,7 @@ under the License.
|
||||
<field name="costComponentCalcId">
|
||||
<display-entity entity-name="CostComponentCalc"/>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="AddProductionRunComponent" type="single" target="addProductionRunComponent" title=""
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-service service-name="addProductionRunComponent"/>
|
||||
@@ -913,16 +896,14 @@ under the License.
|
||||
</field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
|
||||
<form name="ProductionRunPartyAssocs" type="list" title="" list-name="productionRunParties"
|
||||
<grid name="ProductionRunPartyAssocs" list-name="productionRunParties"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
|
||||
<field name="workEffortId"><hidden/></field>
|
||||
<field name="productionRunId"><hidden/></field>
|
||||
|
||||
<field name="partyId">
|
||||
<display-entity entity-name="PartyNameView" description="${personalTitle} ${firstName} ${middleName} ${lastName} ${suffix} ${groupName}" also-hidden="true" cache="false">
|
||||
|
||||
<display-entity entity-name="PartyNameView"
|
||||
description="${personalTitle} ${firstName} ${middleName} ${lastName} ${suffix} ${groupName}"
|
||||
also-hidden="true" cache="false">
|
||||
</display-entity>
|
||||
</field>
|
||||
<field name="roleTypeId" title="${uiLabelMap.CommonRole}">
|
||||
@@ -930,16 +911,17 @@ under the License.
|
||||
</field>
|
||||
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field>
|
||||
<field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field>
|
||||
</form>
|
||||
<form name="ProductionRunTaskPartyAssocs" type="list" title="" list-name="productionRunTaskParties"
|
||||
</grid>
|
||||
<grid name="ProductionRunTaskPartyAssocs" list-name="productionRunTaskParties"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<field name="productionRunId"><hidden/></field>
|
||||
<field name="workEffortId" title="${uiLabelMap.ManufacturingTaskName}">
|
||||
<display-entity entity-name="WorkEffort" description="${workEffortName} - [${workEffortId}]"/>
|
||||
</field>
|
||||
<field name="partyId">
|
||||
<display-entity entity-name="PartyNameView" description="${personalTitle} ${firstName} ${middleName} ${lastName} ${suffix} ${groupName}" also-hidden="true" cache="false">
|
||||
|
||||
<display-entity entity-name="PartyNameView"
|
||||
description="${personalTitle} ${firstName} ${middleName} ${lastName} ${suffix} ${groupName}"
|
||||
also-hidden="true" cache="false">
|
||||
</display-entity>
|
||||
</field>
|
||||
<field name="roleTypeId" title="${uiLabelMap.CommonRole}">
|
||||
@@ -950,9 +932,7 @@ under the License.
|
||||
</field>
|
||||
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field>
|
||||
<field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field>
|
||||
|
||||
</form>
|
||||
|
||||
</grid>
|
||||
<form name="ProductionRunTaskComponents" type="list" target="updateProductionRunComponent" paginate-target="ProductionRunComponents" title="" list-name="records"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<row-actions>
|
||||
|
||||
@@ -36,15 +36,10 @@ under the License.
|
||||
<not><if-empty field="routing"/></not>
|
||||
</condition>
|
||||
<widgets>
|
||||
<label style="h1">${uiLabelMap.CommonRouting}: ${routing.workEffortId}</label>
|
||||
<include-menu name="RoutingTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
|
||||
<container style="button-bar">
|
||||
<link target="EditRouting" text="${uiLabelMap.ManufacturingNewRouting}" style="buttontext create"/>
|
||||
</container>
|
||||
</widgets>
|
||||
</section>
|
||||
<container>
|
||||
<label style="h1">[${uiLabelMap.CommonId} ${routing.workEffortId}] ${routing.workEffortName}</label>
|
||||
</container>
|
||||
<decorator-section-include name="body"/>
|
||||
</widgets>
|
||||
</section>
|
||||
@@ -69,15 +64,10 @@ under the License.
|
||||
<not><if-empty field="routingTask"/></not>
|
||||
</condition>
|
||||
<widgets>
|
||||
<label style="h1">${uiLabelMap.WorkEffortTask}: ${routingTask.workEffortId}</label>
|
||||
<include-menu name="RoutingTaskTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
|
||||
<container style="button-bar">
|
||||
<link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext create"/>
|
||||
</container>
|
||||
</widgets>
|
||||
</section>
|
||||
<container>
|
||||
<label style="h1">[${uiLabelMap.CommonId} ${routingTask.workEffortId}] ${routingTask.workEffortName}</label>
|
||||
</container>
|
||||
<decorator-section-include name="body"/>
|
||||
</widgets>
|
||||
</section>
|
||||
@@ -86,7 +76,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="FindRouting">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -97,7 +86,6 @@ under the License.
|
||||
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
|
||||
<set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/>
|
||||
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
|
||||
|
||||
<set field="asm_multipleSelectForm" value="FindRoutings"/>
|
||||
<set field="asm_formSize" value="700"/>
|
||||
<set field="asm_multipleSelect" value="FindRoutings_currentStatusId"/>
|
||||
@@ -112,11 +100,6 @@ under the License.
|
||||
<section>
|
||||
<widgets>
|
||||
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
|
||||
<decorator-section name="menu-bar">
|
||||
<container style="button-bar">
|
||||
<link target="EditRouting" text="${uiLabelMap.ManufacturingNewRouting}" style="buttontext create"/>
|
||||
</container>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-options">
|
||||
<include-form name="FindRoutings" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
|
||||
</decorator-section>
|
||||
@@ -138,7 +121,6 @@ under the License.
|
||||
<set field="headerItem" value="routing"/>
|
||||
<set field="tabButtonItem" value="editRouting"/>
|
||||
<set field="helpAnchor" value="_create_edit_routing"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
<entity-one entity-name="WorkEffort" value-field="routing"/>
|
||||
</actions>
|
||||
@@ -160,7 +142,6 @@ under the License.
|
||||
<set field="tabButtonItem" value="routingTask"/>
|
||||
<set field="headerItem" value="routingTask"/>
|
||||
<set field="helpAnchor" value="_routing_task"/>
|
||||
|
||||
<set field="requestParameters.workEffortTypeId" to-scope="screen" default-value="ROU_TASK"/>
|
||||
<set field="requestParameters.currentStatusId" to-scope="screen" default-value="ROU_ACTIVE"/>
|
||||
</actions>
|
||||
@@ -170,11 +151,6 @@ under the License.
|
||||
<section>
|
||||
<widgets>
|
||||
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
|
||||
<decorator-section name="menu-bar">
|
||||
<container style="button-bar">
|
||||
<link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext create"/>
|
||||
</container>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-options">
|
||||
<include-form name="FindRoutingTasks" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
|
||||
</decorator-section>
|
||||
@@ -196,7 +172,6 @@ under the License.
|
||||
<set field="headerItem" value="routingTask"/>
|
||||
<set field="tabButtonItem" value="editRoutingTask"/>
|
||||
<set field="helpAnchor" value="_create_edit_route_task"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
<entity-one entity-name="WorkEffort" value-field="routingTask"/>
|
||||
</actions>
|
||||
@@ -204,9 +179,6 @@ under the License.
|
||||
<decorator-screen name="CommonRoutingTaskDecorator">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${groovy: workEffortId ? uiLabelMap.PageTitleEditRoutingTask : uiLabelMap.ManufacturingNewRoutingTask}">
|
||||
<container style="button-bar">
|
||||
<link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext create"/>
|
||||
</container>
|
||||
<include-form name="EditRoutingTask" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
@@ -221,7 +193,6 @@ under the License.
|
||||
<set field="headerItem" value="routingTask"/>
|
||||
<set field="tabButtonItem" value="editRoutingTaskCosts"/>
|
||||
<set field="helpAnchor" value="_create_edit_route_task_cost"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
<entity-one entity-name="WorkEffort" value-field="routingTask"/>
|
||||
<entity-and entity-name="WorkEffortCostCalc" list="allCosts">
|
||||
@@ -246,7 +217,6 @@ under the License.
|
||||
<set field="titleProperty" value="PageTitleListRoutingTaskRoutings"/>
|
||||
<set field="headerItem" value="routingTask"/>
|
||||
<set field="tabButtonItem" value="listRoutingTaskRoutings"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
<entity-one entity-name="WorkEffort" value-field="routingTask"/>
|
||||
<entity-and entity-name="WorkEffortAssoc" list="allRoutings">
|
||||
@@ -271,7 +241,6 @@ under the License.
|
||||
<set field="headerItem" value="routingTask"/>
|
||||
<set field="tabButtonItem" value="listRoutingTaskProducts"/>
|
||||
<set field="helpAnchor" value="_routing_task_deliverable_products"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
<entity-one entity-name="WorkEffort" value-field="routingTask"/>
|
||||
<entity-and entity-name="WorkEffortGoodStandard" list="allProducts">
|
||||
@@ -300,7 +269,6 @@ under the License.
|
||||
<set field="headerItem" value="routingTask"/>
|
||||
<set field="tabButtonItem" value="listRoutingTaskProducts"/>
|
||||
<set field="helpAnchor" value="_create_edit_deliverable_products"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
<entity-and entity-name="WorkEffortGoodStandard" list="allRoutingProductLinks">
|
||||
<field-map field-name="workEffortId" from-field="workEffortId"/>
|
||||
@@ -326,7 +294,6 @@ under the License.
|
||||
<set field="tabButtonItem" value="routingTaskAssoc"/>
|
||||
<set field="headerItem" value="routing"/>
|
||||
<set field="helpAnchor" value="_create_edit_route_associated_task"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
<set field="workEffortAssocTypeId" value="ROUTING_COMPONENT"/>
|
||||
<entity-and entity-name="WorkEffortAssocView" list="allRoutingTasks">
|
||||
@@ -360,7 +327,6 @@ under the License.
|
||||
<!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
|
||||
<set field="headerItem" value="routing"/>
|
||||
<set field="helpAnchor" value="_create_edit_routing_associated_product_link"/>
|
||||
|
||||
<set field="workEffortGoodStdTypeId" value="ROU_PROD_TEMPLATE"/>
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
<!--<entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>-->
|
||||
|
||||
@@ -27,7 +27,7 @@ under the License.
|
||||
<menu-item name="Reports" title="${uiLabelMap.MarketingReports}"><link target="MarketingReport"/></menu-item>
|
||||
</menu>
|
||||
<menu name="MainActionMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected">
|
||||
<menu-item name="NewCampaign" title="${uiLabelMap.CommonNew} ${uiLabelMap.MarketingCampaign}">
|
||||
<menu-item name="NewCampaign" title="${uiLabelMap.MarketingCampaignCreate}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="MARKETING" action="_CREATE"/>
|
||||
@@ -43,8 +43,16 @@ under the License.
|
||||
</condition>
|
||||
<link target="EditContactList"/>
|
||||
</menu-item>
|
||||
<menu-item name="NewTrackingCode" title="${uiLabelMap.MarketingTrackingCodeCreate}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="MARKETING" action="_CREATE"/>
|
||||
</or>
|
||||
</condition>
|
||||
<link target="EditTrackingCode">
|
||||
</link>
|
||||
</menu-item>
|
||||
</menu>
|
||||
|
||||
<menu name="MarketingShortcutAppBar" title="${uiLabelMap.MarketingManager}">
|
||||
<menu-item name="DataSource" title="${uiLabelMap.DataSource}"><link target="/marketing/control/FindDataSource" url-mode="inter-app"/></menu-item>
|
||||
<menu-item name="Campaign" title="${uiLabelMap.MarketingCampaign}"><link target="/marketing/control/FindMarketingCampaign" url-mode="inter-app"/></menu-item>
|
||||
|
||||
@@ -90,11 +90,6 @@ under the License.
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet title="${uiLabelMap.PageTitleEditTrackingCode}">
|
||||
<container>
|
||||
<link text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode" style="buttontext">
|
||||
<parameter param-name="DONE_PAGE" from-field="donePage"/>
|
||||
</link>
|
||||
</container>
|
||||
<include-form name="EditTrackingCode" location="component://marketing/widget/TrackingCodeForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
@@ -247,7 +242,7 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
|
||||
<screen name="ListTrackingCodeVisits">
|
||||
<section>
|
||||
<actions>
|
||||
|
||||
@@ -2094,6 +2094,7 @@
|
||||
</property>
|
||||
<property key="OrderAllocationPlan">
|
||||
<value xml:lang="en">Allocation Plan</value>
|
||||
<value xml:lang="fr">Plan d'allocation</value>
|
||||
<value xml:lang="nl">Allocatieplan</value>
|
||||
</property>
|
||||
<property key="OrderAllocationPlanNotFound">
|
||||
@@ -3563,16 +3564,6 @@
|
||||
<value xml:lang="zh-CN">新建报价项</value>
|
||||
<value xml:lang="zh-TW">新建報價細項</value>
|
||||
</property>
|
||||
<property key="OrderCreateOrderQuoteNote">
|
||||
<value xml:lang="ar">خلق ملاحظة عرض سعر جديدة</value>
|
||||
<value xml:lang="de">Neue Anmerkung zu Angebot erstellen</value>
|
||||
<value xml:lang="de-CH">Neue Anmerkung zu Offerte erstellen</value>
|
||||
<value xml:lang="en">Create New Quote Note</value>
|
||||
<value xml:lang="fr">Créer une nouvelle note de devis</value>
|
||||
<value xml:lang="nl">Nieuwe notitie bij offerte aanmaken</value>
|
||||
<value xml:lang="zh">新建询价便笺</value>
|
||||
<value xml:lang="zh-TW">新建詢價便箋</value>
|
||||
</property>
|
||||
<property key="OrderCreateOrderQuoteRole">
|
||||
<value xml:lang="ar">خلق دور عرض سعر جديد</value>
|
||||
<value xml:lang="de">Neue Angebotsrolle erstellen</value>
|
||||
@@ -8896,7 +8887,7 @@
|
||||
<value xml:lang="de-CH">Offertbericht</value>
|
||||
<value xml:lang="en">Quote Report</value>
|
||||
<value xml:lang="es">Informe del presupuesto</value>
|
||||
<value xml:lang="fr">Report du devis</value>
|
||||
<value xml:lang="fr">Etat du devis</value>
|
||||
<value xml:lang="it">Stampe Preventivo</value>
|
||||
<value xml:lang="ja">見積レポート</value>
|
||||
<value xml:lang="nl">Offerte-rapport</value>
|
||||
@@ -12771,7 +12762,7 @@
|
||||
<value xml:lang="zh">退货类型历史记录</value>
|
||||
<value xml:lang="zh-TW">退貨類型歷史</value>
|
||||
</property>
|
||||
|
||||
|
||||
<property key="OrderReviewOrder">
|
||||
<value xml:lang="ar">مراجعة أمر البيع\الشراء</value>
|
||||
<value xml:lang="de">Auftrag prüfen</value>
|
||||
@@ -16318,4 +16309,8 @@
|
||||
<value xml:lang="en">Lookup Return Header</value>
|
||||
<value xml:lang="nl">Retouren zoeken/vinden</value>
|
||||
</property>
|
||||
<property key="ItemAddedSuccessfully">
|
||||
<value xml:lang="en">Item ${productId} added successfully</value>
|
||||
<value xml:lang="it">Articolo ${productId} aggiunto con successo</value>
|
||||
</property>
|
||||
</resource>
|
||||
|
||||
@@ -47,9 +47,10 @@ def getNextOrderId() {
|
||||
customMethodName = 'orderSequence_enforced'
|
||||
}
|
||||
|
||||
String orderIdTemp
|
||||
if (customMethodName) {
|
||||
Map customMethodMap = [*: parameters]
|
||||
Map result = run service: customMethodName, with: customMethodMap
|
||||
parameters.partyAcctgPreference = partyAcctgPreference
|
||||
Map result = run service: customMethodName, with: parameters
|
||||
orderIdTemp = result.orderId
|
||||
} else {
|
||||
logInfo 'In getNextOrderId sequence by Standard'
|
||||
@@ -68,10 +69,7 @@ def getNextOrderId() {
|
||||
if (partyAcctgPreference) orderId += partyAcctgPreference.orderIdPrefix ?: ""
|
||||
orderId += orderIdTemp.toString()
|
||||
|
||||
Map result = success()
|
||||
result.orderId = orderId
|
||||
|
||||
return result
|
||||
return success([orderId: orderId])
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+2
@@ -695,6 +695,8 @@ public class ShoppingCartEvents {
|
||||
if (cart.viewCartOnAdd()) {
|
||||
return "viewcart";
|
||||
}
|
||||
request.setAttribute("_EVENT_MESSAGE_", UtilProperties.getMessage("OrderUiLabels", "ItemAddedSuccessfully",
|
||||
UtilMisc.toMap("productId", productId), UtilHttp.getLocale(request)));
|
||||
return "success";
|
||||
}
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ under the License.
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<input type="file" name="uploadedFile" class="required" size="25" accept=".png,.gif,.jpg,.jpeg,.tiff,.tif"/>
|
||||
<input type="file" name="uploadedFile" class="required" size="25"/>
|
||||
</div>
|
||||
<div>
|
||||
<button type="submit">
|
||||
|
||||
@@ -69,7 +69,7 @@ under the License.
|
||||
<td class="label">${uiLabelMap.OrderPrice}</td>
|
||||
<td>
|
||||
<input type="text" size="6" name="basePrice" value="${requestParameters.price!}"/>
|
||||
<label><input type="checkbox" name="overridePrice" value="Y"/> ${uiLabelMap.OrderOverridePrice}</label>
|
||||
<label><input type="checkbox" name="overridePrice" value="Y"/>${uiLabelMap.OrderOverridePrice}</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -101,10 +101,12 @@ under the License.
|
||||
<td align="right" class="label">${uiLabelMap.CommonType}</td>
|
||||
<td nowrap="nowrap">
|
||||
<div>
|
||||
<label><input type="checkbox" name="view_SALES_ORDER" value="Y" <#if state.hasType('view_SALES_ORDER')>checked="checked"</#if>/>
|
||||
${descr_SALES_ORDER}</label>
|
||||
<label><input type="checkbox" name="view_PURCHASE_ORDER" value="Y" <#if state.hasType('view_PURCHASE_ORDER')>checked="checked"</#if>/>
|
||||
${descr_PURCHASE_ORDER}</label>
|
||||
<#-- !if the linebreak was performed after the tag, it would be misinterpreted as a blank! -->
|
||||
<label><input type="checkbox" name="view_SALES_ORDER" value="Y"
|
||||
<#if state.hasType('view_SALES_ORDER')>checked="checked"</#if>/>${descr_SALES_ORDER}</label>
|
||||
<#-- !if the linebreak was performed after the tag, it would be misinterpreted as a blank! -->
|
||||
<label><input type="checkbox" name="view_PURCHASE_ORDER" value="Y"
|
||||
<#if state.hasType('view_PURCHASE_ORDER')>checked="checked"</#if>/>${descr_PURCHASE_ORDER}</label>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -113,13 +115,13 @@ under the License.
|
||||
<td nowrap="nowrap">
|
||||
<div>
|
||||
<label>
|
||||
<#-- !if the linebreak was performed after the tag, it would be misinterpreted as a blank! -->
|
||||
<input type="checkbox" name="filterInventoryProblems" value="Y"
|
||||
<#if state.hasFilter('filterInventoryProblems')>checked="checked"</#if>/>
|
||||
${uiLabelMap.OrderFilterInventoryProblems}</label>
|
||||
<#if state.hasFilter('filterInventoryProblems')>checked="checked"</#if>/>${uiLabelMap.OrderFilterInventoryProblems}</label>
|
||||
<label>
|
||||
<#-- !if the linebreak was performed after the tag, it would be misinterpreted as a blank! -->
|
||||
<input type="checkbox" name="filterAuthProblems" value="Y"
|
||||
<#if state.hasFilter('filterAuthProblems')>checked="checked"</#if>/>
|
||||
${uiLabelMap.OrderFilterAuthProblems}</label>
|
||||
<#if state.hasFilter('filterAuthProblems')>checked="checked"</#if>/>${uiLabelMap.OrderFilterAuthProblems}</label>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -127,16 +129,21 @@ under the License.
|
||||
<td align="right" class="label">${uiLabelMap.CommonFilter} (${uiLabelMap.OrderFilterPOs})</td>
|
||||
<td nowrap="nowrap">
|
||||
<div>
|
||||
<#-- !if the linebreak was performed after the tag, it would be misinterpreted as a blank! -->
|
||||
<label>
|
||||
<input type="checkbox" name="filterPartiallyReceivedPOs" value="Y"
|
||||
<#if state.hasFilter('filterPartiallyReceivedPOs')>checked="checked"</#if>/>
|
||||
${uiLabelMap.OrderFilterPartiallyReceivedPOs}</label>
|
||||
<label><input type="checkbox" name="filterPOsOpenPastTheirETA" value="Y"
|
||||
<#if state.hasFilter('filterPOsOpenPastTheirETA')>checked="checked"</#if>/>
|
||||
${uiLabelMap.OrderFilterPOsOpenPastTheirETA}</label>
|
||||
<label><input type="checkbox" name="filterPOsWithRejectedItems" value="Y"
|
||||
<#if state.hasFilter('filterPOsWithRejectedItems')>checked="checked"</#if>/>
|
||||
${uiLabelMap.OrderFilterPOsWithRejectedItems}</label>
|
||||
<input type="checkbox" name="filterPartiallyReceivedPOs" value="Y"
|
||||
<#if state.hasFilter('filterPartiallyReceivedPOs')>checked="checked"</#if>/>${uiLabelMap.OrderFilterPartiallyReceivedPOs}
|
||||
</label>
|
||||
<#-- !if the linebreak was performed after the tag, it would be misinterpreted as a blank! -->
|
||||
<label>
|
||||
<input type="checkbox" name="filterPOsOpenPastTheirETA" value="Y"
|
||||
<#if state.hasFilter('filterPOsOpenPastTheirETA')>checked="checked"</#if>/>${uiLabelMap.OrderFilterPOsOpenPastTheirETA}
|
||||
</label>
|
||||
<#-- !if the linebreak was performed after the tag, it would be misinterpreted as a blank! -->
|
||||
<label>
|
||||
<input type="checkbox" name="filterPOsWithRejectedItems" value="Y"
|
||||
<#if state.hasFilter('filterPOsWithRejectedItems')>checked="checked"</#if>/>${uiLabelMap.OrderFilterPOsWithRejectedItems}
|
||||
</label>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -238,10 +238,29 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<screenlet id="EditRequestRolePanel" title="${uiLabelMap.PageTitleEditRequestRoles}" collapsible="true">
|
||||
<include-form name="EditRequestRole" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
|
||||
</screenlet>
|
||||
<include-form name="ListRequestRoles" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
|
||||
<section>
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
<if-has-permission permission="ORDERMGR" action="_UPDATE"/>
|
||||
</or>
|
||||
</and>
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet id="EditRequestRolePanel" title="${uiLabelMap.PageTitleEditRequestRoles}" collapsible="true">
|
||||
<include-form name="EditRequestRole" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet id="RequestRoles">
|
||||
<include-form name="ListRequestRoles" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<screenlet id="RequestRoles">
|
||||
<include-form name="ViewRequestRoles" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
|
||||
</screenlet>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -268,9 +287,6 @@ under the License.
|
||||
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.PageTitleRequestItems}">
|
||||
<link target="requestitem" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext">
|
||||
<parameter param-name="custRequestId"/>
|
||||
</link>
|
||||
<include-form name="ListRequestItems" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
@@ -296,11 +312,6 @@ under the License.
|
||||
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}">
|
||||
<container>
|
||||
<link target="requestitem" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext">
|
||||
<parameter param-name="custRequestId"/>
|
||||
</link>
|
||||
</container>
|
||||
<include-form name="EditCustRequestItem" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
|
||||
<platform-specific>
|
||||
<html><html-template location="component://order/template/request/CopyRequestItem.ftl"/></html>
|
||||
|
||||
@@ -24,7 +24,7 @@ under the License.
|
||||
<field name="requirementId"><text-find/></field>
|
||||
<field name="partyId" title="${uiLabelMap.PartySupplier}"><lookup target-form-name="LookupPartyName"/></field>
|
||||
<field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field>
|
||||
<field name="requirementByDate"><date-find type="date"/></field>
|
||||
<field name="requiredByDate"><date-find type="date"/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="RequirementsList" type="multi" use-row-submit="true" target="addRequirementsToCart" title="" list-name="requirementsForSupplier"
|
||||
|
||||
@@ -84,7 +84,7 @@ under the License.
|
||||
</menu-item>
|
||||
</menu>
|
||||
<menu name="MainActionMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected">
|
||||
<menu-item name="NewOrder" title="${uiLabelMap.CommonNew} ${uiLabelMap.CommonOrder}">
|
||||
<menu-item name="NewOrder" title="${uiLabelMap.OrderNewOrder}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
@@ -93,7 +93,7 @@ under the License.
|
||||
</condition>
|
||||
<link target="orderentry" link-type="anchor"/>
|
||||
</menu-item>
|
||||
<menu-item name="NewQuote" title="${uiLabelMap.CommonNew} ${uiLabelMap.CommonQuote}">
|
||||
<menu-item name="NewQuote" title="${uiLabelMap.OrderNewQuote}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
@@ -101,7 +101,7 @@ under the License.
|
||||
</condition>
|
||||
<link target="EditQuote"/>
|
||||
</menu-item>
|
||||
<menu-item name="NewRequest" title="${uiLabelMap.CommonNew} ${uiLabelMap.CommonRequest}">
|
||||
<menu-item name="NewRequest" title="${uiLabelMap.OrderNewRequest}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
@@ -109,7 +109,7 @@ under the License.
|
||||
</condition>
|
||||
<link target="request"/>
|
||||
</menu-item>
|
||||
<menu-item name="NewRequirement" title="${uiLabelMap.CommonNew} ${uiLabelMap.OrderRequirement}">
|
||||
<menu-item name="NewRequirement" title="${uiLabelMap.OrderNewRequirement}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
@@ -311,14 +311,6 @@ under the License.
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="QuoteWorkEfforts" title="${uiLabelMap.CommonWorkEfforts}">
|
||||
<condition>
|
||||
<if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
|
||||
</condition>
|
||||
<link target="ListQuoteWorkEfforts">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="ListQuoteNotes" title="${uiLabelMap.CommonNotes}">
|
||||
<condition>
|
||||
<if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
|
||||
@@ -343,19 +335,130 @@ under the License.
|
||||
<parameter param-name="quoteId" from-field="parameters.quoteId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="QuoteWorkEfforts" title="${uiLabelMap.WorkEffortWorkEfforts}">
|
||||
<condition>
|
||||
<if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
|
||||
</condition>
|
||||
<link target="ListQuoteWorkEfforts">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
</menu>
|
||||
|
||||
<menu name="QuoteSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
|
||||
menu-container-style="button-bar button-style-2">
|
||||
<menu-item name="EditQuote" title="${uiLabelMap.CommonEdit}">
|
||||
<condition>
|
||||
<if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
<if-has-permission permission="ORDERMGR" action="_UPDATE"/>
|
||||
</or>
|
||||
<if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="EditQuote">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="quoteReport" title="${uiLabelMap.CommonPdf}">
|
||||
<menu-item name="NewItem" title="${uiLabelMap.OrderCreateOrderQuoteItem}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
<if-has-permission permission="ORDERMGR" action="_UPDATE"/>
|
||||
</or>
|
||||
<if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="EditQuoteItem">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="NewAttribute" title="${uiLabelMap.OrderNewQuoteAttribute}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
<if-has-permission permission="ORDERMGR" action="_UPDATE"/>
|
||||
</or>
|
||||
<if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="EditQuoteAttribute">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="NewCoefficient" title="${uiLabelMap.CommonNew} ${uiLabelMap.OrderOrderQuoteCoefficients}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
<if-has-permission permission="ORDERMGR" action="_UPDATE"/>
|
||||
</or>
|
||||
<if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="EditQuoteCoefficient">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="NewNote" title="${uiLabelMap.OrderAddNote}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
<if-has-permission permission="ORDERMGR" action="_UPDATE"/>
|
||||
</or>
|
||||
<if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="createnewquotenote">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="NewRole" title="${uiLabelMap.CommonNew} ${uiLabelMap.CommonRole}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
<if-has-permission permission="ORDERMGR" action="_UPDATE"/>
|
||||
</or>
|
||||
<if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="EditQuoteRole">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="NewTerm" title="${uiLabelMap.OrderCreateOrderQuoteTerm}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
<if-has-permission permission="ORDERMGR" action="_UPDATE"/>
|
||||
</or>
|
||||
<if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="EditQuoteTerm">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="NewWorkEffort" title="${uiLabelMap.WorkEffortCreate}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
<if-has-permission permission="ORDERMGR" action="_UPDATE"/>
|
||||
</or>
|
||||
<if-compare operator="equals" value="QUO_CREATED" field="quote.statusId"/>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="AddQuoteWorkEffort">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="quoteReport" title="${uiLabelMap.CommonNew} ${uiLabelMap.OrderOrderQuoteReport}">
|
||||
<link target="QuoteReport" target-window="_BLANK">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
@@ -379,26 +482,13 @@ under the License.
|
||||
</link>
|
||||
</menu-item>
|
||||
</menu>
|
||||
|
||||
<menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
|
||||
<menu-item name="ViewRequest" title="${uiLabelMap.OrderRequestOverview}">
|
||||
<menu-item name="ViewRequest" title="${uiLabelMap.CommonOverview}">
|
||||
<link target="ViewRequest">
|
||||
<parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="editRequest" title="${uiLabelMap.OrderRequest}">
|
||||
<condition>
|
||||
<and>
|
||||
<not><if-empty field="custRequest"/></not>
|
||||
<if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
|
||||
<if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="request">
|
||||
<parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="requestroles" title="${uiLabelMap.OrderRequestRoles}">
|
||||
<menu-item name="requestroles" title="${uiLabelMap.CommonRoles}">
|
||||
<condition>
|
||||
<and>
|
||||
<not><if-empty field="custRequest"/></not>
|
||||
@@ -410,7 +500,7 @@ under the License.
|
||||
<parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="requestitems" title="${uiLabelMap.OrderRequestItems}">
|
||||
<menu-item name="requestitems" title="${uiLabelMap.CommonItems}">
|
||||
<condition>
|
||||
<and>
|
||||
<not><if-empty field="custRequest"/></not>
|
||||
@@ -422,7 +512,7 @@ under the License.
|
||||
<parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="custRequestContent" title="${uiLabelMap.OrderRequestContent}">
|
||||
<menu-item name="custRequestContent" title="${uiLabelMap.CommonContent}">
|
||||
<condition>
|
||||
<and>
|
||||
<not><if-empty field="custRequest"/></not>
|
||||
@@ -435,9 +525,38 @@ under the License.
|
||||
</link>
|
||||
</menu-item>
|
||||
</menu>
|
||||
|
||||
<menu name="RequestSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
|
||||
menu-container-style="button-bar button-style-2">
|
||||
<menu-item name="editRequest" title="${uiLabelMap.CommonEdit}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_UPDATE"/>
|
||||
</or>
|
||||
<not><if-empty field="custRequest"/></not>
|
||||
<if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
|
||||
<if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="request">
|
||||
<parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="NewRequestItem" title="${uiLabelMap.OrderNewRequestItem}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="ORDERMGR" action="_CREATE"/>
|
||||
</or>
|
||||
<not><if-empty field="custRequest"/></not>
|
||||
<if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
|
||||
<if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
|
||||
</and>
|
||||
</condition>
|
||||
<link target="requestitem">
|
||||
<parameter param-name="custRequestId"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="createQuoteFromRequest" title="${uiLabelMap.OrderCreateQuoteFromRequest}">
|
||||
<condition>
|
||||
<and>
|
||||
|
||||
@@ -25,6 +25,19 @@ under the License.
|
||||
|
||||
<!-- generate a PDF for the order, sharing the same groovy file as the HTML page for viewing the order -->
|
||||
<screen name="OrderPDF">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="defaultTemplateLocation" value="component://order/widget/ordermgr/OrderPrintScreens.xml"/>
|
||||
<set field="defaultTemplateName" value="DefaultOrderPDF"/>
|
||||
<script location="component://commonext/groovyScripts/template/DocTypeTemplate.groovy"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
<include-screen name="${templateName}" location="${templateLocation}"/>
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="DefaultOrderPDF">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrder" />
|
||||
|
||||
@@ -67,7 +67,7 @@ under the License.
|
||||
<html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/></html>
|
||||
</platform-specific>
|
||||
<include-form name="FindReturns" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
<include-form name="ListReturns" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
<include-grid name="ListReturns" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
@@ -168,7 +168,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="OrderReturnHistory">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -192,7 +191,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ReturnStatusHistory">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -209,7 +207,7 @@ under the License.
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet id="ReturnStatusHistoryPanel" title="${uiLabelMap.OrderOrderReturn} ${uiLabelMap.CommonStatusHistory}" collapsible="true">
|
||||
<include-form name="ReturnStatusHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
<include-grid name="ReturnStatusHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
@@ -221,7 +219,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ReturnTypeHistory">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -237,7 +234,7 @@ under the License.
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet id="ReturnTypeHistoryPanel" title="${uiLabelMap.OrderReturnTypeHistory}" collapsible="true">
|
||||
<include-form name="ReturnTypeHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
<include-grid name="ReturnTypeHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
@@ -249,7 +246,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ReturnReasonHistory">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -265,7 +261,7 @@ under the License.
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet id="ReturnReasonHistoryPanel" title="${uiLabelMap.OrderReturnReasonHistory}" collapsible="true">
|
||||
<include-form name="ReturnReasonHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
<include-grid name="ReturnReasonHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
@@ -277,7 +273,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ReturnQuantityHistory">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -293,7 +288,7 @@ under the License.
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet id="ReturnQuantityHistoryPanel" title="${uiLabelMap.OrderReturnQtyHistory}" collapsible="true">
|
||||
<include-form name="ReturnAndReceivedQuantityHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
<include-grid name="ReturnAndReceivedQuantityHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
@@ -305,7 +300,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ReceivedQuantityHistory">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -333,7 +327,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ReturnPriceHistory">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -349,7 +342,7 @@ under the License.
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet id="ReturnPriceHistoryPanel" title="${uiLabelMap.OrderReturnPriceHistory}" collapsible="true">
|
||||
<include-form name="ReturnPriceHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
<include-grid name="ReturnPriceHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
|
||||
@@ -42,9 +42,10 @@ under the License.
|
||||
<not><if-empty field="quote"/></not>
|
||||
</condition>
|
||||
<widgets>
|
||||
<label style="h1">${uiLabelMap.CommonQuote}:${quote.quoteId}</label>
|
||||
<include-menu name="QuoteTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
|
||||
<include-menu name="QuoteSubTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
|
||||
<container style="page-title">
|
||||
<label>${uiLabelMap[titleProperty]} [${uiLabelMap.CommonId}:${quote.quoteId}] ${quote.description}</label>
|
||||
</container>
|
||||
</widgets>
|
||||
</section>
|
||||
@@ -59,8 +60,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<!-- list all assets in a tabular format -->
|
||||
<screen name="FindQuote">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -81,13 +80,17 @@ under the License.
|
||||
<include-menu name="MainActionMenu" location="component://order/widget/ordermgr/OrderMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.OrderOrderQuotes}">
|
||||
<platform-specific>
|
||||
<html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/></html>
|
||||
</platform-specific>
|
||||
<include-form name="FindQuotes" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
<include-form name="ListQuotes" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
|
||||
<decorator-section name="search-options">
|
||||
<platform-specific>
|
||||
<html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJsList.ftl"/></html>
|
||||
</platform-specific>
|
||||
<include-form name="FindQuotes" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-results">
|
||||
<include-form name="ListQuotes" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -98,7 +101,6 @@ under the License.
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderViewQuote"/>
|
||||
<set field="tabButtonItem" value="ViewQuote"/>
|
||||
|
||||
<set field="showQuoteManagementLinks" value="Y"/>
|
||||
<set field="quoteId" from-field="parameters.quoteId"/>
|
||||
<entity-one entity-name="Quote" value-field="quote"/>
|
||||
@@ -107,7 +109,6 @@ under the License.
|
||||
<get-related-one value-field="quote" relation-name="SalesChannelEnumeration" to-value-field="salesChannel"/>
|
||||
<get-related-one value-field="quote" relation-name="Uom" to-value-field="currency"/>
|
||||
<get-related-one value-field="quote" relation-name="ProductStore" to-value-field="store"/>
|
||||
|
||||
<set field="listOrderBy[]" value="quoteItemSeqId"/>
|
||||
<get-related value-field="quote" relation-name="QuoteItem" list="quoteItems" order-by-list="listOrderBy"/>
|
||||
<get-related value-field="quote" relation-name="QuoteAdjustment" list="quoteAdjustments"/>
|
||||
@@ -121,9 +122,6 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<container>
|
||||
<include-menu name="QuoteSubTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
|
||||
</container>
|
||||
<include-screen name="ViewQuoteTemplate"/>
|
||||
<screenlet title="${uiLabelMap.OrderCopyQuote}">
|
||||
<platform-specific>
|
||||
@@ -145,11 +143,9 @@ under the License.
|
||||
<get-related-one value-field="quote" relation-name="StatusItem" to-value-field="statusItem"/>
|
||||
<get-related-one value-field="quote" relation-name="Uom" to-value-field="currency"/>
|
||||
<get-related-one value-field="quote" relation-name="ProductStore" to-value-field="store"/>
|
||||
|
||||
<get-related value-field="quote" relation-name="QuoteItem" list="quoteItems"/>
|
||||
<get-related value-field="quote" relation-name="QuoteAdjustment" list="quoteAdjustments"/>
|
||||
<get-related value-field="quote" relation-name="QuoteRole" list="quoteRoles"/>
|
||||
|
||||
<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"/>
|
||||
@@ -161,16 +157,28 @@ under the License.
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<!-- generate a PDF for the quote -->
|
||||
<screen name="QuoteReport">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="defaultTemplateLocation" value="component://order/widget/ordermgr/QuoteScreens.xml"/>
|
||||
<set field="defaultTemplateName" value="DefaultQuotePDF"/>
|
||||
<script location="component://commonext/groovyScripts/template/DocTypeTemplate.groovy"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
<include-screen name="${templateName}" location="${templateLocation}"/>
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="DefaultQuotePDF">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrderQuoteReport"/>
|
||||
|
||||
<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"/>
|
||||
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
|
||||
|
||||
<set field="quoteId" from-field="parameters.quoteId"/>
|
||||
<entity-one entity-name="Quote" value-field="quote"/>
|
||||
<get-related-one value-field="quote" relation-name="QuoteType" to-value-field="quoteType"/>
|
||||
@@ -179,11 +187,9 @@ under the License.
|
||||
<get-related-one value-field="quote" relation-name="ProductStore" to-value-field="store"/>
|
||||
<get-related-one value-field="quote" relation-name="Party" to-value-field="party"/>
|
||||
<get-related value-field="quote" relation-name="QuoteTerm" list="quoteTerms"/>
|
||||
|
||||
<set field="listOrderBy[]" value="quoteItemSeqId"/>
|
||||
<get-related value-field="quote" relation-name="QuoteItem" list="quoteItems" order-by-list="listOrderBy"/>
|
||||
<get-related value-field="quote" relation-name="QuoteAdjustment" list="quoteAdjustments"/>
|
||||
|
||||
<script location="component://order/groovyScripts/quote/GetPartyAddress.groovy"/>
|
||||
<!--
|
||||
<get-related value-name="quote" relation-name="QuoteRole" list-name="quoteRoles"/>
|
||||
@@ -229,27 +235,24 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditQuote">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrderQuoteEdit"/>
|
||||
<set field="headerItem" value="quote"/>
|
||||
<set field="tabButtonItem" value="EditQuote"/>
|
||||
|
||||
<set field="quoteId" from-field="parameters.quoteId"/>
|
||||
<entity-one entity-name="Quote" value-field="quote"/>
|
||||
|
||||
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${groovy: parameters.quoteId ? uiLabelMap.OrderOrderQuoteEdit : uiLabelMap.OrderNewQuote}">
|
||||
<include-form name="EditQuote" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.PartyCreateNewPartyGroup}">
|
||||
<include-form name="EditPartyGroup2" location="component://party/widget/partymgr/PartyForms.xml"/>
|
||||
<include-form name="EditPartyGroupForNewQuote" location="component://party/widget/partymgr/PartyForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
@@ -261,22 +264,15 @@ under the License.
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrderQuoteListRoles"/>
|
||||
<set field="tabButtonItem" value="ListQuoteRoles"/>
|
||||
|
||||
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
|
||||
<entity-and entity-name="QuoteRole" list="quoteRoles">
|
||||
<field-map field-name="quoteId" from-field="quote.quoteId"/>
|
||||
</entity-and>
|
||||
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.OrderOrderQuoteListRoles}">
|
||||
<container>
|
||||
<link target="EditQuoteRole" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</container>
|
||||
<screenlet title="${uiLabelMap.CommonRoles}">
|
||||
<include-form name="ListQuoteRoles" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
@@ -289,10 +285,8 @@ under the License.
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrderQuoteEditRoles"/>
|
||||
<set field="tabButtonItem" value="ListQuoteRoles"/>
|
||||
|
||||
<set field="quoteId" from-field="parameters.quoteId"/>
|
||||
<set field="quoteItemSeqId" from-field="parameters.quoteItemSeqId"/>
|
||||
|
||||
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
|
||||
<entity-one entity-name="QuoteRole" value-field="quoteRole"/>
|
||||
</actions>
|
||||
@@ -300,11 +294,6 @@ under the License.
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.OrderOrderQuoteEditRoles}">
|
||||
<container>
|
||||
<link target="EditQuoteRole" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</container>
|
||||
<include-form name="EditQuoteRole" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
@@ -317,7 +306,6 @@ under the License.
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrderQuoteListItems"/>
|
||||
<set field="tabButtonItem" value="ListQuoteItems"/>
|
||||
|
||||
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
|
||||
<set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/>
|
||||
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
|
||||
@@ -326,13 +314,11 @@ under the License.
|
||||
<field-map field-name="quoteId" from-field="quote.quoteId"/>
|
||||
<order-by field-name="quoteItemSeqId"/>
|
||||
</entity-and>
|
||||
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<include-menu name="QuoteItemSubTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
|
||||
<screenlet title="${uiLabelMap.OrderOrderQuoteListItems}">
|
||||
<screenlet title="${uiLabelMap.CommonItems}">
|
||||
<include-form name="ListQuoteItems" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
@@ -345,10 +331,8 @@ under the License.
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrderQuoteEditItems"/>
|
||||
<set field="tabButtonItem" value="ListQuoteItems"/>
|
||||
|
||||
<set field="quoteId" from-field="parameters.quoteId"/>
|
||||
<set field="quoteItemSeqId" from-field="parameters.quoteItemSeqId"/>
|
||||
|
||||
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
|
||||
<entity-one entity-name="QuoteItem" value-field="quoteItem"/>
|
||||
<entity-and entity-name="QuoteTerm" list="quoteTerms">
|
||||
@@ -359,26 +343,28 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<container>
|
||||
<include-menu name="QuoteTermSubTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
|
||||
</container>
|
||||
<container style="lefthalf">
|
||||
<screenlet title="${uiLabelMap.OrderOrderQuoteEditItems}" >
|
||||
<section>
|
||||
<condition>
|
||||
<if-empty field="quoteItemSeqId"/>
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet title="${uiLabelMap.CommonItem}">
|
||||
<include-form name="EditQuoteItem" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
</container>
|
||||
<container style="righthalf">
|
||||
<section>
|
||||
<condition>
|
||||
<not><if-empty field="quoteItemSeqId"/></not>
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet title="${uiLabelMap.OrderOrderQuoteTermList}">
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<container style="lefthalf">
|
||||
<screenlet title="${uiLabelMap.CommonItem}">
|
||||
<include-form name="EditQuoteItem" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
</container>
|
||||
<container style="righthalf">
|
||||
<screenlet title="${uiLabelMap.PartyTerms}">
|
||||
<include-form name="ListQuoteTermItem" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
</section>
|
||||
</container>
|
||||
</container>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -389,7 +375,6 @@ under the License.
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrderQuoteListAttributes"/>
|
||||
<set field="tabButtonItem" value="ListQuoteAttributes"/>
|
||||
|
||||
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
|
||||
<entity-and entity-name="QuoteAttribute" list="quoteAttributes">
|
||||
<field-map field-name="quoteId" from-field="quote.quoteId"/>
|
||||
@@ -398,12 +383,7 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.OrderOrderQuoteListAttributes}">
|
||||
<container style="basic-nav">
|
||||
<link target="EditQuoteAttribute" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</container>
|
||||
<screenlet title="${uiLabelMap.CommonAttributes}">
|
||||
<include-form name="ListQuoteAttributes" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
@@ -416,22 +396,15 @@ under the License.
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrderQuoteEditAttributes"/>
|
||||
<set field="tabButtonItem" value="ListQuoteAttributes"/>
|
||||
|
||||
<set field="quoteId" from-field="parameters.quoteId"/>
|
||||
<set field="attrName" from-field="parameters.attrName"/>
|
||||
|
||||
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
|
||||
<entity-one entity-name="QuoteAttribute" value-field="quoteAttribute"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.OrderOrderQuoteEditAttributes}">
|
||||
<container>
|
||||
<link target="EditQuoteAttribute" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</container>
|
||||
<screenlet title="${uiLabelMap.CommonAttribute}">
|
||||
<include-form name="EditQuoteAttribute" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
@@ -444,7 +417,6 @@ under the License.
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrderQuoteListCoefficients"/>
|
||||
<set field="tabButtonItem" value="ListQuoteCoefficients"/>
|
||||
|
||||
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
|
||||
<entity-and entity-name="QuoteCoefficient" list="quoteCoefficients">
|
||||
<field-map field-name="quoteId" from-field="quote.quoteId"/>
|
||||
@@ -454,11 +426,6 @@ under the License.
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.OrderOrderQuoteListCoefficients}">
|
||||
<container style="basic-nav">
|
||||
<link target="EditQuoteCoefficient" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</container>
|
||||
<include-form name="ListQuoteCoefficients" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
@@ -471,22 +438,15 @@ under the License.
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrderQuoteEditCoefficients"/>
|
||||
<set field="tabButtonItem" value="ListQuoteCoefficients"/>
|
||||
|
||||
<set field="quoteId" from-field="parameters.quoteId"/>
|
||||
<set field="attrName" from-field="parameters.coeffName"/>
|
||||
|
||||
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
|
||||
<entity-one entity-name="QuoteCoefficient" value-field="quoteCoefficient"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.OrderOrderQuoteEditCoefficients}">
|
||||
<container>
|
||||
<link target="EditQuoteCoefficient" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</container>
|
||||
<screenlet title="${uiLabelMap.CommonCoefficient}">
|
||||
<include-form name="EditQuoteCoefficient" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
@@ -502,7 +462,6 @@ under the License.
|
||||
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
|
||||
<set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/>
|
||||
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
|
||||
|
||||
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
|
||||
<entity-and entity-name="QuoteItem" list="quoteItems">
|
||||
<field-map field-name="quoteId" from-field="quote.quoteId"/>
|
||||
@@ -514,7 +473,6 @@ under the License.
|
||||
<field-map field-name="quoteId" from-field="quote.quoteId"/>
|
||||
</entity-and>
|
||||
<set from-field="quote.quoteId" field="quoteId"/>
|
||||
|
||||
<script location="component://order/groovyScripts/quote/ManageQuotePrices.groovy"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
@@ -544,7 +502,6 @@ under the License.
|
||||
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
|
||||
<set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/>
|
||||
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
|
||||
|
||||
<set field="quoteId" from-field="parameters.quoteId"/>
|
||||
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
|
||||
<entity-and entity-name="QuoteAdjustment" list="quoteAdjustments">
|
||||
@@ -575,10 +532,8 @@ under the License.
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrderQuoteEditAdjustments"/>
|
||||
<set field="tabButtonItem" value="ListQuoteAdjustments"/>
|
||||
|
||||
<set field="quoteId" from-field="parameters.quoteId"/>
|
||||
<set field="quoteAdjustmentId" from-field="parameters.quoteAdjustmentId"/>
|
||||
|
||||
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
|
||||
<entity-one entity-name="QuoteAdjustment" value-field="quoteAdjustment"/>
|
||||
</actions>
|
||||
@@ -606,7 +561,6 @@ under the License.
|
||||
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
|
||||
<set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/>
|
||||
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
|
||||
|
||||
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
|
||||
<entity-and entity-name="QuoteItem" list="quoteItems">
|
||||
<field-map field-name="quoteId" from-field="quote.quoteId"/>
|
||||
@@ -618,7 +572,6 @@ under the License.
|
||||
<field-map field-name="quoteId" from-field="quote.quoteId"/>
|
||||
</entity-and>
|
||||
<set from-field="quote.quoteId" field="quoteId"/>
|
||||
|
||||
<script location="component://order/groovyScripts/quote/ViewQuoteProfit.groovy"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
@@ -640,7 +593,6 @@ under the License.
|
||||
<actions>
|
||||
<set field="titleProperty" value="OrderOrderQuoteEditReportMail"/>
|
||||
<set field="tabButtonItem" value="ViewQuote"/>
|
||||
|
||||
<set field="quoteId" from-field="parameters.quoteId"/>
|
||||
<entity-one entity-name="Quote" value-field="quote"/>
|
||||
<get-related-one value-field="quote" relation-name="Party" to-value-field="party"/>
|
||||
@@ -666,7 +618,7 @@ under the License.
|
||||
<label text="${note}"/>
|
||||
<include-screen name="ViewQuoteInfo"/>
|
||||
<container style="clear"/>
|
||||
<include-screen name="ViewQuoteItemInfo"/>
|
||||
<include-screen name="ViewQuoteItemInfo"/>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<label style="h3">${uiLabelMap.OrderNoQuoteFound}</label>
|
||||
@@ -702,7 +654,7 @@ under the License.
|
||||
<section>
|
||||
<actions>
|
||||
<entity-one entity-name="PartyNameView" value-field="toParty">
|
||||
<field-map field-name="partyId" from-field="quote.partyId"/>
|
||||
<field-map field-name="partyId" from-field="quote.partyId"/>
|
||||
</entity-one>
|
||||
</actions>
|
||||
<widgets>
|
||||
@@ -838,7 +790,6 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<include-menu name="QuoteTermSubTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
|
||||
<screenlet title="${uiLabelMap.OrderOrderQuoteTermList}">
|
||||
<include-form name="ListQuoteTerms" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
@@ -863,12 +814,9 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<container style="button-bar button-style-1">
|
||||
<link target="createnewquotenote" text="${uiLabelMap.OrderCreateOrderQuoteNote}">
|
||||
<parameter param-name="quoteId" from-field="quote.quoteId"/>
|
||||
</link>
|
||||
</container>
|
||||
<include-form name="ListQuoteNotes" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
<screenlet id="Notes" title="${uiLabelMap.CommonNotes}">
|
||||
<include-form name="ListQuoteNotes" location="component://order/widget/ordermgr/QuoteForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -927,5 +875,4 @@ under the License.
|
||||
</fail-widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
</screens>
|
||||
|
||||
@@ -122,12 +122,7 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="CommonQuoteDecorator">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.OrderOrderQuoteWorkEfforts}">
|
||||
<container style="basic-nav">
|
||||
<link target="AddQuoteWorkEffort" text="${uiLabelMap.OrderCreateQuoteWorkEffort}" style="buttontext">
|
||||
<parameter param-name="quoteId"/>
|
||||
</link>
|
||||
</container>
|
||||
<screenlet title="${uiLabelMap.WorkEffortWorkEfforts}">
|
||||
<include-form name="ListQuoteWorkEfforts" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
|
||||
@@ -282,7 +282,7 @@ under the License.
|
||||
</drop-down>
|
||||
</field>
|
||||
<field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field>
|
||||
<field name="requirementByDate"><date-find type="date"/></field>
|
||||
<field name="requiredByDate"><date-find type="date"/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ApprovedProductRequirementsList" type="list" title="" list-name="requirementsForSupplier" paginate-target="RequirementsForSupplier"
|
||||
|
||||
@@ -109,17 +109,6 @@ under the License.
|
||||
<field use-when="returnHeader==null&&returnId==null" name="createdBy"><ignored/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<!-- UNUSED FORM
|
||||
<form name="ReturnItems" type="multi" list-name="orderItems" target="createReturnItem"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<auto-fields-service service-name="createReturnItem"/>
|
||||
<field name="itemDescription"><display/></field>
|
||||
<field name="returnId"><hidden/></field>
|
||||
<field name="orderId"><hidden/></field>
|
||||
<field name="orderItemSeqId"><hidden/></field>
|
||||
<field name="statusId"><ignored/></field>
|
||||
</form>
|
||||
-->
|
||||
<form name="FindReturns" type="single" target="findreturn" title="" default-map-name="parameters"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<field name="returnHeaderTypeId">
|
||||
@@ -149,9 +138,8 @@ under the License.
|
||||
<submit button-type="button"/>
|
||||
</field>
|
||||
</form>
|
||||
|
||||
<form name="ListReturns" type="list" target="findreturn" title="" list-name="listIt"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="findreturn">
|
||||
<grid name="ListReturns" list-name="listIt" target="findreturn" paginate-target="findreturn"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
<field-map field-name="inputFields" from-field="requestParameters"/>
|
||||
@@ -184,25 +172,24 @@ under the License.
|
||||
<field name="statusId" title="${uiLabelMap.CommonStatus}">
|
||||
<display-entity entity-name="StatusItem" key-field-name="statusId"/>
|
||||
</field>
|
||||
</form>
|
||||
|
||||
<form name="ReturnStatusHistory" type="list" list-name="orderReturnStatusHistories"
|
||||
</grid>
|
||||
<grid name="ReturnStatusHistory" list-name="orderReturnStatusHistories"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<field name="returnId"><display/></field>
|
||||
<field name="returnItemSeqId"><display/></field>
|
||||
<field name="statusId"><display-entity entity-name="StatusItem"/></field>
|
||||
<field name="statusDatetime" title="${uiLabelMap.CommonDate}"><display/></field>
|
||||
<field name="changeByUserLoginId" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
|
||||
</form>
|
||||
<form name="ReturnAndReceivedQuantityHistory" type="list" list-name="orderReturnItemHistories"
|
||||
</grid>
|
||||
<grid name="ReturnAndReceivedQuantityHistory" list-name="orderReturnItemHistories"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<field name="returnId"><display description="${returnId}"/></field>
|
||||
<field name="oldValueText"><display/></field>
|
||||
<field name="newValueText"><display/></field>
|
||||
<field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
|
||||
<field name="changedByInfo" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
|
||||
</form>
|
||||
<form name="ReturnReasonHistory" type="list" list-name="orderReturnItemHistories"
|
||||
</grid>
|
||||
<grid name="ReturnReasonHistory" list-name="orderReturnItemHistories"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<field name="returnId"><display description="${returnId}"/></field>
|
||||
<field name="oldValueText">
|
||||
@@ -213,8 +200,8 @@ under the License.
|
||||
</field>
|
||||
<field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
|
||||
<field name="changedByInfo" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
|
||||
</form>
|
||||
<form name="ReturnTypeHistory" type="list" list-name="orderReturnItemHistories"
|
||||
</grid>
|
||||
<grid name="ReturnTypeHistory" list-name="orderReturnItemHistories"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<field name="returnId"><display description="${returnId}"/></field>
|
||||
<field name="oldValueText">
|
||||
@@ -225,13 +212,13 @@ under the License.
|
||||
</field>
|
||||
<field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
|
||||
<field name="changedByInfo" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
|
||||
</form>
|
||||
<form name="ReturnPriceHistory" type="list" list-name="orderReturnItemHistories"
|
||||
</grid>
|
||||
<grid name="ReturnPriceHistory" list-name="orderReturnItemHistories"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<field name="returnId"><display description="${returnId}"/></field>
|
||||
<field name="oldValueText"><display type="currency"/></field>
|
||||
<field name="newValueText"><display type="currency"/></field>
|
||||
<field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
|
||||
<field name="changedByInfo" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
|
||||
</form>
|
||||
</grid>
|
||||
</forms>
|
||||
|
||||
@@ -68,6 +68,7 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://party/widget/partymgr/PartyMenus.xml"/>
|
||||
<section>
|
||||
<condition>
|
||||
<and>
|
||||
|
||||
@@ -29,6 +29,7 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://party/widget/partymgr/PartyMenus.xml"/>
|
||||
<section>
|
||||
<condition>
|
||||
<if-has-permission permission="PARTYMGR" action="_VIEW"/>
|
||||
|
||||
@@ -60,6 +60,7 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://party/widget/partymgr/PartyMenus.xml"/>
|
||||
<section>
|
||||
<condition>
|
||||
<if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/>
|
||||
|
||||
@@ -295,15 +295,15 @@ under the License.
|
||||
</drop-down>
|
||||
</field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
|
||||
<field name="cancelLink" title=" " widget-style="smallSubmit">
|
||||
<field name="cancelLink" use-when="partyGroup==null" title=" " widget-style="smallSubmit">
|
||||
<hyperlink description="${uiLabelMap.CommonCancelDone}" target="backHome" also-hidden="false"/>
|
||||
</field>
|
||||
</form>
|
||||
|
||||
<form name="EditPartyGroup2" type="single" target="createPartyGroup" default-map-name="partyGroup"
|
||||
<form name="EditPartyGroupForNewQuote" type="single" target="createPartyGroup" default-map-name="partyGroup" extends="EditPartyGroup"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<field name="groupName"><text size="6" maxlength="10"/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
|
||||
<field name="cancelLink"><hidden/></field>
|
||||
|
||||
</form>
|
||||
|
||||
<form name="ViewPartyGroup" type="single" default-map-name="lookupGroup">
|
||||
|
||||
@@ -30,6 +30,7 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://party/widget/partymgr/PartyMenus.xml"/>
|
||||
<section>
|
||||
<condition>
|
||||
<and>
|
||||
@@ -80,6 +81,9 @@ under the License.
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://party/widget/partymgr/PartyMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<condition>
|
||||
@@ -118,6 +122,9 @@ under the License.
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://party/widget/partymgr/PartyMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<condition>
|
||||
|
||||
@@ -37,7 +37,28 @@
|
||||
<menu-item name="partyinv" title="${uiLabelMap.PartyInvitation}"><link target="partyInvitation"/></menu-item>
|
||||
<menu-item name="importexport" title="${uiLabelMap.CommonImportExport}"><link target="ImportExport"/></menu-item>
|
||||
</menu>
|
||||
|
||||
<menu name="MainActionMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected">
|
||||
<menu-item name="newPerson" title="${uiLabelMap.PartyCreateNewPerson}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
|
||||
</or>
|
||||
</condition>
|
||||
<link target="editperson">
|
||||
<parameter param-name="create_new" value="Y"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="newPartyGroup" title="${uiLabelMap.CommonNew} ${uiLabelMap.CommonGroup}">
|
||||
<condition>
|
||||
<or>
|
||||
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
|
||||
</or>
|
||||
</condition>
|
||||
<link target="editpartygroup">
|
||||
<parameter param-name="create_new" value="Y"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
</menu>
|
||||
<menu name="PartyShortcutAppBar" title="${uiLabelMap.PartyManager}">
|
||||
<menu-item name="find" title="${uiLabelMap.PartyParties}"><link target="/partymgr/control/findparty" url-mode="inter-app"/></menu-item>
|
||||
<menu-item name="mycomm" title="${uiLabelMap.PartyMyCommunications}"><link target="/partymgr/control/MyCommunicationEvents" url-mode="inter-app"/></menu-item>
|
||||
@@ -236,22 +257,6 @@
|
||||
</menu-item>
|
||||
</menu>
|
||||
<menu name="CreateNewParty" menu-container-style="basic-nav">
|
||||
<menu-item name="create-party-group" title="${uiLabelMap.PartyCreateNewPartyGroup}">
|
||||
<condition>
|
||||
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
|
||||
</condition>
|
||||
<link target="editpartygroup">
|
||||
<parameter param-name="create_new" value="Y"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="create-person" title="${uiLabelMap.PartyCreateNewPerson}">
|
||||
<condition>
|
||||
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
|
||||
</condition>
|
||||
<link target="editperson">
|
||||
<parameter param-name="create_new" value="Y"/>
|
||||
</link>
|
||||
</menu-item>
|
||||
<menu-item name="create-customer" title="${uiLabelMap.PartyCreateNewCustomer}">
|
||||
<condition>
|
||||
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
|
||||
|
||||
@@ -41,6 +41,9 @@ under the License.
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://party/widget/partymgr/PartyMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific>
|
||||
<section>
|
||||
@@ -637,7 +640,7 @@ under the License.
|
||||
<screenlet id="AddUserLoginSecurityGroupsPanel" title="${uiLabelMap.AddUserLoginToSecurityGroup}" collapsible="true">
|
||||
<include-form name="AddUserLoginSecurityGroup" location="component://common/widget/SecurityForms.xml"/>
|
||||
</screenlet>
|
||||
<include-form name="ListUserLoginSecurityGroups" location="component://common/widget/SecurityForms.xml"/>
|
||||
<include-grid name="ListUserLoginSecurityGroups" location="component://common/widget/SecurityForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
|
||||
@@ -30,6 +30,9 @@ under the License.
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://party/widget/partymgr/PartyMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<!-- do check for PARTYMGR, _VIEW permission -->
|
||||
|
||||
@@ -3533,7 +3533,7 @@
|
||||
<value xml:lang="zh-TW">促銷包</value>
|
||||
</property>
|
||||
<property key="ProductType.description.MARKETING_PKG_AUTO">
|
||||
<value xml:lang="de">Marketingpaket</value>
|
||||
<value xml:lang="de">Marketingpaket: Automatisch produziert</value>
|
||||
<value xml:lang="en">Marketing Package: Auto Manufactured</value>
|
||||
<value xml:lang="es">Paquete de marketing</value>
|
||||
<value xml:lang="es-CL">Paquete de Marketing: Auto Fabricado</value>
|
||||
|
||||
@@ -9167,7 +9167,7 @@
|
||||
<value xml:lang="es">"Identificación de la instalación de inventario requerida"</value>
|
||||
<value xml:lang="zh">必须有库存场所标识</value>
|
||||
</property>
|
||||
|
||||
|
||||
<property key="lotIdFilledInAllowed">
|
||||
<value xml:lang="de">Erlaubt</value>
|
||||
<value xml:lang="en">Allowed</value>
|
||||
@@ -11198,6 +11198,7 @@
|
||||
<value xml:lang="zh-TW">尋找分類</value>
|
||||
</property>
|
||||
<property key="PageTitleFindCatalog">
|
||||
<value xml:lang="de">Katalog suchen</value>
|
||||
<value xml:lang="en">Find Catalog</value>
|
||||
<value xml:lang="es">Buscar Catálogo</value>
|
||||
<value xml:lang="fr">Recherche de catalogues</value>
|
||||
@@ -11331,6 +11332,7 @@
|
||||
<value xml:lang="zh-TW">尋找庫存細項標籤</value>
|
||||
</property>
|
||||
<property key="PageTitleFindProduct">
|
||||
<value xml:lang="de">Produkt suchen</value>
|
||||
<value xml:lang="en">Find Product</value>
|
||||
<value xml:lang="es">Buscar Producto</value>
|
||||
<value xml:lang="fr">Recherche d'articles</value>
|
||||
@@ -13101,7 +13103,7 @@
|
||||
</property>
|
||||
<property key="ProductAddProductsUsingDefaultQuantities">
|
||||
<value xml:lang="cs">Přidat výrobky této skupiny do košíku v přednastaveném možství</value>
|
||||
<value xml:lang="de">Produkte dieser Produktgruppe in der vorgegebenen Menge in den Warenkorb legen</value>
|
||||
<value xml:lang="de">Produkte dieser Produktkategorie in der vorgegebenen Menge in den Warenkorb legen</value>
|
||||
<value xml:lang="en">Add Products in this Category to the Cart using Default Quantities</value>
|
||||
<value xml:lang="en-GB">Add Products in this Category to the basket using default quantities</value>
|
||||
<value xml:lang="es">Agregue los productos en esta categoría al carro usando cantidades predeterminadas</value>
|
||||
@@ -13298,7 +13300,7 @@
|
||||
</property>
|
||||
<property key="ProductAdvancedSearchInCategory">
|
||||
<value xml:lang="cs">Rozšířené hledání ve skupině výrobků</value>
|
||||
<value xml:lang="de">Erweiterte Suche in der Produktgruppe</value>
|
||||
<value xml:lang="de">Erweiterte Suche in der Produktkategorie</value>
|
||||
<value xml:lang="en">Advanced Search in Category</value>
|
||||
<value xml:lang="es">Búsqueda Avanzada en las Categorías</value>
|
||||
<value xml:lang="fr">Recherche avancée dans la catégorie</value>
|
||||
@@ -13875,7 +13877,7 @@
|
||||
<value xml:lang="zh">关联</value>
|
||||
<value xml:lang="zh-TW">結合</value>
|
||||
</property>
|
||||
|
||||
|
||||
<property key="ProductOrderReturnStatus">
|
||||
<value xml:lang="de">Zurück Sendungsstatus</value>
|
||||
<value xml:lang="en">Return Shipment Status</value>
|
||||
@@ -14379,7 +14381,7 @@
|
||||
</property>
|
||||
<property key="ProductBrowseCategories">
|
||||
<value xml:lang="cs">Výběr skupiny výrobků</value>
|
||||
<value xml:lang="de">Produktgruppen durchsuchen</value>
|
||||
<value xml:lang="de">Produktkategorien durchsuchen</value>
|
||||
<value xml:lang="en">Browse Categories</value>
|
||||
<value xml:lang="es">Hojear Categorías</value>
|
||||
<value xml:lang="es-CL">Navegar Categorías</value>
|
||||
@@ -14749,7 +14751,7 @@
|
||||
<value xml:lang="de">Katalogname [ID]</value>
|
||||
<value xml:lang="en">Catalog Name [Id]</value>
|
||||
<value xml:lang="es">Nombre de Catálogo [Código]</value>
|
||||
<value xml:lang="fr">Catalogue ; Nom ; [Réf.]</value>
|
||||
<value xml:lang="fr">Nom de Catalogue [Réf.]</value>
|
||||
<value xml:lang="it">Nome catalogo [Codice]</value>
|
||||
<value xml:lang="ja">カタログ名称 [ID]</value>
|
||||
<value xml:lang="nl">Catalogusnaam [ID]</value>
|
||||
@@ -14866,7 +14868,7 @@
|
||||
</property>
|
||||
<property key="ProductCategory">
|
||||
<value xml:lang="cs">Skupina výrobků</value>
|
||||
<value xml:lang="de">Produktgruppe</value>
|
||||
<value xml:lang="de">Kategorie</value>
|
||||
<value xml:lang="en">Category</value>
|
||||
<value xml:lang="es">Categoría</value>
|
||||
<value xml:lang="fr">Catégorie</value>
|
||||
@@ -14983,7 +14985,7 @@
|
||||
</property>
|
||||
<property key="ProductCategoryNotFoundForCategoryID">
|
||||
<value xml:lang="cs">Skupina výrobků nenalezena</value>
|
||||
<value xml:lang="de">Produktgruppe wurde nicht gefunden mit ID</value>
|
||||
<value xml:lang="de">Kategorie wurde nicht gefunden mit ID</value>
|
||||
<value xml:lang="en">Category not found for Category ID</value>
|
||||
<value xml:lang="es">Categoría no encontrada por ID</value>
|
||||
<value xml:lang="fr">Aucune catégorie pour cet réf.</value>
|
||||
@@ -15000,11 +15002,11 @@
|
||||
<value xml:lang="zh-TW">沒有找到分類識別</value>
|
||||
</property>
|
||||
<property key="ProductCategoryAttrAlreadyExists">
|
||||
<value xml:lang="de">Eine Attribut mit diesem Namen existiert bereits für die Produktgruppe mit dieser ID.</value>
|
||||
<value xml:lang="de">Eine Attribut mit diesem Namen existiert bereits für die Kategorie mit dieser ID.</value>
|
||||
<value xml:lang="en">There already is an attribute with this name for a group with this ID.</value>
|
||||
</property>
|
||||
<property key="ProductCategoryAlreadyExists">
|
||||
<value xml:lang="de">Eine Produktgruppe mit dieser ID existiert bereits.</value>
|
||||
<value xml:lang="de">Eine Kategorie mit dieser ID existiert bereits.</value>
|
||||
<value xml:lang="en">There already is a Category with this ID.</value>
|
||||
</property>
|
||||
<property key="ProductCategoryNoVariants">
|
||||
@@ -15367,7 +15369,7 @@
|
||||
</property>
|
||||
<property key="ProductChooseQuickAddCategory">
|
||||
<value xml:lang="cs">Výběr zrychleným zadáním produktové skupiny</value>
|
||||
<value xml:lang="de">Auswahl einer Produktgruppe für Schnelleingabe</value>
|
||||
<value xml:lang="de">Auswahl einer Produktkategorie für Schnelleingabe</value>
|
||||
<value xml:lang="en">Choose QuickAdd Category</value>
|
||||
<value xml:lang="es">Elegir la categoría Añadir-Rápido</value>
|
||||
<value xml:lang="fr">Choisir une catégorie d'ajout-rapide</value>
|
||||
@@ -20866,6 +20868,10 @@
|
||||
<value xml:lang="zh">这个明细缺货</value>
|
||||
<value xml:lang="zh-TW">這個細項缺貨</value>
|
||||
</property>
|
||||
<property key="ProductCannotReserveInventoryNotEnoughStock">
|
||||
<value xml:lang="it">Impossibile riservare l'articolo ${parameters.productId}: quantità in stock non sufficiente nel deposito ${parameters.facilityId}. Quantità non riservata è ${parameters.quantityNotReserved}</value>
|
||||
<value xml:lang="en">Cannot reserve product ${parameters.productId}: not enough quantity left in stock for facility ${parameters.facilityId}. Quantity not reserved is ${parameters.quantityNotReserved}</value>
|
||||
</property>
|
||||
<property key="ProductItemPrc">
|
||||
<value xml:lang="de">Position Preis</value>
|
||||
<value xml:lang="en">Item Prc</value>
|
||||
@@ -23268,7 +23274,7 @@
|
||||
</property>
|
||||
<property key="ProductNoProductsInThisCategory">
|
||||
<value xml:lang="cs">V této skupině nejsou žádné výrobky</value>
|
||||
<value xml:lang="de">Es gibt keine Produkte in dieser Produktgruppe</value>
|
||||
<value xml:lang="de">Es gibt keine Produkte in dieser Produktkategorie</value>
|
||||
<value xml:lang="en">There are no products in this category</value>
|
||||
<value xml:lang="es">No hay productos en esta categoría</value>
|
||||
<value xml:lang="fr">Aucun article dans cette catégorie</value>
|
||||
@@ -25739,6 +25745,8 @@
|
||||
<value xml:lang="de">Produkt</value>
|
||||
<value xml:lang="en">Product</value>
|
||||
<value xml:lang="es">Producto</value>
|
||||
<value xml:lang="es-CL">Producto</value>
|
||||
<value xml:lang="es-MX">Producto</value>
|
||||
<value xml:lang="fr">Article</value>
|
||||
<value xml:lang="it">Prodotto</value>
|
||||
<value xml:lang="ja">製品</value>
|
||||
@@ -29046,7 +29054,7 @@
|
||||
</property>
|
||||
<property key="ProductSearchInCategory">
|
||||
<value xml:lang="cs">Hledání ve skupině výrobků</value>
|
||||
<value xml:lang="de">Suche in Produktgruppe</value>
|
||||
<value xml:lang="de">Suche in Produktkategorie</value>
|
||||
<value xml:lang="en">Search in Category</value>
|
||||
<value xml:lang="es">Buscar en la Categoría</value>
|
||||
<value xml:lang="fr">Rechercher dans la catégorie</value>
|
||||
@@ -30954,7 +30962,7 @@
|
||||
<value xml:lang="vi">Để kiểm soát cách nhìn và cảm quan và cửa hàng trực tuyến</value>
|
||||
<value xml:lang="zh">用于控制一个网店的外观感受。</value>
|
||||
<value xml:lang="zh-TW">用於控制一個網店的外觀感受.</value>
|
||||
</property>
|
||||
</property>
|
||||
<property key="ProductStoresFor">
|
||||
<value xml:lang="de">Läden für</value>
|
||||
<value xml:lang="en">Stores For</value>
|
||||
@@ -33245,4 +33253,4 @@
|
||||
<value xml:lang="zh">使用购物车数量</value>
|
||||
<value xml:lang="zh-TW">使用購物車數量</value>
|
||||
</property>
|
||||
</resource>
|
||||
</resource>
|
||||
|
||||
@@ -21,8 +21,7 @@
|
||||
|
||||
|
||||
# -- Image upload path on the server
|
||||
#FIXME the image server path need to be move on runtime
|
||||
image.server.path=${sys:getProperty('ofbiz.home')}/themes/common/images/webapp/images/${tenantId}
|
||||
image.server.path=${sys:getProperty('ofbiz.home')}/themes/common-theme/images/webapp/images/${tenantId}
|
||||
|
||||
# -- The prefix to put on auto-generated image urls (can be relative or absolute, whatever you want)
|
||||
image.url.prefix=/images/${tenantId}
|
||||
@@ -37,8 +36,7 @@ all.product.category=CATALOG1
|
||||
reactivate.product.from.receipt=Y
|
||||
|
||||
# Image upload path on the image management
|
||||
#FIXME the image management path need to be move on runtime
|
||||
image.management.path=${sys:getProperty('ofbiz.home')}/themes/common/webapp/images/products/management
|
||||
image.management.path=${sys:getProperty('ofbiz.home')}/themes/common-theme/webapp/images/products/management
|
||||
image.management.url=/images/products/management
|
||||
image.management.nameofthumbnail=-100
|
||||
image.management.autoApproveImage=Y
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
/*
|
||||
* 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 facility.storage
|
||||
|
||||
import org.apache.ofbiz.entity.GenericValue
|
||||
|
||||
/**
|
||||
* Create a Facility Location
|
||||
* @return
|
||||
*/
|
||||
def createFacilityLocation() {
|
||||
GenericValue newEntity = makeValue("FacilityLocation", parameters)
|
||||
|
||||
String locationSeqId = "${parameters.areaId ?: ''}${parameters.aisleId ?: ''}${parameters.sectionId ?: ''}${parameters.levelId ?: ''}${parameters.positionId ?: ''}"
|
||||
if (locationSeqId) {
|
||||
int i = 1
|
||||
String nextLocationSeqId = locationSeqId
|
||||
while (from("FacilityLocation")
|
||||
.where([locationSeqId: nextLocationSeqId,
|
||||
facilityId: parameters.facilityId])
|
||||
.queryOne()) {
|
||||
nextLocationSeqId = "${locationSeqId}_${i++}"
|
||||
}
|
||||
locationSeqId = nextLocationSeqId
|
||||
} else {
|
||||
locationSeqId = delegator.getNextSeqId("FacilityLocation")
|
||||
}
|
||||
|
||||
newEntity.locationSeqId = locationSeqId
|
||||
newEntity.create()
|
||||
return success(locationSeqId : newEntity.locationSeqId)
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
/*
|
||||
* 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 product.promo
|
||||
|
||||
import org.apache.ofbiz.entity.GenericValue
|
||||
|
||||
def createProductPromoCond() {
|
||||
if (parameters.carrierShipmentMethod) {
|
||||
parameters.otherValue = parameters.carrierShipmentMethod
|
||||
}
|
||||
GenericValue newEntity = makeValue("ProductPromoCond", parameters)
|
||||
delegator.setNextSubSeqId(newEntity, "productPromoCondSeqId", 2, 1)
|
||||
newEntity.create()
|
||||
return success([productPromoCondSeqId: newEntity.productPromoCondSeqId])
|
||||
}
|
||||
|
||||
def updateProductPromoCond() {
|
||||
GenericValue lookedUpValue = from("ProductPromoCond").where(parameters).queryOne()
|
||||
if (lookedUpValue) {
|
||||
if (parameters.carrierShipmentMethod) {
|
||||
parameters.otherValue = parameters.carrierShipmentMethod
|
||||
}
|
||||
lookedUpValue.setNonPKFields(parameters)
|
||||
lookedUpValue.store()
|
||||
return success()
|
||||
}
|
||||
return error(label("ServiceErrorUiLabels", "ServiceValueNotFound"))
|
||||
}
|
||||
@@ -176,6 +176,7 @@ def reserveStoreInventory() {
|
||||
List productStoreFacilities = from("ProductStoreFacility")
|
||||
.where(productStoreId: productStore.productStoreId)
|
||||
.orderBy("sequenceNum")
|
||||
.filterByDate()
|
||||
.cache()
|
||||
.queryList()
|
||||
for (GenericValue productStoreFacility : productStoreFacilities) {
|
||||
@@ -184,29 +185,28 @@ def reserveStoreInventory() {
|
||||
// TODO: must entire quantity be available in one location?
|
||||
// Right now the answer is yes, it only succeeds if one facility has sufficient inventory for the order.
|
||||
Map callServiceMapIABF = [productId: parameters.productId, facilityId: productStoreFacility.facilityId]
|
||||
logInfo("ProductStoreService:In productStoreFacilities loop: [" + parameters.facilityId + "]")
|
||||
Map serviceResultIABF = run service: "getInventoryAvailableByFacility", with: callServiceMapIABF
|
||||
BigDecimal availableToPromiseTotal = serviceResultIABF.availableToPromiseTotal
|
||||
|
||||
if (availableToPromiseTotal >= parameters.quantity) {
|
||||
storeFound = productStoreFacility
|
||||
}
|
||||
}
|
||||
}
|
||||
// didn't find anything? Take the first facility from list
|
||||
GenericValue defaultStoreFound
|
||||
if (!storeFound) {
|
||||
storeFound = productStoreFacilities.get(0)
|
||||
defaultStoreFound = productStore.getRelatedOne("Facility", true)
|
||||
}
|
||||
facilityId = storeFound.facilityId ?: ""
|
||||
facilityId = storeFound ? storeFound.facilityId : defaultStoreFound.facilityId
|
||||
Map serviceResult = run service: "reserveProductInventoryByFacility", with: [*: parameters,
|
||||
facilityId: facilityId,
|
||||
requireInventory: requireInventory,
|
||||
reserveOrderEnumId: productStore.reserveOrderEnumId]
|
||||
quantityNotReserved = serviceResult.quantityNotReserved
|
||||
logInfo("Inventory IS reserved in facility with id [${storeFound.facilityId}] for product id [${parameters.productId}]; desired quantity was ${parameters.quantity}")
|
||||
logInfo("Inventory IS reserved in facility with id [${facilityId}] for product id [${parameters.productId}]; desired quantity was ${parameters.quantity}")
|
||||
}
|
||||
} else {
|
||||
List productStoreFacilities = from("ProductStoreFacility").where(productStoreId: productStore.productStoreId, facilityId: facilityId).cache().orderBy("sequenceNum").queryList()
|
||||
List productStoreFacilities = from("ProductStoreFacility").where(productStoreId: productStore.productStoreId, facilityId: facilityId).cache().orderBy("sequenceNum").filterByDate().queryList()
|
||||
GenericValue facilityFound
|
||||
for (GenericValue productStoreFacility : productStoreFacilities) {
|
||||
// Search Product Store Facilities to insure the facility passed in is associated to the Product Store passed in
|
||||
@@ -314,6 +314,7 @@ def isStoreInventoryAvailable() {
|
||||
List productStoreFacilities = from("ProductStoreFacility")
|
||||
.where(productStoreId: productStore.productStoreId)
|
||||
.orderBy("sequenceNum")
|
||||
.filterByDate()
|
||||
.cache()
|
||||
.queryList()
|
||||
available = "N"
|
||||
|
||||
@@ -0,0 +1,119 @@
|
||||
/*
|
||||
* 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 org.apache.ofbiz.entity.GenericValue
|
||||
|
||||
|
||||
/**
|
||||
* Create a Subscription
|
||||
* @return
|
||||
*/
|
||||
def createSubscription() {
|
||||
GenericValue newEntity = makeValue('Subscription')
|
||||
String subscriptionId = parameters.subscriptionId ?: delegator.getNextSeqId('Subscription')
|
||||
newEntity.subscriptionId = subscriptionId
|
||||
|
||||
// lookup the product subscription resource (if exists)
|
||||
if (parameters.subscriptionResourceId && parameters.productId) {
|
||||
GenericValue resource = from('ProductSubscriptionResource')
|
||||
.where(subscriptionResourceId: parameters.subscriptionResourceId,
|
||||
productId: parameters.productId )
|
||||
.filterByDate()
|
||||
.orderBy('-fromDate')
|
||||
.queryFirst()
|
||||
if (resource) {
|
||||
newEntity.setNonPKFields(resource.getAllFields())
|
||||
}
|
||||
}
|
||||
|
||||
newEntity.setNonPKFields(parameters)
|
||||
newEntity.create()
|
||||
|
||||
return success(subscriptionId: subscriptionId)
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if a party has a subscription
|
||||
* @return
|
||||
*/
|
||||
def isSubscribed() {
|
||||
Map result = success()
|
||||
|
||||
Map serviceContext = [entityName: 'Subscription',
|
||||
inputFields: parameters,
|
||||
filterByDate: parameters.filterByDate ?: 'Y']
|
||||
Map serviceResult = run service: 'performFindList', with: serviceContext
|
||||
|
||||
Boolean found = serviceResult.list
|
||||
if (serviceResult.list) {
|
||||
result.subscriptionId = serviceResult.list[0].subscriptionId
|
||||
}
|
||||
result.isSubscribed = found
|
||||
return result
|
||||
}
|
||||
|
||||
/**
|
||||
* Get Subscription data
|
||||
* @return
|
||||
*/
|
||||
def getSubscription() {
|
||||
Map result = success()
|
||||
|
||||
GenericValue subscription = from('Subscription')
|
||||
.where(parameters)
|
||||
.queryOne()
|
||||
result.subscriptionId = parameters.subscriptionId
|
||||
if (subscription) result.subscription = subscription
|
||||
return result
|
||||
}
|
||||
|
||||
/**
|
||||
* Create (when not exist) or update (when exist) a Subscription attribute
|
||||
* @return
|
||||
*/
|
||||
def updateSubscriptionAttribute() {
|
||||
GenericValue lookedUpValue = from('SubscriptionAttribute')
|
||||
.where(parameters)
|
||||
.queryOne()
|
||||
if (lookedUpValue) {
|
||||
lookedUpValue.setNonPKFields(parameters)
|
||||
lookedUpValue.store()
|
||||
} else {
|
||||
GenericValue newEntity = makeValue('SubscriptionAttribute')
|
||||
newEntity.setPKFields(parameters)
|
||||
newEntity.setNonPKFields(parameters)
|
||||
newEntity.create()
|
||||
}
|
||||
return success(subscriptionId: parameters.subscriptionId)
|
||||
}
|
||||
|
||||
/**
|
||||
* Subscription permission checking logic
|
||||
* @return
|
||||
*/
|
||||
def subscriptionPermissionCheck() {
|
||||
parameters.primaryPermission = "CATALOG"
|
||||
Map result = run service: "genericBasePermissionCheck", with: parameters
|
||||
// Backwards compatibility - check for non-existent CATALOG_READ permission
|
||||
result.hasPermission = result.hasPermission ||
|
||||
(parameters.mainAction == 'VIEW' &&
|
||||
security.hasPermission('CATALOG_READ', userLogin))
|
||||
return result
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
/*
|
||||
* 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 product.supplier
|
||||
|
||||
/**
|
||||
* Get all supplier information for a product feature
|
||||
*/
|
||||
def getSupplierProductFeatures() {
|
||||
return success([supplierProductFeatures: from('SupplierProductFeature')
|
||||
.where(partyId: parameters.partyId,
|
||||
productFeatureId: parameters.productFeatureId)
|
||||
.cache()
|
||||
.queryList()])
|
||||
}
|
||||
@@ -163,7 +163,14 @@ under the License.
|
||||
-->
|
||||
<if-compare field="parameters.quantityNotReserved" operator="not-equals" value="0" type="BigDecimal">
|
||||
<if-compare field="parameters.requireInventory" operator="equals" value="Y">
|
||||
<!-- use this else pattern to accomplish the anything but Y logic, ie if not specified default to inventory NOT required -->
|
||||
<!-- if there is still quantity not reserved but ProductStore is configured to require inventory, we can
|
||||
assume here that also reserveInventory is set to Y (reserveInventory is checked by caller services).
|
||||
In such a scenario we return an error and avoid order creation.
|
||||
-->
|
||||
<add-error>
|
||||
<fail-property resource="ProductUiLabels" property="ProductCannotReserveInventoryNotEnoughStock"/>
|
||||
</add-error>
|
||||
<check-errors/>
|
||||
<else>
|
||||
<if-not-empty field="lastNonSerInventoryItem">
|
||||
<!-- subtract from quantityNotReserved from the availableToPromise of existing inventory item -->
|
||||
|
||||
@@ -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">
|
||||
|
||||
<!-- ProductPromoCond methods -->
|
||||
<simple-method method-name="createProductPromoCond" short-description="Create an ProductPromoCond">
|
||||
<make-value entity-name="ProductPromoCond" value-field="newEntity"/>
|
||||
<set-nonpk-fields map="parameters" value-field="newEntity"/>
|
||||
<if-not-empty field="parameters.carrierShipmentMethod">
|
||||
<set field="newEntity.otherValue" from-field="parameters.carrierShipmentMethod"/>
|
||||
</if-not-empty>
|
||||
<set-pk-fields map="parameters" value-field="newEntity"/>
|
||||
<make-next-seq-id value-field="newEntity" seq-field-name="productPromoCondSeqId" numeric-padding="2"/>
|
||||
<field-to-result field="newEntity.productPromoCondSeqId" result-name="productPromoCondSeqId"/>
|
||||
|
||||
<create-value value-field="newEntity"/>
|
||||
</simple-method>
|
||||
<simple-method method-name="updateProductPromoCond" short-description="Update an ProductPromoCond">
|
||||
<make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/>
|
||||
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
|
||||
<find-by-primary-key entity-name="ProductPromoCond" map="lookupPKMap" value-field="lookedUpValue"/>
|
||||
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
|
||||
<if-not-empty field="parameters.carrierShipmentMethod">
|
||||
<set field="lookedUpValue.otherValue" from-field="parameters.carrierShipmentMethod"/>
|
||||
</if-not-empty>
|
||||
<store-value value-field="lookedUpValue"/>
|
||||
</simple-method>
|
||||
</simple-methods>
|
||||
@@ -1,56 +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">
|
||||
|
||||
<!-- Facility Location Services -->
|
||||
<simple-method method-name="createFacilityLocation" short-description="Create a Facility Location">
|
||||
<make-value entity-name="FacilityLocation" value-field="newEntity"/>
|
||||
<set-nonpk-fields map="parameters" value-field="newEntity"/>
|
||||
<set field="newEntity.facilityId" from-field="parameters.facilityId"/>
|
||||
|
||||
<set field="locationSeqId" value="${parameters.areaId}${parameters.aisleId}${parameters.sectionId}${parameters.levelId}${parameters.positionId}"/>
|
||||
<!-- check to see if it exists already, if so try a simple suffix, then give up and use a sequenced id -->
|
||||
<if-not-empty field="locationSeqId">
|
||||
<set field="checkLocationSeqIdMap.locationSeqId" from-field="locationSeqId"/>
|
||||
<set field="checkLocationSeqIdMap.facilityId" from-field="parameters.facilityId"/>
|
||||
<find-by-primary-key entity-name="FacilityLocation" map="checkLocationSeqIdMap" value-field="checkLocationSeqIdValue"/>
|
||||
<if-not-empty field="checkLocationSeqIdValue">
|
||||
<set field="locationSeqId" value="${locationSeqId}_2"/>
|
||||
<set field="checkLocationSeqIdMap.locationSeqId" from-field="locationSeqId"/>
|
||||
<set field="checkLocationSeqIdMap.facilityId" from-field="parameters.facilityId"/>
|
||||
<find-by-primary-key entity-name="FacilityLocation" map="checkLocationSeqIdMap" value-field="checkLocationSeqIdValue"/>
|
||||
<if-not-empty field="checkLocationSeqIdValue">
|
||||
<set field="locationSeqId" value=""/>
|
||||
</if-not-empty>
|
||||
</if-not-empty>
|
||||
</if-not-empty>
|
||||
|
||||
<if-empty field="locationSeqId">
|
||||
<sequenced-id sequence-name="FacilityLocation" field="locationSeqId"/>
|
||||
<to-string field="locationSeqId"/>
|
||||
</if-empty>
|
||||
<set field="newEntity.locationSeqId" from-field="locationSeqId"/>
|
||||
<field-to-result field="locationSeqId" result-name="locationSeqId"/>
|
||||
|
||||
<create-value value-field="newEntity"/>
|
||||
</simple-method>
|
||||
</simple-methods>
|
||||
@@ -1,117 +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="createSubscription" short-description="Create a Subscription">
|
||||
<make-value entity-name="Subscription" value-field="newEntity"/>
|
||||
<if-empty field="parameters.subscriptionId">
|
||||
<sequenced-id sequence-name="Subscription" field="newEntity.subscriptionId"/> <!-- get the next sequenced ID -->
|
||||
<else>
|
||||
<set field="newEntity.subscriptionId" from-field="parameters.subscriptionId"/>
|
||||
</else>
|
||||
</if-empty>
|
||||
<field-to-result field="newEntity.subscriptionId" result-name="subscriptionId"/>
|
||||
|
||||
<!-- lookup the product subscription resource (if exists) -->
|
||||
<if-not-empty field="parameters.subscriptionResourceId">
|
||||
<if-not-empty field="parameters.productId">
|
||||
<entity-and entity-name="ProductSubscriptionResource" list="resourceList" filter-by-date="true">
|
||||
<field-map field-name="subscriptionResourceId" from-field="parameters.subscriptionResourceId"/>
|
||||
<field-map field-name="productId" from-field="parameters.productId"/>
|
||||
<order-by field-name="-fromDate"/>
|
||||
</entity-and>
|
||||
<first-from-list list="resourceList" entry="resource"/>
|
||||
<if-not-empty field="resource">
|
||||
<set-nonpk-fields map="resource" value-field="newEntity"/>
|
||||
</if-not-empty>
|
||||
</if-not-empty>
|
||||
</if-not-empty>
|
||||
|
||||
<set-nonpk-fields map="parameters" value-field="newEntity"/>
|
||||
<create-value value-field="newEntity"/>
|
||||
</simple-method>
|
||||
|
||||
<simple-method method-name="isSubscribed" short-description="check if a party has a subscription">
|
||||
<set field="pfInput.inputFields" from-field="parameters"/>
|
||||
<set field="pfInput.entityName" value="Subscription"/>
|
||||
<set field="pfInput.filterByDate" from-field="parameters.filterByDate" default-value="Y"/>
|
||||
|
||||
<call-service service-name="performFindList" in-map-name="pfInput">
|
||||
<result-to-field result-name="list" field="pfResultList"/>
|
||||
</call-service>
|
||||
|
||||
<if-empty field="pfResultList">
|
||||
<set field="found" value="false" type="Boolean"/>
|
||||
<else>
|
||||
<set field="found" value="true" type="Boolean"/>
|
||||
<first-from-list list="pfResultList" entry="subscription"/>
|
||||
<field-to-result field="subscription.subscriptionId" result-name="subscriptionId"/>
|
||||
</else>
|
||||
</if-empty>
|
||||
|
||||
<field-to-result field="found" result-name="isSubscribed"/>
|
||||
</simple-method>
|
||||
|
||||
<simple-method method-name="getSubscription" short-description="Get Subscription data">
|
||||
<entity-one entity-name="Subscription" value-field="subscription"/>
|
||||
<field-to-result field="parameters.subscriptionId" result-name="subscriptionId"/>
|
||||
<if-not-empty field="subscription">
|
||||
<field-to-result field="subscription" result-name="subscription"/>
|
||||
</if-not-empty>
|
||||
</simple-method>
|
||||
|
||||
<simple-method method-name="updateSubscriptionAttribute" short-description="Create (when not exist) or update (when exist) a Subscription attribute">
|
||||
<field-to-result field="parameters.subscriptionId" result-name="subscriptionId"/>
|
||||
<entity-one entity-name="SubscriptionAttribute" value-field="lookedUpValue"/>
|
||||
<if-empty field="lookedUpValue">
|
||||
<make-value entity-name="SubscriptionAttribute" value-field="newEntity"/>
|
||||
<set-pk-fields map="parameters" value-field="newEntity"/>
|
||||
<set-nonpk-fields map="parameters" value-field="newEntity"/>
|
||||
<create-value value-field="newEntity"/>
|
||||
<else>
|
||||
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
|
||||
<store-value value-field="lookedUpValue"/>
|
||||
</else>
|
||||
</if-empty>
|
||||
</simple-method>
|
||||
|
||||
<!-- ============== Permission Checking Service ============= -->
|
||||
<simple-method method-name="subscriptionPermissionCheck" short-description="Subscription permission checking logic">
|
||||
<set field="primaryPermission" value="CATALOG"/>
|
||||
<call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/>
|
||||
<!-- Backwards compatibility - check for non-existent CATALOG_READ permission -->
|
||||
<if>
|
||||
<condition>
|
||||
<and>
|
||||
<if-compare field="hasPermission" value="false" operator="equals" type="Boolean"/>
|
||||
<if-compare field="mainAction" value="VIEW" operator="equals"/>
|
||||
</and>
|
||||
</condition>
|
||||
<then>
|
||||
<if-has-permission permission="CATALOG_READ">
|
||||
<set field="hasPermission" type="Boolean" value="true"/>
|
||||
<field-to-result field="hasPermission"/>
|
||||
</if-has-permission>
|
||||
</then>
|
||||
</if>
|
||||
</simple-method>
|
||||
|
||||
</simple-methods>
|
||||
@@ -1,31 +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="getSupplierProductFeatures" short-description="Get all supplier information for a product feature" login-required="false">
|
||||
<entity-and entity-name="SupplierProductFeature" list="supplierProductFeatures">
|
||||
<field-map field-name="partyId" from-field="parameters.partyId"/>
|
||||
<field-map field-name="productFeatureId" from-field="parameters.productFeatureId"/>
|
||||
</entity-and>
|
||||
<field-to-result field="supplierProductFeatures"/>
|
||||
</simple-method>
|
||||
</simple-methods>
|
||||
@@ -528,13 +528,13 @@ under the License.
|
||||
</required-permissions>
|
||||
<auto-attributes mode="IN" include="pk" optional="false"/>
|
||||
</service>
|
||||
<service name="getSupplierProductFeatures" engine="simple"
|
||||
location="component://product/minilang/product/supplier/SupplierProductServices.xml" invoke="getSupplierProductFeatures">
|
||||
<service name="getSupplierProductFeatures" engine="groovy" invoke="getSupplierProductFeatures"
|
||||
location="component://product/groovyScripts/product/supplier/SupplierProductServices.groovy">
|
||||
<description>Finds a list of SupplierProductFeature entities based on the productFeatureId.
|
||||
If a partyId is given, only product feature information for that supplier party is returned.</description>
|
||||
<attribute name="productFeatureId" type="String" mode="IN" optional="false"/>
|
||||
<attribute name="productFeatureId" type="String" mode="IN"/>
|
||||
<attribute name="partyId" type="String" mode="IN" optional="true"/>
|
||||
<attribute name="supplierProductFeatures" type="java.util.List" mode="OUT" optional="false"/>
|
||||
<attribute name="supplierProductFeatures" type="java.util.List" mode="OUT"/>
|
||||
</service>
|
||||
|
||||
<service name="createProductMaint" default-entity-name="ProductMaint" engine="entity-auto" invoke="create" auth="true">
|
||||
@@ -944,8 +944,8 @@ under the License.
|
||||
</group>
|
||||
</service>
|
||||
|
||||
<service name="updateContentSEOForCategory" engine="simple"
|
||||
location="component://product/minilang/product/category/CategoryContentServices.xml" invoke="updateContentSEOForCategory" auth="true">
|
||||
<service name="updateContentSEOForCategory" engine="groovy"
|
||||
location="component://product/groovyScripts/product/category/CategoryContentServices.groovy" invoke="updateContentSEOForCategory" auth="true">
|
||||
<description>Update SEO Content For Product Category</description>
|
||||
<attribute name="productCategoryId" mode="IN" type="String" optional="false"/>
|
||||
<attribute name="title" mode="IN" type="String" optional="true"/>
|
||||
|
||||
@@ -917,18 +917,17 @@ under the License.
|
||||
<auto-attributes mode="IN" entity-name="FacilityAttribute" include="pk" optional="false"/>
|
||||
</service>
|
||||
|
||||
<service name="createFacilityLocation" default-entity-name="FacilityLocation" engine="simple"
|
||||
location="component://product/minilang/product/storage/StorageServices.xml" invoke="createFacilityLocation" auth="true">
|
||||
<service name="createFacilityLocation" default-entity-name="FacilityLocation" engine="groovy" invoke="createFacilityLocation"
|
||||
location="component://product/groovyScripts/facility/storage/StorageServices.groovy" auth="true">
|
||||
<description>Create a Facility Location</description>
|
||||
<permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
|
||||
<auto-attributes include="nonpk" mode="IN" optional="true"/>
|
||||
<attribute name="facilityId" type="String" mode="IN" optional="false">
|
||||
<attribute name="facilityId" type="String" mode="IN">
|
||||
<type-validate>
|
||||
<fail-property resource="ProductErrorUiLabels" property="facility.facilityId"/>
|
||||
</type-validate>
|
||||
</attribute>
|
||||
|
||||
<attribute name="locationSeqId" type="String" mode="OUT" optional="false"/>
|
||||
<attribute name="locationSeqId" type="String" mode="OUT"/>
|
||||
</service>
|
||||
<service name="updateFacilityLocation" default-entity-name="FacilityLocation" engine="entity-auto" invoke="update" auth="true">
|
||||
<description>Update a Facility Location</description>
|
||||
|
||||
@@ -256,21 +256,21 @@ under the License.
|
||||
<attribute name="codeLength" type="Integer" mode="IN" optional="true" default-value="8"/>
|
||||
<attribute name="promoCodeLayout" type="String" mode="IN" optional="true" default-value="sequence"/>
|
||||
</service>
|
||||
|
||||
<service name="createProductPromoCond" default-entity-name="ProductPromoCond" engine="simple"
|
||||
location="component://product/minilang/product/promo/PromoServices.xml" invoke="createProductPromoCond" auth="true">
|
||||
|
||||
<service name="createProductPromoCond" default-entity-name="ProductPromoCond" engine="groovy" invoke="createProductPromoCond"
|
||||
location="component://product/groovyScripts/product/promo/PromoServices.groovy" auth="true">
|
||||
<description>Create a ProductPromo</description>
|
||||
<permission-service service-name="productPriceGenericPermission" main-action="CREATE"/>
|
||||
<auto-attributes include="pk" mode="IN" optional="false"/>
|
||||
<auto-attributes include="pk" mode="IN"/>
|
||||
<auto-attributes include="nonpk" mode="IN" optional="true"/>
|
||||
<attribute name="carrierShipmentMethod" type="String" mode="IN" optional="true"/>
|
||||
<override name="productPromoCondSeqId" mode="OUT"/>
|
||||
</service>
|
||||
<service name="updateProductPromoCond" default-entity-name="ProductPromoCond" engine="simple"
|
||||
location="component://product/minilang/product/promo/PromoServices.xml" invoke="updateProductPromoCond" auth="true">
|
||||
<service name="updateProductPromoCond" default-entity-name="ProductPromoCond" engine="groovy" invoke="updateProductPromoCond"
|
||||
location="component://product/groovyScripts/product/promo/PromoServices.groovy" auth="true">
|
||||
<description>Update a ProductPromo</description>
|
||||
<permission-service service-name="productPriceGenericPermission" main-action="UPDATE"/>
|
||||
<auto-attributes include="pk" mode="IN" optional="false"/>
|
||||
<auto-attributes include="pk" mode="IN"/>
|
||||
<auto-attributes include="nonpk" mode="IN" optional="true"/>
|
||||
<attribute name="carrierShipmentMethod" type="String" mode="IN" optional="true"/>
|
||||
</service>
|
||||
|
||||
@@ -23,8 +23,8 @@ under the License.
|
||||
<description>Product Component Services for subscriptions entity (subscription entity not ContentRoles)</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
|
||||
<service name="createSubscription" default-entity-name="Subscription" auth="true" engine="simple"
|
||||
location="component://product/minilang/product/subscription/SubscriptionServices.xml" invoke="createSubscription">
|
||||
<service name="createSubscription" default-entity-name="Subscription" auth="true" engine="groovy"
|
||||
location="component://product/groovyScripts/product/subscription/SubscriptionServices.groovy" invoke="createSubscription">
|
||||
<description>Create a Subscription Record</description>
|
||||
<permission-service service-name="subscriptionPermissionCheck" main-action="CREATE"/>
|
||||
<auto-attributes include="pk" mode="INOUT" optional="true"/>
|
||||
@@ -37,8 +37,8 @@ under the License.
|
||||
<auto-attributes include="nonpk" mode="IN" optional="true"/>
|
||||
</service>
|
||||
|
||||
<service name="isSubscribed" default-entity-name="Subscription" auth="true" engine="simple"
|
||||
location="component://product/minilang/product/subscription/SubscriptionServices.xml" invoke="isSubscribed">
|
||||
<service name="isSubscribed" default-entity-name="Subscription" auth="true" engine="groovy"
|
||||
location="component://product/groovyScripts/product/subscription/SubscriptionServices.groovy" invoke="isSubscribed">
|
||||
<description>Check if a particular party has at this moment a subscription</description>
|
||||
<permission-service service-name="subscriptionPermissionCheck" main-action="VIEW"/>
|
||||
<auto-attributes include="all" mode="IN" optional="true"/>
|
||||
@@ -48,8 +48,8 @@ under the License.
|
||||
<override name="partyId" optional="false" mode="IN"/>
|
||||
</service>
|
||||
|
||||
<service name="getSubscriptionEnt" default-entity-name="Subscription" auth="true" engine="simple"
|
||||
location="component://product/minilang/product/subscription/SubscriptionServices.xml" invoke="getSubscription">
|
||||
<service name="getSubscriptionEnt" default-entity-name="Subscription" auth="true" engine="groovy"
|
||||
location="component://product/groovyScripts/product/subscription/SubscriptionServices.groovy" invoke="getSubscription">
|
||||
<description>Retrieve a single Subscription Entity Record</description>
|
||||
<permission-service service-name="subscriptionPermissionCheck" main-action="VIEW"/>
|
||||
<auto-attributes include="pk" mode="INOUT" optional="false"/>
|
||||
@@ -130,8 +130,8 @@ under the License.
|
||||
<auto-attributes include="nonpk" mode="IN" optional="true"/>
|
||||
<auto-attributes include="pk" mode="INOUT" optional="false"/>
|
||||
</service>
|
||||
<service name="updateSubscriptionAttribute" default-entity-name="SubscriptionAttribute" auth="true" engine="simple"
|
||||
location="component://product/minilang/product/subscription/SubscriptionServices.xml" invoke="updateSubscriptionAttribute">
|
||||
<service name="updateSubscriptionAttribute" default-entity-name="SubscriptionAttribute" auth="true" engine="groovy"
|
||||
location="component://product/groovyScripts/product/subscription/SubscriptionServices.groovy" invoke="updateSubscriptionAttribute">
|
||||
<description>Create (when not exist) or update (when exist) a Subscription attribute</description>
|
||||
<permission-service service-name="subscriptionPermissionCheck" main-action="UPDATE"/>
|
||||
<attribute name="subscriptionId" type="String" mode="INOUT" optional="false">
|
||||
@@ -162,8 +162,8 @@ under the License.
|
||||
<auto-attributes include="pk" mode="IN" optional="false"/>
|
||||
</service>
|
||||
|
||||
<service name="subscriptionPermissionCheck" engine="simple"
|
||||
location="component://product/minilang/product/subscription/SubscriptionServices.xml" invoke="subscriptionPermissionCheck" auth="true">
|
||||
<service name="subscriptionPermissionCheck" engine="groovy"
|
||||
location="component://product/groovyScripts/product/subscription/SubscriptionServices.groovy" invoke="subscriptionPermissionCheck" auth="true">
|
||||
<description>Subscription Permission Checking Logic</description>
|
||||
<implements service="permissionInterface"/>
|
||||
</service>
|
||||
|
||||
+6
-1
@@ -48,11 +48,12 @@ import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.StringUtil;
|
||||
import org.apache.ofbiz.base.util.UtilHttp;
|
||||
import org.apache.ofbiz.base.util.UtilValidate;
|
||||
import org.apache.ofbiz.security.SecurityUtil;
|
||||
import org.apache.ofbiz.webapp.SeoConfigUtil;
|
||||
import org.apache.ofbiz.webapp.control.ConfigXMLReader;
|
||||
import org.apache.ofbiz.webapp.control.ConfigXMLReader.ControllerConfig;
|
||||
import org.apache.ofbiz.webapp.control.ControlFilter;
|
||||
import org.apache.ofbiz.webapp.control.WebAppConfigurationException;
|
||||
import org.apache.ofbiz.webapp.SeoConfigUtil;
|
||||
import org.apache.oro.text.regex.Pattern;
|
||||
import org.apache.oro.text.regex.Perl5Matcher;
|
||||
|
||||
@@ -115,6 +116,10 @@ public final class SeoContextFilter implements Filter {
|
||||
uri = uri + "?" + queryString;
|
||||
}
|
||||
|
||||
if (SecurityUtil.containsFreemarkerInterpolation(httpRequest, httpResponse, uri)) {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean forwarded = forwardUri(httpResponse, uri);
|
||||
if (forwarded) {
|
||||
return;
|
||||
|
||||
@@ -224,6 +224,7 @@ public class ScaleImage {
|
||||
try {
|
||||
String fileToCheck = imageServerPath + "/" + newFileLocation + "." + imgExtension;
|
||||
ImageIO.write(bufNewImg, imgExtension, new File(fileToCheck));
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(fileToCheck, "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedImageFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
@@ -402,6 +403,7 @@ public class ScaleImage {
|
||||
try {
|
||||
String fileToCheck = imageServerPath + "/" + newFileLocation + "." + imgExtension;
|
||||
ImageIO.write(bufNewImg, imgExtension, new File(fileToCheck));
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(fileToCheck, "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedImageFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
|
||||
+2
-1
@@ -290,7 +290,7 @@ public class FrameImage {
|
||||
if (UtilValidate.isEmpty(imageName) || UtilValidate.isEmpty(imageData)) {
|
||||
session.setAttribute("frameContentId", request.getParameter("frameExistContentId"));
|
||||
session.setAttribute("frameDataResourceId", request.getParameter("frameExistDataResourceId"));
|
||||
request.setAttribute("_ERROR_MESSAGE_", "There is no frame image, please select the image type *.PNG uploading.");
|
||||
request.setAttribute("_ERROR_MESSAGE_", "There is no frame image, please select the image type *.PNG to upload.");
|
||||
return "error";
|
||||
}
|
||||
if (!"image/png".equals(mimType)) {
|
||||
@@ -320,6 +320,7 @@ public class FrameImage {
|
||||
}
|
||||
Path tmpFile = Files.createTempFile(null, null);
|
||||
Files.write(tmpFile, imageData.array(), StandardOpenOption.APPEND);
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(tmpFile.toString(), "Image", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
request.setAttribute("_ERROR_MESSAGE_", errorMessage);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user