diff options
| -rw-r--r-- | addons/purchase/purchase.py | 3 | ||||
| -rw-r--r-- | addons/purchase/purchase_data.xml | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index a6a5f3e75de..ec4fc5c9dcf 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -163,7 +163,6 @@ 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_invoice_paid': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done', }, } _columns = { @@ -1192,7 +1191,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) diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml index a08e221053e..ceb43ba281a 100644 --- a/addons/purchase/purchase_data.xml +++ b/addons/purchase/purchase_data.xml @@ -60,10 +60,6 @@ <field name="default" eval="False"/> <field name="res_model">purchase.order</field> </record> - <record id="mt_rfq_invoice_paid" model="mail.message.subtype"> - <field name="name">Invoice Paid</field> - <field name="default" eval="False"/> - <field name="res_model">purchase.order</field> - </record> + </data> </openerp> |