From 61a3238d978ab40e661974dc2b75fbda700f7c70 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 11 Jun 2012 16:20:38 +0530
Subject: [PATCH 1/2] [FIX]stock: fix the issue of counting of Deliveries in
 kanban view and improve a action string

lp bug: https://launchpad.net/bugs/1011541 fixed

bzr revid: mma@tinyerp.com-20120611105038-wrospxpjr2wbna6h
---
 addons/stock/product.py       | 2 +-
 addons/stock/product_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 62fdbb24ca2..9f9faa1cc24 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -44,7 +44,7 @@ class product_product(osv.osv):
         ], ['product_id'], ['product_id'])
         for move in moves:
             product_id = move['product_id'][0]
-            res[product_id]['reception_count'] = move['product_id_count']
+            res[product_id]['delivery_count'] = move['product_id_count']
         return res
 
     def get_product_accounts(self, cr, uid, product_id, context=None):
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 49e0e9c1880..e1840ac7497 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -140,7 +140,7 @@
         </record>
        
         <record id="action_deliver_move" model="ir.actions.act_window">
-            <field name="name">Receive Products</field>
+            <field name="name">Deliver Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>

From 344ddfbdd5fcf2ff6f22a76f5aa405e8ebeee185 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 19 Jun 2012 11:54:26 +0530
Subject: [PATCH 2/2] [FIX]base:fix the issue of KeyError when changes in line
 of Journal Entry

lp bug: https://launchpad.net/bugs/955910 fixed

bzr revid: mma@tinyerp.com-20120619062426-x5ykv2thycvpvs4l
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index f0c16d8586c..a441a262003 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1363,7 +1363,7 @@ class account_move(osv.osv):
         balance = 0.0
         for line in line_ids:
             if line[2]:
-                balance += (line[2]['debit'] or 0.00)- (line[2]['credit'] or 0.00)
+                balance += (line[2].get('debit',0.00)- (line[2].get('credit',0.00)))
         return {'value': {'balance': balance}}
 
     def write(self, cr, uid, ids, vals, context=None):