diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:40:59 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:40:59 +0200 |
| commit | baf494c67ba7ecba331b24bcfa5eed9bde8a16da (patch) | |
| tree | 3b2c9ec3cacabcf0a5b0fb78a667d5e1b27505dc /addons/procurement/procurement.py | |
| parent | 133490b4d0e347d75bab20da8e5e0ad1f95d3a2d (diff) | |
| parent | 1d81bb06a47b1aee1b7a0dcdaa03084ddedf8b7b (diff) | |
[MERGE] forward port of branch saas-9 up to 1d81bb0
# Conflicts:
# addons/account_extra_reports/i18n/ca.po
# addons/account_extra_reports/i18n/fi.po
# addons/account_extra_reports/i18n/pl.po
# addons/account_extra_reports/i18n/te.po
# addons/account_extra_reports/i18n/zh_CN.po
# addons/account_full_reconcile/i18n/hu.po
# addons/account_full_reconcile/i18n/pl.po
# addons/crm/crm_lead_menu.xml
# addons/crm_claim/i18n/es_PE.po
# addons/crm_claim/i18n/hu.po
# addons/crm_claim/i18n/ja.po
# addons/crm_claim/i18n/pl.po
# addons/delivery/views/delivery_view.xml
# addons/product/product_view.xml
# addons/project_timesheet/i18n/es_PE.po
# addons/stock/stock_view.xml
Diffstat (limited to 'addons/procurement/procurement.py')
| -rw-r--r-- | addons/procurement/procurement.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index a7f21cb4b84..e1d5db08fb9 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -136,7 +136,7 @@ class procurement_order(osv.osv): unlink_ids.append(s['id']) else: raise UserError(_('Cannot delete Procurement Order(s) which are in %s state.') % s['state']) - return osv.osv.unlink(self, cr, uid, unlink_ids, context=context) + return super(procurement_order, self).unlink(cr, uid, unlink_ids, context=context) def create(self, cr, uid, vals, context=None): context = context or {} |