[MERGE] forward port of branch 7.0 up to b1df5aa

diff --cc addons/sale/wizard/sale_line_invoice.py
index fa0b46d,fd3e78c..3c96c52
--- 1/addons/sale/wizard/sale_line_invoice.py
--- 2/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@@ -100,7 -100,7 +100,7 @@@ class sale_order_line_make_invoice(osv.
                      flag = False
                      break
              if flag:
-                 workflow.trg_validate(uid, 'sale.order', order.id, 'manual_invoice', cr)
 -                wf_service.trg_validate(uid, 'sale.order', order.id, 'all_lines', cr)
++                workflow.trg_validate(uid, 'sale.order', order.id, 'all_lines', cr)
  
          if not invoices:
              raise osv.except_osv(_('Warning!'), _('Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n1.The state of this sales order line is either "draft" or "cancel"!\n2.The Sales Order Line is Invoiced!'))