You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/07/30 08:40:28 UTC
svn commit: r1754599 - in /ofbiz/trunk: OPTIONAL_LIBRARIES
applications/product/template/shipment/QuickShipOrder.ftl build.gradle
Author: jleroux
Date: Sat Jul 30 08:40:28 2016
New Revision: 1754599
URL: http://svn.apache.org/viewvc?rev=1754599&view=rev
Log:
Deleted ShipmentScaleApplet.java as POS is now in attic. Thanks to Mridul for the reminder at "Delete stale java files from applications and framework" - https://issues.apache.org/jira/browse/OFBIZ-7529
Completes r1754598
Modified:
ofbiz/trunk/OPTIONAL_LIBRARIES
ofbiz/trunk/applications/product/template/shipment/QuickShipOrder.ftl
ofbiz/trunk/build.gradle
Modified: ofbiz/trunk/OPTIONAL_LIBRARIES
URL: http://svn.apache.org/viewvc/ofbiz/trunk/OPTIONAL_LIBRARIES?rev=1754599&r1=1754598&r2=1754599&view=diff
==============================================================================
--- ofbiz/trunk/OPTIONAL_LIBRARIES (original)
+++ ofbiz/trunk/OPTIONAL_LIBRARIES Sat Jul 30 08:40:28 2016
@@ -13,15 +13,6 @@ on the old Undersun SVN server in the sp
http://www.mozilla.org/js
TO BUILD comment out exclude: base/build.xml:org/apache/ofbiz/base/util/OfbizJsBsfEngine.java
--applets (Netscape javascript plugin : Sun Binary Code License Agreement - BCLA)
- Developpers : http://wp.netscape.com/eng/mozilla/3.0/handbook/javascript/packages.htm
- This link is also interesting : http://forum.java.sun.com/thread.jspa?threadID=516303&tstart=225
- NOTE: applications/product/src/ShipmentScaleApplet.java needs netscape.javascript.JSObject
- If you're using the Sun JDK/JRE 1.4 or greater, the jar is located under jre/lib and it's called plugin.jar.
- You may also find it in the old Undersun SVN server in the specialized/libraries component directory.
- TO BUILD: Copy plugin.jar in framework/base/lib. This seems only needed under Windows.
-
-
-=- Reporting: ________________________________________________________________________________________________________________________________________________
-JasperReports (LGPL):
Modified: ofbiz/trunk/applications/product/template/shipment/QuickShipOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/shipment/QuickShipOrder.ftl?rev=1754599&r1=1754598&r2=1754599&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/shipment/QuickShipOrder.ftl (original)
+++ ofbiz/trunk/applications/product/template/shipment/QuickShipOrder.ftl Sat Jul 30 08:40:28 2016
@@ -16,13 +16,6 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script language="JavaScript" type="text/javascript">
-// function called from ShipmentScaleApplet when a weight is read
-function setWeight(weight) {
- document.weightForm.weight.value = weight;
-}
-</script>
-
<#if security.hasEntityPermission("FACILITY", "_VIEW", session)>
<h1>${uiLabelMap.ProductQuickShipOrderFrom} ${facility.facilityName!} [${uiLabelMap.CommonId}:${facilityId!}]</h1>
<div class="button-bar">
@@ -156,12 +149,6 @@ function setWeight(weight) {
<script language="JavaScript" type="text/javascript">
document.weightForm.weight.focus();
</script>
- <#-- todo embed the applet
- <applet code="ShipmentScaleApplet.class" codebase="/images/" name="Package Weight Reader" width="0" height="0" MAYSCRIPT>
- <param name="serialPort" value="com1">
- <param name="fakeWeight" value="22">
- </applet>
- -->
</#if>
<#else>
<div class="alert">${uiLabelMap.ProductErrorNoPackagesFoundForShipment} !</div>
Modified: ofbiz/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.gradle?rev=1754599&r1=1754598&r2=1754599&view=diff
==============================================================================
--- ofbiz/trunk/build.gradle (original)
+++ ofbiz/trunk/build.gradle Sat Jul 30 08:40:28 2016
@@ -218,7 +218,6 @@ excludedJavaSources.add 'org/apache/ofbi
excludedJavaSources.add 'org/apache/ofbiz/order/thirdparty/taxware/TaxwareException.java'
excludedJavaSources.add 'org/apache/ofbiz/order/thirdparty/taxware/TaxwareServices.java'
excludedJavaSources.add 'org/apache/ofbiz/order/thirdparty/taxware/TaxwareUTL.java'
-excludedJavaSources.add 'ShipmentScaleApplet.java'
excludedJavaSources.add 'org/apache/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java'
excludedJavaSources.add 'org/apache/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java'
excludedJavaSources.add 'org/apache/ofbiz/webapp/view/JasperReportsPdfViewHandler.java'