svn commit: r1058719 - in /ofbiz/trunk: applications/product/config/ applications/product/webapp/catalog/price/ applications/product/widget/catalog/ framework/common/webcommon/includes/

Author: jleroux
Date: Thu Jan 13 19:55:07 2011
New Revision: 1058719

URL: http://svn.apache.org/viewvc?rev=1058719&view=rev
Log:
As requested by Jacopo on dev ML, moves setPriceRulesCondEventJs.ftl from framework to product/catalog

Also fix an orthograph error in a related French labels

Added:
    ofbiz/trunk/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl
      - copied, changed from r1058460, ofbiz/trunk/framework/common/webcommon/includes/setPriceRulesCondEventJs.ftl
Removed:
    ofbiz/trunk/framework/common/webcommon/includes/setPriceRulesCondEventJs.ftl
Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1058719&r1=1058718&r2=1058719&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Jan 13 19:55:07 2011
@@ -10884,7 +10884,7 @@
     </property>
     <property key="ProductConditionsActionsRemoveBefore">        
         <value xml:lang="en">To remove a price rule, you must before remove all conditions and actions OR disable it by entering a Thru Date</value>
-        <value xml:lang="fr">Pour supprimer une règle de prix, vous devez d'abord supprimer toutes les conditions et actions. Vous pouvez aussi la désactivée en entrant une date de fin appropriée</value>
+        <value xml:lang="fr">Pour supprimer une règle de prix, vous devez d'abord supprimer toutes les conditions et actions. Vous pouvez aussi la désactiver en entrant une date de fin appropriée</value>
     </property>    
     <property key="ProductConditionsThenActions">        
         <value xml:lang="en">If multiple conditions are entered they are tested logically as and AND statement. Therefore all Conditions must be TRUE for the price rule to execute (same for actions)</value>

Copied: ofbiz/trunk/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl (from r1058460, ofbiz/trunk/framework/common/webcommon/includes/setPriceRulesCondEventJs.ftl)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl?p2=ofbiz/trunk/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl&p1=ofbiz/trunk/framework/common/webcommon/includes/setPriceRulesCondEventJs.ftl&r1=1058460&r2=1058719&rev=1058719&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/setPriceRulesCondEventJs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl Thu Jan 13 19:55:07 2011
@@ -1,3 +1,21 @@
+<#--
+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.
+-->
 <script type="text/javascript">
 jQuery(document).ready( function() {
 

Modified: ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml?rev=1058719&r1=1058718&r2=1058719&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml Thu Jan 13 19:55:07 2011
@@ -98,7 +98,7 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonPriceDecorator">
                     <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://common/webcommon/includes/setPriceRulesCondEventJs.ftl"/></html></platform-specific>
+                        <platform-specific><html><html-template location="component://product/webapp/catalog/price/setPriceRulesCondEventJs.ftl"/></html></platform-specific>
                         <include-menu name="PriceRulesButtonBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
                         <screenlet title="${uiLabelMap.ProductPriceRuleId} [${parameters.productPriceRuleId}]">
                             <label style="h6" text="${uiLabelMap.ProductConditionsActionsRemoveBefore}"/>