May 5 : [UPDT] Feature Updated 'commission_plan'

commission_plan/__manifest__.py

@@ -24,7 +24,7 @@
     'description': """CRM Commission Plan for odoo15, CRM, crm commission, commission plan, crm features""",
     'summary': """CRM Commission Plan for odoo15""",
     "category": 'Sales',
-    "version": '15.0.1.0.0',
+    "version": '15.0.1.0.1',
     'author': 'Cybrosys Techno Solutions',
     'company': 'Cybrosys Techno Solutions',
     'maintainer': 'Cybrosys Techno Solutions',

commission_plan/doc/RELEASE_NOTES.md

@@ -3,4 +3,9 @@
 #### 18.12.2021
 #### Version 15.0.1.0.0
 #### ADD
-- Initial commit for Commission Plan Module
+- Initial commit for Commission Plan Module
+
+#### 26.04.2023
+#### Version 15.0.1.0.1
+#### UPDT
+- Updated the commission amount type, added the option to use fixed amount commission.

commission_plan/models/commission.py

@@ -41,7 +41,17 @@ class CommissionPlan(models.Model):
     user_id = fields.Many2one('res.users', string='Salesperson')
     product_comm_ids = fields.One2many('commission.product', 'commission_id',
                                        string="Product Wise")
+    currency_id = fields.Many2one("res.currency", string="Currency",
+                                  default=lambda self:
+                                  self.env.user.company_id.currency_id.id)
+    straight_commission_type = fields.Selection([('percentage', 'Percentage'),
+                                                ('fixed', 'Fixed Amount')],
+                                                string="Amount Type",
+                                                default='percentage')
+
+    straight_commission_fixed = fields.Monetary('Commission Amount', default=0.0)
     straight_commission_rate = fields.Float(string='Commission rate (%)')
