Reviewers: ,
Please review this at http://codereview.tryton.org/740002/
Affected files:
M purchase.py
Index: purchase.py
===================================================================
--- a/purchase.py
+++ b/purchase.py
@@ -525,24 +525,22 @@ class Purchase(Workflow, ModelSQL, Model
default['invoices'] = None
default['invoices_ignored'] = None
default['shipment_state'] = 'none'
default.setdefault('purchase_date', None)
return super(Purchase, cls).copy(purchases, default=default)
def check_for_quotation(self):
if not self.invoice_address:
- self.raise_user_error('invoice_address_required',
- (purchase.rec_name,))
+ self.raise_user_error('invoice_address_required',
(self.rec_name,))
for line in self.lines:
if (not line.to_location
and line.product
and line.product.type in ('goods', 'assets')):
- self.raise_user_error('warehouse_required',
- (purchase.rec_name,))
+ self.raise_user_error('warehouse_required',
(self.rec_name,))
@classmethod
def set_reference(cls, purchases):
'''
Fill the reference field with the purchase sequence
'''
pool = Pool()
Sequence = pool.get('ir.sequence')
@@ -1154,27 +1152,27 @@ class PurchaseLine(ModelSQL, ModelView):
invoice_line.unit = self.unit
invoice_line.product = self.product
invoice_line.unit_price = self.unit_price
invoice_line.taxes = self.taxes
if self.product:
invoice_line.account = self.product.account_expense_used
if not invoice_line.account:
self.raise_user_error('missing_account_expense', {
- 'product': line.product.rec_name,
- 'purchase': line.purchase.rec_name,
+ 'product': invoice_line.product.rec_name,
+ 'purchase': invoice_line.purchase.rec_name,
})
else:
for model in ('product.template', 'product.category'):
invoice_line.account = Property.get('account_expense',
model)
if invoice_line.account:
break
if not invoice_line.account:
self.raise_user_error('missing_account_expense_property',
- (line.purchase.rec_name,))
+ (invoice_line.purchase.rec_name,))
invoice_line.origin = self
return [invoice_line]
@classmethod
def copy(cls, lines, default=None):
if default is None:
default = {}
default = default.copy()
