From 0a97c08aedcec44ba43eef43336409b95a0af530 Mon Sep 17 00:00:00 2001
From: "rha@tinyerp.com" <>
Date: Thu, 23 Dec 2010 15:07:00 +0530
Subject: [PATCH 1/2] [Fix]: Bug #692698 purchase analysis - division by zero

bzr revid: rha@tinyerp.com-20101223093700-53cspuk8klp27h8q
---
 addons/purchase/report/purchase_report.py | 7 ++-----
 addons/sale/report/sale_report.py         | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index cd197222eaa..502aec06801 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -99,12 +99,9 @@ class purchase_report(osv.osv):
                     extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
                     count(*) as nbr,
                     (l.price_unit*l.product_qty*u.factor)::decimal(16,2) as price_total,
-                    avg(case when t.standard_price <= 0 then (l.price_unit*l.product_qty*u.factor)
-                    else
-                    (100.0 * (l.price_unit*l.product_qty*u.factor) / (t.standard_price*l.product_qty*u.factor))
-                    end) as negociation,
+                    avg(100.0 * (l.price_unit*l.product_qty*u.factor)/(nullif(t.standard_price*l.product_qty*u.factor,0)))::decimal(16,2) as negociation,
                     sum(t.standard_price*l.product_qty*u.factor)::decimal(16,2) as price_standard,
-                    (sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average
+                    (sum(l.product_qty*l.price_unit)/sum(nullif(l.product_qty*u.factor,0)))::decimal(16,2) as price_average
                 from purchase_order s
                     left join purchase_order_line l on (s.id=l.order_id)
                         left join product_product p on (l.product_id=p.id)
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 75c37ff9416..ae4edbb1f9d 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -94,7 +94,8 @@ class sale_report(osv.osv):
                          u.name as uom_name,
                          sum(l.product_uom_qty * u.factor) as product_uom_qty,
                          sum(l.product_uom_qty*l.price_unit) as price_total,
-                         (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor)*count(l.product_id))::decimal(16,2) as price_average,
+                         (sum(l.product_uom_qty*l.price_unit)/sum(nullif(l.product_uom_qty * u.factor,0))*count(l.product_id))::decimal(16,2) as price_average,
+
                          pt.categ_id, l.order_id
                     from
                      sale_order_line l

From f8b87f9a66ea95dea68ded6209ef57c33f18702a Mon Sep 17 00:00:00 2001
From: "rha@tinyerp.com" <>
Date: Fri, 24 Dec 2010 16:24:20 +0530
Subject: [PATCH 2/2] [Fix]: Bug #693957 deliver and receive products need
 production lot in extended filters

bzr revid: rha@tinyerp.com-20101224105420-58y7nwzwfuyd1bjv
---
 addons/stock/stock_view.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c041fb1b065..02163fbab1b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -10,12 +10,12 @@
         <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
         <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
-           parent="stock.menu_stock_product" sequence="0"/> 
+           parent="stock.menu_stock_product" sequence="0"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
         <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="group_stock_manager"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
-        <menuitem 
+        <menuitem
             id="menu_product_in_config_stock" name="Product"
             parent="stock.menu_stock_configuration" sequence="2"/>
         <menuitem
@@ -24,7 +24,7 @@
         <menuitem
             action="product.product_ul_form_action" groups="base.group_extended"
             id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
-         <menuitem 
+         <menuitem
             id="menu_stock_unit_measure_stock" name="Units of Measure"
             parent="stock.menu_product_in_config_stock"  sequence="2"/>
          <menuitem
@@ -1659,7 +1659,8 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
+                       <field name="tracking_id" context="{'tracking': self}"/>
+                       <field name="prodlot_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
@@ -1694,7 +1695,8 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
+                       <field name="tracking_id" context="{'tracking_id': self}"/>
+                       <field name="prodlot_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">