+
     revenue_grd_comm_ids = fields.One2many(
         'commission.graduated',
         'commission_id',
@@ -78,6 +88,9 @@ class CommissionProduct(models.Model):
     category_id = fields.Many2one('product.category', string='Product Category')
     product_id = fields.Many2one('product.product', string='Product',
                                  domain="[('categ_id', '=', category_id)]")
+    commission_amount_type = fields.Selection([('percentage', 'Percentage'),
+                                               ('fixed', 'Fixed Amount')], string="Amount Type", default='percentage')
+    fixed_amount = fields.Monetary('Commission Amount', default=0.0)
     percentage = fields.Float(string='Rate in Percentage (%)')
     amount = fields.Monetary('Maximum Commission Amount', default=0.0)
     currency_id = fields.Many2one("res.currency", string="Currency",
@@ -90,6 +103,12 @@ class CommissionRevenueGraduated(models.Model):
     _name = 'commission.graduated'
     _description = 'Commission Revenue Graduated Wise'
 
+    currency_id = fields.Many2one("res.currency", string="Currency",
+                                  default=lambda self:
+                                  self.env.user.company_id.currency_id.id)
+    graduated_amount_type = fields.Selection([('percentage', 'Percentage'), ('fixed', 'Fixed Amount')],
+                                             string="Amount Type", default='percentage')
+    graduated_fixed_amount = fields.Monetary('Commission Amount', default=0.0)
     graduated_commission_rate = fields.Float(string='Commission rate (%)')
     amount_from = fields.Float(string="From Amount")
     amount_to = fields.Float(string="To Amount")

commission_plan/static/description/index.html

@@ -231,7 +231,8 @@
                     selecting the Type the Product Wise options can be selected. Further, the Product Categories
                     with
                     respect to the respective Product Category based Commission Plan can be defined.</p>
-                <img src="assets/screenshots/Crm-Commission-Plan-2.png" class="img-responsive img-thumbnail border">
+                <p>You can also choose the commission amount type as fixed or percentage for each product.</p>
+                <img src="assets/screenshots/Crm-Commission-Plan-2-1.png" class="img-responsive img-thumbnail border">
             </div>
             <div class="mt-5">
                 <div class="d-flex mb-2" style="padding-bottom: 0.5rem !important;">
@@ -247,7 +248,11 @@
                     Commission. Further, the commission rate can be defined under the Straight Revenue
                     Commission
                     tab.</p>
-                <img src="assets/screenshots/Crm-Commission-Plan-3.png" class="img-responsive img-thumbnail border">
+                <p>The commission amount type can be chosen as fixed or percentage. You need to enter the percentage rate if you choose percentage type.</p>
+                <img src="assets/screenshots/Crm-Commission-Plan-3-1.png" class="img-responsive img-thumbnail border">
+
+                <p>You need to enter the fixed amount if you choose the fixed type.</p>
+                <img src="assets/screenshots/Crm-Commission-Plan-3-2.png" class="img-responsive img-thumbnail border">
             </div>
 
             <div class="mt-5">
@@ -257,7 +262,7 @@
                     <h3>Revenue-based Commission Plan: Graduated Revenue Commission Plan</h3>
                 </div>
                 <p>While Creating a Graduated Revenue Commission Plan the Commission type can be selected as
-                    Graduated Commission. Further, the commission rate can be defined under the Graduated
+                    Graduated Commission. Further, the commission rate/ commission amount can be defined under the Graduated
                     Revenue
                     Commission tab.</p>
                 <img src="assets/screenshots/Crm-Commission-Plan-4.png" class="img-responsive img-thumbnail border">

commission_plan/views/commission.xml

@@ -62,15 +62,19 @@
                                 <tree editable="Top" create="1" multi_edit="1">
                                     <field name="category_id" style="width:20%%"/>
                                     <field name="product_id" style="width:20%%"/>
-                                    <field name="percentage" style="width:50%%"/>
-                                    <field name="amount" style="width:50%%"/>
+                                    <field name="commission_amount_type"/>
+                                    <field name="percentage" attrs="{'invisible' : [('commission_amount_type', '=', 'fixed')]}"/>
+                                    <field name="fixed_amount"  attrs="{'invisible' : [('commission_amount_type', '!=', 'fixed')]}"/>
+                                    <field name="amount"  attrs="{'invisible' : [('commission_amount_type', '=', 'fixed')]}"/>
                                 </tree>
                             </field>
                         </page>
                         <page string="Straight Revenue Commission" attrs="{'invisible' : ['|','|',('type', '=', 'product'),('revenue_type', '=', False),('revenue_type', '=', 'graduated')]}">
                             <group>
+                                <field name="straight_commission_type"/>
+                                <field name="straight_commission_fixed"  attrs="{'invisible' : [('straight_commission_type', '!=', 'fixed')]}"/>
                                 <field name="straight_commission_rate" string="Commission rate (%)"
-                                       attrs="{'invisible' : ['|','|',('type', '=', 'product'),('revenue_type', '=', False),('revenue_type', '=', 'graduated')]}"/>
+                                       attrs="{'invisible' : ['|','|','|',('straight_commission_type', '=', 'fixed'),('type', '=', 'product'),('revenue_type', '=', False),('revenue_type', '=', 'graduated')]}"/>
                             </group>
                         </page>
                         <page string="Graduated Revenue Commission" attrs="{'invisible' : ['|','|',('type', '=', 'product'),('revenue_type', '=', False),('revenue_type', '=', 'straight')]}">
@@ -79,7 +83,9 @@
                                     <field name="sequence"/>
                                     <field name="amount_from"/>
                                     <field name="amount_to"/>
-                                    <field name="graduated_commission_rate"/>
+                                    <field name="graduated_amount_type" widget="selection" style="max-width:200px !important;"/>
+                                    <field name="graduated_fixed_amount"  style="min-width:200px !important;" attrs="{'invisible' : [('graduated_amount_type', '!=', 'fixed')]}"/>
+                                    <field name="graduated_commission_rate" style="min-width:200px !important;" attrs="{'invisible' : [('graduated_amount_type', '=', 'fixed')]}"/>
                                 </tree>
                             </field>
                         </page>

commission_plan/wizard/commission_report.py

@@ -107,20 +107,25 @@ class CommissionReportWizard(models.TransientModel):
                         lambda l: l.product_id == rule.product_id)
                     total_price = sum(
                         product_order_line.mapped('price_subtotal'))
-                    product_commission = (total_price * rule.percentage) / 100
+                    if rule.commission_amount_type == 'percentage':
+                        product_commission = (total_price * rule.percentage) / 100
+                    elif rule.commission_amount_type == 'fixed':
+                        product_commission = rule.fixed_amount
                     total_list.append(total_price)
                     user_commission_name.append(commission_id.name)
                     user_commission_salesperson.append(user.name)
                     commission_list.append(rule.amount) if (
-                            product_commission > rule.amount) \
+                            product_commission > rule.amount and rule.commission_amount_type == 'percentage') \
                         else commission_list.append(product_commission)
