Compare commits
262
Commits
| 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 |
@@ -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"
|
||||
@@ -28,7 +28,7 @@ on:
|
||||
branches: [ trunk, release* ]
|
||||
pull_request:
|
||||
# The branches below must be a subset of the branches above
|
||||
branches: [ release22.01 ]
|
||||
branches: [ trunk ]
|
||||
schedule:
|
||||
- cron: '27 15 * * 1'
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -21,9 +21,9 @@ name: Java CI with Gradle
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ release22.01 ]
|
||||
branches: [ trunk ]
|
||||
pull_request:
|
||||
branches: [ release22.01 ]
|
||||
branches: [ trunk ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
@@ -39,7 +39,7 @@ jobs:
|
||||
- name: Grant execute permission for gradlew
|
||||
run: chmod +x gradlew
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew pullAllPluginsSource check javadoc
|
||||
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
|
||||
@@ -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.
|
||||
|
||||
|
||||
+6
-6
@@ -21,16 +21,16 @@ under the License.
|
||||
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-release22.01-blue.svg[link=https://github.com/apache/ofbiz-framework]
|
||||
image:https://ci2.apache.org/badges/ofbizBranch22Framework.svg[link=https://ci2.apache.org/badges/ofbizBranch22Framework.svg]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml/badge.svg?branch=release22.01[link=https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml]
|
||||
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/next/readme/html5/[HTML]
|
||||
or https://ci.apache.org/projects/ofbiz/site/next/readme/pdf/README.pdf[PDF] format
|
||||
https://nightlies.apache.org/ofbiz/trunk/readme/html5/[HTML]
|
||||
or https://ci.apache.org/projects/ofbiz/site/trunk/readme/pdf/README.pdf[PDF] format
|
||||
|
||||
---
|
||||
|
||||
@@ -837,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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<entity-engine-xml>
|
||||
<!--
|
||||
<!--
|
||||
# what should the default of the payment to invoice processing be?
|
||||
# paymentProcessing by invoice or paymentprocessing by invoiceitem?
|
||||
# there is still a box on the menu to change this option by the user.
|
||||
@@ -27,24 +27,24 @@ under the License.
|
||||
#value YY: do not show the option box to the user and do only invoice processing
|
||||
#value NN: do not show the option box to the user and do only invoiceitem processing
|
||||
-->
|
||||
<SystemProperty systemResourceId="accounting" systemPropertyId="invoiceProcessing"
|
||||
<SystemProperty systemResourceId="accounting" systemPropertyId="invoiceProcessing"
|
||||
systemPropertyValue="YY"
|
||||
description="Options are: Y, N, YY, NN"
|
||||
/>
|
||||
|
||||
<SystemProperty systemResourceId="accounting" systemPropertyId="accounting.fixedasset.autocreate"
|
||||
<SystemProperty systemResourceId="accounting" systemPropertyId="accounting.fixedasset.autocreate"
|
||||
systemPropertyValue="Y"
|
||||
description="Create a fixed asset when an 'asset usage' type product is created. Options: Y, N"/>
|
||||
|
||||
<SystemProperty systemResourceId="accounting" systemPropertyId="accounting.payment.application.autocreate"
|
||||
<SystemProperty systemResourceId="accounting" systemPropertyId="accounting.payment.application.autocreate"
|
||||
systemPropertyValue="Y"
|
||||
description="Create a payment application when a payment is received/sent or invoice is approved (take the oldest not closed one). Options: Y, N"/>
|
||||
|
||||
<SystemProperty systemResourceId="accounting" systemPropertyId="accounting.payment.purchaseorder.autocreate"
|
||||
<SystemProperty systemResourceId="accounting" systemPropertyId="accounting.payment.purchaseorder.autocreate"
|
||||
systemPropertyValue="Y"
|
||||
description="Create a 'not-paid' payment record if the purchase order is approved. Options: Y, N"/>
|
||||
|
||||
<SystemProperty systemResourceId="accounting" systemPropertyId="accounting.payment.salesorder.autocreate"
|
||||
<SystemProperty systemResourceId="accounting" systemPropertyId="accounting.payment.salesorder.autocreate"
|
||||
systemPropertyValue="Y"
|
||||
description="Create a 'not-paid' payment record if the sales order is completed and no payment exist yet. Options:: Y, N"/>
|
||||
|
||||
|
||||
+1
@@ -20,6 +20,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
|
||||
import org.apache.ofbiz.order.shoppingcart.CheckOutEvents
|
||||
|
||||
@@ -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}">
|
||||
|
||||
@@ -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>
|
||||
|
||||
-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);
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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>
|
||||
|
||||
+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";
|
||||
}
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"/>
|
||||
@@ -160,7 +156,7 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
|
||||
<!-- generate a PDF for the quote -->
|
||||
<screen name="QuoteReport">
|
||||
<section>
|
||||
@@ -179,12 +175,10 @@ under the License.
|
||||
<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"/>
|
||||
@@ -193,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"/>
|
||||
@@ -243,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>
|
||||
@@ -275,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>
|
||||
@@ -303,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>
|
||||
@@ -314,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>
|
||||
@@ -331,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}"/>
|
||||
@@ -340,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>
|
||||
@@ -359,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">
|
||||
@@ -373,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>
|
||||
@@ -403,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"/>
|
||||
@@ -412,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>
|
||||
@@ -430,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>
|
||||
@@ -458,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"/>
|
||||
@@ -468,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>
|
||||
@@ -485,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>
|
||||
@@ -516,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"/>
|
||||
@@ -528,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>
|
||||
@@ -558,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">
|
||||
@@ -589,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>
|
||||
@@ -620,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"/>
|
||||
@@ -632,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>
|
||||
@@ -654,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"/>
|
||||
@@ -680,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>
|
||||
@@ -716,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>
|
||||
@@ -852,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>
|
||||
@@ -877,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>
|
||||
@@ -941,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>
|
||||
|
||||
@@ -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>
|
||||
@@ -13876,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>
|
||||
@@ -14750,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>
|
||||
@@ -20868,7 +20869,7 @@
|
||||
<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="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">
|
||||
@@ -25744,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>
|
||||
@@ -30959,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>
|
||||
@@ -33250,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 moved 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 moved 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"))
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
+2
-3
@@ -64,7 +64,6 @@ public final class ProductWorker {
|
||||
private ProductWorker() { }
|
||||
|
||||
public static boolean shippingApplies(GenericValue product) {
|
||||
String errMsg = "";
|
||||
if (product != null) {
|
||||
String productTypeId = product.getString("productTypeId");
|
||||
if ("SERVICE".equals(productTypeId) || "SERVICE_PRODUCT".equals(productTypeId)
|
||||
@@ -75,7 +74,7 @@ public final class ProductWorker {
|
||||
return product.get("chargeShipping") == null
|
||||
|| product.getBoolean("chargeShipping");
|
||||
}
|
||||
throw new IllegalArgumentException(errMsg);
|
||||
throw new IllegalArgumentException("No product given to analyze if it needed to ship it");
|
||||
}
|
||||
|
||||
public static boolean isBillableToAddress(GenericValue product, GenericValue postalAddress) {
|
||||
@@ -1348,8 +1347,8 @@ public final class ProductWorker {
|
||||
+ ", while filtering out of stock products.", MODULE);
|
||||
}
|
||||
} else {
|
||||
List<GenericValue> facilities = EntityQuery.use(delegator).from("ProductFacility").where("productId", productId).queryList();
|
||||
BigDecimal availableInventory = BigDecimal.ZERO;
|
||||
List<GenericValue> facilities = EntityQuery.use(delegator).from("ProductFacility").where("productId", productId).queryList();
|
||||
if (UtilValidate.isNotEmpty(facilities)) {
|
||||
for (GenericValue facility : facilities) {
|
||||
BigDecimal lastInventoryCount = facility.getBigDecimal("lastInventoryCount");
|
||||
|
||||
@@ -35,7 +35,7 @@ under the License.
|
||||
<menu-item name="Imagemanagement" title="${uiLabelMap.ImageManagement}"><link target="Imagemanagement"/></menu-item>
|
||||
</menu>
|
||||
<menu name="MainActionMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected">
|
||||
<menu-item name="newProduct" title="${uiLabelMap.CommonNew} ${uiLabelMap.CommonProduct}">
|
||||
<menu-item name="newProduct" title="${uiLabelMap.ProductCreateNewProduct}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
@@ -45,7 +45,7 @@ under the License.
|
||||
</condition>
|
||||
<link target="EditProduct"/>
|
||||
</menu-item>
|
||||
<menu-item name="newStore" title="${uiLabelMap.CommonNew} ${uiLabelMap.ProductStore}">
|
||||
<menu-item name="newStore" title="${uiLabelMap.ProductCreateNewProductStore}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
@@ -55,7 +55,7 @@ under the License.
|
||||
</condition>
|
||||
<link target="EditProductStore"/>
|
||||
</menu-item>
|
||||
<menu-item name="newCatalog" title="${uiLabelMap.CommonNew} ${uiLabelMap.Catalog}">
|
||||
<menu-item name="newCatalog" title="${uiLabelMap.ProductCreateNewCatalog}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
@@ -65,7 +65,7 @@ under the License.
|
||||
</condition>
|
||||
<link target="EditProdCatalog"/>
|
||||
</menu-item>
|
||||
<menu-item name="newCategory" title="${uiLabelMap.CommonNew} ${uiLabelMap.ProductCategory}">
|
||||
<menu-item name="newCategory" title="${uiLabelMap.ProductCreateNewCategory}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
|
||||
@@ -59,10 +59,27 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${groovy: parameters.prodCatalogId ? uiLabelMap.PageTitleEditProductCatalog : uiLabelMap.PageTitleNewProductCatalog}">
|
||||
<label style="h3">${uiLabelMap.ProductCatalogEmptyWarning}</label>
|
||||
<include-form name="EditProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
|
||||
</screenlet>
|
||||
<section>
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="CATALOG" action="_CREATE"/>
|
||||
<if-has-permission permission="CATALOG" action="_UPDATE"/>
|
||||
</or>
|
||||
</and>
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet title="${groovy: parameters.prodCatalogId ? uiLabelMap.PageTitleEditProductCatalog : uiLabelMap.PageTitleNewProductCatalog}">
|
||||
<label style="h3">${uiLabelMap.ProductCatalogEmptyWarning}</label>
|
||||
<include-form name="EditProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<screenlet>
|
||||
<include-form name="Catalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/>
|
||||
</screenlet>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
|
||||
@@ -38,8 +38,11 @@ under the License.
|
||||
</hyperlink>
|
||||
</field>
|
||||
</grid>
|
||||
|
||||
<!-- Product Category Content Forms -->
|
||||
<grid name="CategoryProducts" list-name="productCategoryMembers"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table">
|
||||
<auto-fields-entity entity-name="ProductCategoryMember" default-field-type="display"/>
|
||||
<field name="productCategoryId"><hidden/></field>
|
||||
</grid>
|
||||
<form name="AddCategoryContentAssoc" type="single" target="addContentToCategory" title="${uiLabelMap.ProductAddProductCategoryContentFromDate}"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-entity entity-name="ProductCategoryContent"/>
|
||||
|
||||
@@ -268,7 +268,7 @@ under the License.
|
||||
<include-form name="${contentFormName}" location="component://product/widget/catalog/CategoryForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.ProductListAssociatedContentInfos}">
|
||||
<include-form name="ListAssociatedContentInfos" location="component://product/widget/catalog/ProductForms.xml"/>
|
||||
<include-grid name="ListAssociatedContentInfos" location="component://product/widget/catalog/ProductForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.ProductCreateSimpleTextContentForAlternateLocale}">
|
||||
<include-form name="CreateSimpleTextContentForAlternateLocale" location="component://product/widget/catalog/CategoryForms.xml"/>
|
||||
@@ -321,17 +321,32 @@ under the License.
|
||||
<set field="titleProperty" value="PageTitleEditCategoryProducts"/>
|
||||
<set field="tabButtonItem" value="EditCategoryProducts"/>
|
||||
<set field="labelTitleProperty" value="ProductProducts"/>
|
||||
|
||||
<set field="productCategoryId" from-field="parameters.productCategoryId"/>
|
||||
|
||||
<script location="component://product/groovyScripts/catalog/category/EditCategoryProducts.groovy"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="CommonCategoryDecorator">
|
||||
<decorator-section name="body">
|
||||
<platform-specific>
|
||||
<html><html-template location="component://product/template/category/EditCategoryProducts.ftl"/></html>
|
||||
</platform-specific>
|
||||
<section>
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="CATALOG" action="_CREATE"/>
|
||||
<if-has-permission permission="CATALOG" action="_UPDATE"/>
|
||||
</or>
|
||||
</and>
|
||||
</condition>
|
||||
<widgets>
|
||||
<platform-specific>
|
||||
<html><html-template location="component://product/template/category/EditCategoryProducts.ftl"/></html>
|
||||
</platform-specific>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<screenlet>
|
||||
<include-grid name="CategoryProducts" location="component://product/widget/catalog/CategoryForms.xml"/>
|
||||
</screenlet>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
|
||||
@@ -56,6 +56,10 @@ 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="ProductConfigItem" type="single" default-map-name="configItem"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-entity entity-name="ProductConfigItem" default-field-type="display"/>
|
||||
</form>
|
||||
<form name="EditProductConfigItem" type="single" target="updateProductConfigItem" title="" default-map-name="configItem"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
|
||||
|
||||
@@ -94,16 +94,32 @@ under the License.
|
||||
<set field="headerItem" value="configs"/>
|
||||
<set field="tabButtonItem" value="EditProductConfigItem"/>
|
||||
<set field="labelTitleProperty" value="ProductConfigItem"/>
|
||||
|
||||
<set field="configItemId" from-field="parameters.configItemId"/>
|
||||
<entity-one entity-name="ProductConfigItem" value-field="configItem" auto-field-map="true"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="CommonConfigDecorator">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${groovy: configItemId ? uiLabelMap.PageTitleEditConfigItem : uiLabelMap.PageTitleNewConfigItem}">
|
||||
<include-form name="EditProductConfigItem" location="component://product/widget/catalog/ConfigForms.xml"/>
|
||||
</screenlet>
|
||||
<section>
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="CATALOG" action="_CREATE"/>
|
||||
<if-has-permission permission="CATALOG" action="_UPDATE"/>
|
||||
</or>
|
||||
</and>
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet title="${groovy: configItemId ? uiLabelMap.PageTitleEditConfigItem : uiLabelMap.PageTitleNewConfigItem}">
|
||||
<include-form name="EditProductConfigItem" location="component://product/widget/catalog/ConfigForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<screenlet id="ConfigItem">
|
||||
<include-form name="ProductConfigItem" location="component://product/widget/catalog/ConfigForms.xml"/>
|
||||
</screenlet>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
<include-form name="EditProductFeature" location="component://product/widget/catalog/FeatureForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.PageTitleEditFeaturePrice}">
|
||||
<include-form name="ListFeaturePrice" location="component://product/widget/catalog/FeatureForms.xml"/>
|
||||
<include-grid name="ListFeaturePrice" location="component://product/widget/catalog/FeatureForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.PageTitleAddFeaturePrice}">
|
||||
<include-form name="CreateFeaturePrice" location="component://product/widget/catalog/FeatureForms.xml"/>
|
||||
|
||||
@@ -20,15 +20,18 @@ under the License.
|
||||
|
||||
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd">
|
||||
<form name="Catalog" type="single" default-map-name="prodCatalog"
|
||||
header-row-style="header-row" default-table-style="basic-table" default-entity-name="ProdCatalog">
|
||||
<auto-fields-entity entity-name="ProdCatalog" default-field-type="display"/>
|
||||
</form>
|
||||
<form name="FindCatalog" type="single" target="FindCatalog" title="" default-map-name="catalog"
|
||||
header-row-style="header-row" default-table-style="basic-table" >
|
||||
<field name="prodCatalogId" title="${uiLabelMap.ProdCatalogId}"><text-find/></field>
|
||||
<field name="catalogName"><text-find/></field>
|
||||
<field name="prodCatalogId" title="${uiLabelMap.ProductCatalogNameId}"><text-find/></field>
|
||||
<field name="catalogName" title="${uiLabelMap.FormFieldTitle_prodCatalogName}"><text-find/></field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
|
||||
<submit button-type="button"/>
|
||||
</field>
|
||||
</form>
|
||||
|
||||
<grid name="ListCatalog" list-name="listIt" paginate-target="FindCatalog"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
|
||||
<actions>
|
||||
@@ -43,47 +46,39 @@ under the License.
|
||||
<field-map field-name="noConditionFind" value="Y"/>
|
||||
</service>
|
||||
</actions>
|
||||
<field name="prodCatalogId" sort-field="true" widget-style="buttontext">
|
||||
<field name="prodCatalogId" title="${uiLabelMap.ProductCatalogNameId}" sort-field="true" widget-style="buttontext">
|
||||
<hyperlink description="${prodCatalogId}" target="EditCatalog" also-hidden="false">
|
||||
<parameter param-name="prodCatalogId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
<field name="prodCatalogId" sort-field="true">
|
||||
<field name="prodCatalogId" title="${uiLabelMap.ProductCatalogNameId}" sort-field="true">
|
||||
<hyperlink description="${prodCatalogId}" target="EditProdCatalog?prodCatalogId=${prodCatalogId}"></hyperlink>
|
||||
</field>
|
||||
<field name="catalogName" sort-field="true"><display/></field>
|
||||
<field name="catalogName" title="${uiLabelMap.FormFieldTitle_prodCatalogName}" sort-field="true"><display/></field>
|
||||
<field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" sort-field="true"><display/></field>
|
||||
</grid>
|
||||
<form name="EditProdCatalog" type="single" target="updateProdCatalog" title="" default-map-name="prodCatalog"
|
||||
header-row-style="header-row" default-table-style="basic-table" default-entity-name="ProdCatalog">
|
||||
|
||||
<alt-target use-when="prodCatalog==null" target="createProdCatalog"/>
|
||||
|
||||
<auto-fields-service service-name="updateProdCatalog" map-name=""/>
|
||||
|
||||
<field use-when="prodCatalog!=null" name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}" tooltip="${uiLabelMap.ProductNotModificationRecreatingProductCatalog}."><display/></field>
|
||||
<field use-when="prodCatalog!=null" name="prodCatalogId" title="${uiLabelMap.ProductCatalogNameId}" tooltip="${uiLabelMap.ProductNotModificationRecreatingProductCatalog}."><display/></field>
|
||||
<field use-when="prodCatalog==null&&prodCatalogId!=null" name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}" tooltip="${uiLabelMap.ProductCouldNotFindProductCatalogWithId} [${prodCatalogId}]"><text size="20" maxlength="20"/></field>
|
||||
<!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too -->
|
||||
<field use-when="prodCatalog==null&&prodCatalogId==null" name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}"><text size="20" maxlength="20"/></field>
|
||||
|
||||
<field name="catalogName" required-field="true"><text size="30" maxlength="60"/></field>
|
||||
|
||||
<field name="catalogName" title="${uiLabelMap.FormFieldTitle_prodCatalogName}" required-field="true"><text size="30" maxlength="60"/></field>
|
||||
<field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}">
|
||||
<drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
|
||||
</field>
|
||||
|
||||
<field name="styleSheet" title="${uiLabelMap.ProductStyleSheet}"><text size="60" maxlength="250"/></field>
|
||||
<field name="headerLogo" title="${uiLabelMap.ProductHeaderLogo}"><text size="60" maxlength="250"/></field>
|
||||
<field name="contentPathPrefix" title="${uiLabelMap.ProductContentPathPrefix}" tooltip="${uiLabelMap.ProductPrependedImageContentPaths}"><text size="60" maxlength="250"/></field>
|
||||
<field name="templatePathPrefix" title="${uiLabelMap.ProductTemplatePathPrefix}" tooltip="${uiLabelMap.ProductPrependedTemplatePaths}"><text size="60" maxlength="250"/></field>
|
||||
|
||||
<field name="viewAllowPermReqd" title="${uiLabelMap.ProductCategoryViewAllowPermReqd}">
|
||||
<drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
|
||||
</field>
|
||||
<field name="purchaseAllowPermReqd" title="${uiLabelMap.ProductCategoryPurchaseAllowPermReqd}">
|
||||
<drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
|
||||
</field>
|
||||
|
||||
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="AddProdCatalogToParty" type="single" target="addProdCatalogToParty" title=""
|
||||
|
||||
@@ -470,6 +470,26 @@ under the License.
|
||||
</hyperlink>
|
||||
</field>
|
||||
</grid>
|
||||
|
||||
<grid name="ProductPrices" list-name="productPrices" paginate-target="EditProductPrices" separate-columns="true"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table">
|
||||
<auto-fields-entity entity-name="ProductPrice" default-field-type="display"/>
|
||||
<field name="productId"><hidden/></field>
|
||||
<field name="productPriceTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="ProductPriceType"/></field>
|
||||
<field name="productPricePurposeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ProductPricePurpose"/></field>
|
||||
<field name="currencyUomId" title="${uiLabelMap.CommonCurrency}" ><display/></field>
|
||||
<field name="productStoreGroupId" title="${uiLabelMap.CommonGroup}"><display-entity entity-name="ProductStoreGroup" description="${productStoreGroupName}"/></field>
|
||||
<field name="price" title="${uiLabelMap.CommonPrice}" widget-area-style="align-right" title-area-style="align-right"><display type="accounting-number"/></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="viewHistoryLink" title=" " widget-style="buttontext">
|
||||
<hyperlink description="${uiLabelMap.ProductHistory}" target="ProductPriceHistory" also-hidden="false">
|
||||
<parameter param-name="productId"/>
|
||||
<parameter param-name="productPriceTypeId"/>
|
||||
<parameter param-name="fromDate"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</grid>
|
||||
<form name="AddProductPaymentMethodType" type="single" target="createProductPaymentMethodType" title=""
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-service service-name="createProductPaymentMethodType"/>
|
||||
|
||||
@@ -167,7 +167,6 @@ under the License.
|
||||
<set field="titleProperty" value="PageTitleEditProductPrices"/>
|
||||
<set field="tabButtonItem" value="EditProductPrices"/>
|
||||
<set field="labelTitleProperty" value="ProductPrices"/>
|
||||
|
||||
<entity-and entity-name="ProductPrice" list="productPrices">
|
||||
<field-map field-name="productId" from-field="parameters.productId"/>
|
||||
<order-by field-name="productStoreGroupId"/>
|
||||
@@ -176,19 +175,35 @@ under the License.
|
||||
<order-by field-name="currencyUomId"/>
|
||||
<order-by field-name="fromDate"/>
|
||||
</entity-and>
|
||||
|
||||
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.PageTitleEditProductPrices}">
|
||||
<include-grid name="UpdateProductPrice" location="component://product/widget/catalog/ProductForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.PageTitleAddProductPrices}">
|
||||
<label style="h3" text="${uiLabelMap.ProductPricesWarning}"/>
|
||||
<include-form name="AddProductPrice" location="component://product/widget/catalog/ProductForms.xml"/>
|
||||
</screenlet>
|
||||
<section>
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="CATALOG" action="_CREATE"/>
|
||||
<if-has-permission permission="CATALOG" action="_UPDATE"/>
|
||||
</or>
|
||||
</and>
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet title="${uiLabelMap.PageTitleEditProductPrices}">
|
||||
<include-grid name="UpdateProductPrice" location="component://product/widget/catalog/ProductForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.PageTitleAddProductPrices}">
|
||||
<label style="h3" text="${uiLabelMap.ProductPricesWarning}"/>
|
||||
<include-form name="AddProductPrice" location="component://product/widget/catalog/ProductForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<screenlet id="ProductPrices">
|
||||
<include-grid name="ProductPrices" location="component://product/widget/catalog/ProductForms.xml"/>
|
||||
</screenlet>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -244,7 +259,7 @@ under the License.
|
||||
<include-grid name="ListSalesAgreements" location="component://product/widget/catalog/ProductForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.ProductCommissions}">
|
||||
<include-form name="ListCommissionAgreements" location="component://product/widget/catalog/ProductForms.xml"/>
|
||||
<include-grid name="ListCommissionAgreements" location="component://product/widget/catalog/ProductForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.ProductProducts}">
|
||||
<include-grid name="ListProductAgreements" location="component://product/widget/catalog/ProductForms.xml"/>
|
||||
|
||||
@@ -38,7 +38,112 @@ under the License.
|
||||
<field name="title" title="${uiLabelMap.ProductTitle}" sort-field="true"><display/></field>
|
||||
<field name="subtitle" title="${uiLabelMap.ProductSubTitle}" sort-field="true"><display/></field>
|
||||
</grid>
|
||||
|
||||
<form name="ProductStore" type="single" default-map-name="productStore"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-entity entity-name="ProductStore" default-field-type="display"/>
|
||||
<sort-order>
|
||||
<field-group title="${uiLabelMap.ProductStore}">
|
||||
<sort-field name="productStoreId"/>
|
||||
<sort-field name="primaryStoreGroupId"/>
|
||||
<sort-field name="storeName"/>
|
||||
<sort-field name="title"/>
|
||||
<sort-field name="subtitle"/>
|
||||
<sort-field name="companyName"/>
|
||||
<sort-field name="isDemoStore"/>
|
||||
<sort-field name="ecomThemeId"/>
|
||||
</field-group>
|
||||
<field-group title="${uiLabelMap.CommonInventory}" collapsible="true">
|
||||
<sort-field name="inventoryFacilityId"/>
|
||||
<sort-field name="oneInventoryFacility"/>
|
||||
<sort-field name="isImmediatelyFulfilled"/>
|
||||
<sort-field name="checkInventory"/>
|
||||
<sort-field name="requireInventory"/>
|
||||
<sort-field name="requirementMethodEnumId"/>
|
||||
<sort-field name="reserveInventory"/>
|
||||
<sort-field name="reserveOrderEnumId"/>
|
||||
<sort-field name="balanceResOnOrderCreation"/>
|
||||
<sort-field name="showOutOfStockProducts"/>
|
||||
<sort-field name="managedByLot"/>
|
||||
</field-group>
|
||||
<field-group title="${uiLabelMap.CommonShoppingCart}" collapsible="true" initially-collapsed="true">
|
||||
<sort-field name="viewCartOnAdd"/>
|
||||
<sort-field name="autoSaveCart"/>
|
||||
<sort-field name="addToCartReplaceUpsell"/>
|
||||
<sort-field name="addToCartRemoveIncompat"/>
|
||||
<sort-field name="showCheckoutGiftOptions"/>
|
||||
<sort-field name="prodSearchExcludeVariants"/>
|
||||
<sort-field name="orderDecimalQuantity"/>
|
||||
</field-group>
|
||||
<field-group title="${uiLabelMap.CommonShipping}" collapsible="true" initially-collapsed="true">
|
||||
<sort-field name="prorateShipping"/>
|
||||
<sort-field name="reqShipAddrForDigItems"/>
|
||||
<sort-field name="selectPaymentTypePerItem"/>
|
||||
<sort-field name="shipIfCaptureFails"/>
|
||||
<sort-field name="splitPayPrefPerShpGrp"/>
|
||||
</field-group>
|
||||
<field-group title="${uiLabelMap.CommonPayments}" collapsible="true" initially-collapsed="true">
|
||||
<sort-field name="payToPartyId"/>
|
||||
<sort-field name="storeCreditAccountEnumId"/>
|
||||
<sort-field name="manualAuthIsCapture"/>
|
||||
<sort-field name="retryFailedAuths"/>
|
||||
<sort-field name="daysToCancelNonPay"/>
|
||||
<sort-field name="autoOrderCcTryExp"/>
|
||||
<sort-field name="autoOrderCcTryOtherCards"/>
|
||||
<sort-field name="autoOrderCcTryLaterNsf"/>
|
||||
<sort-field name="autoOrderCcTryLaterMax"/>
|
||||
<sort-field name="storeCreditValidDays"/>
|
||||
<sort-field name="setOwnerUponIssuance"/>
|
||||
</field-group>
|
||||
<field-group title="${uiLabelMap.CommonOrders}" collapsible="true" initially-collapsed="true">
|
||||
<sort-field name="orderNumberPrefix"/>
|
||||
<sort-field name="defaultSalesChannelEnumId"/>
|
||||
<sort-field name="explodeOrderItems"/>
|
||||
<sort-field name="checkGcBalance"/>
|
||||
<sort-field name="autoInvoiceDigitalItems"/>
|
||||
<sort-field name="autoApproveInvoice"/>
|
||||
<sort-field name="autoApproveOrder"/>
|
||||
<sort-field name="reqReturnInventoryReceive"/>
|
||||
</field-group>
|
||||
<field-group title="${uiLabelMap.CommonLocalisation}" collapsible="true" initially-collapsed="true">
|
||||
<sort-field name="defaultLocaleString"/>
|
||||
<sort-field name="defaultCurrencyUomId"/>
|
||||
<sort-field name="defaultTimeZoneString"/>
|
||||
</field-group>
|
||||
<field-group title="${uiLabelMap.ProductOrdersStatus}" collapsible="true" initially-collapsed="true">
|
||||
<sort-field name="headerApprovedStatus"/>
|
||||
<sort-field name="itemApprovedStatus"/>
|
||||
<sort-field name="digitalItemApprovedStatus"/>
|
||||
<sort-field name="headerDeclinedStatus"/>
|
||||
<sort-field name="itemDeclinedStatus"/>
|
||||
<sort-field name="headerCancelStatus"/>
|
||||
<sort-field name="itemCancelStatus"/>
|
||||
</field-group>
|
||||
<field-group title="${uiLabelMap.CommonMessages}" collapsible="true" initially-collapsed="true">
|
||||
<sort-field name="authDeclinedMessage"/>
|
||||
<sort-field name="authFraudMessage"/>
|
||||
<sort-field name="authErrorMessage"/>
|
||||
</field-group>
|
||||
<field-group title="${uiLabelMap.CommonTax}" collapsible="true" initially-collapsed="true">
|
||||
<sort-field name="prorateTaxes"/>
|
||||
<sort-field name="showPricesWithVatTax"/>
|
||||
<sort-field name="showTaxIsExempt"/>
|
||||
<sort-field name="vatTaxAuthGeoId"/>
|
||||
<sort-field name="vatTaxAuthPartyId"/>
|
||||
</field-group>
|
||||
<field-group title="${uiLabelMap.CommonVisitors}" collapsible="true" initially-collapsed="true">
|
||||
<sort-field name="autoApproveReviews"/>
|
||||
<sort-field name="allowPassword"/>
|
||||
<sort-field name="defaultPassword"/>
|
||||
<sort-field name="usePrimaryEmailUsername"/>
|
||||
<sort-field name="requireCustomerRole"/>
|
||||
<sort-field name="enableAutoSuggestionList"/>
|
||||
</field-group>
|
||||
<field-group title="${uiLabelMap.CommonUpload}" collapsible="true" initially-collapsed="true">
|
||||
<sort-field name="enableDigProdUpload"/>
|
||||
<sort-field name="digProdUploadCategoryId"/>
|
||||
</field-group>
|
||||
</sort-order>
|
||||
</form>
|
||||
<form name="EditProductStore" type="single" target="updateProductStore" title="" default-map-name="productStore"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
|
||||
|
||||
@@ -53,9 +53,26 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.ProductProductStore}">
|
||||
<include-form name="EditProductStore" location="component://product/widget/catalog/StoreForms.xml"/>
|
||||
</screenlet>
|
||||
<section>
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="CATALOG" action="_CREATE"/>
|
||||
<if-has-permission permission="CATALOG" action="_UPDATE"/>
|
||||
</or>
|
||||
</and>
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet id="ProductStore">
|
||||
<include-form name="EditProductStore" location="component://product/widget/catalog/StoreForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<screenlet id="ProductStore">
|
||||
<include-form name="ProductStore" location="component://product/widget/catalog/StoreForms.xml"/>
|
||||
</screenlet>
|
||||
</fail-widgets>
|
||||
</section>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
|
||||
@@ -25,14 +25,6 @@ under the License.
|
||||
<form name="FindSubscription" default-map-name="subscription" target="FindSubscription" type="single"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-entity entity-name="Subscription" default-field-type="find"/>
|
||||
|
||||
<field name="subscriptionResourceId">
|
||||
<drop-down allow-empty="true">
|
||||
<entity-options entity-name="SubscriptionResource">
|
||||
<entity-order-by field-name="description"/>
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
<field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscriptionType}">
|
||||
<drop-down allow-empty="true">
|
||||
<entity-options entity-name="SubscriptionType">
|
||||
@@ -40,7 +32,13 @@ under the License.
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
|
||||
<field name="subscriptionResourceId">
|
||||
<drop-down allow-empty="true">
|
||||
<entity-options entity-name="SubscriptionResource">
|
||||
<entity-order-by field-name="description"/>
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
<field name="originatedFromPartyId"><lookup target-form-name="LookupPartyName"/></field>
|
||||
<field name="originatedFromRoleTypeId">
|
||||
<drop-down allow-empty="true">
|
||||
@@ -49,26 +47,23 @@ under the License.
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
|
||||
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
|
||||
<field name="roleTypeId">
|
||||
<field name="partyId" title="${uiLabelMap.CommonParty}"><lookup target-form-name="LookupPartyName"/></field>
|
||||
<field name="roleTypeId" title="${uiLabelMap.CommonRole}">
|
||||
<drop-down allow-empty="true">
|
||||
<entity-options entity-name="RoleType">
|
||||
<entity-order-by field-name="description"/>
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
|
||||
<field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field>
|
||||
<field name="productId"><lookup target-form-name="LookupProduct"/></field>
|
||||
<field name="productCategoryId"><lookup target-form-name="LookupProductCategory"/></field>
|
||||
<field name="orderId" title="${uiLabelMap.CommonOrder}"><lookup target-form-name="LookupOrderHeader"/></field>
|
||||
<field name="productId" title="${uiLabelMap.ProductProduct}"><lookup target-form-name="LookupProduct"/></field>
|
||||
<field name="productCategoryId" title="${uiLabelMap.CommonCategory}"><lookup target-form-name="LookupProductCategory"/></field>
|
||||
<field name="automaticExtend" title="Automatic Extend" ><!-- TODO: ${uiLabelMap.FormFieldTitle_automaticExtend} get overwritten with the description of the field from the entitymodel-->
|
||||
<drop-down allow-empty="true">
|
||||
<option key="Y" description="${uiLabelMap.CommonYes}"/>
|
||||
<option key="N" description="${uiLabelMap.CommonNo}"/>
|
||||
</drop-down>
|
||||
</field>
|
||||
|
||||
<field name="roleTypeId"><ignored/></field>
|
||||
<field name="canclAutmExtTimeUomId"><ignored/></field>
|
||||
<field name="canclAutmExtTime"><ignored/></field>
|
||||
@@ -93,9 +88,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="ListFindSubscription" target="" type="list" list-name="listIt"
|
||||
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table"
|
||||
paginate-target="FindSubscription" paginate="true">
|
||||
<grid name="ListFindSubscription" list-name="listIt" paginate-target="FindSubscription" paginate="true"
|
||||
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table">
|
||||
<actions>
|
||||
<service service-name="performFind" result-map-list="listIt" result-map="performFindResult">
|
||||
<field-map field-name="inputFields" from-field="parameters"/>
|
||||
@@ -105,7 +99,9 @@ under the License.
|
||||
</service>
|
||||
</actions>
|
||||
<auto-fields-entity entity-name="Subscription" default-field-type="display"/>
|
||||
|
||||
<field name="subscriptionTypeId" title="${uiLabelMap.CommonType}">
|
||||
<display-entity entity-name="SubscriptionType"/>
|
||||
</field>
|
||||
<field name="subscriptionResourceId">
|
||||
<display-entity entity-name="SubscriptionResource">
|
||||
<sub-hyperlink target="EditSubscriptionResource" description="${subscriptionResourceId}" link-style="buttontext">
|
||||
@@ -113,10 +109,6 @@ under the License.
|
||||
</sub-hyperlink>
|
||||
</display-entity>
|
||||
</field>
|
||||
<field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscriptionType}">
|
||||
<display-entity entity-name="SubscriptionType"/>
|
||||
</field>
|
||||
|
||||
<field name="originatedFromPartyId">
|
||||
<display-entity entity-name="PartyNameView" description="${groupName} ${firstName} ${lastName}" key-field-name="partyId">
|
||||
<sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${originatedFromPartyId}" link-style="buttontext">
|
||||
@@ -125,22 +117,20 @@ under the License.
|
||||
</display-entity>
|
||||
</field>
|
||||
<field name="originatedFromRoleTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
|
||||
|
||||
<field name="partyId">
|
||||
<field name="partyId" title="${uiLabelMap.CommonParty}">
|
||||
<display-entity entity-name="PartyNameView" description="${groupName} ${firstName} ${lastName}">
|
||||
<sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
|
||||
<parameter param-name="partyId"/>
|
||||
</sub-hyperlink>
|
||||
</display-entity>
|
||||
</field>
|
||||
<field name="roleTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
|
||||
|
||||
<field name="orderId" widget-style="buttontext">
|
||||
<field name="roleTypeId" title="${uiLabelMap.CommonRole}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
|
||||
<field name="orderId" title="${uiLabelMap.CommonOrder}" widget-style="buttontext">
|
||||
<hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app">
|
||||
<parameter param-name="orderId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
<field name="productId">
|
||||
<field name="productId" title="${uiLabelMap.ProductProduct}">
|
||||
<display-entity entity-name="Product" description="${productName}">
|
||||
<sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}" link-style="buttontext">
|
||||
<parameter param-name="productId"/>
|
||||
@@ -154,7 +144,6 @@ under the License.
|
||||
</sub-hyperlink>
|
||||
</display-entity>
|
||||
</field>
|
||||
|
||||
<field name="roleTypeId"><ignored/></field>
|
||||
<field name="canclAutmExtTimeUomId"><ignored/></field>
|
||||
<field name="canclAutmExtTime"><ignored/></field>
|
||||
@@ -176,22 +165,26 @@ under the License.
|
||||
<field name="useTimeUomId"><ignored/></field>
|
||||
<field name="purchaseFromDate"><ignored/></field>
|
||||
<field name="purchaseThruDate"><ignored/></field>
|
||||
|
||||
<field name="subscriptionId" widget-style="buttontext">
|
||||
<hyperlink description="${subscriptionId}" target="EditSubscription" also-hidden="false">
|
||||
<parameter param-name="subscriptionId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="EditSubscription" type="single" target="updateSubscription" default-map-name="subscription"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<alt-target use-when="subscription==null" target="createSubscription"/>
|
||||
<auto-fields-service service-name="updateSubscription"/>
|
||||
|
||||
<field use-when="subscription!=null" name="subscriptionId"><display/></field>
|
||||
<field use-when="subscription==null&&subscriptionId==null" name="subscriptionId"><ignored/></field>
|
||||
<field use-when="subscription==null&&subscriptionId!=null" name="subscriptionId"><display description="${uiLabelMap.CommonCannotBeFound}: [${subscriptionId}]" also-hidden="false"/></field>
|
||||
|
||||
<field name="subscriptionTypeId" title="${uiLabelMap.CommonType}">
|
||||
<drop-down allow-empty="true">
|
||||
<entity-options entity-name="SubscriptionType">
|
||||
<entity-order-by field-name="description"/>
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
<field name="subscriptionResourceId">
|
||||
<drop-down allow-empty="false">
|
||||
<entity-options entity-name="SubscriptionResource">
|
||||
@@ -199,14 +192,6 @@ under the License.
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
<field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscriptionType}">
|
||||
<drop-down allow-empty="true">
|
||||
<entity-options entity-name="SubscriptionType">
|
||||
<entity-order-by field-name="description"/>
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
|
||||
<field name="originatedFromPartyId">
|
||||
<lookup target-form-name="LookupPartyName">
|
||||
<sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${subscription.originatedFromPartyId}" link-style="buttontext">
|
||||
@@ -221,8 +206,7 @@ under the License.
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
|
||||
<field name="partyId">
|
||||
<field name="partyId" title="${uiLabelMap.CommonParty}">
|
||||
<lookup target-form-name="LookupPartyName">
|
||||
<sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${subscription.partyId}" link-style="buttontext">
|
||||
<parameter param-name="partyId" from-field="subscription.partyId"/>
|
||||
@@ -236,7 +220,6 @@ under the License.
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
|
||||
<field name="partyNeedId">
|
||||
<lookup target-form-name="LookupPartyName">
|
||||
<sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${subscription.partyId}" link-style="buttontext">
|
||||
@@ -251,15 +234,14 @@ under the License.
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
|
||||
<field name="orderId">
|
||||
<field name="orderId" title="${uiLabelMap.CommonOrder}">
|
||||
<lookup target-form-name="LookupOrderHeader">
|
||||
<sub-hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${subscription.orderId}" link-style="buttontext">
|
||||
<parameter param-name="orderId" from-field="subscription.orderId"/>
|
||||
</sub-hyperlink>
|
||||
</lookup>
|
||||
</field>
|
||||
<field name="productId">
|
||||
<field name="productId" title="${uiLabelMap.ProductProduct}">
|
||||
<lookup target-form-name="LookupProduct">
|
||||
<sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${subscription.productId}" link-style="buttontext">
|
||||
<parameter param-name="productId" from-field="subscription.productId"/>
|
||||
@@ -306,8 +288,6 @@ under the License.
|
||||
</field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
|
||||
<!-- SubscriptionResource Forms -->
|
||||
<form name="ListSubscriptionResources" type="list" list-name="examples"
|
||||
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table"
|
||||
paginate-target="FindSubscriptionResource">
|
||||
@@ -317,9 +297,7 @@ under the License.
|
||||
</entity-condition>
|
||||
</actions>
|
||||
<auto-fields-entity entity-name="SubscriptionResource" default-field-type="display"/>
|
||||
|
||||
<field name="parentResourceId"><ignored/></field>
|
||||
|
||||
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
|
||||
<field name="contentId">
|
||||
<display-entity entity-name="Content" description="${contentName}">
|
||||
@@ -335,7 +313,6 @@ under the License.
|
||||
</sub-hyperlink>
|
||||
</display-entity>
|
||||
</field>
|
||||
|
||||
<field name="subscriptionResourceId" widget-style="buttontext">
|
||||
<hyperlink description="${subscriptionResourceId}" target="EditSubscriptionResource" also-hidden="false">
|
||||
<parameter param-name="subscriptionResourceId"/>
|
||||
@@ -346,28 +323,24 @@ under the License.
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<alt-target use-when="subscriptionResource==null" target="createSubscriptionResource"/>
|
||||
<auto-fields-service service-name="updateSubscriptionResource"/>
|
||||
|
||||
<field use-when="subscriptionResource!=null" name="subscriptionResourceId"><display/></field>
|
||||
<field use-when="subscriptionResource==null&&subscriptionResourceId==null" name="subscriptionResourceId"><ignored/></field>
|
||||
<field use-when="subscriptionResource==null&&subscriptionResourceId!=null" name="subscriptionResourceId"><display description="${uiLabelMap.CommonCannotBeFound}: [${subscriptionResourceId}]" also-hidden="false"/></field>
|
||||
|
||||
<field use-when="subscriptionResource==null&&subscriptionResourceId!=null" name="subscriptionResourceId">
|
||||
<display description="${uiLabelMap.CommonCannotBeFound}: [${subscriptionResourceId}]" also-hidden="false"/>
|
||||
</field>
|
||||
<field name="parentResourceId"><ignored/></field>
|
||||
|
||||
<field name="description" title="${uiLabelMap.CommonDescription}"/>
|
||||
<field name="contentId"><lookup target-form-name="LookupContent"/></field>
|
||||
<field name="webSiteId">
|
||||
<field name="contentId" title="${uiLabelMap.CommonContent}"><lookup target-form-name="LookupContent"/></field>
|
||||
<field name="webSiteId" title="${uiLabelMap.CommonWebsite}">
|
||||
<drop-down allow-empty="true">
|
||||
<entity-options entity-name="WebSite" description="${siteName} [${webSiteId}]">
|
||||
<entity-order-by field-name="siteName"/>
|
||||
</entity-options>
|
||||
</drop-down>
|
||||
</field>
|
||||
|
||||
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
|
||||
<!-- ProductSubscriptionResource -->
|
||||
<form name="ListSubscriptionResourceProducts" type="list" list-name="productSubscriptionResource" target="updateProductSubscriptionResourceSr"
|
||||
<grid name="ListSubscriptionResourceProducts" list-name="productSubscriptionResource" target="updateProductSubscriptionResourceSr"
|
||||
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table">
|
||||
<actions>
|
||||
<entity-condition entity-name="ProductSubscriptionResource">
|
||||
@@ -377,9 +350,8 @@ under the License.
|
||||
</entity-condition>
|
||||
</actions>
|
||||
<auto-fields-service service-name="updateProductSubscriptionResource"/>
|
||||
|
||||
<field name="subscriptionResourceId"><hidden/></field>
|
||||
<field name="productId"><display/></field>
|
||||
<field name="productId" title="${uiLabelMap.ProductProduct}"><display/></field>
|
||||
<field name="useTimeUomId">
|
||||
<drop-down>
|
||||
<entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
|
||||
@@ -417,13 +389,12 @@ under the License.
|
||||
</hyperlink>
|
||||
</field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="AddSubscriptionResourceProduct" type="single" target="createProductSubscriptionResourceSr" title=""
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-service service-name="createProductSubscriptionResource"/>
|
||||
|
||||
<field name="subscriptionResourceId"><hidden/></field>
|
||||
<field name="productId"><lookup target-form-name="LookupProduct"/></field>
|
||||
<field name="productId" title="${uiLabelMap.ProductProduct}"><lookup target-form-name="LookupProduct"/></field>
|
||||
<field name="useTimeUomId">
|
||||
<drop-down allow-empty="false">
|
||||
<entity-options entity-name="Uom" key-field-name="uomId" description="${description} (${abbreviation})">
|
||||
@@ -455,10 +426,9 @@ under the License.
|
||||
</field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="EditSubscriptionAttributes" type="list" list-name="subscriptionAttributes" target="UpdateSubscriptionAttribute"
|
||||
<form name="EditSubscriptionAttributes" list-name="subscriptionAttributes" target="UpdateSubscriptionAttribute"
|
||||
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true">
|
||||
<auto-fields-service service-name="updateSubscriptionAttribute"/>
|
||||
|
||||
<field name="subscriptionId"><hidden/></field>
|
||||
<field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
@@ -468,9 +438,7 @@ under the License.
|
||||
<field name="subscriptionId"><hidden/></field>
|
||||
<field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
|
||||
<!-- Subscription Communication Event -->
|
||||
<form name="ListSubscriptionCommEvent" type="list" list-name="subscriptionCommEvent" target="ListSubscriptionCommEvent"
|
||||
<grid name="ListSubscriptionCommEvent" list-name="subscriptionCommEvent" target="ListSubscriptionCommEvent"
|
||||
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table">
|
||||
<actions>
|
||||
<entity-condition entity-name="SubscriptionAndCommEvent">
|
||||
@@ -503,7 +471,7 @@ under the License.
|
||||
<parameter param-name="communicationEventId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="CreateSubscriptionCommEvent" type="single" target="createSubscriptionCommEvent" title=""
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-service service-name="createSubscriptionCommEvent"/>
|
||||
|
||||
@@ -20,7 +20,6 @@ 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">
|
||||
|
||||
<!-- Subscription Screens -->
|
||||
<screen name="FindSubscription">
|
||||
<section>
|
||||
@@ -54,7 +53,7 @@ under the License.
|
||||
<include-form name="FindSubscription" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="search-results">
|
||||
<include-form name="ListFindSubscription" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
<include-grid name="ListFindSubscription" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -67,7 +66,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="CommonSubscriptionDecorator">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -79,7 +77,7 @@ under the License.
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="left-column">
|
||||
<include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<condition>
|
||||
@@ -117,7 +115,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditSubscription">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -143,7 +140,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditSubscriptionAttributes">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -161,13 +157,12 @@ under the License.
|
||||
<screenlet id="addSubscriptionAttribute" title="${uiLabelMap.PageTitleAddSubscriptionAttributes}" collapsible="true">
|
||||
<include-form name="AddSubscriptionAttribute" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
</screenlet>
|
||||
<include-form name="EditSubscriptionAttributes" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
<include-grid name="EditSubscriptionAttributes" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<!-- SubscriptionResource Screens -->
|
||||
<screen name="FindSubscriptionResource">
|
||||
<section>
|
||||
@@ -187,7 +182,7 @@ under the License.
|
||||
<container style="button-bar">
|
||||
<link target="EditSubscriptionResource" text="${uiLabelMap.ProductNewSubscriptionResource}" style="buttontext create"/>
|
||||
</container>
|
||||
<include-form name="ListSubscriptionResources" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
<include-grid name="ListSubscriptionResources" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
</widgets>
|
||||
<fail-widgets>
|
||||
<label>${uiLabelMap.ProductSubscriptionViewPermissionError}</label>
|
||||
@@ -198,7 +193,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="CommonSubscriptionResourceDecorator">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -210,7 +204,7 @@ under the License.
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="left-column">
|
||||
<include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<condition>
|
||||
@@ -246,7 +240,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditSubscriptionResource">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -272,7 +265,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditSubscriptionResourceProducts">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -286,13 +278,12 @@ under the License.
|
||||
<screenlet id="addSubscriptionResourceProduct" title="${uiLabelMap.PageTitleAddSubscriptionResourceProducts}" collapsible="true">
|
||||
<include-form name="AddSubscriptionResourceProduct" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
</screenlet>
|
||||
<include-form name="ListSubscriptionResourceProducts" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
<include-grid name="ListSubscriptionResourceProducts" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditSubscriptionCommEvent">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -309,11 +300,10 @@ under the License.
|
||||
<screenlet id="addSubscriptionCommEvent" title="${uiLabelMap.PageTitleAddSubscriptionCommEvent}" collapsible="true">
|
||||
<include-form name="CreateSubscriptionCommEvent" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
</screenlet>
|
||||
<include-form name="ListSubscriptionCommEvent" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
<include-grid name="ListSubscriptionCommEvent" location="component://product/widget/catalog/SubscriptionForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
</screens>
|
||||
|
||||
@@ -714,7 +714,9 @@ under the License.
|
||||
<screenlet id="add-facility-group-member" title="${uiLabelMap.ProductAddFacilityGroupMember}" collapsible="true">
|
||||
<include-form name="AddGroupToFacility" location="component://product/widget/facility/FacilityForms.xml"/>
|
||||
</screenlet>
|
||||
<include-grid name="EditFacilityGroups" location="component://product/widget/facility/FacilityForms.xml"/>
|
||||
<screenlet>
|
||||
<include-grid name="EditFacilityGroups" location="component://product/widget/facility/FacilityForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -745,7 +747,9 @@ under the License.
|
||||
<screenlet id="add-facility-party-role" title="${uiLabelMap.ProductAddFacilityPartyRole}" collapsible="true">
|
||||
<include-form name="AddPartyToFacility" location="component://product/widget/facility/FacilityForms.xml"/>
|
||||
</screenlet>
|
||||
<include-grid name="EditFacilityParties" location="component://product/widget/facility/FacilityForms.xml"/>
|
||||
<screenlet>
|
||||
<include-grid name="EditFacilityParties" location="component://product/widget/facility/FacilityForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -915,7 +919,7 @@ under the License.
|
||||
</condition>
|
||||
<widgets>
|
||||
<screenlet id="inventory-item-reservations" title="${uiLabelMap.ProductInventoryItemReservations}" initially-collapsed="true">
|
||||
<include-form name="InventoryItemReservations" location="component://product/widget/facility/InventoryForms.xml"/>
|
||||
<include-grid name="InventoryItemReservations" location="component://product/widget/facility/InventoryForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
</section>
|
||||
@@ -929,7 +933,9 @@ under the License.
|
||||
<widgets>
|
||||
<screenlet id="physical-inventory-variances" title="${uiLabelMap.ProductPhysicalInventoryVariances}" initially-collapsed="true">
|
||||
<include-form name="CreatePhysicalInventoryAndVariance" location="component://product/widget/facility/InventoryForms.xml"/>
|
||||
<include-form name="ViewPhysicalInventoryAndVariance" location="component://product/widget/facility/InventoryForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet>
|
||||
<include-grid name="ViewPhysicalInventoryAndVariance" location="component://product/widget/facility/InventoryForms.xml"/>
|
||||
</screenlet>
|
||||
</widgets>
|
||||
</section>
|
||||
@@ -962,10 +968,10 @@ under the License.
|
||||
<decorator-section name="body">
|
||||
<include-menu name="InventoryItemTabBar" location="component://product/widget/facility/FacilityMenus.xml"/>
|
||||
<screenlet title="${uiLabelMap.ProductInventoryDetails} ${uiLabelMap.CommonFor} [${inventoryItemId}]">
|
||||
<include-form name="ListInventoryItemDetail" location="component://product/widget/facility/InventoryForms.xml"/>
|
||||
<include-grid name="ListInventoryItemDetail" location="component://product/widget/facility/InventoryForms.xml"/>
|
||||
</screenlet>
|
||||
<screenlet title="${uiLabelMap.ProductShipmentReceiptsFor} [${inventoryItemId}]">
|
||||
<include-form name="ViewInventoryItemShipmentReceipts" location="component://product/widget/facility/InventoryForms.xml"/>
|
||||
<include-grid name="ViewInventoryItemShipmentReceipts" location="component://product/widget/facility/InventoryForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
@@ -997,7 +1003,9 @@ under the License.
|
||||
<screenlet id="AddInventoryItemLabelPanel" title="${uiLabelMap.ProductInventoryItemLabels} ${uiLabelMap.CommonFor} [${inventoryItemId}]" collapsible="true">
|
||||
<include-form name="AddInventoryItemLabelAppl" location="component://product/widget/facility/InventoryForms.xml"/>
|
||||
</screenlet>
|
||||
<include-form name="UpdateInventoryItemLabelAppls" location="component://product/widget/facility/InventoryForms.xml"/>
|
||||
<screenlet>
|
||||
<include-grid name="UpdateInventoryItemLabelAppls" location="component://product/widget/facility/InventoryForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -1505,7 +1513,9 @@ under the License.
|
||||
<screenlet id="add-facility-content" title="${uiLabelMap.ProductAddFacilityContent}" collapsible="true">
|
||||
<include-form name="AddFacilityContent" location="component://product/widget/facility/FacilityForms.xml"/>
|
||||
</screenlet>
|
||||
<include-grid name="ListFacilityContent" location="component://product/widget/facility/FacilityForms.xml"/>
|
||||
<screenlet>
|
||||
<include-grid name="ListFacilityContent" location="component://product/widget/facility/FacilityForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
|
||||
@@ -169,14 +169,14 @@ under the License.
|
||||
<field name="comments"/>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="ViewPhysicalInventoryAndVariance" type="list" target="" title="" list-name="physicalInventoryAndVarianceDatas"
|
||||
<grid name="ViewPhysicalInventoryAndVariance" list-name="physicalInventoryAndVarianceDatas"
|
||||
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<auto-fields-entity entity-name="PhysicalInventoryAndVariance" map-name="physicalInventoryAndVariance" default-field-type="display"/>
|
||||
<field name="inventoryItemId"><hidden/></field>
|
||||
<field name="partyId"><display description="${person.firstName} ${person.lastName} ${partyGroup.groupName} [${physicalInventoryAndVariance.partyId}]"/></field>
|
||||
<field name="varianceReasonId"><display description="${varianceReason.description}"/></field>
|
||||
</form>
|
||||
<form name="ViewInventoryItemShipmentReceipts" type="list" target="" title="" list-name="shipmentReceiptList"
|
||||
</grid>
|
||||
<grid name="ViewInventoryItemShipmentReceipts" list-name="shipmentReceiptList"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<entity-and entity-name="ShipmentReceipt" list="shipmentReceiptList">
|
||||
@@ -185,9 +185,8 @@ under the License.
|
||||
</actions>
|
||||
<auto-fields-entity entity-name="ShipmentReceipt" map-name="shipmentReceipt" default-field-type="display"/>
|
||||
<field name="inventoryItemId"><hidden/></field>
|
||||
</form>
|
||||
|
||||
<form name="ListInventoryItemDetail" type="list" target="" title="" list-name="inventoryItemDetails"
|
||||
</grid>
|
||||
<grid name="ListInventoryItemDetail" list-name="inventoryItemDetails"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<auto-fields-entity entity-name="InventoryItemDetail" map-name="inventoryItemDetail" default-field-type="display"/>
|
||||
<field name="inventoryItemId"><hidden/></field> <!-- this field is redundant -->
|
||||
@@ -204,10 +203,8 @@ under the License.
|
||||
<field name="reasonEnumId">
|
||||
<display-entity entity-name="Enumeration" key-field-name="enumId"/>
|
||||
</field>
|
||||
<!-- workEffortId - not sure if it's better to show manufacturing or workeffort app
|
||||
itemIssuanceId, receiptId, physicalInventoryId - no natural screens to show these -->
|
||||
</form>
|
||||
<form name="InventoryItemReservations" type="list" target="" title="" list-name="inventoryItemReservations"
|
||||
</grid>
|
||||
<grid name="InventoryItemReservations" list-name="inventoryItemReservations"
|
||||
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<auto-fields-entity entity-name="OrderItemShipGrpInvRes" default-field-type="display"/>
|
||||
<field name="inventoryItemId"><hidden/></field>
|
||||
@@ -216,9 +213,8 @@ under the License.
|
||||
<parameter param-name="orderId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
<!-- Inventory Item Labels -->
|
||||
<form name="UpdateInventoryItemLabelAppls" type="list" target="updateInventoryItemLabelApplFromItem" title="" list-name="inventoryItemLabelAppls"
|
||||
</grid>
|
||||
<grid name="UpdateInventoryItemLabelAppls" list-name="inventoryItemLabelAppls" target="updateInventoryItemLabelApplFromItem"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<auto-fields-service service-name="updateInventoryItemLabelAppl"/>
|
||||
<field name="inventoryItemLabelId" title=" " widget-style="buttontext">
|
||||
@@ -240,7 +236,7 @@ under the License.
|
||||
<parameter param-name="facilityId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="AddInventoryItemLabelAppl" type="single" target="createInventoryItemLabelApplFromItem" title=""
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-service service-name="createInventoryItemLabelAppl"/>
|
||||
|
||||
@@ -35,7 +35,7 @@ under the License.
|
||||
</field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="UpdateInventoryItemLabelTypes" type="list" target="updateInventoryItemLabelType" title="" list-name="inventoryItemLabelTypes"
|
||||
<grid name="UpdateInventoryItemLabelTypes" list-name="inventoryItemLabelTypes" target="updateInventoryItemLabelType"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
|
||||
<auto-fields-service service-name="updateInventoryItemLabelType"/>
|
||||
<field name="inventoryItemLabelTypeId"><display/></field>
|
||||
@@ -52,8 +52,8 @@ under the License.
|
||||
<parameter param-name="inventoryItemLabelTypeId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
<form name="ListInventoryItemLabels" type="list" title="" list-name="inventoryItemLabels"
|
||||
</grid>
|
||||
<grid name="ListInventoryItemLabels" list-name="inventoryItemLabels"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<auto-fields-entity entity-name="InventoryItemLabel" default-field-type="display"/>
|
||||
<field name="inventoryItemLabelId" widget-style="buttontext">
|
||||
@@ -69,7 +69,7 @@ under the License.
|
||||
<parameter param-name="inventoryItemLabelId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="EditInventoryItemLabel" type="single" target="createInventoryItemLabel" title="" default-map-name="inventoryItemLabel"
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<alt-target target="updateInventoryItemLabel" use-when="inventoryItemLabel!=null"/>
|
||||
@@ -87,7 +87,7 @@ under the License.
|
||||
</field>
|
||||
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="UpdateInventoryItemLabelAppls" type="list" target="updateInventoryItemLabelAppl" title="" list-name="inventoryItemLabelAppls"
|
||||
<grid name="UpdateInventoryItemLabelAppls" list-name="inventoryItemLabelAppls" target="updateInventoryItemLabelAppl"
|
||||
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
|
||||
<auto-fields-service service-name="updateInventoryItemLabelAppl"/>
|
||||
<field name="inventoryItemLabelId"><hidden/></field>
|
||||
@@ -107,7 +107,7 @@ under the License.
|
||||
<parameter param-name="inventoryItemLabelId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
</form>
|
||||
</grid>
|
||||
<form name="AddInventoryItemLabelAppl" type="single" target="createInventoryItemLabelAppl" title=""
|
||||
header-row-style="header-row" default-table-style="basic-table">
|
||||
<auto-fields-service service-name="createInventoryItemLabelAppl"/>
|
||||
|
||||
@@ -36,7 +36,7 @@ under the License.
|
||||
<link target="EditInventoryItemLabel" text="${uiLabelMap.CommonNew}" style="buttontext create"/>
|
||||
</container>
|
||||
<screenlet title="${uiLabelMap.PageTitleFindInventoryItemLabels}">
|
||||
<include-form name="ListInventoryItemLabels" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
|
||||
<include-grid name="ListInventoryItemLabels" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
|
||||
</screenlet>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
@@ -57,7 +57,7 @@ under the License.
|
||||
<screenlet id="AddInventoryItemLabelTypePanel" title="${uiLabelMap.PageTitleAddInventoryItemLabelTypes}" collapsible="true">
|
||||
<include-form name="AddInventoryItemLabelType" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
|
||||
</screenlet>
|
||||
<include-form name="UpdateInventoryItemLabelTypes" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
|
||||
<include-grid name="UpdateInventoryItemLabelTypes" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
@@ -120,7 +120,7 @@ under the License.
|
||||
<screenlet id="AddInventoryItemLabelApplPanel" title="${uiLabelMap.PageTitleAddInventoryItemLabelAppls}" collapsible="true">
|
||||
<include-form name="AddInventoryItemLabelAppl" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
|
||||
</screenlet>
|
||||
<include-form name="UpdateInventoryItemLabelAppls" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
|
||||
<include-grid name="UpdateInventoryItemLabelAppls" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
|
||||
</decorator-section>
|
||||
</decorator-screen>
|
||||
</widgets>
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
<value xml:lang="fr">Date d'achèvement réelle</value>
|
||||
<value xml:lang="it">Data fine attuale</value>
|
||||
<value xml:lang="ja">実績終了日</value>
|
||||
<value xml:lang="nl">Einddatum</value>
|
||||
<value xml:lang="ro">Data Finala Actuala</value>
|
||||
<value xml:lang="th">วันสิ้นสุดตามความจริง</value>
|
||||
<value xml:lang="vi">Ngày kết thúc thực tế</value>
|
||||
@@ -68,7 +69,7 @@
|
||||
<value xml:lang="fr">Millisecondes</value>
|
||||
<value xml:lang="it">Millisecondi attuali</value>
|
||||
<value xml:lang="ja">実績ミリ秒</value>
|
||||
<value xml:lang="nl">Actual Milli Seconds</value>
|
||||
<value xml:lang="nl">Werlk. milliseconden</value>
|
||||
<value xml:lang="ro">Millisecunde Actuale</value>
|
||||
<value xml:lang="th">พันวินาทีตามความจริง</value>
|
||||
<value xml:lang="vi">Số giây thực tế</value>
|
||||
@@ -81,7 +82,7 @@
|
||||
<value xml:lang="fr">Configuration en millisecondes</value>
|
||||
<value xml:lang="it">Millisecondi Configurazione Attuali</value>
|
||||
<value xml:lang="ja">実績設定ミリ秒</value>
|
||||
<value xml:lang="nl">Actual Setup Millis</value>
|
||||
<value xml:lang="nl">Setup - werk. milliseconden</value>
|
||||
<value xml:lang="ro">Configuratie Milisecunde Actuala </value>
|
||||
<value xml:lang="th">Actual Setup Millis</value>
|
||||
<value xml:lang="vi">Thời gian Thiết lập thực tế(giây)</value>
|
||||
@@ -3428,7 +3429,7 @@
|
||||
<value xml:lang="fr">Nouveau Projet</value>
|
||||
<value xml:lang="it">Nuovo progetto</value>
|
||||
<value xml:lang="ja">新規プロジェクト</value>
|
||||
<value xml:lang="nl">New Project</value>
|
||||
<value xml:lang="nl">Nieuw Project</value>
|
||||
<value xml:lang="ro">Proiect Nou</value>
|
||||
<value xml:lang="ru">Новый проект</value>
|
||||
<value xml:lang="th">โปรเจคใหม่</value>
|
||||
@@ -5364,7 +5365,7 @@
|
||||
<value xml:lang="fr">Tâche</value>
|
||||
<value xml:lang="it">Impegno di lavoro</value>
|
||||
<value xml:lang="ja">作業成果</value>
|
||||
<value xml:lang="nl">Actie</value>
|
||||
<value xml:lang="nl">Activiteit</value>
|
||||
<value xml:lang="ro">Sarcina de Lucru</value>
|
||||
<value xml:lang="th">งาน</value>
|
||||
<value xml:lang="vi">Lượng giá nguồn lực</value>
|
||||
@@ -5460,7 +5461,7 @@
|
||||
<value xml:lang="fr">Tâches</value>
|
||||
<value xml:lang="it">Impegni di lavoro</value>
|
||||
<value xml:lang="ja">作業成果</value>
|
||||
<value xml:lang="nl">Acties</value>
|
||||
<value xml:lang="nl">Activiteiten</value>
|
||||
<value xml:lang="ro">Sarcini de Lucru </value>
|
||||
<value xml:lang="th">งาน</value>
|
||||
<value xml:lang="vi">Lượng giá nguồn lực</value>
|
||||
@@ -5515,4 +5516,4 @@
|
||||
<property key="WorkeffortErrorWhileInvokingService">
|
||||
<value xml:lang="en">Error while invoking service : ${serviceName}</value>
|
||||
</property>
|
||||
</resource>
|
||||
</resource>
|
||||
|
||||
@@ -70,6 +70,7 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://workeffort/widget/WorkEffortMenus.xml"/>
|
||||
<section>
|
||||
<condition>
|
||||
<and>
|
||||
@@ -129,6 +130,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://workeffort/widget/WorkEffortMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<condition>
|
||||
@@ -164,6 +168,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://workeffort/widget/WorkEffortMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<condition>
|
||||
@@ -213,6 +220,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://workeffort/widget/WorkEffortMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<platform-specific>
|
||||
<html><html-template location="component://workeffort/template/Main.ftl"/></html>
|
||||
|
||||
@@ -36,6 +36,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://workeffort/widget/WorkEffortMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.WorkEffortMyRequestList}">
|
||||
<include-grid name="ListRequests" location="component://workeffort/widget/CustRequestForms.xml"/>
|
||||
|
||||
@@ -43,6 +43,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://workeffort/widget/WorkEffortMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<screenlet title="${uiLabelMap.WorkEffortMyCurrentTimesheets}">
|
||||
<container style="button-bar">
|
||||
|
||||
@@ -31,7 +31,22 @@ under the License.
|
||||
<menu-item name="userJobs" title="${uiLabelMap.WorkEffortJobList}"><link target="UserJobs"/></menu-item>
|
||||
<menu-item name="WorkEffortICalendar" title="${uiLabelMap.WorkEffortICalendar}"><link target="FindICalendars"/></menu-item>
|
||||
</menu>
|
||||
|
||||
<menu name="MainActionMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected">
|
||||
<menu-item name="NewWorkEffort" title="${uiLabelMap.WorkEffortCreate}">
|
||||
<condition>
|
||||
<and>
|
||||
<or>
|
||||
<if-has-permission permission="WORKEFFORTMGR" action="_CREATE"/>
|
||||
</or>
|
||||
</and>
|
||||
</condition>
|
||||
<link text="${uiLabelMap.WorkEffortCreate}" target="WorkEffort/Edit" link-type="layered-modal">
|
||||
<set-callback area-target="WorkEffortSummary" area-id="window">
|
||||
<parameter param-name="workEffortId" from-event-result="workEffortId"/>
|
||||
</set-callback>
|
||||
</link>
|
||||
</menu-item>
|
||||
</menu>
|
||||
<menu name="WorkEffortShortcutAppBar" title="${uiLabelMap.WorkEffortManager}" default-menu-item-name="task" >
|
||||
<menu-item name="task" title="${uiLabelMap.WorkEffortTaskList}"><link target="/workeffort/control/mytasks" url-mode="inter-app"/></menu-item>
|
||||
<menu-item name="calendar" title="${uiLabelMap.WorkEffortCalendar}"><link target="/workeffort/control/calendar" url-mode="inter-app"/></menu-item>
|
||||
|
||||
@@ -35,6 +35,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://workeffort/widget/WorkEffortMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<condition>
|
||||
@@ -60,7 +63,6 @@ under the License.
|
||||
<actions>
|
||||
<set field="headerItem" value="task"/>
|
||||
<set field="titleProperty" value="PageTitleViewActivityAndTaskList"/>
|
||||
|
||||
<service service-name="getWorkEffortAssignedActivities"/>
|
||||
<service service-name="getWorkEffortAssignedActivitiesByRole"/>
|
||||
<service service-name="getWorkEffortAssignedActivitiesByGroup"/>
|
||||
@@ -68,6 +70,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://workeffort/widget/WorkEffortMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<condition>
|
||||
@@ -85,7 +90,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditWorkEffort">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -143,7 +147,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="FindWorkEffort">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -154,6 +157,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://workeffort/widget/WorkEffortMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<include-screen name="FindWorkEfforts" location="component://workeffort/widget/workeffort/WorkEffortCpd.xml"/>
|
||||
</decorator-section>
|
||||
@@ -161,7 +167,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ChildWorkEfforts">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -193,7 +198,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="AddWorkEffortAndAssoc">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -217,7 +221,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditWorkEffortAndAssoc">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -243,7 +246,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="AddWorkEffortAssoc">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -290,7 +292,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ListWorkEffortPartyAssigns">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -307,7 +308,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ListWorkEffortFixedAssetAssigns">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -325,14 +325,12 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditWorkEffortRates">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="titleProperty" value="PageTitleListWorkEffortAssignmentRates"/>
|
||||
<set field="tabButtonItem" value="WorkEffortRates"/>
|
||||
<set field="labelTitleProperty" value="PageTitleListWorkEffortAssignmentRates"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
@@ -344,7 +342,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ListWorkEffortCommEvents">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -361,14 +358,12 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ListWorkEffortShopLists">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="titleProperty" value="PageTitleListWorkEffortShopLists"/>
|
||||
<set field="tabButtonItem" value="WorkEffortShopLists"/>
|
||||
<set field="labelTitleProperty" value="PageTitleListWorkEffortShopLists"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
@@ -380,14 +375,12 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ListWorkEffortRequests">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="titleProperty" value="PageTitleListWorkEffortRequests"/>
|
||||
<set field="tabButtonItem" value="WorkEffortRequests"/>
|
||||
<set field="labelTitleProperty" value="PageTitleListWorkEffortRequests"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
@@ -400,7 +393,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ListWorkEffortRequirements">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -417,14 +409,12 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ListWorkEffortQuotes">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="titleProperty" value="PageTitleListWorkEffortQuotes"/>
|
||||
<set field="tabButtonItem" value="WorkEffortQuotes"/>
|
||||
<set field="labelTitleProperty" value="PageTitleListWorkEffortQuotes"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
@@ -437,14 +427,12 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ListWorkEffortOrderHeaders">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="titleProperty" value="PageTitleListWorkEffortOrderHeaders"/>
|
||||
<set field="tabButtonItem" value="WorkEffortOrderHeaders"/>
|
||||
<set field="labelTitleProperty" value="PageTitleListWorkEffortOrderHeaders"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
@@ -456,14 +444,12 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditWorkEffortTimeEntries">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="titleProperty" value="PageTitleListWorkEffortTimeEntries"/>
|
||||
<set field="tabButtonItem" value="WorkEffortTimeEntries"/>
|
||||
<set field="labelTitleProperty" value="PageTitleListWorkEffortTimeEntries"/>
|
||||
|
||||
<set field="workEffortId" from-field="parameters.workEffortId"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
@@ -475,7 +461,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditWorkEffortNotes">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -495,7 +480,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditWorkEffortContents">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -511,7 +495,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditWorkEffortGoodStandards">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -528,15 +511,11 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditWorkEffortReviews">
|
||||
<section>
|
||||
<actions>
|
||||
<set field="titleProperty" value="PageTitleListWorkEffortReviews"/>
|
||||
<set field="tabButtonItem" value="WorkEffortReviews"/>
|
||||
<!--<set field="labelTitleProperty" value="PageTitleListWorkEffortReviews"/>
|
||||
<set field="defaultUserLoginId" from-field="parameters.userLogin.userLoginId"/>
|
||||
<set field="partyId" from-field="parameters.userLogin.partyId"/> -->
|
||||
</actions>
|
||||
<widgets>
|
||||
<decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}">
|
||||
@@ -580,7 +559,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="WorkEffortSearchResults">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -598,7 +576,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="WorkEffortSearchOptions">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -631,7 +608,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ListWorkEffortAttributes">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -648,7 +624,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ListWorkEffortEventReminders">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -666,7 +641,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="WorkEffortEventReminderEmail">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -692,7 +666,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="iCalendarDecorator">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -701,6 +674,7 @@ under the License.
|
||||
<widgets>
|
||||
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
|
||||
<decorator-section name="pre-body">
|
||||
<include-menu name="MainActionMenu" location="component://workeffort/widget/WorkEffortMenus.xml"/>
|
||||
<section>
|
||||
<condition>
|
||||
<not><if-empty field="workEffort"/></not>
|
||||
@@ -736,7 +710,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="FindICalendars">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -745,6 +718,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://workeffort/widget/WorkEffortMenus.xml"/>
|
||||
</decorator-section>
|
||||
<decorator-section name="body">
|
||||
<section>
|
||||
<condition>
|
||||
@@ -769,7 +745,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditICalendar">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -814,7 +789,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="EditICalendarData">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -838,7 +812,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ICalendarChildren">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -862,7 +835,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ICalendarParties">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -886,7 +858,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ICalendarFixedAssets">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -910,7 +881,6 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
<screen name="ICalendarHelp">
|
||||
<section>
|
||||
<actions>
|
||||
@@ -939,5 +909,4 @@ under the License.
|
||||
</widgets>
|
||||
</section>
|
||||
</screen>
|
||||
|
||||
</screens>
|
||||
|
||||
+40
-32
@@ -29,14 +29,14 @@ plugins {
|
||||
id 'eclipse'
|
||||
id 'checkstyle'
|
||||
id 'maven-publish'
|
||||
id 'at.bxm.svntools' version '2.2.1' // Don't update as long as we don't use Java 11, it's needed by version 3
|
||||
id 'at.bxm.svntools' version '3.1' // Java 11 is needed by version 3
|
||||
id 'org.asciidoctor.convert' version '2.4.0' // About org.asciidoctor.jvm.convert as it says itself: "If you need a production-ready version of the AsciidoctorJ plugin for Gradle use a 1.5.x release of 'org.asciidoctor.convert' instead"
|
||||
id 'org.owasp.dependencycheck' version '6.3.1' apply false
|
||||
id 'se.patrikerdes.use-latest-versions' version '0.2.17' apply false
|
||||
id 'com.github.ben-manes.versions' version '0.39.0' apply false
|
||||
id 'org.owasp.dependencycheck' version '7.1.1' apply false
|
||||
id 'se.patrikerdes.use-latest-versions' version '0.2.18' apply false
|
||||
id 'com.github.ben-manes.versions' version '0.42.0' apply false
|
||||
id "com.github.ManifestClasspath" version "0.1.0-RELEASE"
|
||||
id "com.github.jakemarsden.git-hooks" version "0.0.2"
|
||||
id "com.github.node-gradle.node" version "3.1.0"
|
||||
id "com.github.node-gradle.node" version "3.4.0"
|
||||
}
|
||||
|
||||
/* OWASP plugin
|
||||
@@ -115,7 +115,7 @@ node {
|
||||
|
||||
// https://github.com/node-gradle/gradle-node-plugin/blob/2.2.4/README.md
|
||||
// Set the work directory where node_modules should be located
|
||||
nodeModulesDir = file("${project.projectDir}/themes/common-theme/webapp/common/js")
|
||||
nodeModulesDir = file("${project.projectDir}/themes/common-theme/webapp/common-theme/js")
|
||||
// If you set a "CI" env var then ci only will be used:
|
||||
// https://github.com/node-gradle/gradle-node-plugin/blob/master/docs/faq.md#how-do-i-use-npm-ci-instead-of-npm-install
|
||||
npmInstallCommand = System.getenv("CI") ? 'ci' : 'install'
|
||||
@@ -160,6 +160,8 @@ allprojects {
|
||||
maven {
|
||||
// org/milyn/flute/1.3/flute-1.3.jar
|
||||
// need artifact only because of wrong pom metadata in maven central
|
||||
// Required by: plugins:birt > org.eclipse.birt.runtime:viewservlets:4.5.0 > org.eclipse.birt.runtime:org.eclipse.birt.runtime:4.4.1
|
||||
// TODO Maybe this will no longer needed wheh upgrading viewservlets to 4.9.0
|
||||
url "https://repo1.maven.org/maven2"
|
||||
metadataSources {
|
||||
artifact()
|
||||
@@ -168,6 +170,11 @@ allprojects {
|
||||
maven {
|
||||
url "https://clojars.org/repo"
|
||||
}
|
||||
maven {
|
||||
// org.cyberneko.html.parsers (used by UELFunctions, was in esapi before 2.3)
|
||||
url "https://repository.ow2.org/nexus/content/repositories/public/"
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -194,62 +201,63 @@ configurations {
|
||||
|
||||
dependencies {
|
||||
implementation 'xerces:xercesImpl:2.12.2'
|
||||
implementation 'com.google.zxing:core:3.4.1'
|
||||
implementation 'com.google.zxing:core:3.5.0'
|
||||
implementation 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
|
||||
implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.2'
|
||||
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20200713.1'
|
||||
implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.3'
|
||||
implementation 'com.ibm.icu:icu4j:69.1'
|
||||
implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.3'
|
||||
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20220608.1'
|
||||
implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.50'
|
||||
implementation 'com.ibm.icu:icu4j:71.1'
|
||||
implementation 'com.lowagie:itext:2.1.7' // Don't update due to license change in newer versions, see OFBIZ-10455
|
||||
implementation 'com.sun.mail:javax.mail:1.6.2'
|
||||
implementation 'com.rometools:rome:1.16.0'
|
||||
implementation 'com.thoughtworks.xstream:xstream:1.4.18'
|
||||
implementation 'com.rometools:rome:1.18.0'
|
||||
implementation 'com.thoughtworks.xstream:xstream:1.4.19'
|
||||
implementation 'commons-fileupload:commons-fileupload:1.4'
|
||||
implementation 'commons-net:commons-net:3.8.0'
|
||||
implementation 'commons-validator:commons-validator:1.7'
|
||||
implementation 'de.odysseus.juel:juel-impl:2.2.7'
|
||||
implementation 'net.fortuna.ical4j:ical4j:1.0-rc4-atlassian-12'
|
||||
implementation 'net.lingala.zip4j:zip4j:2.9.0'
|
||||
implementation 'org.apache.ant:ant-junit:1.10.11'
|
||||
implementation 'net.lingala.zip4j:zip4j:2.11.1'
|
||||
implementation 'org.apache.ant:ant-junit:1.10.12'
|
||||
implementation 'org.apache.commons:commons-collections4:4.4'
|
||||
implementation 'org.apache.commons:commons-dbcp2:2.9.0'
|
||||
implementation 'org.apache.commons:commons-imaging:1.0-alpha2' // Alpha but OK, "Imaging was working and was used by a number of projects in production even before reaching its initial release as an Apache Commons component."
|
||||
implementation 'org.apache.commons:commons-imaging:1.0-alpha3' // Alpha but OK, "Imaging was working and was used by a number of projects in production even before reaching its initial release as an Apache Commons component."
|
||||
implementation 'org.apache.commons:commons-text:1.9'
|
||||
implementation 'org.apache.geronimo.components:geronimo-transaction:3.1.4'
|
||||
implementation 'org.apache.geronimo.components:geronimo-transaction:3.1.5'
|
||||
implementation 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1'
|
||||
implementation 'org.apache.httpcomponents:httpclient-cache:4.5.13'
|
||||
implementation 'org.apache.logging.log4j:log4j-api:2.17.2' // the API of log4j 2
|
||||
implementation 'org.apache.logging.log4j:log4j-core:2.17.2' // Somehow needed by Buildbot to compile OFBizDynamicThresholdFilter.java
|
||||
implementation 'org.apache.poi:poi:4.1.2' // poi-ooxml-schemas-5.0.0.pom'. Received status code 401 from server
|
||||
implementation 'org.apache.pdfbox:pdfbox:2.0.24'
|
||||
implementation 'org.apache.shiro:shiro-core:1.8.0'
|
||||
implementation 'org.apache.shiro:shiro-core:1.9.0'
|
||||
implementation 'org.apache.sshd:sshd-core:2.8.0'
|
||||
implementation 'org.apache.sshd:sshd-sftp:2.8.0'
|
||||
// Note: The Apache Tika PMC has set September 30, 2022 as the End Of Life for the Tika 1.x branch.
|
||||
// The PMC will make security fixes for the 1.x branch until that date.
|
||||
implementation 'org.apache.tika:tika-core:1.28.4' // version 2 needs more work, see OFBIZ-12572
|
||||
implementation 'org.apache.tika:tika-parsers:1.28.4' // 2.1.0 does not work,
|
||||
implementation 'org.apache.tika:tika-core:1.28.4'
|
||||
implementation 'org.apache.tika:tika-parsers:1.28.4' // 2.4.1 does not work,
|
||||
implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.60' // Remember to change the version number (9 now) in javadoc block if needed.
|
||||
implementation 'org.apache.tomcat:tomcat-jasper:9.0.60'
|
||||
implementation 'org.apache.axis2:axis2-kernel:1.7.9' // Above: SOAPEventHandler.java:42: error: package org.apache.axiom.om.impl.builder does not exist
|
||||
implementation 'org.apache.axis2:axis2-kernel:1.8.1'
|
||||
implementation 'batik:batik-svg-dom:1.6-1'
|
||||
implementation 'org.apache.xmlgraphics:fop:2.3' // NOTE: since 2.4 dependencies are messed up. See https://github.com/moqui/moqui-fop/blob/master/build.gradle
|
||||
implementation 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
|
||||
implementation 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
|
||||
implementation 'org.clojure:clojure:1.10.2'
|
||||
implementation 'org.clojure:clojure:1.11.1'
|
||||
implementation 'org.codehaus.groovy:groovy-all:2.5.18' // Compile issue with commons-cli and Groovy 3. Remember to change the version number in javadoc block.
|
||||
implementation 'org.freemarker:freemarker:2.3.31' // Remember to change the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if >= 2.4
|
||||
implementation 'org.owasp.esapi:esapi:2.2.2.0'
|
||||
implementation 'org.springframework:spring-test:5.3.9'
|
||||
implementation 'org.owasp.esapi:esapi:2.4.0.0'
|
||||
implementation 'org.cyberneko:html:1.9.8'
|
||||
implementation 'org.springframework:spring-test:5.3.21'
|
||||
implementation 'org.zapodot:jackson-databind-java-optional:2.6.1'
|
||||
implementation 'oro:oro:2.0.8'
|
||||
implementation 'wsdl4j:wsdl4j:1.6.3'
|
||||
implementation 'com.auth0:java-jwt:3.18.1'
|
||||
implementation 'com.auth0:java-jwt:4.0.0'
|
||||
implementation 'org.jdom:jdom:1.1.3' // don't upgrade above 1.1.3, makes a lot of not obvious and useless complications, see last commits of OFBIZ-12092 for more
|
||||
implementation 'com.google.re2j:re2j:1.6'
|
||||
|
||||
testImplementation 'org.hamcrest:hamcrest-library:2.2' // Enable junit4 to not depend on hamcrest-1.3
|
||||
testImplementation 'org.mockito:mockito-core:3.12.4'
|
||||
testImplementation 'org.mockito:mockito-core:4.6.1'
|
||||
testImplementation 'org.jmockit:jmockit:1.49'
|
||||
testImplementation 'com.pholser:junit-quickcheck-generators:1.0'
|
||||
|
||||
@@ -257,9 +265,9 @@ dependencies {
|
||||
runtimeOnly 'de.odysseus.juel:juel-spi:2.2.7'
|
||||
runtimeOnly 'net.sf.barcode4j:barcode4j-fop-ext:2.1'
|
||||
runtimeOnly 'net.sf.barcode4j:barcode4j:2.1'
|
||||
runtimeOnly 'org.apache.axis2:axis2-transport-http:1.7.9' // Above: SOAPEventHandler.java:42: error: package org.apache.axiom.om.impl.builder does not exist
|
||||
runtimeOnly 'org.apache.axis2:axis2-transport-local:1.7.9' // Above: SOAPEventHandler.java:42: error: package org.apache.axiom.om.impl.builder does not exist
|
||||
runtimeOnly 'org.apache.derby:derby:10.14.2.0' // So far we did not update from 10.14.2.0 because of a compile issue. You may try w/ a newer version than 10.15.1.3
|
||||
runtimeOnly 'org.apache.axis2:axis2-transport-http:1.8.1'
|
||||
runtimeOnly 'org.apache.axis2:axis2-transport-local:1.8.1'
|
||||
runtimeOnly 'org.apache.derby:derby:10.14.2.0' // So far we did not update from 10.14.2.0 because of a runtime issue with 10.16.1.1: java.lang.ClassNotFoundException: org.apache.derby.jdbc.EmbeddedDriver
|
||||
runtimeOnly 'org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec:2.1'
|
||||
runtimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.17.2' // for external jars using the old log4j1.2: routes logging to log4j 2
|
||||
runtimeOnly 'org.apache.logging.log4j:log4j-jul:2.17.2' // for external jars using the java.util.logging: routes logging to log4j 2
|
||||
@@ -275,8 +283,8 @@ dependencies {
|
||||
compileOnly project(path: subProject.path, configuration: 'pluginLibsCompileOnly')
|
||||
}
|
||||
|
||||
junitReport 'junit:junit:4.13.1'
|
||||
junitReport 'org.apache.ant:ant-junit:1.10.11'
|
||||
junitReport 'junit:junit:4.13.2'
|
||||
junitReport 'org.apache.ant:ant-junit:1.10.12'
|
||||
asciidoctor 'org.asciidoctor:asciidoctorj-pdf:1.5.3'
|
||||
asciidoctor 'org.jruby:jruby-complete:9.2.19.0' // bug workaround - see OFBIZ-9873
|
||||
|
||||
@@ -1021,7 +1029,7 @@ task cleanFooterFiles(group: cleanupGroup, description: 'clean generated footer
|
||||
}
|
||||
task cleanNpm(group: cleanupGroup, description: 'clean node modules') {
|
||||
doLast {
|
||||
delete "${project.projectDir}/themes/common-theme/webapp/common/js/node_modules"
|
||||
delete "${project.projectDir}/themes/common-theme/webapp/common-theme/js/node_modules"
|
||||
}
|
||||
}
|
||||
/*
|
||||
|
||||
@@ -22,9 +22,9 @@
|
||||
####
|
||||
|
||||
# By default we use a permissive sanitizer policy
|
||||
# This has a slight impact on the code rendered, see last comments in OFBIZ-6669.
|
||||
# Given as an example based on rendering cmssite, as it was before using the sanitizer.
|
||||
# You might want to adapt the PERMISSIVE_POLICY to your needs.
|
||||
# This has a slight impact on the HTML code rendered, look for "cmssite" in OFBIZ-6669 description.
|
||||
# You will an example based on rendering cmssite, as it was before using the sanitizer.
|
||||
# You might want to adapt the PERMISSIVE_POLICY to your needs.
|
||||
# Be sure to check https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet before...
|
||||
sanitizer.enable=true
|
||||
|
||||
@@ -34,4 +34,4 @@ sanitizer.custom.permissive.policy.class=org.apache.ofbiz.base.html.CustomPermis
|
||||
|
||||
# Use sanitizer.safe.policy=CUSTOM to use your custom safe PolicyFactory (see OFBIZ-5254)
|
||||
sanitizer.safe.policy=DEFAULT
|
||||
sanitizer.custom.safe.policy.class=org.apache.ofbiz.base.html.CustomSafePolicy
|
||||
sanitizer.custom.safe.policy.class=org.apache.ofbiz.base.html.CustomSafePolicy
|
||||
|
||||
@@ -60,7 +60,8 @@ public class CustomSafePolicy implements SanitizerCustomPolicy {
|
||||
.matching(true, "center", "left", "right", "justify", "char")
|
||||
.onElements("p")
|
||||
// These elements are allowed.
|
||||
.allowElements("a", "p", "div", "i", "b", "em", "blockquote", "tt", "strong", "br", "ul", "ol", "li")
|
||||
.allowElements("a", "p", "div", "i", "b", "em", "blockquote", "hr", "strong", "br", "ul", "ol", "li", "img")
|
||||
.allowAttributes("src", "alt").onElements("img")
|
||||
.toFactory();
|
||||
|
||||
@Override
|
||||
|
||||
@@ -40,9 +40,13 @@ import org.owasp.esapi.codecs.Codec;
|
||||
import org.owasp.esapi.codecs.HTMLEntityCodec;
|
||||
import org.owasp.esapi.codecs.PercentCodec;
|
||||
import org.owasp.esapi.codecs.XMLEntityCodec;
|
||||
import org.owasp.html.Handler;
|
||||
import org.owasp.html.HtmlPolicyBuilder;
|
||||
import org.owasp.html.HtmlSanitizer;
|
||||
import org.owasp.html.HtmlStreamRenderer;
|
||||
import org.owasp.html.PolicyFactory;
|
||||
import org.owasp.html.Sanitizers;
|
||||
import org.owasp.html.TagBalancingHtmlStreamEventReceiver;
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
public class UtilCodec {
|
||||
@@ -490,8 +494,38 @@ public class UtilCodec {
|
||||
}
|
||||
|
||||
if (value != null) {
|
||||
//Create valid HTML from input with empty sanitizer. Compare the result with the sanitized result.
|
||||
StringBuilder htmlOutput = new StringBuilder();
|
||||
HtmlStreamRenderer renderer = HtmlStreamRenderer.create(htmlOutput, Handler.DO_NOTHING);
|
||||
TagBalancingHtmlStreamEventReceiver balancer = new TagBalancingHtmlStreamEventReceiver(renderer);
|
||||
HtmlSanitizer.sanitize(value, new HtmlSanitizer.Policy() {
|
||||
@Override
|
||||
public void openDocument() {
|
||||
balancer.openDocument();
|
||||
}
|
||||
@Override
|
||||
public void openTag(String tagName, List<String> attrs) {
|
||||
balancer.openTag(tagName, attrs);
|
||||
}
|
||||
@Override
|
||||
public void text(String text) {
|
||||
balancer.text(text);
|
||||
}
|
||||
@Override
|
||||
public void closeTag(String tagName) {
|
||||
balancer.closeTag(tagName);
|
||||
}
|
||||
@Override
|
||||
public void closeDocument() {
|
||||
balancer.closeDocument();
|
||||
}
|
||||
});
|
||||
|
||||
value = htmlOutput.toString();
|
||||
String filtered = policy.sanitize(value);
|
||||
if (filtered != null && !value.equals(StringEscapeUtils.unescapeEcmaScript(StringEscapeUtils.unescapeHtml4(filtered)))) {
|
||||
String unescapeHtml4 = StringEscapeUtils.unescapeHtml4(filtered);
|
||||
String unescapeEcmaScriptAndHtml4 = StringEscapeUtils.unescapeEcmaScript(unescapeHtml4);
|
||||
if (filtered != null && !value.equals(unescapeEcmaScriptAndHtml4)) {
|
||||
String issueMsg = null;
|
||||
if (locale.equals(new Locale("test"))) {
|
||||
issueMsg = "In field [" + valueName + "] by our input policy, your input has not been accepted "
|
||||
|
||||
@@ -76,17 +76,19 @@ under the License.
|
||||
<property name="xpoweredBy" value="false"/>
|
||||
<!-- AJP/13 connector attributes -->
|
||||
<!-- Despite OFBIZ-11407, allowedRequestAttributesPattern is commented out because of OFBIZ-12558
|
||||
OOTB the Tomcat default values should be used as recommended by
|
||||
OOTB the Tomcat default values are used as recommended by
|
||||
https://tomcat.apache.org/tomcat-9.0-doc/config/ajp.html#Introduction
|
||||
This is in relation with
|
||||
https://tomcat.apache.org/security-9.html#Fixed_in_Apache_Tomcat_9.0.31
|
||||
and
|
||||
https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#Connectors
|
||||
But secretRequired value must be false because secret value is empty
|
||||
|
||||
But OOTB secretRequired value must be false because secret value is empty
|
||||
Else a notifying message appears in log saying that AJP is not available.
|
||||
|
||||
Long story short, with this configuration only localhost works.
|
||||
So if you use it you need to use value/s
|
||||
Long story short, with OOTB configuration only localhost works.
|
||||
So if you want to use AJP you need to set the values depending on your configuration.
|
||||
Using ".*" to allowedRequestAttributesPattern put you at risk.
|
||||
-->
|
||||
<property name="secretRequired" value="false"/>
|
||||
<!-- <property name="allowedRequestAttributesPattern" value=".*"/> -->
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user