diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-02-29 13:09:06 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-02-29 13:09:06 +0100 |
| commit | a3bc09ce94a9c0a38e54ffd33b90e15f9fda0ebb (patch) | |
| tree | 9bc90c4681ed2accfc5857fd27f7c9e164035b6e | |
| parent | 1c7f5a45e526142a9a2d6c752d81131a58e97148 (diff) | |
[FIX] base,sale_margin: correct error introduced during previous forward-port
| -rw-r--r-- | addons/sale_margin/models/sale_order.py | 2 | ||||
| -rw-r--r-- | openerp/addons/base/res/res_partner.py | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/addons/sale_margin/models/sale_order.py b/addons/sale_margin/models/sale_order.py index e1f2c59056f..a8e1ed6ef8b 100644 --- a/addons/sale_margin/models/sale_order.py +++ b/addons/sale_margin/models/sale_order.py @@ -39,7 +39,7 @@ class SaleOrderLine(models.Model): vals['purchase_price'] = self._compute_margin(order_id, product_id, product_uom_id) - return super(sale_order_line, self).create(vals) + return super(SaleOrderLine, self).create(vals) @api.depends('product_id', 'purchase_price', 'product_uom_qty', 'price_unit') def _product_margin(self): diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 3b44a876916..9bf594cc82f 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -562,9 +562,6 @@ class res_partner(osv.Model, format_address): @api.model def create(self, vals): - if vals.get('type') in ['delivery', 'invoice'] and not vals.get('image'): - # force no colorize for images with no transparency - vals['image'] = self.with_context(partner_type=vals['type'])._get_default_image(False, False) if vals.get('website'): vals['website'] = self._clean_website(vals['website']) # function field not correctly triggered at create -> remove me when |