-
             if commission_id.type == 'revenue' and (
                     commission_id.revenue_type == 'graduated'):
                 for rule in commission_id.revenue_grd_comm_ids:
                     if rule.amount_from <= filtered_order_lines_commission_total < rule.amount_to:
-                        graduated_commission = (filtered_order_lines_commission_total
+                        if rule.graduated_amount_type == 'percentage':
+                            graduated_commission = (filtered_order_lines_commission_total
                                                 * rule.graduated_commission_rate) / 100
+                        elif rule.graduated_amount_type == 'fixed':
+                            graduated_commission = rule.graduated_fixed_amount
                         commission_list.append(graduated_commission)
                         user_commission_name.append(commission_id.name)
                         user_commission_salesperson.append(user.name)
@@ -128,8 +133,11 @@ class CommissionReportWizard(models.TransientModel):
 
             if commission_id.type == 'revenue' and (
                     commission_id.revenue_type == 'straight'):
-                straight_commission = (filtered_order_lines_commission_total
-                                       * commission_id.straight_commission_rate) / 100
+                if commission_id.straight_commission_type == 'percentage':
+                    straight_commission = (filtered_order_lines_commission_total
+                                           * commission_id.straight_commission_rate) / 100
+                elif commission_id.straight_commission_type == 'fixed':
+                    straight_commission = commission_id.straight_commission_fixed
                 commission_list.append(straight_commission)
                 user_commission_name.append(commission_id.name)
                 user_commission_salesperson.append(user.name)
@@ -177,14 +185,17 @@ class CommissionReportWizard(models.TransientModel):
                             lambda l: l.product_id == rules.product_id)
                         total_price = sum(
                             product_order_line.mapped('price_subtotal'))
-                        product_commission = (total_price * rules.percentage) / 100
+                        if rules.commission_amount_type == 'percentage':
+                            product_commission = (total_price * rules.percentage) / 100
+                        elif rules.commission_amount_type == 'fixed':
+                            product_commission = rules.fixed_amount
                         commission_total.append(total_price)
                         commission_name.append(commissions_id.name)
                         commission_salesperson.append(team_user.name)
                         commission_sales_team.append(
                             team_user.sale_team_id.name)
                         commission.append(rules.amount) if (
-                                product_commission > rules.amount) \
+                                product_commission > rules.amount and rules.commission_amount_type == 'percentage') \
                             else commission.append(product_commission)
 
                 if commissions_id.type == 'revenue' and (
@@ -192,8 +203,12 @@ class CommissionReportWizard(models.TransientModel):
                     for rules in commissions_id.revenue_grd_comm_ids:
                         if rules.amount_from <= filtered_order_lines_commission_total \
                                 < rules.amount_to:
-                            graduated_commission = (filtered_order_lines_commission_total
-                                                               * rules.graduated_commission_rate) / 100
+                            if rules.graduated_amount_type == 'percentage':
+                                graduated_commission = (filtered_order_lines_commission_total
+                                                        * rules.graduated_commission_rate) / 100
+                            elif rules.graduated_amount_type == 'fixed':
+                                graduated_commission = rules.graduated_fixed_amount
+
                             commission.append(graduated_commission)
                             commission_name.append(commissions_id.name)
                             commission_salesperson.append(team_user.name)
@@ -204,8 +219,11 @@ class CommissionReportWizard(models.TransientModel):
 
                 if commissions_id.type == 'revenue' and (
                         commissions_id.revenue_type == 'straight'):
-                    straight_commission = (filtered_order_lines_commission_total
-                                           * commissions_id.straight_commission_rate) / 100
+                    if commission_id.straight_commission_type == 'percentage':
+                        straight_commission = (filtered_order_lines_commission_total
+                                               * commission_id.straight_commission_rate) / 100
+                    elif commission_id.straight_commission_type == 'fixed':
+                        straight_commission = commission_id.straight_commission_fixed
                     commission.append(straight_commission)
                     commission_name.append(commissions_id.name)
                     commission_salesperson.append(team_user.name)