diff --git a/cor_custom/models/analytic.py b/cor_custom/models/analytic.py
index f2efbc2..0eda290 100755
--- a/cor_custom/models/analytic.py
+++ b/cor_custom/models/analytic.py
@@ -14,8 +14,8 @@ import dateutil.parser
class AccountAnalyticLine(models.Model):
_inherit = 'account.analytic.line'
- #start_time = fields.Float(string='Start Time', digits=(16, 2))
- #end_time = fields.Float(string='End Time', digits=(16, 2))
+ start_time = fields.Float(string='Start Time', digits=(16, 2))
+ end_time = fields.Float(string='End Time', digits=(16, 2))
start_datetime = fields.Datetime("Start Time", required=True)
end_datetime = fields.Datetime("End Time", required=True)
unit_amount = fields.Float('Duration', default=0.0)
diff --git a/cor_custom/views/analytic_view.xml b/cor_custom/views/analytic_view.xml
index 5957cde..bf620be 100755
--- a/cor_custom/views/analytic_view.xml
+++ b/cor_custom/views/analytic_view.xml
@@ -21,6 +21,8 @@
+
@@ -178,21 +180,6 @@
-
- account.analytic.line.search
- account.analytic.line
-
-
-
-
-
-
-
-
-
-
-
-
account.analytic.line.calendar
account.analytic.line
diff --git a/sub_project/__manifest__.py b/sub_project/__manifest__.py
index ae3332f..1b22b94 100755
--- a/sub_project/__manifest__.py
+++ b/sub_project/__manifest__.py
@@ -9,6 +9,7 @@
'license': '',
'depends': ['base', 'project'],
'data': ['views/sub_project.xml',
+ #'views/analytic_view.xml',
'security/ir.model.access.csv'],
'demo': [''],
'installable': True,
diff --git a/sub_project/models/__init__.py b/sub_project/models/__init__.py
index d30a3e9..d5082c4 100755
--- a/sub_project/models/__init__.py
+++ b/sub_project/models/__init__.py
@@ -1 +1,2 @@
-from . import sub_project
\ No newline at end of file
+from . import sub_project
+from . import analytic
\ No newline at end of file
diff --git a/sub_project/models/analytic.py b/sub_project/models/analytic.py
new file mode 100755
index 0000000..4cba857
--- /dev/null
+++ b/sub_project/models/analytic.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details
+
+from odoo import api, exceptions, fields, models, tools, _
+from odoo.exceptions import UserError, AccessError, ValidationError
+from odoo.osv import expression
+import math
+from datetime import datetime, time, timedelta
+from odoo.tools.float_utils import float_round
+from odoo.tools import DEFAULT_SERVER_DATE_FORMAT, ustr
+import dateutil.parser
+
+
+class AccountAnalyticLineSubProject(models.Model):
+ _inherit = 'account.analytic.line'
+
+ sub_project = fields.Many2many('project.project', 'project_subproject_timesheet_rel', 'project_id', 'id',
+ domain="[('is_sub_project', '=', True),('parent_project', '=', False)]",
+ string='Sub Project')
+
+
+
+ # @api.onchange('project_id')
+ # def _onchange_parent_project_id(self):
+ # if self.project_id:
+ # parent_project = self.env['project.project'].search([('sub_project', '=', self.project_id.id)], limit=1)
+ # if parent_project:
+ # self.parent_project = parent_project.id
+ # else:
+ # self.parent_project = False
+ # else:
+ # self.parent_project = False
\ No newline at end of file
diff --git a/sub_project/views/analytic_view.xml b/sub_project/views/analytic_view.xml
new file mode 100755
index 0000000..2fcb11f
--- /dev/null
+++ b/sub_project/views/analytic_view.xml
@@ -0,0 +1,13 @@
+
+
+
+ account.analytic.line.tree.subproject
+ account.analytic.line
+
+
+
+
+
+
+
+