svn commit: r441701 - in /incubator/ofbiz/trunk/applications/product: config/ProductUiLabels.properties config/ProductUiLabels_fr.properties config/ProductUiLabels_it.properties entitydef/entitymodel.xml webapp/catalog/price/EditProductPriceRules.ftl

[jonesde]

Author: jonesde
Date: Fri Sep  8 17:35:34 2006
New Revision: 441701

URL: http://svn.apache.org/viewvc?view=rev&rev=441701
Log:
Applied patch from Tim Ruppert to add a description to a ProductPriceRule; ASF Jira #OFBIZ-211

Modified:
    incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_fr.properties
    incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
    incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    incubator/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl

Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=441701&r1=441700&r2=441701
==============================================================================
--- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties Fri Sep  8 17:35:34 2006
@@ -1081,7 +1081,7 @@
 ProductRoutings=Routings
 ProductRuleId=Rule ID
 ProductRuleName=Rule Name
-ProductRuleNameFromDateThruDate=Rule Name, From Date, Thru Date
+ProductRuleNameFromDateThruDate=Rule Name, Description, From Date, Thru Date
 ProductRules=Rules
 ProductSaleRule=Sale Rule
 ProductSalesDiscontinuationNotAvailable=Disc. When Inv. Not Avail?

Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_fr.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_fr.properties?view=diff&rev=441701&r1=441700&r2=441701
==============================================================================
--- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_fr.properties (original)
+++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_fr.properties Fri Sep  8 17:35:34 2006
@@ -1253,7 +1253,7 @@
 ProductRoutings=Routage
 ProductRuleId=R\u00E9f\u00E9rence de la r\u00E8gle
 ProductRuleName=Nom de la r\u00E8gle
-ProductRuleNameFromDateThruDate=Nom de la r\u00E8gle, de la date, jusqu'\u00E0 la date
+ProductRuleNameFromDateThruDate=Nom de la r\u00E8gle, Description, de la date, jusqu'\u00E0 la date
 ProductRules=R\u00E8gles
 ProductSRCH=Rch.
 ProductST=Art.

Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?view=diff&rev=441701&r1=441700&r2=441701
==============================================================================
--- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Fri Sep  8 17:35:34 2006
@@ -1068,7 +1068,7 @@
 ProductRoutings=Percorsi
 ProductRuleId=Codice Ruolo
 ProductRuleName=Nome Ruolo
-ProductRuleNameFromDateThruDate=Nome Ruolo, Da Data, A Data
+ProductRuleNameFromDateThruDate=Nome Ruolo, Descrizione, Da Data, A Data
 ProductRules=Regole
 ProductSaleRule=Regole Vendita
 ProductSalesDiscontinuationNotAvailable=Sospeso Quando Inventario Non Disponibile?

Modified: incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?view=diff&rev=441701&r1=441700&r2=441701
==============================================================================
--- incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml Fri Sep  8 17:35:34 2006
@@ -1641,6 +1641,7 @@
             title="Product Pice Rule Entity">
       <field name="productPriceRuleId" type="id-ne"></field>
       <field name="ruleName" type="name"></field>
+      <field name="description" type="description"></field>
       <field name="isSale" type="indicator"></field>
       <field name="fromDate" type="date-time"></field>
       <field name="thruDate" type="date-time"></field>

Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl?view=diff&rev=441701&r1=441700&r2=441701
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl Fri Sep  8 17:35:34 2006
@@ -35,6 +35,7 @@
         <FORM method="post" action="<@ofbizUrl>updateProductPriceRule</@ofbizUrl>" name="updateProductPriceRule">
             <input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}">
             <input type="text" size="15" name="ruleName" value="${productPriceRule.ruleName}" class="inputBox">
+            <input type="text" size="15" name="description" value="${productPriceRule.description?if_exists}" class="inputBox">
             <input type="text" size="22" name="fromDate" value="${productPriceRule.fromDate?if_exists}" class="inputBox"><a href="javascript:call_cal(document.updateProductPriceRule.fromDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a>
             <input type="text" size="22" name="thruDate" value="${productPriceRule.thruDate?if_exists}" class="inputBox"><a href="javascript:call_cal(document.updateProductPriceRule.thruDate, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a>
             &nbsp;&nbsp;