Return-Path: 
 <commits-return-22536-apmail-ofbiz-commits-archive=ofbiz.apache.org@ofbiz.apache.org>
X-Original-To: apmail-ofbiz-commits-archive@www.apache.org
Delivered-To: apmail-ofbiz-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id EA75D7073
	for <apmail-ofbiz-commits-archive@www.apache.org>;
 Wed, 12 Oct 2011 08:35:22 +0000 (UTC)
Received: (qmail 91702 invoked by uid 500); 12 Oct 2011 08:35:22 -0000
Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org
Received: (qmail 91678 invoked by uid 500); 12 Oct 2011 08:35:22 -0000
Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ofbiz.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ofbiz.apache.org>
List-Post: <mailto:commits@ofbiz.apache.org>
List-Id: <commits.ofbiz.apache.org>
Reply-To: dev@ofbiz.apache.org
Delivered-To: mailing list commits@ofbiz.apache.org
Received: (qmail 91670 invoked by uid 99); 12 Oct 2011 08:35:21 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Oct 2011 08:35:21 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Oct 2011 08:35:18 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2CC0D23889DE
	for <commits@ofbiz.apache.org>; Wed, 12 Oct 2011 08:34:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1182259 - in /ofbiz/trunk/applications/product:
 config/ProductErrorUiLabels.xml webapp/facility/facility/PickMoveStock.ftl
 widget/facility/CommonScreens.xml widget/facility/FacilityScreens.xml
Date: Wed, 12 Oct 2011 08:34:56 -0000
To: commits@ofbiz.apache.org
From: jleroux@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111012083457.2CC0D23889DE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jleroux
Date: Wed Oct 12 08:34:56 2011
New Revision: 1182259

URL: http://svn.apache.org/viewvc?rev=1182259&view=rev
Log:
Fixes "Stock Move: Error when attempting to select a From Stock location" https://issues.apache.org/jira/browse/OFBIZ-4465 reported by Alan Barker

It was simply a matter of replacing &amp; by & in PickMoveStock.ftl. 
I also improved by checking if the product was already selected

Modified:
    ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml
    ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
    ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml?rev=1182259&r1=1182258&r2=1182259&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml Wed Oct 12 08:34:56 2011
@@ -148,9 +148,14 @@
     </property>
     <property key="ProductNotInAnyLocation">
         <value xml:lang="en">This Product is not in any Location</value>
+        <value xml:lang="fr">Ce produit ne se trouve en aucun emplacement</value>
         <value xml:lang="zh">这个产品不在任何地方</value>
         <value xml:lang="zh_TW">這個產品不在任何地方</value>
     </property>
+    <property key="ProductFieldEmpty">
+        <value xml:lang="en">Please, fill the product field before</value>
+        <value xml:lang="fr">Sélectionnez le produit d'abord</value>
+    </property>
     <property key="ProductNumberOfOrdersMustNotBeEmptyToPrintPickSheet">
         <value xml:lang="en">The number of orders must not be empty. Please re-enter to print pick sheet.</value>
     </property>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl?rev=1182259&r1=1182258&r2=1182259&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl Wed Oct 12 08:34:56 2011
@@ -16,13 +16,16 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-
 <script language="JavaScript" type="text/javascript">
     function quicklookup(func, locationelement, facilityelement, productelement) {
         
         var productId = productelement.value;
+        if (productId.length == 0) {
+          alert("${StringUtil.wrapString(uiLabelMap.ProductFieldEmpty)}");
+          return;
+        }
         var facilityId = facilityelement.value;
-        var request = "LookupProductInventoryLocation?productId=" + productId + "&amp;facilityId=" + facilityId;
+        var request = "LookupProductInventoryLocation?productId=" + productId + "&facilityId=" + facilityId;
         window[func](locationelement, request);
     }
 </script>

Modified: ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=1182259&r1=1182258&r2=1182259&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Wed Oct 12 08:34:56 2011
@@ -25,6 +25,7 @@ under the License.
             <actions>
                 <!-- base/top/specific map first, then more common map added for shared labels -->
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductErrorUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1182259&r1=1182258&r2=1182259&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Wed Oct 12 08:34:56 2011
@@ -1281,6 +1281,7 @@ under the License.
         <section>
             <actions>
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductErrorUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
 
                 <set field="layoutSettings.companyName" from-field="uiLabelMap.FacilityCompanyName" global="true"/>