[MERGE] Merged BDE's branch to remove done button from sale order line

bzr revid: pso@tinyerp.com-20120817131500-b37zch4y0z01q73c

addons/sale/sale.py

@@ -1260,13 +1260,6 @@ class sale_order_line(osv.osv):
     def button_confirm(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'confirmed'})
 
-    def button_done(self, cr, uid, ids, context=None):
-        wf_service = netsvc.LocalService("workflow")
-        res = self.write(cr, uid, ids, {'state': 'done'})
-        for line in self.browse(cr, uid, ids, context=context):
-            wf_service.trg_write(uid, 'sale.order', line.order_id.id, cr)
-        return res
-
     def uos_change(self, cr, uid, ids, product_uos, product_uos_qty=0, product_id=None):
         product_obj = self.pool.get('product.product')
         if not product_id:

addons/sale/sale_view.xml

@@ -508,8 +508,7 @@
                     <header>
                         <span groups="base.group_user">
                             <button name="button_cancel" string="Cancel" type="object" icon="gtk-cancel" states="confirmed,exception"/>
-                            <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" states="done" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', 1)]}" class="oe_highlight"/>
-                            <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward" class="oe_highlight"/>
+                            <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" icon="gtk-go-forward" states="confirmed" attrs="{'invisible': [('invoiced', '=', True)]}" class="oe_highlight"/>
                         </span>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                     </header>

addons/sale/wizard/sale_line_invoice.py

@@ -89,7 +89,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
                 for lid in line_id:
                     invoices[line.order_id.id].append((line, lid))
                 sales_order_line_obj.write(cr, uid, [line.id],
-                        {'invoiced': True})
+                        {'invoiced': True, 'state': 'done'})
         for result in invoices.values():
             order = result[0][0].order_id
             il = map(lambda x: x[1], result)