[ADD] #792 extra crm features

[RFR] make work days calculation accessible to other modules

Author: hbrunn

ps_crm/models/__init__.py

@@ -1,4 +1,5 @@
 from . import crm_lead
+from . import crm_lead_employee
 from . import crm_monthly_revenue
 from . import crm_monthly_revenue_split
 from . import crm_stage

ps_crm/models/crm_lead.py

@@ -8,6 +8,8 @@
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 
+from odoo.addons.ps_planning.models.ps_contracted_line import _get_work_days_dates
+
 
 class Lead(models.Model):
     _inherit = "crm.lead"
@@ -38,6 +40,12 @@ class Lead(models.Model):
         "lead_id",
         string="Revenue split",
     )
+    user_name = fields.Char(related="user_id.name")
+    lead_employee_ids = fields.One2many(
+        "crm.lead.employee", "lead_id", string="Employees"
+    )
+    first_employee_name = fields.Char(compute="_compute_first_employee_name")
+    docs_link = fields.Char("Link to documentation")
 
     @api.depends("monthly_revenue_ids.date")
     def _compute_latest_revenue_date(self):
@@ -60,13 +68,25 @@ def _compute_show_recalculate_total_button(self):
                 this.expected_revenue != this.sum_monthly_revenue
             )
 
+    @api.depends("lead_employee_ids")
+    def _compute_first_employee_name(self):
+        for this in self:
+            this.first_employee_name = this.lead_employee_ids[:1].employee_id.name
+
     @api.model
     def default_get(self, fields):
         res = super().default_get(fields)
         user = self.env.user
         res.update({"operating_unit_id": user.default_operating_unit_id.id})
         return res
 
+    @api.model_create_multi
+    def create(self, vals_list):
+        result = super().create(vals_list)
+        for this in result:
+            this.update_monthly_revenue()
+        return result
+
     def _get_split_operating_units(self):
         return self.env["operating.unit"].search(
             [
@@ -98,22 +118,24 @@ def update_monthly_revenue(self):
                 )
             )
             total_expected_revenue -= line.expected_revenue
-            manual_days += (line.month.date_end - line.month.date_start).days + 1
+            manual_days += _get_work_days_dates(
+                line.month.date_start, line.month.date_end
+            )
 
         month_end_date = (sd + relativedelta(months=1)).replace(day=1) - timedelta(
             days=1
         )
         if month_end_date > ed:
             month_end_date = ed
         monthly_revenues = []
-        total_days = (ed - sd).days + 1 - manual_days
+        total_days = _get_work_days_dates(sd, ed) - manual_days
 
         while True:
             if not any(
                 vals["date"].month == month_end_date.month
                 for _dummy, _dummy, vals in manual_lines
             ):
-                days_per_month = (month_end_date - sd).days + 1
+                days_per_month = _get_work_days_dates(sd, month_end_date)
                 expected_revenue_per_month = self.company_currency.round(
                     total_expected_revenue * days_per_month / total_days
                 )

ps_crm/models/crm_lead_employee.py

@@ -0,0 +1,11 @@
+from odoo import fields, models
+
+
+class CrmLeadEmployee(models.Model):
+    _name = "crm.lead.employee"
+    _description = "CRM lead employee"
+
+    lead_id = fields.Many2one("crm.lead", required=True)
+    employee_id = fields.Many2one("hr.employee", required=True)
+    rate = fields.Monetary()
+    currency_id = fields.Many2one(related="lead_id.company_currency")

ps_crm/models/crm_monthly_revenue.py

@@ -5,7 +5,10 @@
 
 from dateutil.relativedelta import relativedelta
 
-from odoo import api, fields, models
+from odoo import _, api, fields, models
+from odoo.tools.misc import format_date
+
+from odoo.addons.ps_planning.models.ps_contracted_line import _get_work_days_dates
 
 
 class CrmMonthlyRevenue(models.Model):
@@ -96,29 +99,6 @@ def onchange_editable_fields(self):
     def _compute_date_fields(self):
         date_range = self.env["date.range"]
         for this in self:
