[MERGE] merge with main branch

bzr revid: mra@mra-laptop-20100709075932-4xps0jlvosu2xf9a

addons/account/report/account_invoice_report_view.xml

@@ -28,7 +28,7 @@
                 <field name="partner_bank" invisible="1"/>
                 <field name="account_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
-                <field name="product_qty"/>
+                <field name="product_qty" sum="Qty"/>
                 <field name="reconciled"  sum="# Reconciled"/>
                 <field name="price_average" sum="Average Price"/>
                 <field name="price_total" sum="Total Price"/>

addons/account/wizard/account_change_currency.py

@@ -35,7 +35,7 @@ class account_change_currency(osv.osv_memory):
             context = {}
         state = obj_inv.browse(cr, uid, context['active_id']).state
         if obj_inv.browse(cr, uid, context['active_id']).state != 'draft':
-            raise osv.except_osv(_('Error'), _('You can not change currency for Open Invoice !'))
+            raise osv.except_osv(_('Error'), _('You can only change currency for Draft Invoice !'))
         pass
 
     def change_currency(self, cr, uid, ids, context=None):