1
=== modified file 'sale/sale.py'
2
--- sale/sale.py	2012-07-04 12:05:33 +0000
3
+++ sale/sale.py	2012-07-18 10:08:38 +0000
4
@@ -1263,7 +1263,7 @@
5
1263
            context = {}
1263
            context = {}
6
1264
        """Allows to delete sales order lines in draft,cancel states"""
1264
        """Allows to delete sales order lines in draft,cancel states"""
7
1265
        for rec in self.browse(cr, uid, ids, context=context):
1265
        for rec in self.browse(cr, uid, ids, context=context):
9
1266
            if rec.state not in ['draft', 'cancel']:
1266
            if rec.state not in ['draft', 'cancel'] and not context.get('call_unlink', False):
10
1267
                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sales order line which is %s !') %(rec.state,))
1267
                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sales order line which is %s !') %(rec.state,))
11
1268
        return super(sale_order_line, self).unlink(cr, uid, ids, context=context)
1268
        return super(sale_order_line, self).unlink(cr, uid, ids, context=context)
12
1269
1269
Status:	Merged
Merged at revision:	4546
Proposed branch:	lp:~unifield-team/unifield-addons/uf-1216
Merge into:	lp:unifield-addons
Diff against target:	11 lines (+1/-1) 1 file modified sale/sale.py (+1/-1)
To merge this branch:	bzr merge lp:~unifield-team/unifield-addons/uf-1216
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
UniField Dev Team		2012-07-18	Pending
Review via email: mp+115507@code.launchpad.net
1	=== modified file 'sale/sale.py'
2	--- sale/sale.py 2012-07-04 12:05:33 +0000
3	+++ sale/sale.py 2012-07-18 10:08:38 +0000
4	@@ -1263,7 +1263,7 @@
5	1263	context = {}	1263	context = {}
6	1264	"""Allows to delete sales order lines in draft,cancel states"""	1264	"""Allows to delete sales order lines in draft,cancel states"""
7	1265	for rec in self.browse(cr, uid, ids, context=context):	1265	for rec in self.browse(cr, uid, ids, context=context):
9	1266	if rec.state not in ['draft', 'cancel']:	1266	if rec.state not in ['draft', 'cancel'] and not context.get('call_unlink', False):
10	1267	raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sales order line which is %s !') %(rec.state,))	1267	raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sales order line which is %s !') %(rec.state,))
11	1268	return super(sale_order_line, self).unlink(cr, uid, ids, context=context)	1268	return super(sale_order_line, self).unlink(cr, uid, ids, context=context)
12	1269		1269