-            date = this.date
-
-            if date and this.latest_revenue_date:
-                lrd = this.latest_revenue_date
-                if date < lrd or (date.month == lrd.month and date.year == lrd.year):
-                    date = date = (lrd + relativedelta(months=2)).replace(
-                        day=1
-                    ) - timedelta(days=1)
-
-            if not date:
-                continue
-
-            days = " days (" if date.day > 1 else " day ("
-            this.no_of_days = (
-                str(date.day)
-                + days
-                + str(1)
-                + "-"
-                + str(date.day)
-                + " "
-                + str(date.strftime("%B"))
-                + ")"
-            )
             company_id = this.lead_id.company_id.id or this.env.user.company_id.id
             common_domain = [
                 ("date_start", "<=", this.date),
@@ -133,3 +113,10 @@ def _compute_date_fields(self):
                 common_domain + [("type_id.fiscal_year", "=", True)]
             )
             this.year = year.id
+
+            days = _get_work_days_dates(this.date.replace(day=1), this.date)
+            this.no_of_days = _("%d days (1 - %s %s)") % (
+                days,
+                this.date.day,
+                format_date(self.env, this.date, date_format="MMMM"),
+            )

ps_crm/models/crm_stage.py

@@ -8,4 +8,5 @@
 class CRMStage(models.Model):
     _inherit = "crm.stage"
 
+    active = fields.Boolean(default=True)
     popup_requirements = fields.Boolean("Show when changing")

ps_crm/security/ir.model.access.csv

@@ -30,3 +30,6 @@ access_account_tax_group_sale_manager_mgs,account.tax.group sale manager,account
 access_crm_monthly_revenue_reg_usr,crm.monthly.revenue.manager,model_crm_monthly_revenue,ps_crm.group_sale_regular_user,1,1,1,1
 access_crm_monthly_revenue_split_reg_usr,crm.revenue.split,model_crm_monthly_revenue_split,ps_crm.group_sale_regular_user,1,1,1,1
 access_crm_lead_mgs,sale.order,crm.model_crm_lead,ps_crm.group_sale_regular_user,1,1,1,1
+
+access_crm_lead_employee_user,access_crm_lead_employee,model_crm_lead_employee,group_sale_regular_user,1,1,1,1
+access_crm_lead_employee_salesman,access_crm_lead_employee,model_crm_lead_employee,sales_team.group_sale_salesman,1,1,1,1

ps_crm/views/crm_lead.xml

@@ -5,9 +5,12 @@
         <field name="inherit_id" ref="crm.crm_lead_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//group[1]" position="before">
-                <div colspan="2">
-                    <field name="contract_signed" />
+                <div>
+                    <field name="contract_signed" nolabel="1" />
                     <label for="contract_signed" />
+                    <br class="oe_edit_only" />
+                    <label for="docs_link" class="ml-4" />
+                    <field name="docs_link" widget="url" />
                 </div>
                 <field name="show_recalculate_total_button" invisible="1" />
                 <button
@@ -57,6 +60,15 @@
                         </tree>
                     </field>
                 </div>
+                <group string="Tariffs">
+                    <field name="lead_employee_ids" nolabel="1">
+                        <tree editable="bottom">
+                            <field name="employee_id" />
+                            <field name="rate" />
+                            <field name="currency_id" invisible="1" />
+                        </tree>
+                    </field>
+                </group>
             </xpath>
             <xpath expr="//field[@name='date_deadline']" position="after">
                 <field name="project_id" />
@@ -223,18 +235,90 @@
         <field name="model">crm.lead</field>
         <field name="inherit_id" ref="crm.quick_create_opportunity_form" />
         <field name="arch" type="xml">
+            <field name="partner_id" position="before">
+                <field name="name" position="move" />
+            </field>
+            <field name="partner_id" position="attributes">
+                <attribute name="string">Customer</attribute>
+            </field>
+            <field name="name" position="after">
+                <field name="start_date" />
+                <field name="end_date" />
+            </field>
             <xpath expr="//field[@name='partner_id']" position="after">
                 <field name="operating_unit_id" />
                 <field name="department_id" />
