From 83f6ea35e686df7f5886e2084770de2b39515a81 Mon Sep 17 00:00:00 2001 From: projectsodoo Date: Wed, 16 Dec 2020 11:03:26 +0530 Subject: [PATCH] Analytic percentage field added and crm start, close date added --- cor_custom/__manifest__.py | 3 ++- cor_custom/models/__init__.py | 3 ++- cor_custom/models/analytic.py | 13 +++++++++++++ cor_custom/models/crm_lead.py | 2 ++ cor_custom/views/analytic_view.xml | 18 ++++++++++++++++++ cor_custom/views/crm_view.xml | 2 ++ cor_custom/views/project_view.xml | 13 +++++++++++++ 7 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 cor_custom/models/analytic.py create mode 100755 cor_custom/views/analytic_view.xml diff --git a/cor_custom/__manifest__.py b/cor_custom/__manifest__.py index 48ec7f2..57a12ab 100644 --- a/cor_custom/__manifest__.py +++ b/cor_custom/__manifest__.py @@ -20,7 +20,7 @@ 'version': '0.1', # any module necessary for this one to work correctly - 'depends': ['base', 'crm', 'sale_timesheet'], + 'depends': ['base', 'crm', 'sale_timesheet', 'analytic'], # always loaded 'data': [ @@ -28,6 +28,7 @@ 'views/crm_view.xml', 'views/project_view.xml', 'views/hr_timesheet_templates.xml', + 'views/analytic_view.xml', 'views/views.xml', 'views/templates.xml', ], diff --git a/cor_custom/models/__init__.py b/cor_custom/models/__init__.py index 284dfb7..8e0c0a0 100644 --- a/cor_custom/models/__init__.py +++ b/cor_custom/models/__init__.py @@ -3,4 +3,5 @@ from . import crm_lead from . import models from . import project -from . import project_overview \ No newline at end of file +from . import project_overview +from . import analytic \ No newline at end of file diff --git a/cor_custom/models/analytic.py b/cor_custom/models/analytic.py new file mode 100644 index 0000000..97c0605 --- /dev/null +++ b/cor_custom/models/analytic.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details + +from odoo import api, fields, models, _ +from odoo.exceptions import UserError, AccessError +from odoo.osv import expression + +class AccountAnalyticLine(models.Model): + _inherit = 'account.analytic.line' + + ispercentage = fields.Boolean(string="Is Percentage", default=False) + percentage_rate = fields.Float(string="Percentage (%)") + per_from_amt = fields.Float(string="Of", digits=(6, 2)) \ No newline at end of file diff --git a/cor_custom/models/crm_lead.py b/cor_custom/models/crm_lead.py index 3440a59..27ff63e 100644 --- a/cor_custom/models/crm_lead.py +++ b/cor_custom/models/crm_lead.py @@ -12,3 +12,5 @@ class Lead(models.Model): ref_summary_status = fields.Char(string='Referral Summary status') project_scope = fields.Char(string='The scope of the project') client_folder = fields.Char(string='Client Folder') + start_date = fields.Date(string='Start Date') + close_date = fields.Date(string='Close Date') diff --git a/cor_custom/views/analytic_view.xml b/cor_custom/views/analytic_view.xml new file mode 100755 index 0000000..dd0c981 --- /dev/null +++ b/cor_custom/views/analytic_view.xml @@ -0,0 +1,18 @@ + + + + + Percentage Analytic + account.analytic.line + + + + + + + + + + + + diff --git a/cor_custom/views/crm_view.xml b/cor_custom/views/crm_view.xml index ac52133..11fa30e 100755 --- a/cor_custom/views/crm_view.xml +++ b/cor_custom/views/crm_view.xml @@ -14,6 +14,8 @@ + + diff --git a/cor_custom/views/project_view.xml b/cor_custom/views/project_view.xml index 1d3d46b..4f88986 100755 --- a/cor_custom/views/project_view.xml +++ b/cor_custom/views/project_view.xml @@ -1,6 +1,19 @@ + + Project Analytic + project.project + + +
+ +
+
+
+ + project.project.form.inherit project.project