Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-opw-591101-psi into lp:openobject-addons/7.0

  1. 7.0-opw-591101-psi
  2. Merge into 7.0
Proposed by Purnendu Singh (OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 9000
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-591101-psi
Merge into: lp:openobject-addons/7.0
Diff against target: 37 lines (+6/-0)
3 files modified
purchase/purchase.py (+2/-0)
sale/sale.py (+2/-0)
sale_stock/sale_stock.py (+2/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-591101-psi
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+157845@code.launchpad.net

Description of the change

Hello,

As there is no way to delete a sale or purchase order which is in done state! Updated the warning message to avoid any misguidance.

Thanks,
Purnendu Singh

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Reply

Unmerged revisions

9000. By Purnendu Singh (OpenERP)

[FIX] sale, sale_stock, purchase: As there is no way to delete a done so or po, improve the warning message according

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'purchase/purchase.py'
2--- purchase/purchase.py 2013-04-04 09:21:34 +0000
3+++ purchase/purchase.py 2013-04-09 10:56:23 +0000
4@@ -258,6 +258,8 @@
5 for s in purchase_orders:
6 if s['state'] in ['draft','cancel']:
7 unlink_ids.append(s['id'])
8+ elif s['state'] == 'done':
9+ raise osv.except_osv(_('Invalid Action!'), _('You cannot delete a purchase order which is in done state !'))
10 else:
11 raise osv.except_osv(_('Invalid Action!'), _('In order to delete a purchase order, you must cancel it first.'))
12
13
14=== modified file 'sale/sale.py'
15--- sale/sale.py 2013-04-05 15:14:51 +0000
16+++ sale/sale.py 2013-04-09 10:56:23 +0000
17@@ -273,6 +273,8 @@
18 for s in sale_orders:
19 if s['state'] in ['draft', 'cancel']:
20 unlink_ids.append(s['id'])
21+ elif s['state'] == 'done':
22+ raise osv.except_osv(_('Invalid Action!'), _('You cannot delete a sale order which is in done state !'))
23 else:
24 raise osv.except_osv(_('Invalid Action!'), _('In order to delete a confirmed sales order, you must cancel it before !'))
25
26
27=== modified file 'sale_stock/sale_stock.py'
28--- sale_stock/sale_stock.py 2013-04-05 15:14:51 +0000
29+++ sale_stock/sale_stock.py 2013-04-09 10:56:23 +0000
30@@ -159,6 +159,8 @@
31 for s in sale_orders:
32 if s['state'] in ['draft', 'cancel']:
33 unlink_ids.append(s['id'])
34+ elif s['state'] == 'done':
35+ raise osv.except_osv(_('Invalid Action!'), _('You cannot delete a sale order which is in done state !'))
36 else:
37 raise osv.except_osv(_('Invalid Action!'), _('In order to delete a confirmed sales order, you must cancel it.\nTo do so, you must first cancel related picking for delivery orders.'))
38