-                <field name="tag_ids" string="Proposition" widget="many2many_tags" />
-                <field name="date_deadline" string="Expected Closing Date" />
+                <field name="date_deadline" string="Deadline submission" />
             </xpath>
             <label for="expected_revenue" position="attributes">
                 <attribute name="string">Expected Revenue + Probability</attribute>
             </label>
             <xpath expr="//field[@name='expected_revenue']" position="after">
                 <field name="probability" />
             </xpath>
+            <field name="email_from" position="attributes">
+                <attribute name="invisible">True</attribute>
+            </field>
+            <field name="phone" position="attributes">
+                <attribute name="invisible">True</attribute>
+            </field>
+            <xpath
+                expr="//field[@name='priority' and @widget='priority']"
+                position="attributes"
+            >
+                <attribute name="invisible">True</attribute>
+            </xpath>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="crm_case_kanban_view_leads">
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_case_kanban_view_leads" />
+        <field name="arch" type="xml">
+            <field name="user_id" position="before">
+                <field name="user_name" />
+                <field name="date_deadline" />
+                <field name="first_employee_name" />
+            </field>
+            <xpath
+                expr="//div[hasclass('o_kanban_record_title')]//field"
+                position="before"
+            >
+                <xpath
+                    expr="//div/span[@t-if='record.partner_id.value']"
+                    position="move"
+                />
+            </xpath>
+            <xpath
+                expr="//div[hasclass('o_kanban_record_title')]//field"
+                position="attributes"
+            >
+                <attribute name="t-if">!record.partner_id.value</attribute>
+            </xpath>
+            <xpath expr="//div[hasclass('o_kanban_record_title')]" position="after">
+                <div t-if="record.partner_id.value">
+                    <field name="name" />
+                </div>
+                <div>
+                    <field name="user_name" />
+                </div>
+            </xpath>
+            <xpath expr="//field[@name='tag_ids']/.." position="before">
+                <div t-if="record.date_deadline and record.date_deadline.value">
+                    <field name="date_deadline" />
+                </div>
+                <div
+                    t-if="record.first_employee_name and record.first_employee_name.value"
+                >
+                    Proposed
+                    <field name="first_employee_name" />
+                </div>
+            </xpath>
+            <xpath
+                expr="//field[@name='priority' and @widget='priority']"
+                position="attributes"
+            >
+                <attribute name="invisible">True</attribute>
+            </xpath>
         </field>
     </record>
     <record id="crm.crm_lead_all_leads" model="ir.actions.act_window">

ps_planning/models/ps_contracted_line.py

@@ -8,6 +8,31 @@
 from odoo.exceptions import UserError, ValidationError
 
 
+def _get_work_days_dates(date_start, date_end):
+    start_weekday = date_start.weekday()
+    end_weekday = date_end.weekday()
+    weeks = (
+        (
+            (date_end + relativedelta(weekday=SU))
+            - (
+                date_start
+                + (
+                    relativedelta(weekday=SA)
+                    if start_weekday != 6
+                    else relativedelta(days=-1)
+                )
+            )
+        ).days
+        - 1
+    ) / 7
+    days = weeks * 5
+    if start_weekday < 5:
+        days += 5 - start_weekday
+    if end_weekday < 4:
+        days -= 4 - end_weekday
+    return days
+
+
 class PsContractedLine(models.Model):
     _name = "ps.contracted.line"
     _inherit = "ps.planning.department.mixin"
@@ -222,25 +247,4 @@ def _get_work_days(self, period):
         return self._get_work_days_dates(period.date_start, period.date_end)
 
     def _get_work_days_dates(self, date_start, date_end):
-        start_weekday = date_start.weekday()
-        end_weekday = date_end.weekday()
-        weeks = (
-            (
-                (date_end + relativedelta(weekday=SU))
-                - (
-                    date_start
-                    + (
-                        relativedelta(weekday=SA)
-                        if start_weekday != 6
-                        else relativedelta(days=-1)
-                    )
-                )
-            ).days
-            - 1
-        ) / 7
-        days = weeks * 5
-        if start_weekday < 5:
-            days += 5 - start_weekday
-        if end_weekday < 4:
-            days -= 4 - end_weekday
-        return days
+        return _get_work_days_dates(date_start, date_end)