[MERGE] fix bug lp:797715 by mtr

bzr revid: tfr@openerp.com-20110701142134-w8gk9oizibp4n6m3

addons/sale/report/sale_report.py

@@ -31,7 +31,7 @@ class sale_report(osv.osv):
         'date': fields.date('Date Order', readonly=True),
         'date_confirm': fields.date('Date Confirm', readonly=True),
         'shipped': fields.boolean('Shipped', readonly=True),
-        'shipped_qty_1': fields.integer('Shipped Qty', readonly=True),
+        'shipped_qty_1': fields.integer('Shipped', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'),
             ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),

addons/sale/report/sale_report_view.xml

@@ -21,7 +21,7 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_uom_qty" sum="# of Qty"/>
-                <field name="shipped_qty_1" sum="Shipped Qty"/>
+                <field name="shipped_qty_1" sum="Shipped"/>
                 <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" sum="Commitment Delay"/>