From 492c8707fe27deee6c154442b4e87a7c4f804124 Mon Sep 17 00:00:00 2001 From: EliseDup Date: Fri, 3 Jun 2016 17:21:47 +0200 Subject: [PATCH] Add profit margin in product_category --- beesdoo_product/models/beesdoo_product.py | 40 +++++++++++++++++------ beesdoo_product/views/beesdoo_product.xml | 29 +++++++++++++--- 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/beesdoo_product/models/beesdoo_product.py b/beesdoo_product/models/beesdoo_product.py index 57a8c29..6b41ebe 100644 --- a/beesdoo_product/models/beesdoo_product.py +++ b/beesdoo_product/models/beesdoo_product.py @@ -6,10 +6,10 @@ from openerp.exceptions import UserError class BeesdooProduct(models.Model): _inherit = "product.template" - eco_label = fields.Many2one('beesdoo.product.label', domain = [('type', '=', 'eco')]) - local_label = fields.Many2one('beesdoo.product.label', domain = [('type', '=', 'local')]) - fair_label = fields.Many2one('beesdoo.product.label', domain = [('type', '=', 'fair')]) - origin_label = fields.Many2one('beesdoo.product.label', domain = [('type', '=', 'delivery')]) + eco_label = fields.Many2one('beesdoo.product.label', domain=[('type', '=', 'eco')]) + local_label = fields.Many2one('beesdoo.product.label', domain=[('type', '=', 'local')]) + fair_label = fields.Many2one('beesdoo.product.label', domain=[('type', '=', 'fair')]) + origin_label = fields.Many2one('beesdoo.product.label', domain=[('type', '=', 'delivery')]) main_seller_id = fields.Many2one('res.partner', compute='_compute_main_seller_id', store=True) @@ -26,15 +26,19 @@ class BeesdooProduct(models.Model): # S0023 : List_price = Price HTVA, so add a suggested price list_price = fields.Float(string='exVAT Price') - suggested_price = fields.Float(string='Suggested Price', compute='_get_suggested_price', readOnly = True) + suggested_price = fields.Float(string='Suggested Price', compute='_compute_cost', readOnly=True) + standard_price = fields.Float(compute='_compute_cost') + + def _get_main_supplier_info(self): + return self.seller_ids.sorted(key=lambda seller: seller.date_start, reverse=True) @api.one @api.depends('seller_ids', 'seller_ids.date_start') def _compute_main_seller_id(self): # Calcule le vendeur associé qui a la date de début la plus récente et plus petite qu’aujourd’hui - sellers_ids = self.seller_ids.sorted(key=lambda seller: seller.date_start, reverse=True) + sellers_ids = self._get_main_supplier_info() # self.seller_ids.sorted(key=lambda seller: seller.date_start, reverse=True) self.main_seller_id = sellers_ids and sellers_ids[0].name or False - + @api.one @api.depends('taxes_id', 'list_price', 'taxes_id.amount', 'taxes_id.tax_group_id', 'total_with_vat', 'display_weight', 'weight') def _get_total(self): @@ -57,10 +61,15 @@ class BeesdooProduct(models.Model): raise UserError(_('Reference Unit and Display Unit should belong to the same category')) @api.one - @api.depends('list_price') - def _get_suggested_price(self): - self.suggested_price = 1000.0 + @api.depends('seller_ids') + def _compute_cost(self): + suppliers = self._get_main_supplier_info() + if(len(suppliers) > 0): + self.standard_price = suppliers[0].price + self.suggested_price = (suppliers[0].price)* (1 + suppliers[0].product_tmpl_id.categ_id.profit_margin / 100) + + class BeesdooProductLabel(models.Model): _name = "beesdoo.product.label" @@ -68,3 +77,14 @@ class BeesdooProductLabel(models.Model): type = fields.Selection([('eco', 'Écologique'), ('local', 'Local'), ('fair', 'Équitable'), ('delivery', 'Distribution')]) color_code = fields.Char() +class BeesdooProductCategory(models.Model): + _inherit = "product.category" + + profit_margin = fields.Float(default = '10.0', string = "Product Margin [%]") + + @api.one + @api.constrains('profit_margin') + def _check_margin(self): + if (self.profit_margin < 0.0): + raise UserError(_('Percentages for Profit Margin must > 0.')) + diff --git a/beesdoo_product/views/beesdoo_product.xml b/beesdoo_product/views/beesdoo_product.xml index f366c11..bd70c39 100644 --- a/beesdoo_product/views/beesdoo_product.xml +++ b/beesdoo_product/views/beesdoo_product.xml @@ -1,14 +1,13 @@ - - bees.product.template.form product.template - + 1 @@ -54,7 +53,6 @@ - bees.product.label.form beesdoo.product.label @@ -68,4 +66,27 @@ + + + beesdoo.product.category.list + product.category + + + + + + + + + + beesdoo.product.category.form + product.category + + + + + + + + \ No newline at end of file