diff --git a/addons/delivery/wizard/delivery_invoice_onshipping.py b/addons/delivery/wizard/delivery_invoice_onshipping.py
index eba71f8c8da..84e12c5d953 100644
--- a/addons/delivery/wizard/delivery_invoice_onshipping.py
+++ b/addons/delivery/wizard/delivery_invoice_onshipping.py
@@ -146,5 +146,3 @@ class make_invoice_onshipping(wizard.interface):
}
make_invoice_onshipping("delivery.invoice_onshipping")
-
-
diff --git a/addons/project/mrp.py b/addons/project/mrp.py
index 8640c0ccd9e..699d6ea594e 100644
--- a/addons/project/mrp.py
+++ b/addons/project/mrp.py
@@ -42,6 +42,7 @@ class mrp_procurement(osv.osv):
'state': 'open',
'planned_hours': procurement.product_qty,
'user_id': procurement.product_id.product_manager.id,
+ 'notes': procurement.origin,
'procurement_id': procurement.id
})
return task_id
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index caae77b9d9d..e978ad5ca81 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -338,7 +338,7 @@ class sale_order(osv.osv):
write_cancel_ids = []
for order in self.browse(cr, uid, ids, context={}):
for line in order.order_line:
- if line.procurement_id and line.procurement_id.state != 'done':
+ if line.procurement_id and (line.procurement_id.state != 'done') and (line.state!='done'):
finished = False
if line.procurement_id and line.procurement_id.state == 'cancel':
canceled = True
@@ -602,7 +602,12 @@ class sale_order_line(osv.osv):
return self.write(cr, uid, ids, {'state':'confirmed'})
def button_done(self, cr, uid, ids, context={}):
- return self.write(cr, uid, ids, {'state':'done'})
+ wf_service = netsvc.LocalService("workflow")
+ res = self.write(cr, uid, ids, {'state':'done'})
+ for line in self.browse(cr,uid,ids,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):
if not product_id:
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e650eba0b85..b53c12dfc60 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -109,7 +109,17 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -345,13 +355,13 @@
tree
+
-
@@ -384,7 +394,7 @@
-
+