Merge lp:~openerp-dev/openobject-addons/trunk-bug-1011541-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello Sir,

     product : I Have fix the issue of counting of Deliveries in kanban view and improve a action string of Deliver product

Thanks
Mayur

=== modified file 'stock/product.py'
--- stock/product.py	2012-05-22 14:54:33 +0000
+++ stock/product.py	2012-06-21 11:15:26 +0000
@@ -44,7 +44,7 @@
         ], ['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):

=== modified file 'stock/product_view.xml'
--- stock/product_view.xml	2012-06-19 08:56:18 +0000
+++ stock/product_view.xml	2012-06-21 11:15:26 +0000
@@ -138,7 +138,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>