pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] sale: code cleaning

Browse Source 
Some code cleaning here, because this is really ugly.
This commit is contained in:
Nicolas Martinelli
2015-12-08 08:20:13 +01:00
parent 6f0b224e5f
commit fa1da9dcf9
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/sale_analytic.py
+4 -12
View File
@@ -86,8 +86,6 @@ class AccountAnalyticLine(models.Model):
# a new line # a new line
if sol and sol.price_unit == self._get_invoice_price(sol.order_id): if sol and sol.price_unit == self._get_invoice_price(sol.order_id):
result.update({'so_line': sol.id}) result.update({'so_line': sol.id})
else:
sol = self.so_line
if not sol and self.account_id and self.product_id and self.product_id.invoice_policy == 'cost': if not sol and self.account_id and self.product_id and self.product_id.invoice_policy == 'cost':
order_line_vals = self._get_sale_order_line_vals() order_line_vals = self._get_sale_order_line_vals()
@@ -103,19 +101,13 @@ class AccountAnalyticLine(models.Model):
if self._context.get('create', False): if self._context.get('create', False):
return super(AccountAnalyticLine, self).write(values) return super(AccountAnalyticLine, self).write(values)
todo = self.mapped('so_line') lines = super(AccountAnalyticLine, self).write(values)
result = super(AccountAnalyticLine, self).write(values)
if 'so_line' in values:
todo |= self.mapped('so_line')
for line in self: for line in self:
res = self._get_sale_order_line(vals=values) res = line._get_sale_order_line(vals=values)
super(AccountAnalyticLine, line).write(res) super(AccountAnalyticLine, line).write(res)
if 'so_line' in res:
todo |= line.mapped('so_line')
todo._compute_analytic() self.mapped('so_line')._compute_analytic()
return result return lines
@api.model @api.model
def create(self, values): def create(self, values):