Revert "Change default numbering of RMA to avoid crash on SQL unique constraint"

This reverts commit aaa379647c.
This commit is contained in:
Joël Grand-Guillaume
2014-07-16 15:06:48 +02:00
parent 39fa48276d
commit fdfbd40096

View File

@@ -338,6 +338,11 @@ class claim_line(orm.Model):
class crm_claim(orm.Model):
_inherit = 'crm.claim'
def _get_sequence_number(self, cr, uid, context=None):
seq_obj = self.pool.get('ir.sequence')
res = seq_obj.get(cr, uid, 'crm.claim.rma', context=context) or '/'
return res
def _get_default_warehouse(self, cr, uid, context=None):
user_obj = self.pool.get('res.users')
user = user_obj.browse(cr, uid, uid, context=context)
@@ -361,13 +366,20 @@ class crm_claim(orm.Model):
res.append((claim.id, '[' + number + '] ' + claim.name))
return res
def create(self, cr, uid, vals, context=None):
if ('number' not in vals) or (vals.get('number') == '/'):
vals['number'] = self._get_sequence_number(cr, uid,
context=context)
new_id = super(crm_claim, self).create(cr, uid, vals, context=context)
return new_id
def copy_data(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
std_default = {
'invoice_ids': False,
'picking_ids': False,
'number': self.pool['ir.sequence'].get(cr, uid, 'crm.claim.rma')
'number': self._get_sequence_number(cr, uid, context=context),
}
std_default.update(default)
return super(crm_claim, self).copy_data(
@@ -411,8 +423,7 @@ class crm_claim(orm.Model):
}
_defaults = {
'number': lambda self, cr, uid, context: self.pool['ir.sequence'].get(
cr, uid, 'crm.claim.rma'),
'number': '/',
'claim_type': 'customer',
'warehouse_id': _get_default_warehouse,
}