Index: app/code/core/Mage/Weee/etc/config.xml
===================================================================
--- app/code/core/Mage/Weee/etc/config.xml	(revision 44593)
+++ app/code/core/Mage/Weee/etc/config.xml	(working copy)
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Weee>
-            <version>0.13</version>
+            <version>0.14</version>
         </Mage_Weee>
     </modules>
 
@@ -297,4 +297,4 @@
              </updates>
         </layout>
     </frontend>
-</config>
\ No newline at end of file
+</config>
Index: app/code/core/Mage/Weee/Model/Mysql4/Tax.php
===================================================================
--- app/code/core/Mage/Weee/Model/Mysql4/Tax.php	(revision 44593)
+++ app/code/core/Mage/Weee/Model/Mysql4/Tax.php	(working copy)
@@ -14,17 +14,44 @@
     {
         return $this->_getReadAdapter()->fetchCol($select);
     }
-
+
     public function updateDiscountPercents()
     {
-        $this->_getWriteAdapter()->delete($this->getTable('weee/discount'));
+		return $this->_updateDiscountPercents();
+    }
+
+    public function updateDiscountPercentsByPCondition($productCondition)
+    {
+    	return $this->_updateDiscountPercents($productCondition);
+    }
+
+    protected function _updateDiscountPercents($productCondition=null)
+    {
+        if (is_null($productCondition)) {
+            $this->_getWriteAdapter()->delete($this->getTable('weee/discount'));
+        } else {
+            $this->_getWriteAdapter()->delete($this->getTable('weee/discount'),
+                $this->_getReadAdapter()->quoteInto('entity_id in (?)',
+                    $this->_getReadAdapter()->fetchCol($productCondition->getIdsSelect($this->_getReadAdapter()))
+                )
+            );
+        }
+
         $now = strtotime(now());
 
         $select = $this->_getReadAdapter()->select();
-        $select->from(array('data'=>$this->getTable('catalogrule/rule_product')))
-            ->where('(from_time <= ? OR from_time = 0)', $now) -            ->where('(to_time >= ? OR to_time = 0)', $now)
-            ->order(array('data.website_id', 'data.customer_group_id', 'data.product_id', 'data.sort_order'));
+        $select->from(array('data'=>$this->getTable('catalogrule/rule_product')));
+
+        if (is_null($productCondition)) {
+            $select->where('(from_time <= ? OR from_time = 0)', $now); +            $select->where('(to_time >= ? OR to_time = 0)', $now);
+        } else {
+            $select->where('product_id in (?)',
+                $this->_getReadAdapter()->fetchCol($productCondition->getIdsSelect($this->_getReadAdapter()))
+            );
+        }
+
+        $select->order(array('data.website_id', 'data.customer_group_id', 'data.product_id', 'data.sort_order'));
 
         $data = $this->_getReadAdapter()->fetchAll($select);
         $productData = array();
@@ -68,4 +95,4 @@
 
         return $this->_getReadAdapter()->fetchOne($select);
     }
-}
\ No newline at end of file
+}
Index: app/code/core/Mage/Weee/Model/Observer.php
===================================================================
--- app/code/core/Mage/Weee/Model/Observer.php	(revision 44593)
+++ app/code/core/Mage/Weee/Model/Observer.php	(working copy)
@@ -195,7 +195,13 @@
 
     public function updateDiscountPercents(Varien_Event_Observer $observer)
     {
-        Mage::getModel('weee/tax')->updateDiscountPercents();
+    	if ( $observer->getEvent()->getProductCondition() ) {
+        	Mage::getModel('weee/tax')->updateDiscountPercentsByPCondition(
+        	   $observer->getEvent()->getProductCondition()
+        	);
+    	} else {
+    		Mage::getModel('weee/tax')->updateDiscountPercents();
+    	}
         return $this;
     }
 
@@ -252,4 +258,4 @@
 
         return $this;
     }
-}
\ No newline at end of file
+}
Index: app/code/core/Mage/Weee/Model/Tax.php
===================================================================
--- app/code/core/Mage/Weee/Model/Tax.php	(revision 44593)
+++ app/code/core/Mage/Weee/Model/Tax.php	(working copy)
@@ -152,6 +152,12 @@
         }
     }
 
+    public function updateDiscountPercentsByPCondition($productCondition)
+    {
+    	$this->getResource()->updateDiscountPercentsByPCondition($productCondition);
+    	return $this;
+    }
+
     public function updateDiscountPercents()
     {
         $this->getResource()->updateDiscountPercents();
Index: app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.13-0.14.php
===================================================================
--- app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.13-0.14.php	(revision 0)
+++ app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.13-0.14.php	(revision 0)
@@ -0,0 +1,31 @@
+<?php +/** + * Magento + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://opensource.org/licenses/osl-3.0.php + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@magentocommerce.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade Magento to newer + * versions in the future. If you wish to customize Magento for your + * needs please refer to http://www.magentocommerce.com for more information. + * + * @category   Mage + * @package    Mage_Weee + * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0) + */ + +$installer = $this; +/* @var $installer Mage_Weee_Model_Mysql4_Setup */ + +$installer->getConnection()->modifyColumn($installer->getTable('weee/discount'), 'customer_group_id', 'SMALLINT(5) UNSIGNED DEFAULT NULL');
+$installer->getConnection()->modifyColumn($installer->getTable('weee/discount'), 'website_id', 'SMALLINT(5) UNSIGNED DEFAULT NULL');