From 39d0932dfab7f6735f4b43fd1d1f1d5fbafb3e90 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 14 Apr 2011 15:05:40 +0530
Subject: [PATCH 1/5] [FIX]: purchase: Fixed invoiced rate for purchase order

bzr revid: rpa@tinyerp.com-20110414093540-lv5x998zs3cv770b
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6f6ab0c1b44..324fe130f81 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -98,7 +98,7 @@ class purchase_order(osv.osv):
             tot = 0.0
             for invoice in purchase.invoice_ids:
                 if invoice.state not in ('draft','cancel'):
-                    tot += invoice.amount_untaxed
+                    tot += (invoice.amount_untaxed - invoice.residual)
             if purchase.amount_untaxed:
                 res[purchase.id] = tot * 100.0 / purchase.amount_untaxed
             else:

From d224cc22054ee46646b8b43aed347a1efb6fda2e Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 14 Apr 2011 18:10:49 +0530
Subject: [PATCH 2/5] [IMP]resource:Usability Issue-Remove Read only Field
 working period

bzr revid: aag@tinyerp.co.in-20110414124049-ehkses30irtpjiv4
---
 addons/resource/resource_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 7663a5af5d4..424955d0584 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -225,7 +225,7 @@
                        </group>
                        <group colspan="2" col="2">
                            <field name="date_from"/>
-                           <field name="calendar_id" string="Working Period" readonly='1'/>
+                           <field name="calendar_id" string="Working Period"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
                        <group colspan="2" col="2">

From f0cf5764c820aa35ed59bbc1bf41ee51c5c8ec7c Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 15 Apr 2011 11:28:17 +0530
Subject: [PATCH 3/5] [IMP]MRP :Usability Issue-Now MO: Product is not
 Consumable or Service type

bzr revid: aag@tinyerp.co.in-20110415055817-3366enzlvbav7yr2
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 1ac11707870..48c136d1258 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -638,7 +638,7 @@
                         <field name="date_planned"/>
                         <field name="origin"/>
                         <newline/>
-                        <field name="product_id" on_change="product_id_change(product_id)"/>
+                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('type','=','product')]"/>
                         <field name="product_qty"/>
                         <field name="product_uom"/>
                         <button type="action"

From eeaa82523233a5ab498288172000ca175770a343 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 15 Apr 2011 14:13:11 +0530
Subject: [PATCH 4/5] [IMP]Procrument :Usability Issue-solve Speling Mistack of
  tooltip

bzr revid: aag@tinyerp.co.in-20110415084311-3iygvwq221ctgqd1
---
 addons/procurement/procurement.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 3257f0a5694..fccc6445d3d 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -512,13 +512,13 @@ class stock_warehouse_orderpoint(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_min_qty': fields.float('Min Quantity', required=True,
-            help="When the virtual stock goes belong the Min Quantity, OpenERP generates "\
+            help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'product_max_qty': fields.float('Max Quantity', required=True,
-            help="When the virtual stock goes belong the Max Quantity, OpenERP generates "\
+            help="When the virtual stock goes below the Max Quantity, OpenERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
-            help="The procurement quantity will by rounded up to this multiple."),
+            help="The procurement quantity will be rounded up to this multiple."),
         'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),
         'company_id': fields.many2one('res.company','Company',required=True),
         'procurement_draft_ids': fields.function(_get_draft_procurements, method=True, type='many2many', relation="procurement.order", \

From 71049f8bb6043bd7d9db40af76f87c690cd73404 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 20 Apr 2011 11:43:48 +0530
Subject: [PATCH 5/5] [IMP]: procurement: Improved tooltip for min-max qty of
 minimun stock rule

bzr revid: rpa@tinyerp.com-20110420061348-uy8xmycbeehfa7l3
---
 addons/procurement/procurement.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index fccc6445d3d..1f808f2bef6 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -512,11 +512,11 @@ class stock_warehouse_orderpoint(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_min_qty': fields.float('Min Quantity', required=True,
-            help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
+            help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'product_max_qty': fields.float('Max Quantity', required=True,
-            help="When the virtual stock goes below the Max Quantity, OpenERP generates "\
-            "a procurement to bring the virtual stock to the Max Quantity."),
+            help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
+            "a procurement to bring the virtual stock to the Quantity specified as Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
             help="The procurement quantity will be rounded up to this multiple."),
         'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),