Reviewers: ,
Please review this at http://codereview.tryton.org/738003/
Affected files:
M sale.py
Index: sale.py
===================================================================
--- a/sale.py
+++ b/sale.py
@@ -542,20 +542,20 @@ class Sale(Workflow, ModelSQL, ModelView
sale.check_method()
def check_method(self):
'''
Check the methods.
'''
if (self.invoice_method == 'shipment'
and self.shipment_method in ('invoice', 'manual')):
- self.raise_user_error('invalid_method', (sale.rec_name,))
+ self.raise_user_error('invalid_method', (self.rec_name,))
if (self.shipment_method == 'invoice'
and self.invoice_method in ('shipment', 'manual')):
- self.raise_user_error('invalid_method', (sale.rec_name,))
+ self.raise_user_error('invalid_method', (self.rec_name,))
def get_rec_name(self, name):
return (self.reference or str(self.id)
+ ' - ' + self.party.rec_name)
@classmethod
def search_rec_name(cls, name, clause):
names = clause[2].split(' - ', 1)
@@ -575,27 +575,27 @@ class Sale(Workflow, ModelSQL, ModelView
default['invoices'] = None
default['invoices_ignored'] = None
default['shipment_state'] = 'none'
default.setdefault('sale_date', None)
return super(Sale, cls).copy(sales, default=default)
def check_for_quotation(self):
if not self.invoice_address or not self.shipment_address:
- self.raise_user_error('addresses_required', (sale.rec_name,))
+ self.raise_user_error('addresses_required', (self.rec_name,))
for line in self.lines:
if line.quantity >= 0:
location = line.from_location
else:
location = line.to_location
if ((not location or not line.warehouse)
and line.product
and line.product.type in ('goods', 'assets')):
self.raise_user_error('warehouse_required',
- (sale.rec_name,))
+ (self.rec_name,))
@classmethod
def set_reference(cls, sales):
'''
Fill the reference field with the sale sequence
'''
pool = Pool()
Sequence = pool.get('ir.sequence')
@@ -674,17 +674,17 @@ class Sale(Workflow, ModelSQL, ModelView
'''
pool = Pool()
Invoice = pool.get('account.invoice')
if self.invoice_method == 'manual':
return
if not self.party.account_receivable:
self.raise_user_error('missing_account_receivable',
- error_args=(self.party.rec_name,))
+ (self.party.rec_name,))
invoice_lines = self._get_invoice_line_sale_line(invoice_type)
if not invoice_lines:
return
invoice = self._get_invoice_sale(invoice_type)
invoice.lines =
list(chain.from_iterable(invoice_lines.itervalues()))
invoice.save()
@@ -773,17 +773,17 @@ class Sale(Workflow, ModelSQL, ModelView
or self.shipment_method == 'manual'))
@classmethod
def delete(cls, sales):
# Cancel before delete
cls.cancel(sales)
for sale in sales:
if sale.state != 'cancel':
- cls.raise_user_error('delete_cancel', sale.rec_name)
+ cls.raise_user_error('delete_cancel', (sale.rec_name,))
super(Sale, cls).delete(sales)
@classmethod
@ModelView.button
@Workflow.transition('cancel')
def cancel(cls, sales):
cls.store_cache(sales)
