diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 8a02b11b0f5..baba6697a22 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -163,6 +163,7 @@ class purchase_order(osv.osv): 'state': { 'purchase.mt_rfq_confirmed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'confirmed', 'purchase.mt_rfq_approved': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'approved', + 'purchase.mt_rfq_done': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done', }, } _columns = { @@ -675,7 +676,7 @@ class purchase_order(osv.osv): def picking_done(self, cr, uid, ids, context=None): self.write(cr, uid, ids, {'shipped':1,'state':'approved'}, context=context) - self.message_post(cr, uid, ids, body=_("Product Received."), context=context) + self.message_post(cr, uid, ids, body=_("Products Received."), context=context) return True def copy(self, cr, uid, id, default=None, context=None): @@ -1192,7 +1193,7 @@ class mail_compose_message(osv.Model): class account_invoice(osv.Model): _inherit = 'account.invoice' - + def invoice_validate(self, cr, uid, ids, context=None): po_ids = self.pool.get('purchase.order').search(cr,uid,[('invoice_ids','in',ids)],context) res = super(account_invoice, self).invoice_validate(cr, uid, ids, context=None) @@ -1205,4 +1206,5 @@ class account_invoice(osv.Model): self.pool.get('purchase.order').message_post(cr, uid, po_ids, body=_("Invoice Paid"), context=context) return res + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml index ceb43ba281a..66e64926e49 100644 --- a/addons/purchase/purchase_data.xml +++ b/addons/purchase/purchase_data.xml @@ -60,6 +60,11 @@ purchase.order + + Purchase Order Done + + purchase.order +